aboutsummaryrefslogtreecommitdiffstats
path: root/PolicyEngineAPI
diff options
context:
space:
mode:
authorRavindra Bakkamanthala <rb7147@att.com>2017-05-31 15:54:24 -0400
committerRavindra Bakkamanthala <rb7147@att.com>2017-05-31 15:57:02 -0400
commitd9007d680d19734d5dc106479784c420236cca4b (patch)
treeb3356847c3d6e1543098b447c1df7d49e7118652 /PolicyEngineAPI
parent6a5e800771311208c66ad79ce1bdf76affd144b2 (diff)
[Policy-17] Removed the sql scripts from sdk app
Change-Id: I5b017aad569014c7f12eab35e1dbd1c215f90ebe Signed-off-by: Ravindra Bakkamanthala <rb7147@att.com>
Diffstat (limited to 'PolicyEngineAPI')
-rw-r--r--PolicyEngineAPI/pom.xml4
-rw-r--r--PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java14
2 files changed, 7 insertions, 11 deletions
diff --git a/PolicyEngineAPI/pom.xml b/PolicyEngineAPI/pom.xml
index f0bffb5de..60e603bf4 100644
--- a/PolicyEngineAPI/pom.xml
+++ b/PolicyEngineAPI/pom.xml
@@ -121,10 +121,6 @@
<groupId>com.att.aft</groupId>
<artifactId>dme2</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.att.cadi</groupId>
- <artifactId>cadi-aaf</artifactId>
- </exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
diff --git a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java b/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java
index 5b10f3066..2e14676c8 100644
--- a/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java
+++ b/PolicyEngineAPI/src/main/java/org/openecomp/policy/std/StdPolicyEngine.java
@@ -82,7 +82,7 @@ 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.AAFPolicyClient.Environment;
+import org.openecomp.policy.utils.AAFEnvironment;
import org.openecomp.policy.utils.PolicyUtils;
import org.openecomp.policy.xacml.api.XACMLErrorConstants;
import org.springframework.core.io.FileSystemResource;
@@ -902,13 +902,13 @@ public class StdPolicyEngine {
pass = clientKey.trim();
}
setClientEncoding();
- environment = prop.getProperty("ENVIRONMENT", Environment.DEVL.toString());
- if(environment.equalsIgnoreCase(Environment.TEST.toString())){
- environment = Environment.TEST.toString();
- }else if(environment.equalsIgnoreCase(Environment.PROD.toString())){
- environment = Environment.PROD.toString();
+ environment = prop.getProperty("ENVIRONMENT", AAFEnvironment.DEVL.toString());
+ if(environment.equalsIgnoreCase(AAFEnvironment.TEST.toString())){
+ environment = AAFEnvironment.TEST.toString();
+ }else if(environment.equalsIgnoreCase(AAFEnvironment.PROD.toString())){
+ environment = AAFEnvironment.PROD.toString();
}else{
- environment = Environment.DEVL.toString();
+ environment = AAFEnvironment.DEVL.toString();
}
// Initializing the values.
pdps = new ArrayList<>();