From 72cf248dced4e272e69a8c48f5ee24c9d345f41d Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Tue, 25 Aug 2020 17:05:37 -0400 Subject: Address more sonars in drools-pdp Addressed the following sonars: - either log or rethrow - call "remove()" for thread-local-storage - use assertEquals - only one method call in exception test - swap arguments in assertEquals - add assertion to assertThatThrownBy() - explain @Ignore Also addressed eclipse warnings: - unused fields and methods Issue-ID: POLICY-2616 Change-Id: I6590c0d2b103885bc933014d48bf5fd92401cd80 Signed-off-by: Jim Hahn --- .../java/org/onap/policy/drools/system/Main.java | 24 ++++++++-------------- .../configuration/ControllerConfigurationTest.java | 2 +- .../configuration/DroolsConfigurationTest.java | 2 +- .../configuration/PdpdConfigurationTest.java | 6 +++--- 4 files changed, 13 insertions(+), 21 deletions(-) (limited to 'policy-management') diff --git a/policy-management/src/main/java/org/onap/policy/drools/system/Main.java b/policy-management/src/main/java/org/onap/policy/drools/system/Main.java index 4f0dc39c..9e6d0432 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/system/Main.java +++ b/policy-management/src/main/java/org/onap/policy/drools/system/Main.java @@ -157,10 +157,8 @@ public class Main { .flush(); logger.warn( LoggerUtil.TRANSACTION_LOG_MARKER, - "Main: cannot start {} (bad state) because of {}", - PolicyEngineConstants.getManager(), - e.getMessage(), - e); + "Main: cannot start {} (bad state)", + PolicyEngineConstants.getManager()); throw new PolicyDroolsPdpRuntimeException( String.format(MessageConstants.START_FAILURE_MSG, MessageConstants.POLICY_DROOLS_PDP), e); } catch (final Exception e) { @@ -171,10 +169,8 @@ public class Main { .flush(); logger.warn( LoggerUtil.TRANSACTION_LOG_MARKER, - "Main: cannot start {} because of {}", - PolicyEngineConstants.getManager(), - e.getMessage(), - e); + "Main: cannot start {}", + PolicyEngineConstants.getManager()); throw new PolicyDroolsPdpRuntimeException( String.format(MessageConstants.START_FAILURE_MSG, MessageConstants.POLICY_DROOLS_PDP), e); } @@ -209,10 +205,8 @@ public class Main { .flush(); logger.error( LoggerUtil.TRANSACTION_LOG_MARKER, - "Main: cannot instantiate policy-controller {} because of {}", - controllerName, - e.getMessage(), - e); + "Main: cannot instantiate policy-controller {}", + controllerName); throw new PolicyDroolsPdpRuntimeException( String.format(MessageConstants.START_FAILURE_MSG, MessageConstants.POLICY_DROOLS_PDP), e); } catch (final LinkageError e) { @@ -223,10 +217,8 @@ public class Main { .flush(); logger.warn( LoggerUtil.TRANSACTION_LOG_MARKER, - "Main: cannot instantiate policy-controller {} (linkage) because of {}", - controllerName, - e.getMessage(), - e); + "Main: cannot instantiate policy-controller {} (linkage)", + controllerName); throw new PolicyDroolsPdpRuntimeException( String.format(MessageConstants.START_FAILURE_MSG, MessageConstants.POLICY_DROOLS_PDP), e); } diff --git a/policy-management/src/test/java/org/onap/policy/drools/protocol/configuration/ControllerConfigurationTest.java b/policy-management/src/test/java/org/onap/policy/drools/protocol/configuration/ControllerConfigurationTest.java index 3741e71a..3560671a 100644 --- a/policy-management/src/test/java/org/onap/policy/drools/protocol/configuration/ControllerConfigurationTest.java +++ b/policy-management/src/test/java/org/onap/policy/drools/protocol/configuration/ControllerConfigurationTest.java @@ -66,7 +66,7 @@ public class ControllerConfigurationTest { ControllerConfiguration controllerConfig = new ControllerConfiguration(NAME, OPERATION, DROOLS_CONFIG); - assertEquals(controllerConfig, controllerConfig); + assertEquals(controllerConfig, (Object) controllerConfig); assertNotEquals(controllerConfig, new Object()); ControllerConfiguration controllerConfig2 = new ControllerConfiguration(); diff --git a/policy-management/src/test/java/org/onap/policy/drools/protocol/configuration/DroolsConfigurationTest.java b/policy-management/src/test/java/org/onap/policy/drools/protocol/configuration/DroolsConfigurationTest.java index 92726f89..a18a20b4 100644 --- a/policy-management/src/test/java/org/onap/policy/drools/protocol/configuration/DroolsConfigurationTest.java +++ b/policy-management/src/test/java/org/onap/policy/drools/protocol/configuration/DroolsConfigurationTest.java @@ -56,7 +56,7 @@ public class DroolsConfigurationTest { additionalProperties.put(ADDITIONAL_PROPERTY_KEY, ADDITIONAL_PROPERTY_VALUE); final DroolsConfiguration droolsConfig = new DroolsConfiguration(ARTIFACT, GROUPID, VERSION); - assertEquals(droolsConfig, droolsConfig); + assertEquals(droolsConfig, (Object) droolsConfig); droolsConfig.set(ARTIFACT_ID_STRING, "foobar"); assertEquals("foobar", droolsConfig.get(ARTIFACT_ID_STRING)); diff --git a/policy-management/src/test/java/org/onap/policy/drools/protocol/configuration/PdpdConfigurationTest.java b/policy-management/src/test/java/org/onap/policy/drools/protocol/configuration/PdpdConfigurationTest.java index 352d8ce1..b02090b4 100644 --- a/policy-management/src/test/java/org/onap/policy/drools/protocol/configuration/PdpdConfigurationTest.java +++ b/policy-management/src/test/java/org/onap/policy/drools/protocol/configuration/PdpdConfigurationTest.java @@ -74,7 +74,7 @@ public class PdpdConfigurationTest { drools.set("version", VERSION); drools.set(PROPERTY1, VALUE1); - assertEquals(drools, drools); + assertEquals(drools, (Object) drools); assertNotEquals(drools, new Object()); logger.info("Drools HashCode {}", drools.hashCode()); @@ -131,7 +131,7 @@ public class PdpdConfigurationTest { controller.set("drools", drools); controller.set(PROPERTY1, VALUE1); - assertEquals(controller, controller); + assertEquals(controller, (Object) controller); assertNotEquals(controller, new Object()); logger.info("Controller HashCode {}", controller.hashCode()); @@ -194,7 +194,7 @@ public class PdpdConfigurationTest { config.set("controllers", controllers); config.set(PROPERTY1, VALUE1); - assertEquals(config, config); + assertEquals(config, (Object) config); assertNotEquals(config, new Object()); logger.info("Config HashCode {}", config.hashCode()); -- cgit 1.2.3-korg