diff options
author | Jim Hahn <jrh3@att.com> | 2019-02-13 13:55:31 -0500 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2019-02-14 14:00:12 -0500 |
commit | 710992a925b44fa9594d8f70bbc9f22a6f91d8ad (patch) | |
tree | 4f2ff921eb015632204f8ef6868de8db9bf27bbe /policy-management/src/main/java/org/onap/policy/drools/controller/DroolsControllerFactory.java | |
parent | 6683a08e12d119e1ba8fb1070a93660c0c3a3931 (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/DroolsControllerFactory.java')
-rw-r--r-- | policy-management/src/main/java/org/onap/policy/drools/controller/DroolsControllerFactory.java | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/policy-management/src/main/java/org/onap/policy/drools/controller/DroolsControllerFactory.java b/policy-management/src/main/java/org/onap/policy/drools/controller/DroolsControllerFactory.java index 6dcae635..24fc6de9 100644 --- a/policy-management/src/main/java/org/onap/policy/drools/controller/DroolsControllerFactory.java +++ b/policy-management/src/main/java/org/onap/policy/drools/controller/DroolsControllerFactory.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * policy-management * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,6 @@ import org.onap.policy.drools.properties.DroolsProperties; 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.Pair; import org.slf4j.Logger; @@ -311,19 +310,6 @@ class IndexedDroolsControllerFactory implements DroolsControllerFactory { } } - String customJackson = properties.getProperty(propertyTopicEntityPrefix + firstTopic - + PolicyEndPointProperties.PROPERTY_TOPIC_EVENTS_CUSTOM_MODEL_CODER_JACKSON_SUFFIX); - - CustomJacksonCoder customJacksonCoder = null; - if (customJackson != null && !customJackson.isEmpty()) { - try { - customJacksonCoder = new CustomJacksonCoder(customJackson); - } catch (IllegalArgumentException e) { - logger.warn("{}: cannot create custom-jackson-coder {} because of {}", this, customJackson, - e.getMessage(), e); - } - } - // 3. second the list of classes associated with each topic String eventClasses = properties @@ -395,7 +381,7 @@ class IndexedDroolsControllerFactory implements DroolsControllerFactory { } TopicCoderFilterConfiguration topic2Classes2Filters = - new TopicCoderFilterConfiguration(firstTopic, classes2Filters, customGsonCoder, customJacksonCoder); + new TopicCoderFilterConfiguration(firstTopic, classes2Filters, customGsonCoder); topics2DecodedClasses2Filters.add(topic2Classes2Filters); } |