summaryrefslogtreecommitdiffstats
path: root/models-tosca/src/main/java
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2019-05-09 20:59:37 +0000
committerliamfallon <liam.fallon@est.tech>2019-05-09 20:59:37 +0000
commit2aea40592eae4b365e69426c8487ff672c18b4e1 (patch)
tree33cd28725d188b38b1c89b9a81f8cbb6ed4fdb9c /models-tosca/src/main/java
parent78e05b7c3cf5fa9953eab626f46a45951686cefb (diff)
Store legacy op policy properties as plain strings
THe properties of legacy operational policies are already encoded and should not be stored in JSON format. Issue-ID: POLICY-1759 Change-Id: I3e2a69f216348c02c2ef9c23282f87da52a7f390 Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'models-tosca/src/main/java')
-rw-r--r--models-tosca/src/main/java/org/onap/policy/models/tosca/legacy/mapping/LegacyOperationalPolicyMapper.java20
1 files changed, 2 insertions, 18 deletions
diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/legacy/mapping/LegacyOperationalPolicyMapper.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/legacy/mapping/LegacyOperationalPolicyMapper.java
index 2dddda26b..e7dabf1b8 100644
--- a/models-tosca/src/main/java/org/onap/policy/models/tosca/legacy/mapping/LegacyOperationalPolicyMapper.java
+++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/legacy/mapping/LegacyOperationalPolicyMapper.java
@@ -25,8 +25,6 @@ import java.util.Map;
import javax.ws.rs.core.Response;
-import org.onap.policy.common.utils.coder.CoderException;
-import org.onap.policy.common.utils.coder.StandardCoder;
import org.onap.policy.models.base.PfConceptKey;
import org.onap.policy.models.base.PfModelRuntimeException;
import org.onap.policy.models.tosca.legacy.concepts.LegacyOperationalPolicy;
@@ -70,14 +68,7 @@ public class LegacyOperationalPolicyMapper
final Map<String, String> propertyMap = new HashMap<>();
toscaPolicy.setProperties(propertyMap);
- try {
- toscaPolicy.getProperties().put(CONTENT_PROPERTY,
- new StandardCoder().encode(legacyOperationalPolicy.getContent()));
- } catch (CoderException ce) {
- String errorMessage = "encoding of property \"content\" to JSON failed";
- LOGGER.warn(errorMessage, ce);
- throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage, ce);
- }
+ toscaPolicy.getProperties().put(CONTENT_PROPERTY, legacyOperationalPolicy.getContent());
final JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate();
serviceTemplate.setToscaDefinitionsVersion("tosca_simple_yaml_1_0");
@@ -114,14 +105,7 @@ public class LegacyOperationalPolicyMapper
throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage);
}
- String content = null;
- try {
- content = new StandardCoder().decode(toscaPolicy.getProperties().get(CONTENT_PROPERTY), String.class);
- } catch (CoderException ce) {
- String errorMessage = "decoding of property \"content\" from JSON failed";
- LOGGER.warn(errorMessage, ce);
- throw new PfModelRuntimeException(Response.Status.BAD_REQUEST, errorMessage, ce);
- }
+ String content = toscaPolicy.getProperties().get(CONTENT_PROPERTY);
if (content == null) {
String errorMessage = "property \"content\" not defined on TOSCA policy";