You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/07/15 21:53:24 UTC
svn commit: r1361779 - in /tomcat/trunk/java/org/apache/catalina/servlets:
CGIServlet.java DefaultServlet.java WebdavServlet.java
Author: markt
Date: Sun Jul 15 19:53:24 2012
New Revision: 1361779
URL: http://svn.apache.org/viewvc?rev=1361779&view=rev
Log:
Code clean-up for o.a.catalina.servlets
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1361779&r1=1361778&r2=1361779&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Sun Jul 15 19:53:24 2012
@@ -273,10 +273,10 @@ public final class CGIServlet extends Ht
private long stderrTimeout = 2000;
/** object used to ensure multiple threads don't try to expand same file */
- static Object expandFileLock = new Object();
+ private static final Object expandFileLock = new Object();
/** the shell environment variables to be passed to the CGI script */
- static Hashtable<String,String> shellEnv = new Hashtable<String,String>();
+ private static final Hashtable<String,String> shellEnv = new Hashtable<>();
/**
* Sets instance variables.
@@ -314,7 +314,7 @@ public final class CGIServlet extends Ht
}
if (getServletConfig().getInitParameter("executable-arg-1") != null) {
- List<String> args = new ArrayList<String>();
+ List<String> args = new ArrayList<>();
for (int i = 1;; i++) {
String arg = getServletConfig().getInitParameter(
"executable-arg-" + i);
@@ -678,13 +678,13 @@ public final class CGIServlet extends Ht
private String command = null;
/** cgi command's desired working directory */
- private File workingDirectory = null;
+ private final File workingDirectory;
/** cgi command's command line parameters */
- private ArrayList<String> cmdLineParameters = new ArrayList<String>();
+ private final ArrayList<String> cmdLineParameters = new ArrayList<>();
/** whether or not this object is valid or not */
- private boolean valid = false;
+ private final boolean valid;
/**
@@ -707,8 +707,9 @@ public final class CGIServlet extends Ht
if (this.valid) {
workingDirectory = new File(command.substring(0,
command.lastIndexOf(File.separator)));
+ } else {
+ workingDirectory = null;
}
-
}
@@ -933,7 +934,7 @@ public final class CGIServlet extends Ht
* (apologies to Marv Albert regarding MJ)
*/
- Hashtable<String,String> envp = new Hashtable<String,String>();
+ Hashtable<String,String> envp = new Hashtable<>();
// Add the shell environment variables (if any)
envp.putAll(shellEnv);
@@ -1384,16 +1385,16 @@ public final class CGIServlet extends Ht
protected class CGIRunner {
/** script/command to be executed */
- private String command = null;
+ private final String command;
/** environment used when invoking the cgi script */
- private Hashtable<String,String> env = null;
+ private final Hashtable<String,String> env;
/** working directory used when invoking the cgi script */
- private File wd = null;
+ private final File wd;
/** command line parameters to be passed to the invoked script */
- private ArrayList<String> params = null;
+ private final ArrayList<String> params;
/** stdin to be passed to cgi script */
private InputStream stdin = null;
@@ -1495,7 +1496,7 @@ public final class CGIServlet extends Ht
*/
protected String[] hashToStringArray(Hashtable<String,?> h)
throws NullPointerException {
- Vector<String> v = new Vector<String>();
+ Vector<String> v = new Vector<>();
Enumeration<String> e = h.keys();
while (e.hasMoreElements()) {
String k = e.nextElement();
@@ -1596,7 +1597,7 @@ public final class CGIServlet extends Ht
Process proc = null;
int bufRead = -1;
- List<String> cmdAndArgs = new ArrayList<String>();
+ List<String> cmdAndArgs = new ArrayList<>();
if (cgiExecutable.length() != 0) {
cmdAndArgs.add(cgiExecutable);
}
@@ -1842,7 +1843,7 @@ public final class CGIServlet extends Ht
private static final int STATE_SECOND_CR = 3;
private static final int STATE_HEADER_END = 4;
- private InputStream input;
+ private final InputStream input;
private int state;
HTTPHeaderInputStream(InputStream theInput) {
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1361779&r1=1361778&r2=1361779&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Sun Jul 15 19:53:24 2012
@@ -211,7 +211,7 @@ public class DefaultServlet
/**
* Full range marker.
*/
- protected static final ArrayList<Range> FULL = new ArrayList<Range>();
+ protected static final ArrayList<Range> FULL = new ArrayList<>();
// ----------------------------------------------------- Static Initializer
@@ -1135,7 +1135,7 @@ public class DefaultServlet
// Vector which will contain all the ranges which are successfully
// parsed.
- ArrayList<Range> result = new ArrayList<Range>();
+ ArrayList<Range> result = new ArrayList<>();
StringTokenizer commaTokenizer = new StringTokenizer(rangeHeader, ",");
// Parsing the range list
Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1361779&r1=1361778&r2=1361779&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Sun Jul 15 19:53:24 2012
@@ -230,8 +230,7 @@ public class WebdavServlet
* Key : path <br>
* Value : LockInfo
*/
- private Hashtable<String,LockInfo> resourceLocks =
- new Hashtable<String,LockInfo>();
+ private final Hashtable<String,LockInfo> resourceLocks = new Hashtable<>();
/**
@@ -242,8 +241,8 @@ public class WebdavServlet
* collection. Each element of the Vector is the path associated with
* the lock-null resource.
*/
- private Hashtable<String,Vector<String>> lockNullResources =
- new Hashtable<String,Vector<String>>();
+ private final Hashtable<String,Vector<String>> lockNullResources =
+ new Hashtable<>();
/**
@@ -252,7 +251,7 @@ public class WebdavServlet
* Key : path <br>
* Value : LockInfo
*/
- private Vector<LockInfo> collectionLocks = new Vector<LockInfo>();
+ private final Vector<LockInfo> collectionLocks = new Vector<>();
/**
@@ -569,7 +568,7 @@ public class WebdavServlet
}
if (type == FIND_BY_PROPERTY) {
- properties = new Vector<String>();
+ properties = new Vector<>();
// propNode must be non-null if type == FIND_BY_PROPERTY
@SuppressWarnings("null")
NodeList childList = propNode.getChildNodes();
@@ -656,11 +655,11 @@ public class WebdavServlet
properties);
} else {
// The stack always contains the object of the current level
- Stack<String> stack = new Stack<String>();
+ Stack<String> stack = new Stack<>();
stack.push(path);
// Stack of the objects one level below
- Stack<String> stackBelow = new Stack<String>();
+ Stack<String> stackBelow = new Stack<>();
while ((!stack.isEmpty()) && (depth >= 0)) {
@@ -719,7 +718,7 @@ public class WebdavServlet
if (stack.isEmpty()) {
depth--;
stack = stackBelow;
- stackBelow = new Stack<String>();
+ stackBelow = new Stack<>();
}
generatedXML.sendData();
@@ -1162,7 +1161,7 @@ public class WebdavServlet
// Checking if a child resource of this collection is
// already locked
- Vector<String> lockPaths = new Vector<String>();
+ Vector<String> lockPaths = new Vector<>();
locksList = collectionLocks.elements();
while (locksList.hasMoreElements()) {
LockInfo currentLock = locksList.nextElement();
@@ -1310,7 +1309,7 @@ public class WebdavServlet
Vector<String> lockNulls =
lockNullResources.get(parentPath);
if (lockNulls == null) {
- lockNulls = new Vector<String>();
+ lockNulls = new Vector<>();
lockNullResources.put(parentPath, lockNulls);
}
@@ -1697,7 +1696,7 @@ public class WebdavServlet
// Copying source to destination
- Hashtable<String,Integer> errorList = new Hashtable<String,Integer>();
+ Hashtable<String,Integer> errorList = new Hashtable<>();
boolean result = copyResource(resources, errorList,
path, destinationPath);
@@ -1879,8 +1878,7 @@ public class WebdavServlet
}
} else {
- Hashtable<String,Integer> errorList =
- new Hashtable<String,Integer>();
+ Hashtable<String,Integer> errorList = new Hashtable<>();
deleteCollection(req, resources, path, errorList);
try {
@@ -2188,7 +2186,7 @@ public class WebdavServlet
case FIND_BY_PROPERTY :
- Vector<String> propertiesNotFound = new Vector<String>();
+ Vector<String> propertiesNotFound = new Vector<>();
// Parse the list of properties
@@ -2453,7 +2451,7 @@ public class WebdavServlet
case FIND_BY_PROPERTY :
- Vector<String> propertiesNotFound = new Vector<String>();
+ Vector<String> propertiesNotFound = new Vector<>();
// Parse the list of properties
@@ -2696,7 +2694,7 @@ public class WebdavServlet
String scope = "exclusive";
int depth = 0;
String owner = "";
- Vector<String> tokens = new Vector<String>();
+ Vector<String> tokens = new Vector<>();
long expiresAt = 0;
Date creationDate = new Date();
@@ -2847,8 +2845,8 @@ class WebdavStatus {
* status codes to descriptive text. This is a static
* variable.
*/
- private static Hashtable<Integer,String> mapStatusCodes =
- new Hashtable<Integer,String>();
+ private static final Hashtable<Integer,String> mapStatusCodes =
+ new Hashtable<>();
// ------------------------------------------------------ HTTP Status Codes
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org