aboutsummaryrefslogtreecommitdiffstats
path: root/policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-08-05 15:27:16 -0400
committerJim Hahn <jrh3@att.com>2019-08-13 15:58:15 -0400
commita156cf3cbad6512510ae9a02a13c0408f901c734 (patch)
tree0a69bffb2a6c9f961bda1408153cf44f360c6a17 /policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java
parent62d1ff054b0ec6348ab6f7415063fdaa3f425215 (diff)
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>
Diffstat (limited to 'policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java')
-rw-r--r--policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java27
1 files changed, 16 insertions, 11 deletions
diff --git a/policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java b/policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java
index b09ae85c..ca1f2283 100644
--- a/policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java
+++ b/policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java
@@ -43,11 +43,14 @@ import org.onap.policy.common.gson.annotation.GsonJsonIgnore;
import org.onap.policy.common.gson.annotation.GsonJsonProperty;
import org.onap.policy.common.utils.services.OrderedServiceImpl;
import org.onap.policy.drools.controller.DroolsController;
+import org.onap.policy.drools.controller.DroolsControllerConstants;
import org.onap.policy.drools.core.PolicyContainer;
import org.onap.policy.drools.core.PolicySession;
import org.onap.policy.drools.core.jmx.PdpJmx;
import org.onap.policy.drools.features.DroolsControllerFeatureApi;
+import org.onap.policy.drools.features.DroolsControllerFeatureApiConstants;
import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
+import org.onap.policy.drools.protocol.coders.EventProtocolCoderConstants;
import org.onap.policy.drools.protocol.coders.EventProtocolParams;
import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
@@ -64,6 +67,8 @@ import org.slf4j.LoggerFactory;
*/
public class MavenDroolsController implements DroolsController {
+ private static final String FACT_RETRIEVE_ERROR = "Object cannot be retrieved from fact {}";
+
/**
* logger.
*/
@@ -193,9 +198,9 @@ public class MavenDroolsController implements DroolsController {
throw new IllegalArgumentException("Missing maven version coordinate");
}
- if (newGroupId.equalsIgnoreCase(DroolsController.NO_GROUP_ID)
- || newArtifactId.equalsIgnoreCase(DroolsController.NO_ARTIFACT_ID)
- || newVersion.equalsIgnoreCase(DroolsController.NO_VERSION)) {
+ if (newGroupId.equalsIgnoreCase(DroolsControllerConstants.NO_GROUP_ID)
+ || newArtifactId.equalsIgnoreCase(DroolsControllerConstants.NO_ARTIFACT_ID)
+ || newVersion.equalsIgnoreCase(DroolsControllerConstants.NO_VERSION)) {
throw new IllegalArgumentException("BRAINLESS maven coordinates provided: "
+ newGroupId + ":" + newArtifactId + ":"
+ newVersion);
@@ -755,7 +760,7 @@ public class MavenDroolsController implements DroolsController {
classNames.put(className, 1);
}
} catch (Exception e) {
- logger.warn("Object cannot be retrieved from fact {}", fact, e);
+ logger.warn(FACT_RETRIEVE_ERROR, fact, e);
}
}
@@ -803,7 +808,7 @@ public class MavenDroolsController implements DroolsController {
kieSession.delete(factHandle);
}
} catch (Exception e) {
- logger.warn("Object cannot be retrieved from fact {}", factHandle, e);
+ logger.warn(FACT_RETRIEVE_ERROR, factHandle, e);
}
}
@@ -881,7 +886,7 @@ public class MavenDroolsController implements DroolsController {
return true;
}
} catch (Exception e) {
- logger.warn("Object cannot be retrieved from fact {}", factHandle, e);
+ logger.warn(FACT_RETRIEVE_ERROR, factHandle, e);
}
}
return false;
@@ -889,7 +894,7 @@ public class MavenDroolsController implements DroolsController {
@Override
public <T> boolean delete(@NonNull T fact) {
- return this.getSessionNames().stream().map((ss) -> delete(ss, fact)).reduce(false, Boolean::logicalOr);
+ return this.getSessionNames().stream().map(ss -> delete(ss, fact)).reduce(false, Boolean::logicalOr);
}
@Override
@@ -903,7 +908,7 @@ public class MavenDroolsController implements DroolsController {
try {
kieSession.delete(factHandle);
} catch (Exception e) {
- logger.warn("Object cannot be retrieved from fact {}", factHandle, e);
+ logger.warn(FACT_RETRIEVE_ERROR, factHandle, e);
success = false;
}
}
@@ -912,7 +917,7 @@ public class MavenDroolsController implements DroolsController {
@Override
public <T> boolean delete(@NonNull Class<T> fact) {
- return this.getSessionNames().stream().map((ss) -> delete(ss, fact)).reduce(false, Boolean::logicalOr);
+ return this.getSessionNames().stream().map(ss -> delete(ss, fact)).reduce(false, Boolean::logicalOr);
}
@@ -972,11 +977,11 @@ public class MavenDroolsController implements DroolsController {
// these may be overridden by junit tests
protected EventProtocolCoder getCoderManager() {
- return EventProtocolCoder.manager;
+ return EventProtocolCoderConstants.getManager();
}
protected OrderedServiceImpl<DroolsControllerFeatureApi> getDroolsProviders() {
- return DroolsControllerFeatureApi.providers;
+ return DroolsControllerFeatureApiConstants.getProviders();
}
protected PolicyContainer makePolicyContainer(String groupId, String artifactId, String version) {