You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2017/12/31 11:10:20 UTC

svn commit: r1819729 - /uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerHttpRequestFilter.java

Author: degenaro
Date: Sun Dec 31 11:10:20 2017
New Revision: 1819729

URL: http://svn.apache.org/viewvc?rev=1819729&view=rev
Log:
UIMA-5685 DUCC Web Server (WS) fix poorly named method name in DuccHandlerHttpRequestFilter

Modified:
    uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerHttpRequestFilter.java

Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerHttpRequestFilter.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerHttpRequestFilter.java?rev=1819729&r1=1819728&r2=1819729&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerHttpRequestFilter.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerHttpRequestFilter.java Sun Dec 31 11:10:20 2017
@@ -42,7 +42,7 @@ public class DuccHandlerHttpRequestFilte
 	private static DuccLogger duccLogger = DuccLogger.getLogger(DuccHandlerHttpRequestFilter.class);
 	private static volatile DuccId jobid = null;
 	
-	// refresh interval for both ducc.properties and URI encryption exception list
+	// refresh interval for both ducc.properties and URI encryption Exemption list
 	private long expiryMillis = 60*1000;
 	
 	// TOD of last refresh
@@ -55,7 +55,7 @@ public class DuccHandlerHttpRequestFilte
 	private volatile UserDataAccessMode userDataAccessMode = UserDataAccessMode.unrestricted;
 	
 	// present list of encryption exempt URI prefixes
-	private volatile List<String> listEncryptionException = new ArrayList<String>();
+	private volatile List<String> listEncryptionExemption = new ArrayList<String>();
 	
 	// file containing list of encryption exempt URI prefixes
 	// - one per line
@@ -74,8 +74,8 @@ public class DuccHandlerHttpRequestFilte
 	}
 	
 	// re-read file containing list of encryption exempt URI prefixes
-	private void refreshListEncryptionException() {
-		String location = "refreshListEncryptionException";
+	private void refreshListEncryptionExemption() {
+		String location = "refreshListEncryptionExemption";
 		try {
 			List<String> listRefresh = new ArrayList<String>();
 			BufferedReader br = null;
@@ -91,7 +91,7 @@ public class DuccHandlerHttpRequestFilte
 	                	listRefresh.add(line);
 	                }
 	            }
-	            listEncryptionException = listRefresh;
+	            listEncryptionExemption = listRefresh;
 	        } 
 	        catch (IOException e) {
 	        	duccLogger.trace(location, jobid, e);
@@ -106,15 +106,15 @@ public class DuccHandlerHttpRequestFilte
 	            	duccLogger.error(location, jobid, e);
 	            }
 	        }
-	        duccLogger.debug(location, jobid, "size:"+listEncryptionException.size());
+	        duccLogger.debug(location, jobid, "size:"+listEncryptionExemption.size());
 		}
 		catch (Exception e) {
         	duccLogger.error(location, jobid, e);
         }
 	}
 	
-	private List<String> getListEncryptionException() {
-		return listEncryptionException;
+	private List<String> getListEncryptionExemption() {
+		return listEncryptionExemption;
 	}
 	
 	// re-read value of ducc.ws.user.data.access
@@ -192,13 +192,13 @@ public class DuccHandlerHttpRequestFilte
 		return retVal;
 	}
 	
-	// if refresh time has elapsed, refresh ducc property and encryption exception list
+	// if refresh time has elapsed, refresh ducc property and encryption Exemption list
 	private void refresh() {
 		long timeMillisNow = System.currentTimeMillis();
 		long timeMillisLastUpdate = saveMillisUpdate.get();
 		if(timeMillisNow-timeMillisLastUpdate > expiryMillis) {
 			refreshUserDataAccessMode();
-			refreshListEncryptionException();
+			refreshListEncryptionExemption();
 			saveMillisUpdate.set(timeMillisNow);
 		}
 	}
@@ -217,7 +217,7 @@ public class DuccHandlerHttpRequestFilte
 	
 	private boolean isRestrictedUri(String reqUri) {
 		boolean retVal = true;
-		List<String> list = getListEncryptionException();
+		List<String> list = getListEncryptionExemption();
 		for(String includeUri : list) {
 			if(reqUri.startsWith(includeUri)) {
 				retVal = false;