[POLICY-73] replace openecomp for policy-engine

[policy/engine.git] / PolicyEngineAPI / src / main / java / org / onap / policy / std / StdPolicyEngine.java

diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdPolicyEngine.java
similarity index 94%
rename from PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java
rename to PolicyEngineAPI/src/main/java/org/onap/policy/std/StdPolicyEngine.java
index 0732c3c..608bb8d 100644 (file)
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java
+++ b/PolicyEngineAPI/src/main/java/org/onap/policy/std/StdPolicyEngine.java
@@ -19,7 +19,7 @@
  */
 
 
-package org.openecomp.policy.std;
+package org.onap.policy.std;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -51,40 +51,40 @@ import javax.json.JsonReader;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.openecomp.policy.api.AttributeType;
-import org.openecomp.policy.api.ConfigRequestParameters;
-import org.openecomp.policy.api.DecisionRequestParameters;
-import org.openecomp.policy.api.DecisionResponse;
-import org.openecomp.policy.api.DeletePolicyParameters;
-import org.openecomp.policy.api.DictionaryParameters;
-import org.openecomp.policy.api.DictionaryResponse;
-import org.openecomp.policy.api.EventRequestParameters;
-import org.openecomp.policy.api.ImportParameters;
-import org.openecomp.policy.api.MetricsRequestParameters;
-import org.openecomp.policy.api.MetricsResponse;
-import org.openecomp.policy.api.NotificationHandler;
-import org.openecomp.policy.api.NotificationScheme;
-import org.openecomp.policy.api.PDPNotification;
-import org.openecomp.policy.api.PolicyChangeResponse;
-import org.openecomp.policy.api.PolicyClass;
-import org.openecomp.policy.api.PolicyConfig;
-import org.openecomp.policy.api.PolicyConfigException;
-import org.openecomp.policy.api.PolicyConfigType;
-import org.openecomp.policy.api.PolicyDecisionException;
-import org.openecomp.policy.api.PolicyEngineException;
-import org.openecomp.policy.api.PolicyEventException;
-import org.openecomp.policy.api.PolicyException;
-import org.openecomp.policy.api.PolicyParameters;
-import org.openecomp.policy.api.PolicyResponse;
-import org.openecomp.policy.api.PolicyType;
-import org.openecomp.policy.api.PushPolicyParameters;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.models.APIDictionaryResponse;
-import org.openecomp.policy.models.APIPolicyConfigResponse;
-import org.openecomp.policy.utils.AAFEnvironment;
-import org.openecomp.policy.utils.PolicyUtils;
-import org.openecomp.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.api.AttributeType;
+import org.onap.policy.api.ConfigRequestParameters;
+import org.onap.policy.api.DecisionRequestParameters;
+import org.onap.policy.api.DecisionResponse;
+import org.onap.policy.api.DeletePolicyParameters;
+import org.onap.policy.api.DictionaryParameters;
+import org.onap.policy.api.DictionaryResponse;
+import org.onap.policy.api.EventRequestParameters;
+import org.onap.policy.api.ImportParameters;
+import org.onap.policy.api.MetricsRequestParameters;
+import org.onap.policy.api.MetricsResponse;
+import org.onap.policy.api.NotificationHandler;
+import org.onap.policy.api.NotificationScheme;
+import org.onap.policy.api.PDPNotification;
+import org.onap.policy.api.PolicyChangeResponse;
+import org.onap.policy.api.PolicyClass;
+import org.onap.policy.api.PolicyConfig;
+import org.onap.policy.api.PolicyConfigException;
+import org.onap.policy.api.PolicyConfigType;
+import org.onap.policy.api.PolicyDecisionException;
+import org.onap.policy.api.PolicyEngineException;
+import org.onap.policy.api.PolicyEventException;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.api.PolicyParameters;
+import org.onap.policy.api.PolicyResponse;
+import org.onap.policy.api.PolicyType;
+import org.onap.policy.api.PushPolicyParameters;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.models.APIDictionaryResponse;
+import org.onap.policy.models.APIPolicyConfigResponse;
+import org.onap.policy.utils.AAFEnvironment;
+import org.onap.policy.utils.PolicyUtils;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -205,8 +205,8 @@ public class StdPolicyEngine {
        /*
         * getDecision using the decision Attributes.
         */
-       public DecisionResponse getDecision(String eCOMPComponentName, Map<String, String> decisionAttributes, UUID requestID) throws PolicyDecisionException {
-               return getDecisionImpl(eCOMPComponentName, decisionAttributes, requestID);
+       public DecisionResponse getDecision(String onapComponentName, Map<String, String> decisionAttributes, UUID requestID) throws PolicyDecisionException {
+               return getDecisionImpl(onapComponentName, decisionAttributes, requestID);
        }
        
        /*
@@ -218,7 +218,7 @@ public class StdPolicyEngine {
                        LOGGER.error(message);
                        throw new PolicyDecisionException(message);
                }
-               return getDecisionImpl(decisionRequestParameters.getECOMPComponentName(), decisionRequestParameters.getDecisionAttributes(), decisionRequestParameters.getRequestID());
+               return getDecisionImpl(decisionRequestParameters.getONAPComponentName(), decisionRequestParameters.getDecisionAttributes(), decisionRequestParameters.getRequestID());
        }
        
        /*
@@ -523,7 +523,7 @@ public class StdPolicyEngine {
         }
     }
 
-    public DecisionResponse getDecisionImpl(String eCOMPComponentName,
+    public DecisionResponse getDecisionImpl(String onapComponentName,
                                                                                        Map<String, String> decisionAttributes,
                                                                                        UUID requestID) throws PolicyDecisionException {
                String resource= "getDecision";
@@ -533,7 +533,7 @@ public class StdPolicyEngine {
         try {
             DecisionRequestParameters decisionRequestParameters = new DecisionRequestParameters();
             decisionRequestParameters.setDecisionAttributes(decisionAttributes);
-            decisionRequestParameters.setECOMPComponentName(eCOMPComponentName);
+            decisionRequestParameters.setONAPComponentName(onapComponentName);
             decisionRequestParameters.setRequestID(requestID);
             body = PolicyUtils.objectToJsonString(decisionRequestParameters);
         } catch (JsonProcessingException e) {
@@ -650,8 +650,8 @@ public class StdPolicyEngine {
         HashMap<String, String> configAttributes = new HashMap<>();
         try{
             for(String key: matchingConditions.keySet()){
-                if(key.equalsIgnoreCase("ECOMPName")){
-                    match.setEcompName(matchingConditions.get(key));
+                if(key.equalsIgnoreCase("ONAPName")){
+                    match.setOnapName(matchingConditions.get(key));
                 }else if(key.equalsIgnoreCase("ConfigName")){
                     match.setConfigName(matchingConditions.get(key));
                 }else{
@@ -663,8 +663,8 @@ public class StdPolicyEngine {
             }
             MatchStore.storeMatch(match);
         }catch(Exception e){
-            LOGGER.info("StoreMatch failed for Ecomp:"
-                    + match.getEcompName() + " Config: "
+            LOGGER.info("StoreMatch failed for Onap:"
+                    + match.getOnapName() + " Config: "
                     + match.getConfigName());
         }
     }
@@ -1138,10 +1138,10 @@ public class StdPolicyEngine {
                return pushPolicyImpl(pushPolicyParameters).getResponseMessage();
        }
        
-       public String createUpdateConfigPolicy(String policyName, String policyDescription, String ecompName, String configName,
+       public String createUpdateConfigPolicy(String policyName, String policyDescription, String onapName, String configName,
                        Map<String, String> configAttributes, String configType, String body, String policyScope, UUID requestID,
                        String riskLevel, String riskType, String guard, String ttlDate, boolean updateFlag) throws PolicyException {
-               return createUpdateConfigPolicyImpl(policyName, policyDescription, ecompName, configName,
+               return createUpdateConfigPolicyImpl(policyName, policyDescription, onapName, configName,
                                configAttributes, configType, body, policyScope, requestID,
                                riskLevel, riskType, guard, ttlDate, updateFlag);
        }
@@ -1149,7 +1149,7 @@ public class StdPolicyEngine {
        /*
         * Create Config Policy API Implementation
         */
-       public String createUpdateConfigPolicyImpl(String policyName, String policyDescription, String ecompName, String configName,
+       public String createUpdateConfigPolicyImpl(String policyName, String policyDescription, String onapName, String configName,
                        Map<String, String> configAttributes, String configType, String body, String policyScope, UUID requestID,
                        String riskLevel, String riskType, String guard, String ttlDate, boolean updateFlag) throws PolicyException {
                PolicyParameters policyParameters = new PolicyParameters();
@@ -1167,7 +1167,7 @@ public class StdPolicyEngine {
                }
                policyParameters.setPolicyName(policyScope+"."+policyName);
                policyParameters.setPolicyDescription(policyDescription);
-               policyParameters.setEcompName(ecompName);
+               policyParameters.setOnapName(onapName);
                policyParameters.setConfigName(configName);
                Map<AttributeType, Map<String, String>> attributes = new HashMap<AttributeType, Map<String, String>>();
                attributes.put(AttributeType.MATCHING, configAttributes);