diff options
| author |   rameshiyer27 <ramesh.murugan.iyer@est.tech> | 2022-02-11 08:53:57 +0000 |
|---|---|---|
| committer | Ramesh Murugan Iyer <ramesh.murugan.iyer@est.tech> | 2022-02-11 09:29:32 +0000 |
| commit | fca2e06f2a01c03ba0d12271defaec0b5ab13ba5 (patch) | |
| tree | 6e5d98e874d17fe982e619077a3949c10321b683 /applications/common/src/main | |
| parent | d8ed7a991d54bd6e53a7c1fedee808ab78dfdf19 (diff) | |
Fix xacml pdp to accommodate Object values in policy metadata
Issue-ID: POLICY-3832
Signed-off-by: zrrmmua <ramesh.murugan.iyer@est.tech>
Change-Id: I276bf28d3fdaad6e1d7cde315cdb049343cbde3f
Diffstat (limited to 'applications/common/src/main')
3 files changed, 4 insertions, 4 deletions
diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdBaseTranslator.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdBaseTranslator.java index 58bdafa2..d1c6d38c 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdBaseTranslator.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdBaseTranslator.java @@ -187,7 +187,7 @@ public abstract class StdBaseTranslator implements ToscaPolicyTranslator { * @throws ToscaPolicyConversionException If there is something missing from the metadata */ protected PolicyType fillMetadataSection(PolicyType policy, - Map<String, String> map) throws ToscaPolicyConversionException { + Map<String, Object> map) throws ToscaPolicyConversionException { // // Ensure the policy-id exists - we don't use it here. It // is saved in the TOSCA Policy Name field. @@ -205,7 +205,7 @@ public abstract class StdBaseTranslator implements ToscaPolicyTranslator { // // Add in the Policy Version // - policy.setVersion(map.get(POLICY_VERSION)); + policy.setVersion(String.valueOf(map.get(POLICY_VERSION))); return policy; } diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyResultsTranslator.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyResultsTranslator.java index 2a4574eb..64a7db98 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyResultsTranslator.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdCombinedPolicyResultsTranslator.java @@ -69,7 +69,7 @@ public class StdCombinedPolicyResultsTranslator extends StdBaseTranslator { // // Get the policy Id // - String policyId = toscaPolicy.getMetadata().get(POLICY_ID); + String policyId = String.valueOf(toscaPolicy.getMetadata().get(POLICY_ID)); // // Set it as the policy ID // diff --git a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java index e473de88..732542a2 100644 --- a/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java +++ b/applications/common/src/main/java/org/onap/policy/pdp/xacml/application/common/std/StdMatchableTranslator.java @@ -251,7 +251,7 @@ public class StdMatchableTranslator extends StdBaseTranslator implements Matcha // // Policy name should be at the root // - String policyName = toscaPolicy.getMetadata().get(POLICY_ID); + String policyName = String.valueOf(toscaPolicy.getMetadata().get(POLICY_ID)); // // Set it as the policy ID // |