X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=applications%2Fcommon%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpdp%2Fxacml%2Fapplication%2Fcommon%2Fstd%2FStdCombinedPolicyResultsTranslator.java;h=2d7386d99f97ccee828b665a46b46531495cdfcd;hb=refs%2Fheads%2Felalto;hp=20b34006c1c33b9b5ee5e1235eadb2cdaf4bdb96;hpb=a9c7e7322eb09672c8dfba32503653d12e685543;p=policy%2Fxacml-pdp.git

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 20b34006..bd10fb2e 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
@@ -32,9 +32,8 @@ import com.att.research.xacml.api.Result;
 import com.att.research.xacml.api.XACML3;
 import com.att.research.xacml.std.annotations.RequestParser;
 import com.google.gson.Gson;
-
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 
 import oasis.names.tc.xacml._3_0.core.schema.wd_17.AnyOfType;
@@ -64,6 +63,7 @@ import org.slf4j.LoggerFactory;
 public class StdCombinedPolicyResultsTranslator implements ToscaPolicyTranslator {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(StdCombinedPolicyResultsTranslator.class);
+    private static final String POLICY_ID = "policy-id";
 
     public StdCombinedPolicyResultsTranslator() {
         super();
@@ -75,7 +75,7 @@ public class StdCombinedPolicyResultsTranslator implements ToscaPolicyTranslator
         // Set it as the policy ID
         //
         PolicyType newPolicyType = new PolicyType();
-        newPolicyType.setPolicyId(toscaPolicy.getMetadata().get("policy-id"));
+        newPolicyType.setPolicyId(toscaPolicy.getMetadata().get(POLICY_ID));
         //
         // Optional description
         //
@@ -91,7 +91,7 @@ public class StdCombinedPolicyResultsTranslator implements ToscaPolicyTranslator
         //
         // Generate the TargetType
         //
-        TargetType target = this.generateTargetType(toscaPolicy.getMetadata().get("policy-id"),
+        TargetType target = this.generateTargetType(toscaPolicy.getMetadata().get(POLICY_ID),
                 toscaPolicy.getType(), toscaPolicy.getVersion());
         newPolicyType.setTarget(target);
         //
@@ -101,7 +101,7 @@ public class StdCombinedPolicyResultsTranslator implements ToscaPolicyTranslator
         //
         RuleType rule = new RuleType();
         rule.setDescription("Default is to PERMIT if the policy matches.");
-        rule.setRuleId(toscaPolicy.getMetadata().get("policy-id") + ":rule");
+        rule.setRuleId(toscaPolicy.getMetadata().get(POLICY_ID) + ":rule");
         rule.setEffect(EffectType.PERMIT);
         rule.setTarget(new TargetType());
         //
@@ -128,7 +128,7 @@ public class StdCombinedPolicyResultsTranslator implements ToscaPolicyTranslator
 
     @Override
     public Request convertRequest(DecisionRequest request) {
-        LOGGER.debug("Converting Request {}", request);
+        LOGGER.info("Converting Request {}", request);
         try {
             return RequestParser.parseRequest(StdCombinedPolicyRequest.createInstance(request));
         } catch (IllegalArgumentException | IllegalAccessException | DataTypeException e) {
@@ -142,9 +142,13 @@ public class StdCombinedPolicyResultsTranslator implements ToscaPolicyTranslator
 
     @Override
     public DecisionResponse convertResponse(Response xacmlResponse) {
-        LOGGER.debug("Converting Response {}", xacmlResponse);
+        LOGGER.info("Converting Response {}", xacmlResponse);
         DecisionResponse decisionResponse = new DecisionResponse();
         //
+        // Setup policies
+        //
+        decisionResponse.setPolicies(new HashMap<>());
+        //
         // Iterate through all the results
         //
         for (Result xacmlResult : xacmlResponse.getResults()) {
@@ -152,21 +156,11 @@ public class StdCombinedPolicyResultsTranslator implements ToscaPolicyTranslator
             // Check the result
             //
             if (xacmlResult.getDecision() == Decision.PERMIT) {
-                //
-                // Setup policies
-                //
-                decisionResponse.setPolicies(new ArrayList<>());
                 //
                 // Go through obligations
                 //
                 scanObligations(xacmlResult.getObligations(), decisionResponse);
             }
-            if (xacmlResult.getDecision() == Decision.NOTAPPLICABLE) {
-                //
-                // There is no policy
-                //
-                decisionResponse.setPolicies(new ArrayList<>());
-            }
             if (xacmlResult.getDecision() == Decision.DENY
                     || xacmlResult.getDecision() == Decision.INDETERMINATE) {
                 //
@@ -181,9 +175,9 @@ public class StdCombinedPolicyResultsTranslator implements ToscaPolicyTranslator
 
     protected void scanObligations(Collection<Obligation> obligations, DecisionResponse decisionResponse) {
         for (Obligation obligation : obligations) {
-            LOGGER.debug("Obligation: {}", obligation);
+            LOGGER.info("Obligation: {}", obligation);
             for (AttributeAssignment assignment : obligation.getAttributeAssignments()) {
-                LOGGER.debug("Attribute Assignment: {}", assignment);
+                LOGGER.info("Attribute Assignment: {}", assignment);
                 //
                 // We care about the content attribute
                 //
@@ -193,8 +187,8 @@ public class StdCombinedPolicyResultsTranslator implements ToscaPolicyTranslator
                     // The contents are in Json form
                     //
                     Object stringContents = assignment.getAttributeValue().getValue();
-                    if (LOGGER.isDebugEnabled()) {
-                        LOGGER.debug("DCAE contents: {}{}", System.lineSeparator(), stringContents);
+                    if (LOGGER.isInfoEnabled()) {
+                        LOGGER.info("DCAE contents: {}{}", System.lineSeparator(), stringContents);
                     }
                     //
                     // Let's parse it into a map using Gson
@@ -202,7 +196,16 @@ public class StdCombinedPolicyResultsTranslator implements ToscaPolicyTranslator
                     Gson gson = new Gson();
                     @SuppressWarnings("unchecked")
                     Map<String, Object> result = gson.fromJson(stringContents.toString() ,Map.class);
-                    decisionResponse.getPolicies().add(result);
+                    //
+                    // Find the metadata section
+                    //
+                    @SuppressWarnings("unchecked")
+                    Map<String, Object> metadata = (Map<String, Object>) result.get("metadata");
+                    if (metadata != null) {
+                        decisionResponse.getPolicies().put(metadata.get(POLICY_ID).toString(), result);
+                    } else {
+                        LOGGER.error("Missing metadata section in policy contained in obligation.");
+                    }
                 }
             }
         }
@@ -218,7 +221,7 @@ public class StdCombinedPolicyResultsTranslator implements ToscaPolicyTranslator
      */
     protected PolicyType fillMetadataSection(PolicyType policy,
             Map<String, String> map) throws ToscaPolicyConversionException {
-        if (! map.containsKey("policy-id")) {
+        if (! map.containsKey(POLICY_ID)) {
             throw new ToscaPolicyConversionException(policy.getPolicyId() + " missing metadata policy-id");
         } else {
             //
@@ -231,7 +234,7 @@ public class StdCombinedPolicyResultsTranslator implements ToscaPolicyTranslator
             //
             // Add in the Policy Version
             //
-            policy.setVersion(map.get("policy-version").toString());
+            policy.setVersion(map.get("policy-version"));
         }
         return policy;
     }
@@ -295,8 +298,8 @@ public class StdCombinedPolicyResultsTranslator implements ToscaPolicyTranslator
         //
         // Convert the YAML Policy to JSON Object
         //
-        if (LOGGER.isDebugEnabled()) {
-            LOGGER.debug("JSON DCAE Policy {}{}", System.lineSeparator(), jsonPolicy);
+        if (LOGGER.isInfoEnabled()) {
+            LOGGER.info("JSON DCAE Policy {}{}", System.lineSeparator(), jsonPolicy);
         }
         //
         // Create an AttributeValue for it