Change getCanonicalName() to getName() in api

Per javadocs, getName() should generally be used instead of
Class.getCanonicalName(). This change only applies to classes; it
does not apply to File objects.

Change-Id: Ia1726f178f906bfdfbd056c50598228cff8e1a2d
Issue-ID: POLICY-1646
Signed-off-by: Jim Hahn <jrh3@att.com>

1 files changed, 6 insertions, 11 deletions

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);
         }
     }