From e7364a7f58ec5c42901e5de445a295d6f782f38b Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 17 Jun 2019 10:42:41 -0400 Subject: Change getCanonicalName() to getName() in drools-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: I28df56b3dfd0382239960d7f0f6e1131d702b2ab Issue-ID: POLICY-1646 Signed-off-by: Jim Hahn --- .../drools/controller/internal/MavenDroolsController.java | 10 +++++----- .../drools/controller/internal/NullDroolsController.java | 2 +- .../policy/drools/protocol/coders/EventProtocolCoder.java | 14 +++++++------- .../java/org/onap/policy/drools/system/PolicyEngine.java | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'policy-management/src/main/java') diff --git a/policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java b/policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java index 140d6769..97312042 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java +++ b/policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java @@ -374,21 +374,21 @@ public class MavenDroolsController implements DroolsController { @Override public boolean ownsCoder(Class coderClass, int modelHash) { - if (!ReflectionUtil.isClass(this.policyContainer.getClassLoader(), coderClass.getCanonicalName())) { - logger.error("{}{} cannot be retrieved. ", this, coderClass.getCanonicalName()); + if (!ReflectionUtil.isClass(this.policyContainer.getClassLoader(), coderClass.getName())) { + logger.error("{}{} cannot be retrieved. ", this, coderClass.getName()); return false; } if (modelHash == this.modelClassLoaderHash) { if (logger.isInfoEnabled()) { - logger.info(coderClass.getCanonicalName() + logger.info(coderClass.getName() + this + " class loader matches original drools controller rules classloader " + coderClass.getClassLoader()); } return true; } else { if (logger.isWarnEnabled()) { - logger.warn(this + coderClass.getCanonicalName() + " class loaders don't match " + logger.warn(this + coderClass.getName() + " class loaders don't match " + coderClass.getClassLoader() + " vs " + this.policyContainer.getClassLoader()); } @@ -837,7 +837,7 @@ public class MavenDroolsController implements DroolsController { @Override public List facts(@NonNull String sessionName, @NonNull Class clazz) { - return facts(sessionName, clazz.getCanonicalName(), false) + return facts(sessionName, clazz.getName(), false) .stream() .filter(clazz::isInstance) .map(clazz::cast) diff --git a/policy-management/src/main/java/org/onap/policy/drools/controller/internal/NullDroolsController.java b/policy-management/src/main/java/org/onap/policy/drools/controller/internal/NullDroolsController.java index 3595f91a..4b38e722 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/controller/internal/NullDroolsController.java +++ b/policy-management/src/main/java/org/onap/policy/drools/controller/internal/NullDroolsController.java @@ -214,6 +214,6 @@ public class NullDroolsController implements DroolsController { } private String makeInvokeMsg() { - return this.getClass().getCanonicalName() + " invoked"; + return this.getClass().getName() + " invoked"; } } diff --git a/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/EventProtocolCoder.java b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/EventProtocolCoder.java index 56eadad3..1297ff8c 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/EventProtocolCoder.java +++ b/policy-management/src/main/java/org/onap/policy/drools/protocol/coders/EventProtocolCoder.java @@ -920,7 +920,7 @@ abstract class GenericEventProtocolCoder { throw new IllegalArgumentException("Invalid topic"); } - String reverseKey = this.reverseCodersKey(topic, event.getClass().getCanonicalName()); + String reverseKey = this.reverseCodersKey(topic, event.getClass().getName()); if (!this.reverseCoders.containsKey(reverseKey)) { throw new IllegalArgumentException("no reverse coder has been found"); } @@ -996,7 +996,7 @@ abstract class GenericEventProtocolCoder { List droolsControllers = new ArrayList<>(); - String reverseKey = this.reverseCodersKey(topic, encodedClass.getClass().getCanonicalName()); + String reverseKey = this.reverseCodersKey(topic, encodedClass.getClass().getName()); if (!this.reverseCoders.containsKey(reverseKey)) { logger.warn("{}: no reverse mapping for {}", this, reverseKey); return droolsControllers; @@ -1016,7 +1016,7 @@ abstract class GenericEventProtocolCoder { "No Encoders toolsets available for topic " + topic + " encoder " - + encodedClass.getClass().getCanonicalName()); + + encodedClass.getClass().getName()); } for (ProtocolCoderToolset encoderSet : toolsets) { @@ -1025,7 +1025,7 @@ abstract class GenericEventProtocolCoder { String artifactId = encoderSet.getArtifactId(); List coderFilters = encoderSet.getCoders(); for (CoderFilters coder : coderFilters) { - if (coder.getCodedClass().equals(encodedClass.getClass().getCanonicalName())) { + if (coder.getCodedClass().equals(encodedClass.getClass().getName())) { DroolsController droolsController = DroolsController.factory.get(groupId, artifactId, ""); if (droolsController.ownsCoder( encodedClass.getClass(), coder.getModelClassLoaderHash())) { @@ -1040,7 +1040,7 @@ abstract class GenericEventProtocolCoder { "No Encoders toolsets available for " + topic + ":" - + encodedClass.getClass().getCanonicalName()); + + encodedClass.getClass().getName()); } return droolsControllers; @@ -1235,7 +1235,7 @@ abstract class GenericEventProtocolCoder { this, droolsControllers, topic, - fact.getClass().getCanonicalName()); + fact.getClass().getName()); // continue } return droolsControllers.get(0); @@ -1266,7 +1266,7 @@ abstract class GenericEventProtocolCoder { this, droolsControllers, topic, - fact.getClass().getCanonicalName()); + fact.getClass().getName()); // continue } return droolsControllers; diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java index 86655fff..963aced4 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java +++ b/policy-management/src/main/java/org/onap/policy/drools/system/PolicyEngine.java @@ -521,7 +521,7 @@ class PolicyEngineManager implements PolicyEngine { this.httpServers = getServletFactory().build(properties); for (HttpServletServer server : this.httpServers) { if (server.isAaf()) { - server.addFilterClass(null, AafTelemetryAuthFilter.class.getCanonicalName()); + server.addFilterClass(null, AafTelemetryAuthFilter.class.getName()); } } } catch (final IllegalArgumentException e) { -- cgit 1.2.3-korg