X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ECOMP-PDP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fpolicy%2Fpdp%2Frest%2FPapUrlResolver.java;h=924c2b5ff66be1f2d384798e04f5778c9ad7e956;hb=fc5c07705edc4dcb7083b39116a43844bb6a1490;hp=44a1f5e178665d2a051925cbf03d1859963d537a;hpb=e0addf5b588a1244f9679becd90999dfcb4c3a94;p=policy%2Fengine.git

diff --git a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/PapUrlResolver.java b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/PapUrlResolver.java
index 44a1f5e17..924c2b5ff 100644
--- a/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/PapUrlResolver.java
+++ b/ECOMP-PDP-REST/src/main/java/org/openecomp/policy/pdp/rest/PapUrlResolver.java
@@ -28,31 +28,29 @@ import java.util.Date;
 import java.util.NoSuchElementException;
 import java.util.Properties;
 
+import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
+import org.openecomp.policy.common.logging.flexlogger.Logger;
 import org.openecomp.policy.rest.XACMLRestProperties;
 
 import com.att.research.xacml.util.XACMLProperties;
 
-import org.openecomp.policy.common.logging.flexlogger.*;
-
 public class PapUrlResolver {
 	private static final Logger LOGGER = FlexLogger.getLogger(PapUrlResolver.class);
 	//how long to keep a pap failed before making it un-failed, in milli-seconds
 	private static final long FAIL_TIMEOUT = 18000000;
 	
 	//thread locks
-	public static Object propertyLock = new Object();
+	public static final Object propertyLock = new Object();
 	
-	public static void setPapUrls(String[] papUrls){
-		
-	}
 	//keeping this here for backward compatibility
 	public static String extractIdFromUrl(String url){
 		return extractQuery(url);
 	}
 	public static String extractQuery(String url){
 		try{
-		return URI.create(url).getQuery();
+			return URI.create(url).getQuery();
 		} catch(Exception e){
+			LOGGER.error("Exception occured while extracting query. So, empty string is returned"+e);
 			return "";
 		}
 	}
@@ -92,22 +90,24 @@ public class PapUrlResolver {
 	//because it is used for a difference purpose.
 	private PapUrlResolver(String urlList, String failedList, String succeededList, boolean autoUpdateProperties){	
 		this.autoUpdateProperties = autoUpdateProperties;
-		//synchronized(propertyLock){
-		if(urlList == null){
-			urlList = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_URLS);
-			if(urlList == null){
-				urlList = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_URL);
+		String papUrlLists = urlList;
+		String papUrlFailedList = failedList;
+		String papUrlSuccessList = succeededList;
+		if(papUrlLists == null){
+			papUrlLists = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_URLS);
+			if(papUrlLists == null){
+				papUrlLists = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_URL);
 			}
-			failedList = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_FAILED_URLS);
-			succeededList = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_SUCCEEDED_URLS);
+			papUrlFailedList = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_FAILED_URLS);
+			papUrlSuccessList = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_SUCCEEDED_URLS);
 		}
-		//}		
-		String[] urls = urlList.split(",");
+		
+		String[] urls = papUrlLists.split(",");
 		if(urls.length == 0){		
 			//log error
 		}
-		String[] failed = emptyOrSplit(failedList,urls.length);
-		String[] succeeded = emptyOrSplit(succeededList,urls.length);
+		String[] failed = emptyOrSplit(papUrlFailedList,urls.length);
+		String[] succeeded = emptyOrSplit(papUrlSuccessList,urls.length);
 		
 		sortedUrlNodes = new PapUrlNode[urls.length];
 		for(int i=0;i<urls.length;i++){
@@ -130,7 +130,6 @@ public class PapUrlResolver {
 			if(sortedUrlNodes[i] == null){
 				sortedUrlNodes[i] = newNode;
 			}
-			
 		}
 		originalUrlNodes = sortedUrlNodes.clone();
 		sort(sortedUrlNodes);
@@ -243,8 +242,7 @@ public class PapUrlResolver {
 		if(sortedUrlNodes[pointer]== null){
 			throw new NoSuchElementException();
 		} else {
-			String finalUrl = sortedUrlNodes[pointer].getUrl().concat("?").concat(query);
-			return finalUrl;
+			return sortedUrlNodes[pointer].getUrl().concat("?").concat(query);
 		}
 	}
 	
@@ -324,13 +322,12 @@ public class PapUrlResolver {
 		//parses string into a date or a null date, if the url never failed/succeeded (since -1 will be in the property)
 		private Date setHandler(Object time){
 			if(time instanceof String){
-				if(((String)time).equals("-1")){
+				if("-1".equals((String)time)){
 					return null;
 				}
 				try {
 					DateFormat df = new SimpleDateFormat();
-					Date parsedTime = df.parse((String)time);
-					return parsedTime;
+					return df.parse((String)time);
 				} catch (ParseException e) {					
 					return null;
 				}
@@ -362,7 +359,8 @@ public class PapUrlResolver {
 		public String getUrl(){
 			return papUrl;
 		}
-
+		
+		@Override
 		public int compareTo(PapUrlNode other){
 			if(this.failedTime == null && other.failedTime != null){
 				return -1;