From a156cf3cbad6512510ae9a02a13c0408f901c734 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 5 Aug 2019 15:27:16 -0400 Subject: 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 --- .../statemanagement/StateManagementFeature.java | 20 ++++++++++---------- .../statemanagement/test/StateManagementTest.java | 3 ++- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'feature-state-management') diff --git a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java index d8468b56..7d5ba512 100644 --- a/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java +++ b/feature-state-management/src/main/java/org/onap/policy/drools/statemanagement/StateManagementFeature.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory; * a separate optional feature. */ -public class StateManagementFeature implements StateManagementFeatureApi, +public class StateManagementFeature implements StateManagementFeatureApi, PolicySessionFeatureApi, PolicyEngineFeatureApi { // get an instance of logger private static final Logger logger = @@ -187,7 +187,7 @@ public class StateManagementFeature implements StateManagementFeatureApi, /** * {@inheritDoc}. - * + * * @return true if locked or false if failed */ @Override @@ -203,7 +203,7 @@ public class StateManagementFeature implements StateManagementFeatureApi, /** * {@inheritDoc}. - * + * * @throws Exception exception */ @Override @@ -219,8 +219,8 @@ public class StateManagementFeature implements StateManagementFeatureApi, /** * {@inheritDoc}. - * - * @throws Exception exception + * + * @throws Exception exception */ @Override public boolean isLocked() { @@ -229,19 +229,19 @@ public class StateManagementFeature implements StateManagementFeatureApi, @Override public int getSequenceNumber() { - return SEQ_NUM; + return StateManagementFeatureApiConstants.SEQ_NUM; } /** * Read in the properties and initialize the StateManagementProperties. */ private static void initializeProperties(String configDir) { - //Get the state management properties + //Get the state management properties try { Properties props = PropertyUtil.getProperties(configDir + "/feature-state-management.properties"); StateManagementProperties.initProperties(props); - logger.info("initializeProperties: resourceName= {}", + logger.info("initializeProperties: resourceName= {}", StateManagementProperties.getProperty(StateManagementProperties.NODE_NAME)); } catch (IOException e1) { logger.error("initializeProperties", e1); diff --git a/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java b/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java index 327bb166..86125069 100644 --- a/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java +++ b/feature-state-management/src/test/java/org/onap/policy/drools/statemanagement/test/StateManagementTest.java @@ -44,6 +44,7 @@ import org.onap.policy.drools.statemanagement.DbAudit; import org.onap.policy.drools.statemanagement.IntegrityMonitorRestManager; import org.onap.policy.drools.statemanagement.RepositoryAudit; import org.onap.policy.drools.statemanagement.StateManagementFeatureApi; +import org.onap.policy.drools.statemanagement.StateManagementFeatureApiConstants; import org.onap.policy.drools.statemanagement.StateManagementProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -115,7 +116,7 @@ public class StateManagementTest { .getProperty(StateManagementProperties.NODE_NAME); StateManagementFeatureApi stateManagementFeature = null; - for (StateManagementFeatureApi feature : StateManagementFeatureApi.impl.getList()) { + for (StateManagementFeatureApi feature : StateManagementFeatureApiConstants.getImpl().getList()) { ((PolicySessionFeatureApi) feature).globalInit(null, configDir); stateManagementFeature = feature; logger.debug("testStateManagementOperation stateManagementFeature.getResourceName(): " -- cgit 1.2.3-korg