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

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 0c98a44a3..f411e7d98 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
@@ -30,69 +30,69 @@ import com.google.common.base.Joiner;
 
 @Component
 public abstract class AbstractPolicyCreation {
-	
-	public static String getDomain() {
-		return XACMLProperties.getProperty(XACMLRestProperties.PROP_ADMIN_DOMAIN, "urn");
-	}
-	
-	public String newPolicyID() {
-		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("/")){
-			formateDate = dateTTL.replace("/", "-");
-		}else {
-			formateDate = dateTTL;
-		}
-		return formateDate;
-	}
-	
 
-	
-	public void updatePolicyCreationToDatabase(){
-		// Add it into our tree
+    public static String getDomain() {
+        return XACMLProperties.getProperty(XACMLRestProperties.PROP_ADMIN_DOMAIN, "urn");
+    }
+
+    public String newPolicyID() {
+        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("/")){
+            formateDate = dateTTL.replace("/", "-");
+        }else {
+            formateDate = dateTTL;
+        }
+        return formateDate;
+    }
+
+
+
+    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);
-			}	
-		}*/
-	}
+        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);
+            }
+        }*/
+    }
 
 
 }