Fix sonar issues in drools-pdp

Address sonar issue, "Move constants to a class or enum", by
moving them from interfaces to classes:
  ActiveStandbyFeatureApi
  StateManagementFeatureApi
  PolicyResourceLockFeatureApi
  PolicySessionFeatureApi
  DroolsController
  DroolsControllerFeatureApi
  PolicyControllerFeatureApi
  PolicyEngineFeatureApi
  HealthCheck
  SystemPersistence
  EventProtocolCoder
  PolicyController
  PolicyEngine
  TestTransaction
  MdcTransaction
Address sonar issue, "Move constants to a class or enum", by
change the interface to a class:
  DroolsProperties
Address sonar issue, "Override the "equals" method in this class", by
adding equals & hashCode to:
  DroolsPdpEntity
  DroolsPdpImpl
Use lombok for a number of getters & setters.
Address sonar issue, "Define a constant instead of duplicating this
literal" in:
  DroolsPdpsElectionHandler
  JpaDroolsPdpsConnector
  MavenDroolsController
  GenericEventProtocolCoder
  GsonProtocolCoderToolset
  RestManager
Address sonar issue, "Remove the parentheses around the parameter" in:
  MavenDroolsController
Address sonar issue, "Replace this lambda with a method reference" in:
  LifecycleFsm
Address sonar issue, "Move this constructor to comply with Java Code
Conventions" in:
  LifecycleStateRunning
Address sonar issue, "Replace this 'switch' statement by 'if'
statements to increase readability", as specified in:
  PolicyEngineManager
Address sonar issue, "Rename field to prevent any misunderstanding/clash
with field" in:
  MdcTransactionImpl
Address sonar issue, "Either log or rethrow this exception", in:
  RestManager
Address sonar issue, "Rename this constant name to" uppercase, by
replacing enums with static lists in:
  RestManager
Addressed review comments:
  Fixed license dates.
  Renamed getSiteName/setSiteName methods to getSite/setSite in
  the interface to match the field names in the implementation
  classes.
  Renamed *Instance classes to *Constants.
  Next round of review comments.

Change-Id: I1c26af9f194833dd773f2b25dc5f60cde163201c
Issue-ID: POLICY-1968
Signed-off-by: Jim Hahn <jrh3@att.com>

1 files changed, 17 insertions, 12 deletions

diff --git a/feature-controller-logging/src/test/java/org/onap/policy/drools/controller/logging/ControllerLoggingTest.java b/feature-controller-logging/src/test/java/org/onap/policy/drools/controller/logging/ControllerLoggingTest.java
index 4fb6b91d..213ac493 100755
--- a/feature-controller-logging/src/test/java/org/onap/policy/drools/controller/logging/ControllerLoggingTest.java
+++ b/feature-controller-logging/src/test/java/org/onap/policy/drools/controller/logging/ControllerLoggingTest.java
@@ -39,12 +39,12 @@ import org.onap.policy.common.endpoints.event.comm.Topic;
 import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;

 import org.onap.policy.common.endpoints.event.comm.bus.NoopTopicSink;

 import org.onap.policy.drools.controller.DroolsController;

-import org.onap.policy.drools.controller.logging.ControllerLoggingFeature;

-import org.onap.policy.drools.properties.DroolsProperties;

+import org.onap.policy.drools.controller.DroolsControllerConstants;

+import org.onap.policy.drools.properties.DroolsPropertyConstants;

 import org.onap.policy.drools.protocol.configuration.ControllerConfiguration;

 import org.onap.policy.drools.protocol.configuration.PdpdConfiguration;

 import org.onap.policy.drools.system.PolicyController;

-import org.onap.policy.drools.system.PolicyEngine;

+import org.onap.policy.drools.system.PolicyEngineConstants;

 import org.onap.policy.drools.util.KieUtils;

 

 /**

@@ -111,12 +111,13 @@ public class ControllerLoggingTest {
                         JUNIT_KJAR_DRL_PATH, Paths.get(JUNIT_KMODULE_DRL_PATH).toFile());

 

         controllerProps = new Properties();

-        controllerProps.put(DroolsProperties.PROPERTY_CONTROLLER_NAME, TEST_CONTROLLER_NAME);

-        controllerProps.put(DroolsProperties.RULES_GROUPID, TEST_GROUP_ID);

-        controllerProps.put(DroolsProperties.RULES_ARTIFACTID, TEST_ARTIFACT_ID);

-        controllerProps.put(DroolsProperties.RULES_VERSION, TEST_VERSION);

+        controllerProps.put(DroolsPropertyConstants.PROPERTY_CONTROLLER_NAME, TEST_CONTROLLER_NAME);

+        controllerProps.put(DroolsPropertyConstants.RULES_GROUPID, TEST_GROUP_ID);

+        controllerProps.put(DroolsPropertyConstants.RULES_ARTIFACTID, TEST_ARTIFACT_ID);

+        controllerProps.put(DroolsPropertyConstants.RULES_VERSION, TEST_VERSION);

 

-        policyController = PolicyEngine.manager.createPolicyController(TEST_CONTROLLER_NAME, controllerProps);

+        policyController = PolicyEngineConstants.getManager().createPolicyController(TEST_CONTROLLER_NAME,

+                        controllerProps);

 

         message = "{\"requestID\":\"38adde30-cc22-11e8-a8d5-f2801f1b9fd1\",\"entity\":\"controller\",\"controllers\":"

                         + "[{\"name\":\"test-controller\",\"drools\":{\"groupId\":\"org.onap.policy.drools.test\","

@@ -167,7 +168,8 @@ public class ControllerLoggingTest {
 

         final ControllerLoggingFeature nlf = new ControllerLoggingFeature();

 

-        DroolsController droolsController = DroolsController.factory.get(TEST_GROUP_ID, TEST_ARTIFACT_ID, TEST_VERSION);

+        DroolsController droolsController =

+                        DroolsControllerConstants.getFactory().get(TEST_GROUP_ID, TEST_ARTIFACT_ID, TEST_VERSION);

 

         NoopTopicSink sinkTopic = new NoopTopicSink(Arrays.asList(TEST_SERVER), TEST_TOPIC);

 

@@ -186,7 +188,8 @@ public class ControllerLoggingTest {
 

         final ControllerLoggingFeature nlf = new ControllerLoggingFeature();

 

-        DroolsController droolsController = DroolsController.factory.get(TEST_GROUP_ID, TEST_ARTIFACT_ID, TEST_VERSION);

+        DroolsController droolsController =

+                        DroolsControllerConstants.getFactory().get(TEST_GROUP_ID, TEST_ARTIFACT_ID, TEST_VERSION);

 

         NoopTopicSink sinkTopic = new NoopTopicSink(Arrays.asList(TEST_SERVER), TEST_TOPIC);

 

@@ -203,7 +206,8 @@ public class ControllerLoggingTest {
     public void afterOnTopicEventSuccess() {

         final ControllerLoggingFeature nlf = new ControllerLoggingFeature();

 

-        nlf.afterOnTopicEvent(PolicyEngine.manager, pdpdNotification, CommInfrastructure.UEB, TEST_TOPIC, message);

+        nlf.afterOnTopicEvent(PolicyEngineConstants.getManager(), pdpdNotification, CommInfrastructure.UEB, TEST_TOPIC,

+                        message);

 

         assertEquals(1, events.size());

     }

@@ -221,7 +225,8 @@ public class ControllerLoggingTest {
         config.setName("test-controller-2");

         notification.setControllers(Arrays.asList(config));

 

-        nlf.afterOnTopicEvent(PolicyEngine.manager, notification, CommInfrastructure.UEB, TEST_TOPIC, message);

+        nlf.afterOnTopicEvent(PolicyEngineConstants.getManager(), notification, CommInfrastructure.UEB, TEST_TOPIC,

+                        message);

 

         assertEquals(0, events.size());

     }