Author: markt
Date: Fri Jul 13 20:51:19 2012
New Revision: 1361394
URL: http://svn.apache.org/viewvc?rev=1361394&view=rev
Log:
Code clean-up for o.a.catalina.filters
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java?rev=1361394&r1=1361393&r2=1361394&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java Fri
Jul 13 20:51:19 2012
@@ -56,7 +56,7 @@ public class CsrfPreventionFilter extend
private Random randomSource;
- private final Set<String> entryPoints = new HashSet<String>();
+ private final Set<String> entryPoints = new HashSet<>();
private int nonceCacheSize = 5;
@@ -153,7 +153,6 @@ public class CsrfPreventionFilter extend
}
}
- @SuppressWarnings("unchecked")
LruCache<String> nonceCache =
(LruCache<String>) req.getSession(true).getAttribute(
Constants.CSRF_NONCE_SESSION_ATTR_NAME);
@@ -169,7 +168,7 @@ public class CsrfPreventionFilter extend
}
if (nonceCache == null) {
- nonceCache = new LruCache<String>(nonceCacheSize);
+ nonceCache = new LruCache<>(nonceCacheSize);
req.getSession().setAttribute(
Constants.CSRF_NONCE_SESSION_ATTR_NAME, nonceCache);
}
Modified: tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java?rev=1361394&r1=1361393&r2=1361394&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/ExpiresFilter.java Fri Jul 13
20:51:19 2012
@@ -1177,7 +1177,7 @@ public class ExpiresFilter extends Filte
/**
* Expires configuration by content type. Visible for test.
*/
- private Map<String, ExpiresConfiguration>
expiresConfigurationByContentType = new LinkedHashMap<String,
ExpiresConfiguration>();
+ private Map<String, ExpiresConfiguration>
expiresConfigurationByContentType = new LinkedHashMap<>();
@Override
public void doFilter(ServletRequest request, ServletResponse response,
@@ -1536,7 +1536,7 @@ public class ExpiresFilter extends Filte
}
}
- List<Duration> durations = new ArrayList<Duration>();
+ List<Duration> durations = new ArrayList<>();
while (currentToken != null) {
int amount;
Modified: tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java?rev=1361394&r1=1361393&r2=1361394&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RemoteIpFilter.java Fri Jul
13 20:51:19 2012
@@ -452,7 +452,7 @@ public class RemoteIpFilter implements F
}
};
- protected Map<String, List<String>> headers;
+ protected final Map<String, List<String>> headers;
protected int localPort;
@@ -475,7 +475,7 @@ public class RemoteIpFilter implements F
this.secure = request.isSecure();
this.serverPort = request.getServerPort();
- headers = new HashMap<String, List<String>>();
+ headers = new HashMap<>();
for (Enumeration<String> headerNames = request.getHeaderNames();
headerNames.hasMoreElements();) {
String header = headerNames.nextElement();
headers.put(header,
Collections.list(request.getHeaders(header)));
@@ -739,7 +739,7 @@ public class RemoteIpFilter implements F
internalProxies.matcher(request.getRemoteAddr()).matches()) {
String remoteIp = null;
// In java 6, proxiesHeaderValue should be declared as a
java.util.Deque
- LinkedList<String> proxiesHeaderValue = new LinkedList<String>();
+ LinkedList<String> proxiesHeaderValue = new LinkedList<>();
StringBuilder concatRemoteIpHeaderValue = new StringBuilder();
for (Enumeration<String> e = request.getHeaders(remoteIpHeader);
e.hasMoreElements();) {
@@ -767,7 +767,7 @@ public class RemoteIpFilter implements F
}
}
// continue to loop on remoteIpHeaderValue to build the new value
of the remoteIpHeader
- LinkedList<String> newRemoteIpHeaderValue = new
LinkedList<String>();
+ LinkedList<String> newRemoteIpHeaderValue = new LinkedList<>();
for (; idx >= 0; idx--) {
String currentRemoteIp = remoteIpHeaderValue[idx];
newRemoteIpHeaderValue.addFirst(currentRemoteIp);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
