X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Futil%2FAbstractPolicyCreation.java;h=db68fb29f7c74614b014760e45253403869da5bf;hp=f411e7d982eb13aa87703b94247ad1135be7b1c9;hb=c2ca6ea5cb44103903e1409e8dd6db80167e61e8;hpb=4068da123ee33b532b4b52f15545c76a978f977e

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/AbstractPolicyCreation.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/AbstractPolicyCreation.java
index f411e7d98..db68fb29f 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/AbstractPolicyCreation.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/util/AbstractPolicyCreation.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,82 +17,83 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.pap.xacml.rest.util;
 
+import com.att.research.xacml.util.XACMLProperties;
+import com.google.common.base.Joiner;
 
 import java.util.UUID;
 
-import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.XacmlRestProperties;
 import org.springframework.stereotype.Component;
 
-import com.att.research.xacml.util.XACMLProperties;
-import com.google.common.base.Joiner;
-
 @Component
 public abstract class AbstractPolicyCreation {
 
     public static String getDomain() {
-        return XACMLProperties.getProperty(XACMLRestProperties.PROP_ADMIN_DOMAIN, "urn");
+        return XACMLProperties.getProperty(XacmlRestProperties.PROP_ADMIN_DOMAIN, "urn");
     }
 
     public String newPolicyID() {
-        return Joiner.on(':').skipNulls().join((getDomain().startsWith("urn") ? null: "urn"),
+        return Joiner.on(':').skipNulls().join((getDomain().startsWith("urn") ? null : "urn"),
                 getDomain().replaceAll("[/\\\\.]", ":"), "xacml", "policy", "id", UUID.randomUUID());
     }
 
     public String convertDate(String dateTTL) {
         String formateDate = null;
-        if(dateTTL.contains("/")){
+        if (dateTTL.contains("/")) {
             formateDate = dateTTL.replace("/", "-");
-        }else {
+        } else {
             formateDate = dateTTL;
         }
         return formateDate;
     }
 
-
-
-    public void updatePolicyCreationToDatabase(){
+    public void updatePolicyCreationToDatabase() {
         // Add it into our tree
-/*		Path finalPolicyPath = null;
-        finalPolicyPath = Paths.get(successMap.get("success"));
-        PolicyElasticSearchController controller = new PolicyElasticSearchController();
-        controller.updateElk(finalPolicyPath.toString());
-        File file = finalPolicyPath.toFile();
-        if(file != null){
-            String policyName = file.toString();
-            String removePath = policyName.substring(policyName.indexOf("repository")+11);
-            String removeXml = removePath.replace(".xml", "");
-            String removeExtension = removeXml.substring(0, removeXml.indexOf("."));
-            List<Object> policyVersionList = commonClassDao.getDataById(PolicyVersion.class, "policyName", removeExtension);
-            if (policyVersionList.size() > 0) {
-                for(int i = 0;  i < policyVersionList.size(); i++) {
-                PolicyVersion entityItem = (PolicyVersion) policyVersionList.get(i);
-                    if(entityItem.getPolicyName().equals(removeExtension)){
-                        version = entityItem.getHigherVersion() +1;
-                        entityItem.setActiveVersion(version);
-                        entityItem.setHigherVersion(version);
-                        entityItem.setModifiedBy(userId);
-                        commonClassDao.update(entityItem);
-                        if(policyData.isEditPolicy){
-                            PolicyNotificationMail email = new PolicyNotificationMail();
-                            String mode = "EditPolicy";
-                            String policyNameForEmail = policyData.getDomainDir() + File.separator + policyData.getOldPolicyFileName() + ".xml";
-                            email.sendMail(entityItem, policyNameForEmail, mode, commonClassDao);
-                        }
-                    }
-                }
-            }else{
-                PolicyVersion entityItem = new PolicyVersion();
-                entityItem.setActiveVersion(version);
-                entityItem.setHigherVersion(version);
-                entityItem.setPolicyName(removeExtension);
-                entityItem.setCreatedBy(userId);
-                entityItem.setModifiedBy(userId);
-                commonClassDao.save(entityItem);
-            }
-        }*/
+        /*
+         * Path finalPolicyPath = null;
+         * finalPolicyPath = Paths.get(successMap.get("success"));
+         * PolicyElasticSearchController controller = new PolicyElasticSearchController();
+         * controller.updateElk(finalPolicyPath.toString());
+         * File file = finalPolicyPath.toFile();
+         * if(file != null){
+         * String policyName = file.toString();
+         * String removePath = policyName.substring(policyName.indexOf("repository")+11);
+         * String removeXml = removePath.replace(".xml", "");
+         * String removeExtension = removeXml.substring(0, removeXml.indexOf("."));
+         * List<Object> policyVersionList = commonClassDao.getDataById(PolicyVersion.class, "policyName",
+         * removeExtension);
+         * if (policyVersionList.size() > 0) {
+         * for(int i = 0; i < policyVersionList.size(); i++) {
+         * PolicyVersion entityItem = (PolicyVersion) policyVersionList.get(i);
+         * if(entityItem.getPolicyName().equals(removeExtension)){
+         * version = entityItem.getHigherVersion() +1;
+         * entityItem.setActiveVersion(version);
+         * entityItem.setHigherVersion(version);
+         * entityItem.setModifiedBy(userId);
+         * commonClassDao.update(entityItem);
+         * if(policyData.isEditPolicy){
+         * PolicyNotificationMail email = new PolicyNotificationMail();
+         * String mode = "EditPolicy";
+         * String policyNameForEmail = policyData.getDomainDir() + File.separator + policyData.getOldPolicyFileName() +
+         * ".xml";
+         * email.sendMail(entityItem, policyNameForEmail, mode, commonClassDao);
+         * }
+         * }
+         * }
+         * }else{
+         * PolicyVersion entityItem = new PolicyVersion();
+         * entityItem.setActiveVersion(version);
+         * entityItem.setHigherVersion(version);
+         * entityItem.setPolicyName(removeExtension);
+         * entityItem.setCreatedBy(userId);
+         * entityItem.setModifiedBy(userId);
+         * commonClassDao.save(entityItem);
+         * }
+         * }
+         */
     }
 
-
 }