Author: markt
Date: Tue Aug 7 22:13:00 2012
New Revision: 1370569
URL: http://svn.apache.org/viewvc?rev=1370569&view=rev
Log:
Code clean-up for o.a.catalina.util
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/util/Base64.java
tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java
tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java
tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
tomcat/trunk/java/org/apache/catalina/util/InstanceSupport.java
tomcat/trunk/java/org/apache/catalina/util/Introspection.java
tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
tomcat/trunk/java/org/apache/catalina/util/LifecycleMBeanBase.java
tomcat/trunk/java/org/apache/catalina/util/LifecycleSupport.java
tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java
tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java
tomcat/trunk/java/org/apache/catalina/util/SchemaResolver.java
tomcat/trunk/java/org/apache/catalina/util/ServerInfo.java
tomcat/trunk/java/org/apache/catalina/util/SessionIdGenerator.java
tomcat/trunk/java/org/apache/catalina/util/Strftime.java
tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java
tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java
Modified: tomcat/trunk/java/org/apache/catalina/util/Base64.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Base64.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/Base64.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/Base64.java Tue Aug 7 22:13:00
2012
@@ -33,16 +33,16 @@ import org.apache.tomcat.util.buf.CharCh
*/
public final class Base64
{
- private static final int BASELENGTH = 255;
- private static final int LOOKUPLENGTH = 64;
- private static final int TWENTYFOURBITGROUP = 24;
- private static final int EIGHTBIT = 8;
- private static final int SIXTEENBIT = 16;
- private static final int FOURBYTE = 4;
- private static final int SIGN = -128;
- private static final byte PAD = (byte) '=';
- private static byte [] base64Alphabet = new byte[BASELENGTH];
- private static byte [] lookUpBase64Alphabet = new byte[LOOKUPLENGTH];
+ private static final int BASELENGTH = 255;
+ private static final int LOOKUPLENGTH = 64;
+ private static final int TWENTYFOURBITGROUP = 24;
+ private static final int EIGHTBIT = 8;
+ private static final int SIXTEENBIT = 16;
+ private static final int FOURBYTE = 4;
+ private static final int SIGN = -128;
+ private static final byte PAD = (byte) '=';
+ private static final byte [] base64Alphabet = new byte[BASELENGTH];
+ private static final byte [] lookUpBase64Alphabet = new byte[LOOKUPLENGTH];
static
{
Modified:
tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/CustomObjectInputStream.java Tue
Aug 7 22:13:00 2012
@@ -40,7 +40,7 @@ public final class CustomObjectInputStre
/**
* The class loader we will use to resolve classes.
*/
- private ClassLoader classLoader = null;
+ private final ClassLoader classLoader;
/**
Modified: tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java Tue Aug 7
22:13:00 2012
@@ -42,7 +42,7 @@ public class DOMWriter {
private static String
PRINTWRITER_ENCODING = "UTF8";
- private static String MIME2JAVA_ENCODINGS[] =
+ private static final String MIME2JAVA_ENCODINGS[] =
{ "Default", "UTF-8", "US-ASCII", "ISO-8859-1", "ISO-8859-2",
"ISO-8859-3", "ISO-8859-4",
"ISO-8859-5", "ISO-8859-6", "ISO-8859-7", "ISO-8859-8", "ISO-8859-9",
"ISO-2022-JP",
"SHIFT_JIS", "EUC-JP","GB2312", "BIG5", "EUC-KR", "ISO-2022-KR",
"KOI8-R", "EBCDIC-CP-US",
@@ -56,10 +56,10 @@ public class DOMWriter {
private boolean qualifiedNames = true;
/** Print writer. */
- protected PrintWriter out;
+ protected final PrintWriter out;
/** Canonical output. */
- protected boolean canonical;
+ protected final boolean canonical;
public DOMWriter(String encoding, boolean canonical)
Modified: tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java Tue Aug
7 22:13:00 2012
@@ -62,12 +62,12 @@ public final class ExtensionValidator {
* The string resources for this package.
*/
private static final StringManager sm =
- StringManager.getManager("org.apache.catalina.util");
+ StringManager.getManager("org.apache.catalina.util");
private static volatile ArrayList<Extension> containerAvailableExtensions =
- null;
- private static ArrayList<ManifestResource> containerManifestResources =
- new ArrayList<ManifestResource>();
+ null;
+ private static final ArrayList<ManifestResource>
containerManifestResources =
+ new ArrayList<>();
// ----------------------------------------------------- Static Initializer
@@ -136,8 +136,7 @@ public final class ExtensionValidator {
throws IOException {
String appName = context.getName();
- ArrayList<ManifestResource> appManifestResources =
- new ArrayList<ManifestResource>();
+ ArrayList<ManifestResource> appManifestResources = new ArrayList<>();
// If the application context is null it does not exist and
// therefore is not valid
if (dirContext == null) return false;
@@ -364,7 +363,7 @@ public final class ExtensionValidator {
while (values.hasNext()) {
Extension ext = values.next();
if (availableList == null) {
- availableList = new ArrayList<Extension>();
+ availableList = new ArrayList<>();
availableList.add(ext);
} else {
availableList.add(ext);
Modified: tomcat/trunk/java/org/apache/catalina/util/InstanceSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/InstanceSupport.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/InstanceSupport.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/InstanceSupport.java Tue Aug 7
22:13:00 2012
@@ -72,7 +72,7 @@ public final class InstanceSupport {
/**
* The source component for instance events that we will fire.
*/
- private Wrapper wrapper = null;
+ private final Wrapper wrapper;
// ------------------------------------------------------------- Properties
Modified: tomcat/trunk/java/org/apache/catalina/util/Introspection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Introspection.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/Introspection.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/Introspection.java Tue Aug 7
22:13:00 2012
@@ -34,7 +34,7 @@ import org.apache.tomcat.util.res.String
*/
public class Introspection {
- private static StringManager sm =
+ private static final StringManager sm =
StringManager.getManager("org.apache.catalina.util");
Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LifecycleBase.java Tue Aug 7
22:13:00 2012
@@ -34,9 +34,9 @@ import org.apache.tomcat.util.res.String
*/
public abstract class LifecycleBase implements Lifecycle {
- private static Log log = LogFactory.getLog(LifecycleBase.class);
+ private static final Log log = LogFactory.getLog(LifecycleBase.class);
- private static StringManager sm =
+ private static final StringManager sm =
StringManager.getManager("org.apache.catalina.util");
@@ -44,7 +44,7 @@ public abstract class LifecycleBase impl
* Used to handle firing lifecycle events.
* TODO: Consider merging LifecycleSupport into this class.
*/
- private LifecycleSupport lifecycle = new LifecycleSupport(this);
+ private final LifecycleSupport lifecycle = new LifecycleSupport(this);
/**
Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleMBeanBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleMBeanBase.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/LifecycleMBeanBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/LifecycleMBeanBase.java Tue Aug
7 22:13:00 2012
@@ -34,9 +34,9 @@ import org.apache.tomcat.util.res.String
public abstract class LifecycleMBeanBase extends LifecycleBase
implements JmxEnabled {
- private static Log log = LogFactory.getLog(LifecycleMBeanBase.class);
+ private static final Log log = LogFactory.getLog(LifecycleMBeanBase.class);
- private static StringManager sm =
+ private static final StringManager sm =
StringManager.getManager("org.apache.catalina.util");
Modified: tomcat/trunk/java/org/apache/catalina/util/LifecycleSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/LifecycleSupport.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/LifecycleSupport.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/LifecycleSupport.java Tue Aug 7
22:13:00 2012
@@ -59,7 +59,7 @@ public final class LifecycleSupport {
/**
* The source component for lifecycle events that we will fire.
*/
- private Lifecycle lifecycle = null;
+ private final Lifecycle lifecycle;
/**
Modified: tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/MIME2Java.java Tue Aug 7
22:13:00 2012
@@ -472,11 +472,11 @@ import java.util.Locale;
*/
public class MIME2Java {
- private static Hashtable<String,String> s_enchash;
- private static Hashtable<String,String> s_revhash;
+ private static final Hashtable<String,String> s_enchash;
+ private static final Hashtable<String,String> s_revhash;
static {
- s_enchash = new Hashtable<String,String>();
+ s_enchash = new Hashtable<>();
// <preferred MIME name>, <Java encoding name>
s_enchash.put("UTF-8", "UTF8");
s_enchash.put("US-ASCII", "8859_1"); // ?
@@ -520,7 +520,7 @@ public class MIME2Java {
// j:CNS11643 -> EUC-TW?
// ISO-2022-CN?
ISO-2022-CN-EXT?
- s_revhash = new Hashtable<String,String>();
+ s_revhash = new Hashtable<>();
// <Java encoding name>, <preferred MIME name>
s_revhash.put("UTF8", "UTF-8");
//s_revhash.put("8859_1", "US-ASCII"); // ?
Modified: tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java Tue Aug 7
22:13:00 2012
@@ -42,8 +42,8 @@ public class ManifestResource {
private ArrayList<Extension> availableExtensions = null;
private ArrayList<Extension> requiredExtensions = null;
- private String resourceName = null;
- private int resourceType = -1;
+ private final String resourceName;
+ private final int resourceType;
public ManifestResource(String resourceName, Manifest manifest,
int resourceType) {
@@ -173,7 +173,7 @@ public class ManifestResource {
if (names == null)
return null;
- ArrayList<Extension> extensionList = new ArrayList<Extension>();
+ ArrayList<Extension> extensionList = new ArrayList<>();
names += " ";
while (true) {
@@ -220,7 +220,7 @@ public class ManifestResource {
if (name == null)
return null;
- ArrayList<Extension> extensionList = new ArrayList<Extension>();
+ ArrayList<Extension> extensionList = new ArrayList<>();
Extension extension = new Extension();
extension.setExtensionName(name);
Modified: tomcat/trunk/java/org/apache/catalina/util/SchemaResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/SchemaResolver.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/SchemaResolver.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/SchemaResolver.java Tue Aug 7
22:13:00 2012
@@ -36,21 +36,20 @@ public class SchemaResolver implements E
/**
* The digester instance for which this class is the entity resolver.
*/
- protected Digester digester;
+ protected final Digester digester;
/**
* The URLs of dtds and schemas that have been registered, keyed by the
* public identifier that corresponds.
*/
- protected HashMap<String,String> entityValidator =
- new HashMap<String,String>();
+ protected final HashMap<String,String> entityValidator = new HashMap<>();
/**
* Extension to make the difference between DTD and Schema.
*/
- protected String schemaExtension = "xsd";
+ protected final String schemaExtension = "xsd";
/**
Modified: tomcat/trunk/java/org/apache/catalina/util/ServerInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ServerInfo.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ServerInfo.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/ServerInfo.java Tue Aug 7
22:13:00 2012
@@ -42,39 +42,46 @@ public class ServerInfo {
/**
* The server information String with which we identify ourselves.
*/
- private static String serverInfo = null;
+ private static final String serverInfo;
/**
* The server built String.
*/
- private static String serverBuilt = null;
+ private static final String serverBuilt;
/**
* The server's version number String.
*/
- private static String serverNumber = null;
+ private static final String serverNumber;
static {
+ String info = null;
+ String built = null;
+ String number = null;
+
try {
InputStream is = ServerInfo.class.getResourceAsStream
("/org/apache/catalina/util/ServerInfo.properties");
Properties props = new Properties();
props.load(is);
is.close();
- serverInfo = props.getProperty("server.info");
- serverBuilt = props.getProperty("server.built");
- serverNumber = props.getProperty("server.number");
+ info = props.getProperty("server.info");
+ built = props.getProperty("server.built");
+ number = props.getProperty("server.number");
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
}
- if (serverInfo == null)
- serverInfo = "Apache Tomcat 7.0.x-dev";
- if (serverBuilt == null)
- serverBuilt = "unknown";
- if (serverNumber == null)
- serverNumber = "7.0.x";
-
+ if (info == null)
+ info = "Apache Tomcat 7.0.x-dev";
+ if (built == null)
+ built = "unknown";
+ if (number == null)
+ number = "7.0.x";
+
+ serverInfo = info;
+ serverBuilt = built;
+ serverNumber = number;
}
Modified: tomcat/trunk/java/org/apache/catalina/util/SessionIdGenerator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/SessionIdGenerator.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/SessionIdGenerator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/SessionIdGenerator.java Tue Aug
7 22:13:00 2012
@@ -28,10 +28,10 @@ import org.apache.tomcat.util.res.String
public class SessionIdGenerator {
- private static Log log = LogFactory.getLog(SessionIdGenerator.class);
+ private static final Log log = LogFactory.getLog(SessionIdGenerator.class);
- private static StringManager sm =
+ private static final StringManager sm =
StringManager.getManager("org.apache.catalina.util");
@@ -42,8 +42,7 @@ public class SessionIdGenerator {
* designed this way since random number generators use a sync to make them
* thread-safe and the sync makes using a a single object slow(er).
*/
- private Queue<SecureRandom> randoms =
- new ConcurrentLinkedQueue<SecureRandom>();
+ private final Queue<SecureRandom> randoms = new ConcurrentLinkedQueue<>();
/**
Modified: tomcat/trunk/java/org/apache/catalina/util/Strftime.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Strftime.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/Strftime.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/Strftime.java Tue Aug 7
22:13:00 2012
@@ -43,8 +43,8 @@ import java.util.TimeZone;
* @version $Id$
*/
public class Strftime {
- protected static Properties translate;
- protected SimpleDateFormat simpleDateFormat;
+ protected static final Properties translate;
+ protected final SimpleDateFormat simpleDateFormat;
/**
* Initialize our pattern translation
Modified: tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java Tue Aug 7
22:13:00 2012
@@ -39,7 +39,7 @@ public class URLEncoder {
'A', 'B', 'C', 'D', 'E', 'F'};
//Array containing the safe characters set.
- protected BitSet safeCharacters = new BitSet(256);
+ protected final BitSet safeCharacters = new BitSet(256);
public URLEncoder() {
for (char i = 'a'; i <= 'z'; i++) {
Modified: tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java?rev=1370569&r1=1370568&r2=1370569&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/XMLWriter.java Tue Aug 7
22:13:00 2012
@@ -61,7 +61,7 @@ public class XMLWriter {
/**
* Writer.
*/
- protected Writer writer = null;
+ protected final Writer writer;
// ----------------------------------------------------------- Constructors
@@ -71,6 +71,7 @@ public class XMLWriter {
* Constructor.
*/
public XMLWriter() {
+ this(null);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
