Author: markt
Date: Thu Aug 9 20:05:31 2012
New Revision: 1371422
URL: http://svn.apache.org/viewvc?rev=1371422&view=rev
Log:
Code clean-up for o.a.catalina.valves
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1371422&r1=1371421&r2=1371422&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Thu Aug 9
20:05:31 2012
@@ -421,7 +421,7 @@ public class AccessLogValve extends Valv
private final Locale cacheDefaultLocale;
private final DateFormatCache parent;
private final Cache cLFCache;
- private final HashMap<String, Cache> formatCache = new HashMap<String,
Cache>();
+ private final HashMap<String, Cache> formatCache = new HashMap<>();
private DateFormatCache(int size, Locale loc, DateFormatCache parent) {
cacheSize = size;
@@ -498,7 +498,7 @@ public class AccessLogValve extends Valv
/**
* The list of our format types.
*/
- private static enum formatType {
+ private static enum FormatType {
CLF, SEC, MSEC, MSEC_FRAC, SDF
}
@@ -1412,11 +1412,11 @@ public class AccessLogValve extends Valv
msecPattern + msecPattern + msecPattern;
/* Our format description string, null if CLF */
- private String format = null;
+ private final String format;
/* Whether to use begin of request or end of response as the timestamp
*/
- private boolean usesBegin = false;
+ private final boolean usesBegin;
/* The format type */
- private formatType type = formatType.CLF;
+ private final FormatType type;
/* Whether we need to postprocess by adding milliseconds */
private boolean usesMsecs = false;
@@ -1452,7 +1452,10 @@ public class AccessLogValve extends Valv
}
protected DateAndTimeElement(String header) {
- format = header;
+ String format = header;
+ boolean usesBegin = false;
+ FormatType type = FormatType.CLF;
+
if (format != null) {
if (format.equals(requestStartPrefix)) {
usesBegin = true;
@@ -1468,18 +1471,21 @@ public class AccessLogValve extends Valv
format = format.substring(4);
}
if (format.length() == 0) {
- type = formatType.CLF;
+ type = FormatType.CLF;
} else if (format.equals(secFormat)) {
- type = formatType.SEC;
+ type = FormatType.SEC;
} else if (format.equals(msecFormat)) {
- type = formatType.MSEC;
+ type = FormatType.MSEC;
} else if (format.equals(msecFractionFormat)) {
- type = formatType.MSEC_FRAC;
+ type = FormatType.MSEC_FRAC;
} else {
- type = formatType.SDF;
+ type = FormatType.SDF;
format = tidyFormat(format);
}
}
+ this.format = format;
+ this.usesBegin = usesBegin;
+ this.type = type;
}
@Override
@@ -1915,7 +1921,7 @@ public class AccessLogValve extends Valv
* parse pattern string and create the array of AccessLogElement
*/
protected AccessLogElement[] createLogElements() {
- List<AccessLogElement> list = new ArrayList<AccessLogElement>();
+ List<AccessLogElement> list = new ArrayList<>();
boolean replace = false;
StringBuilder buf = new StringBuilder();
for (int i = 0; i < pattern.length(); i++) {
Modified:
tomcat/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java?rev=1371422&r1=1371421&r2=1371422&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/valves/CrawlerSessionManagerValve.java
Thu Aug 9 20:05:31 2012
@@ -47,9 +47,9 @@ public class CrawlerSessionManagerValve
LogFactory.getLog(CrawlerSessionManagerValve.class);
private final Map<String,String> clientIpSessionId =
- new ConcurrentHashMap<String, String>();
+ new ConcurrentHashMap<>();
private final Map<String,String> sessionIdClientIp =
- new ConcurrentHashMap<String, String>();
+ new ConcurrentHashMap<>();
private String crawlerUserAgents =
".*[bB]ot.*|.*Yahoo! Slurp.*|.*Feedfetcher-Google.*";
Modified:
tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java?rev=1371422&r1=1371421&r2=1371422&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java
Thu Aug 9 20:05:31 2012
@@ -421,7 +421,7 @@ public class ExtendedAccessLogValve exte
}
protected static class PatternTokenizer {
- private StringReader sr = null;
+ private final StringReader sr;
private StringBuilder buf = new StringBuilder();
private boolean ended = false;
private boolean subToken;
@@ -543,7 +543,7 @@ public class ExtendedAccessLogValve exte
if (log.isDebugEnabled()) {
log.debug("decodePattern, pattern =" + pattern);
}
- List<AccessLogElement> list = new ArrayList<AccessLogElement>();
+ List<AccessLogElement> list = new ArrayList<>();
PatternTokenizer tokenizer = new PatternTokenizer(pattern);
try {
Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1371422&r1=1371421&r2=1371422&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Thu Aug 9
20:05:31 2012
@@ -567,7 +567,7 @@ public class RemoteIpValve extends Valve
internalProxies.matcher(originalRemoteAddr).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();) {
@@ -595,7 +595,7 @@ public class RemoteIpValve extends Valve
}
}
// 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);
Modified:
tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java?rev=1371422&r1=1371421&r2=1371422&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
Thu Aug 9 20:05:31 2012
@@ -68,12 +68,12 @@ public class StuckThreadDetectionValve e
* are stuck (caused by a long monitor interval)
*/
private final ConcurrentHashMap<Long, MonitoredThread> activeThreads =
- new ConcurrentHashMap<Long, MonitoredThread>();
+ new ConcurrentHashMap<>();
/**
*
*/
private final Queue<CompletedStuckThread> completedStuckThreadsQueue =
- new ConcurrentLinkedQueue<CompletedStuckThread>();
+ new ConcurrentLinkedQueue<>();
/**
* Specify the threshold (in seconds) used when checking for stuck threads.
@@ -214,7 +214,7 @@ public class StuckThreadDetectionValve e
}
public long[] getStuckThreadIds() {
- List<Long> idList = new ArrayList<Long>();
+ List<Long> idList = new ArrayList<>();
for (MonitoredThread monitoredThread : activeThreads.values()) {
if (monitoredThread.isMarkedAsStuck()) {
idList.add(Long.valueOf(monitoredThread.getThread().getId()));
@@ -229,7 +229,7 @@ public class StuckThreadDetectionValve e
}
public String[] getStuckThreadNames() {
- List<String> nameList = new ArrayList<String>();
+ List<String> nameList = new ArrayList<>();
for (MonitoredThread monitoredThread : activeThreads.values()) {
if (monitoredThread.isMarkedAsStuck()) {
nameList.add(monitoredThread.getThread().getName());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
