From 1f8ab3cf97f2c6168f0d6086e9b0755363b67da3 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 17 Jun 2019 10:30:20 -0400 Subject: [PATCH] Change getCanonicalName() to getName() in xacml-pdp 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: Id9ad514a7ba10e7cdbf292bba2b07135bdbd2572 Issue-ID: POLICY-1646 Signed-off-by: Jim Hahn --- .../main/java/org/onap/policy/pdpx/main/rest/XacmlPdpRestServer.java | 4 ++-- .../onap/policy/pdpx/main/startstop/XacmlPdpCommandLineArguments.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpRestServer.java b/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpRestServer.java index a64953bd..4b89cb16 100644 --- a/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpRestServer.java +++ b/main/src/main/java/org/onap/policy/pdpx/main/rest/XacmlPdpRestServer.java @@ -70,7 +70,7 @@ public class XacmlPdpRestServer implements Startable { // for (final HttpServletServer server : servers) { if (server.isAaf()) { - server.addFilterClass(null, XacmlPdpAafFilter.class.getCanonicalName()); + server.addFilterClass(null, XacmlPdpAafFilter.class.getName()); } server.start(); } @@ -95,7 +95,7 @@ public class XacmlPdpRestServer implements Startable { props.setProperty(HTTP_SERVER_SERVICES + SEPARATOR + restServerParameters.getName() + ".port", Integer.toString(restServerParameters.getPort())); props.setProperty(HTTP_SERVER_SERVICES + SEPARATOR + restServerParameters.getName() + ".restClasses", - XacmlPdpRestController.class.getCanonicalName()); + XacmlPdpRestController.class.getName()); props.setProperty(HTTP_SERVER_SERVICES + SEPARATOR + restServerParameters.getName() + ".managed", "false"); props.setProperty(HTTP_SERVER_SERVICES + SEPARATOR + restServerParameters.getName() + ".swagger", "true"); props.setProperty(HTTP_SERVER_SERVICES + SEPARATOR + restServerParameters.getName() + ".userName", diff --git a/main/src/main/java/org/onap/policy/pdpx/main/startstop/XacmlPdpCommandLineArguments.java b/main/src/main/java/org/onap/policy/pdpx/main/startstop/XacmlPdpCommandLineArguments.java index 7a04d237..f393fc91 100644 --- a/main/src/main/java/org/onap/policy/pdpx/main/startstop/XacmlPdpCommandLineArguments.java +++ b/main/src/main/java/org/onap/policy/pdpx/main/startstop/XacmlPdpCommandLineArguments.java @@ -137,7 +137,7 @@ public class XacmlPdpCommandLineArguments { } if (commandLine.hasOption('h')) { - return help(Main.class.getCanonicalName()); + return help(Main.class.getName()); } if (commandLine.hasOption('v')) { -- 2.16.6