summaryrefslogtreecommitdiffstats
path: root/plugins/reception-plugins/src/main/java
diff options
context:
space:
mode:
authorRam Krishna Verma <ram_krishna.verma@bell.ca>2021-08-18 17:17:23 -0400
committerRam Krishna Verma <ram_krishna.verma@bell.ca>2021-08-19 09:44:21 -0400
commit801ab43d13537d19710e8f948d4614f158daafc7 (patch)
treec03ff06d789e65266a6e2f58a255dd83fd70773b /plugins/reception-plugins/src/main/java
parent7fdd0a9a2eec02bf499663eff8fd7794b007c168 (diff)
Add yaml support for policy & policy types
Adding support for yaml format of policy & policy types in distribution. So that users can either define them in json or yaml format. And then distribute to policy framework. Issue-ID: POLICY-3509 Change-Id: Ifba7486bbc1e6876f0e3e39b0ae5ebe043567029 Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Diffstat (limited to 'plugins/reception-plugins/src/main/java')
-rw-r--r--plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicy.java23
1 files changed, 22 insertions, 1 deletions
diff --git a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicy.java b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicy.java
index a552bbcc..72316f28 100644
--- a/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicy.java
+++ b/plugins/reception-plugins/src/main/java/org/onap/policy/distribution/reception/decoding/policy/file/PolicyDecoderFileInCsarToPolicy.java
@@ -33,6 +33,7 @@ import java.util.zip.ZipFile;
import org.onap.policy.common.parameters.ParameterService;
import org.onap.policy.common.utils.coder.CoderException;
import org.onap.policy.common.utils.coder.StandardCoder;
+import org.onap.policy.common.utils.coder.StandardYamlCoder;
import org.onap.policy.distribution.model.Csar;
import org.onap.policy.distribution.model.PolicyInput;
import org.onap.policy.distribution.reception.decoding.PolicyDecoder;
@@ -49,6 +50,7 @@ public class PolicyDecoderFileInCsarToPolicy implements PolicyDecoder<Csar, Tosc
private PolicyDecoderFileInCsarToPolicyParameterGroup decoderParameters;
private StandardCoder coder;
+ private StandardYamlCoder yamlCoder;
private static final long MAX_FILE_SIZE = 512L * 1024;
/**
@@ -58,6 +60,7 @@ public class PolicyDecoderFileInCsarToPolicy implements PolicyDecoder<Csar, Tosc
public void configure(final String parameterGroupName) {
decoderParameters = ParameterService.get(parameterGroupName);
coder = new StandardCoder();
+ yamlCoder = new StandardYamlCoder();
}
/**
@@ -86,7 +89,7 @@ public class PolicyDecoderFileInCsarToPolicy implements PolicyDecoder<Csar, Tosc
final ZipEntry entry = entries.nextElement(); // NOSONAR
if (isZipEntryValid(entry.getName(), csar.getCsarFilePath(), entry.getSize())) {
final ToscaServiceTemplate policy =
- coder.decode(zipFile.getInputStream(entry), ToscaServiceTemplate.class);
+ decodeFile(zipFile, entry);
policyList.add(policy);
}
}
@@ -135,4 +138,22 @@ public class PolicyDecoderFileInCsarToPolicy implements PolicyDecoder<Csar, Tosc
return false;
}
+
+ /**
+ * Method to decode either a json or yaml file into an object.
+ *
+ * @param zipFile the zip file
+ * @param entry the entry to read in the zip file.
+ * @return the decoded ToscaServiceTemplate object.
+ * @throws CoderException IOException if the file decoding fails.
+ */
+ private ToscaServiceTemplate decodeFile(ZipFile zipFile, final ZipEntry entry) throws IOException, CoderException {
+ ToscaServiceTemplate policy = null;
+ if (entry.getName().endsWith(".json")) {
+ policy = coder.decode(zipFile.getInputStream(entry), ToscaServiceTemplate.class);
+ } else if (entry.getName().endsWith(".yaml")) {
+ policy = yamlCoder.decode(zipFile.getInputStream(entry), ToscaServiceTemplate.class);
+ }
+ return policy;
+ }
}