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-02-13 13:55:31 -0500
committerJim Hahn <jrh3@att.com>2019-02-14 14:00:12 -0500
commit710992a925b44fa9594d8f70bbc9f22a6f91d8ad (patch)
tree4f2ff921eb015632204f8ef6868de8db9bf27bbe /policy-management/src/main/java/org/onap/policy/drools/controller/internal/MavenDroolsController.java
parent6683a08e12d119e1ba8fb1070a93660c0c3a3931 (diff)
Remove jackson from policy coders
Coders came in pairs, one for GSON and one for Jackson. Replaced the pairs with a single coder for GSON. Simplified list copy. Removed multipleToolsetRetries flag. Removed additional jackson code. It had been removed, but the changes were somehow lost. Simplified another list copy. Updated license dates. Note: the date in PolicyEngineTest will be updated via a different review (mgmt-gson). Change-Id: Id3c7688c2389d194f66afcefa14303cf403ada16 Issue-ID: POLICY-1431 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.java20
1 files changed, 1 insertions, 19 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 6e9f04ed..55352fe2 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
@@ -46,7 +46,6 @@ import org.onap.policy.drools.protocol.coders.EventProtocolParams;
import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration;
import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomGsonCoder;
-import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.CustomJacksonCoder;
import org.onap.policy.drools.protocol.coders.TopicCoderFilterConfiguration.PotentialCoderFilter;
import org.onap.policy.drools.utils.ReflectionUtil;
import org.slf4j.Logger;
@@ -270,22 +269,6 @@ public class MavenDroolsController implements DroolsController {
}
}
- CustomJacksonCoder customJacksonCoder = coderConfig.getCustomJacksonCoder();
- if (coderConfig.getCustomJacksonCoder() != null
- && coderConfig.getCustomJacksonCoder().getClassContainer() != null
- && !coderConfig.getCustomJacksonCoder().getClassContainer().isEmpty()) {
-
- String customJacksonCoderClass = coderConfig.getCustomJacksonCoder().getClassContainer();
- if (!ReflectionUtil.isClass(this.policyContainer.getClassLoader(),
- customJacksonCoderClass)) {
- throw makeRetrieveEx(customJacksonCoderClass);
- } else {
- if (logger.isInfoEnabled()) {
- logClassFetched(customJacksonCoderClass);
- }
- }
- }
-
List<PotentialCoderFilter> coderFilters = coderConfig.getCoderFilters();
if (coderFilters == null || coderFilters.isEmpty()) {
continue;
@@ -312,14 +295,13 @@ public class MavenDroolsController implements DroolsController {
.eventClass(potentialCodedClass)
.protocolFilter(protocolFilter)
.customGsonCoder(customGsonCoder)
- .customJacksonCoder(customJacksonCoder)
.modelClassLoaderHash(this.policyContainer.getClassLoader().hashCode()));
} else {
EventProtocolCoder.manager.addEncoder(
EventProtocolParams.builder().groupId(this.getGroupId())
.artifactId(this.getArtifactId()).topic(topic)
.eventClass(potentialCodedClass).protocolFilter(protocolFilter)
- .customGsonCoder(customGsonCoder).customJacksonCoder(customJacksonCoder)
+ .customGsonCoder(customGsonCoder)
.modelClassLoaderHash(this.policyContainer.getClassLoader().hashCode()));
}
}