From 7c0d9b8016859f5c7033a1c4afabda9c0c46d738 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 17 Jun 2019 18:04:43 -0400 Subject: Change getCanonicalName to getName in distribution 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: I7a575900f6d26065563e4907cd2176f690797021 Issue-ID: POLICY-1646 Signed-off-by: Jim Hahn --- .../org/onap/policy/distribution/main/rest/DistributionRestServer.java | 2 +- .../distribution/main/startstop/DistributionCommandLineArguments.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'main/src') diff --git a/main/src/main/java/org/onap/policy/distribution/main/rest/DistributionRestServer.java b/main/src/main/java/org/onap/policy/distribution/main/rest/DistributionRestServer.java index 8e78fdb7..0a03bcbb 100644 --- a/main/src/main/java/org/onap/policy/distribution/main/rest/DistributionRestServer.java +++ b/main/src/main/java/org/onap/policy/distribution/main/rest/DistributionRestServer.java @@ -87,7 +87,7 @@ public class DistributionRestServer implements Startable { props.setProperty(HTTP_SERVER_SERVICES + SEPARATOR + restServerParameters.getName() + ".port", Integer.toString(restServerParameters.getPort())); props.setProperty(HTTP_SERVER_SERVICES + SEPARATOR + restServerParameters.getName() + ".restClasses", - DistributionRestController.class.getCanonicalName()); + DistributionRestController.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/distribution/main/startstop/DistributionCommandLineArguments.java b/main/src/main/java/org/onap/policy/distribution/main/startstop/DistributionCommandLineArguments.java index b805456e..a56bf9ce 100644 --- a/main/src/main/java/org/onap/policy/distribution/main/startstop/DistributionCommandLineArguments.java +++ b/main/src/main/java/org/onap/policy/distribution/main/startstop/DistributionCommandLineArguments.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2019 AT&T Intellectual Property. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -127,7 +128,7 @@ public class DistributionCommandLineArguments { } if (commandLine.hasOption('h')) { - return help(Main.class.getCanonicalName()); + return help(Main.class.getName()); } if (commandLine.hasOption('v')) { -- cgit 1.2.3-korg