summaryrefslogtreecommitdiffstats
path: root/policy-management
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-08-25 17:05:37 -0400
committerJim Hahn <jrh3@att.com>2020-08-25 18:47:23 -0400
commit72cf248dced4e272e69a8c48f5ee24c9d345f41d (patch)
treeb09ed0f9b7ee7aac6493119d950d78d50ae08da1 /policy-management
parent5c71b5a62f4208030b3c3cd18b3f42398a0a86e5 (diff)
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 <jrh3@att.com>
Diffstat (limited to 'policy-management')
-rw-r--r--policy-management/src/main/java/org/onap/policy/drools/system/Main.java24
-rw-r--r--policy-management/src/test/java/org/onap/policy/drools/protocol/configuration/ControllerConfigurationTest.java2
-rw-r--r--policy-management/src/test/java/org/onap/policy/drools/protocol/configuration/DroolsConfigurationTest.java2
-rw-r--r--policy-management/src/test/java/org/onap/policy/drools/protocol/configuration/PdpdConfigurationTest.java6
4 files changed, 13 insertions, 21 deletions
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());