From bf6126968adcabff605775f554642dfff0644530 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 17 Jun 2019 10:03:57 -0400 Subject: Change getCanonicalName() to getName() in drools-apps 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: Ie402ab9239b2d5149c420d495f16bb82417d2d25 Issue-ID: POLICY-1646 Signed-off-by: Jim Hahn --- .../onap/policy/controlloop/impl/ControlLoopPublisherJUnitImpl.java | 4 ++-- .../test/java/org/onap/policy/controlloop/ControlLoopLoggerTest.java | 3 ++- .../java/org/onap/policy/controlloop/ControlLoopPublisherTest.java | 3 ++- .../controlloop/feature/management/ControlLoopManagementFeature.java | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'controlloop/common') diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/impl/ControlLoopPublisherJUnitImpl.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/impl/ControlLoopPublisherJUnitImpl.java index 13f52e36e..067663700 100644 --- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/impl/ControlLoopPublisherJUnitImpl.java +++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/impl/ControlLoopPublisherJUnitImpl.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * controlloop * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,6 @@ public class ControlLoopPublisherJUnitImpl implements ControlLoopPublisher { @Override public void publish(Object object) { throw new UnsupportedOperationException( - "publish() method is not implemented on " + this.getClass().getCanonicalName()); + "publish() method is not implemented on " + this.getClass().getName()); } } diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopLoggerTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopLoggerTest.java index 6c5264e1c..4e2719075 100644 --- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopLoggerTest.java +++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopLoggerTest.java @@ -3,6 +3,7 @@ * eventmanager * ================================================================================ * Copyright (C) 2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +32,7 @@ public class ControlLoopLoggerTest { @Test public void testControlLoopLogger() throws ControlLoopException { ControlLoopLogger logger = - new ControlLoopLogger.Factory().buildLogger(ControlLoopLoggerStdOutImpl.class.getCanonicalName()); + new ControlLoopLogger.Factory().buildLogger(ControlLoopLoggerStdOutImpl.class.getName()); assertNotNull(logger); logger.info("a log message", "and another", " and another"); logger.metrics("a metric", "and another", " and another"); diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopPublisherTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopPublisherTest.java index 309aeb206..77a3d643f 100644 --- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopPublisherTest.java +++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/ControlLoopPublisherTest.java @@ -3,6 +3,7 @@ * eventmanager * ================================================================================ * Copyright (C) 2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +32,7 @@ public class ControlLoopPublisherTest { @Test public void testControlLoopPublisher() throws ControlLoopException { ControlLoopPublisher publisher = - new ControlLoopPublisher.Factory().buildLogger(ControlLoopPublisherJUnitImpl.class.getCanonicalName()); + new ControlLoopPublisher.Factory().buildLogger(ControlLoopPublisherJUnitImpl.class.getName()); assertNotNull(publisher); try { diff --git a/controlloop/common/feature-controlloop-management/src/main/java/org/onap/policy/drools/apps/controlloop/feature/management/ControlLoopManagementFeature.java b/controlloop/common/feature-controlloop-management/src/main/java/org/onap/policy/drools/apps/controlloop/feature/management/ControlLoopManagementFeature.java index e9fb811c7..800971a61 100644 --- a/controlloop/common/feature-controlloop-management/src/main/java/org/onap/policy/drools/apps/controlloop/feature/management/ControlLoopManagementFeature.java +++ b/controlloop/common/feature-controlloop-management/src/main/java/org/onap/policy/drools/apps/controlloop/feature/management/ControlLoopManagementFeature.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ public class ControlLoopManagementFeature implements PolicyEngineFeatureAPI { } return controller.getDrools() - .facts(sessionName, ControlLoopParams.class.getCanonicalName(), false) + .facts(sessionName, ControlLoopParams.class.getName(), false) .stream() .filter(c -> c instanceof ControlLoopParams) .map(c -> (ControlLoopParams) c); -- cgit 1.2.3-korg