aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam Fallon <liam.fallon@est.tech>2019-06-18 12:42:51 +0000
committerGerrit Code Review <gerrit@onap.org>2019-06-18 12:42:51 +0000
commit95c4529dc6ee374a1438af53ccff2033a11d1902 (patch)
treedb54fac667d8c079df87f1f85d6ce203a0a33927
parentdb27731b36f50bfe731fd33e96f2c3ce34f659e0 (diff)
parent7403d21c2c60368c34d4750ffaa698fc9379f1be (diff)
Merge "Change getCanonicalName() to getName() in api"
-rw-r--r--main/src/main/java/org/onap/policy/api/main/rest/ApiRestServer.java6
-rw-r--r--main/src/main/java/org/onap/policy/api/main/startstop/ApiCommandLineArguments.java2
-rw-r--r--main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java17
3 files changed, 10 insertions, 15 deletions
diff --git a/main/src/main/java/org/onap/policy/api/main/rest/ApiRestServer.java b/main/src/main/java/org/onap/policy/api/main/rest/ApiRestServer.java
index 2a7b0cef..42133fdf 100644
--- a/main/src/main/java/org/onap/policy/api/main/rest/ApiRestServer.java
+++ b/main/src/main/java/org/onap/policy/api/main/rest/ApiRestServer.java
@@ -66,7 +66,7 @@ public class ApiRestServer implements Startable {
servers = HttpServletServer.factory.build(getServerProperties());
for (HttpServletServer server : servers) {
if (server.isAaf()) {
- server.addFilterClass(null, AafApiFilter.class.getCanonicalName());
+ server.addFilterClass(null, AafApiFilter.class.getName());
}
server.start();
}
@@ -92,8 +92,8 @@ public class ApiRestServer implements Startable {
props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_PORT_SUFFIX,
Integer.toString(restServerParameters.getPort()));
props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_REST_CLASSES_SUFFIX,
- String.join(",", LegacyApiRestController.class.getCanonicalName(),
- ApiRestController.class.getCanonicalName()));
+ String.join(",", LegacyApiRestController.class.getName(),
+ ApiRestController.class.getName()));
props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_MANAGED_SUFFIX, "false");
props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_SWAGGER_SUFFIX, "true");
props.setProperty(svcpfx + PolicyEndPointProperties.PROPERTY_HTTP_AUTH_USERNAME_SUFFIX,
diff --git a/main/src/main/java/org/onap/policy/api/main/startstop/ApiCommandLineArguments.java b/main/src/main/java/org/onap/policy/api/main/startstop/ApiCommandLineArguments.java
index f6c1c781..26fca0ea 100644
--- a/main/src/main/java/org/onap/policy/api/main/startstop/ApiCommandLineArguments.java
+++ b/main/src/main/java/org/onap/policy/api/main/startstop/ApiCommandLineArguments.java
@@ -126,7 +126,7 @@ public class ApiCommandLineArguments {
}
if (commandLine.hasOption('h')) {
- return help(Main.class.getCanonicalName());
+ return help(Main.class.getName());
}
if (commandLine.hasOption('v')) {
diff --git a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
index ec4640e3..166bbb4a 100644
--- a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
+++ b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
@@ -169,18 +169,13 @@ public class TestApiRestServer {
* Method for cleanup after each test.
*/
@After
- public void teardown() {
-
- try {
- if (NetworkUtil.isTcpPortOpen("localhost", 6969, 1, 1000L)) {
- if (main != null) {
- stopApiService(main);
- } else if (restServer != null) {
- restServer.stop();
- }
+ public void teardown() throws Exception {
+ if (NetworkUtil.isTcpPortOpen("localhost", 6969, 1, 1000L)) {
+ if (main != null) {
+ stopApiService(main);
+ } else if (restServer != null) {
+ restServer.stop();
}
- } catch (InterruptedException | IOException | PolicyApiException exp) {
- LOGGER.error("teardown failed", exp);
}
}