Author: markt Date: Sun Jul 15 22:16:06 2012 New Revision: 1361823 URL: http://svn.apache.org/viewvc?rev=1361823&view=rev Log: Code clean-up for o.a.catalina.ssi - Add final prompted by UCDetector - Java 7 use of <>
Modified: tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java tomcat/trunk/java/org/apache/catalina/ssi/SSIProcessor.java tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java Modified: tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java?rev=1361823&r1=1361822&r2=1361823&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java (original) +++ tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java Sun Jul 15 22:16:06 2012 @@ -35,7 +35,7 @@ public class ByteArrayServletOutputStrea /** * Our buffer to hold the stream. */ - protected ByteArrayOutputStream buf = null; + protected final ByteArrayOutputStream buf; /** Modified: tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java?rev=1361823&r1=1361822&r2=1361823&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java (original) +++ tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java Sun Jul 15 22:16:06 2012 @@ -33,12 +33,12 @@ public class ExpressionParseTree { * Contains the current set of completed nodes. This is a workspace for the * parser. */ - private LinkedList<Node> nodeStack = new LinkedList<Node>(); + private final LinkedList<Node> nodeStack = new LinkedList<>(); /** * Contains operator nodes that don't yet have values. This is a workspace * for the parser. */ - private LinkedList<OppNode> oppStack = new LinkedList<OppNode>(); + private final LinkedList<OppNode> oppStack = new LinkedList<>(); /** * The root node after the expression has been parsed. */ @@ -46,7 +46,7 @@ public class ExpressionParseTree { /** * The SSIMediator to use when evaluating the expressions. */ - private SSIMediator ssiMediator; + private final SSIMediator ssiMediator; /** Modified: tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java?rev=1361823&r1=1361822&r2=1361823&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java (original) +++ tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java Sun Jul 15 22:16:06 2012 @@ -39,10 +39,10 @@ public class ExpressionTokenizer { public static final int TOKEN_GT = 10; public static final int TOKEN_LT = 11; public static final int TOKEN_END = 12; - private char[] expr; + private final char[] expr; private String tokenVal = null; private int index; - private int length; + private final int length; /** Modified: tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java?rev=1361823&r1=1361822&r2=1361823&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java (original) +++ tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java Sun Jul 15 22:16:06 2012 @@ -56,12 +56,12 @@ public class ResponseIncludeWrapper exte /** * Our ServletOutputStream */ - protected ServletOutputStream captureServletOutputStream; + protected final ServletOutputStream captureServletOutputStream; protected ServletOutputStream servletOutputStream; protected PrintWriter printWriter; - private ServletContext context; - private HttpServletRequest request; + private final ServletContext context; + private final HttpServletRequest request; static { RFC1123_FORMAT = new SimpleDateFormat(RFC1123_PATTERN, Locale.US); @@ -163,17 +163,6 @@ public class ResponseIncludeWrapper exte } /** - * Sets the value of the <code>last-modified</code> header field. - * - * @param lastModified The number of milliseconds since January 1, 1970 GMT. - */ - public void setLastModified(long lastModified) { - this.lastModified = lastModified; - ((HttpServletResponse) getResponse()).setDateHeader(LAST_MODIFIED, - lastModified); - } - - /** * Returns the value of the <code>content-type</code> header field. * * @return the content type of the resource referenced by this Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java?rev=1361823&r1=1361822&r2=1361823&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java (original) +++ tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java Sun Jul 15 22:16:06 2012 @@ -34,7 +34,7 @@ import org.apache.catalina.util.IOTools; * @version $Id$ */ public class SSIExec implements SSICommand { - protected SSIInclude ssiInclude = new SSIInclude(); + protected final SSIInclude ssiInclude = new SSIInclude(); protected static final int BUFFER_SIZE = 1024; Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java?rev=1361823&r1=1361822&r2=1361823&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java (original) +++ tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java Sun Jul 15 22:16:06 2012 @@ -57,7 +57,7 @@ public class SSIFilter implements Filter /** regex pattern to match when evaluating content types */ protected Pattern contentTypeRegEx = null; /** default pattern for ssi filter content type matching */ - protected Pattern shtmlRegEx = + protected final Pattern shtmlRegEx = Pattern.compile("text/x-server-parsed-html(;.*)?"); /** Allow exec (normally blocked for security) */ protected boolean allowExec = false; Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java?rev=1361823&r1=1361822&r2=1361823&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java (original) +++ tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java Sun Jul 15 22:16:06 2012 @@ -44,16 +44,15 @@ public class SSIMediator { protected static final String DEFAULT_CONFIG_ERR_MSG = "[an error occurred while processing this directive]"; protected static final String DEFAULT_CONFIG_TIME_FMT = "%A, %d-%b-%Y %T %Z"; protected static final String DEFAULT_CONFIG_SIZE_FMT = "abbrev"; - protected static URLEncoder urlEncoder; + protected static final URLEncoder urlEncoder; protected String configErrMsg = DEFAULT_CONFIG_ERR_MSG; protected String configTimeFmt = DEFAULT_CONFIG_TIME_FMT; protected String configSizeFmt = DEFAULT_CONFIG_SIZE_FMT; - protected String className = getClass().getName(); - protected SSIExternalResolver ssiExternalResolver; - protected long lastModifiedDate; - protected int debug; + protected final String className = getClass().getName(); + protected final SSIExternalResolver ssiExternalResolver; + protected final long lastModifiedDate; protected Strftime strftime; - protected SSIConditionalState conditionalState = new SSIConditionalState(); + protected final SSIConditionalState conditionalState = new SSIConditionalState(); static { //We try to encode only the same characters that apache does urlEncoder = new URLEncoder(); @@ -73,10 +72,9 @@ public class SSIMediator { public SSIMediator(SSIExternalResolver ssiExternalResolver, - long lastModifiedDate, int debug) { + long lastModifiedDate) { this.ssiExternalResolver = ssiExternalResolver; this.lastModifiedDate = lastModifiedDate; - this.debug = debug; setConfigTimeFmt(DEFAULT_CONFIG_TIME_FMT, true); } @@ -127,7 +125,7 @@ public class SSIMediator { public Collection<String> getVariableNames() { - Set<String> variableNames = new HashSet<String>(); + Set<String> variableNames = new HashSet<>(); //These built-in variables are supplied by the mediator ( if not // over-written by // the user ) and always exist Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIProcessor.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIProcessor.java?rev=1361823&r1=1361822&r2=1361823&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ssi/SSIProcessor.java (original) +++ tomcat/trunk/java/org/apache/catalina/ssi/SSIProcessor.java Sun Jul 15 22:16:06 2012 @@ -40,11 +40,9 @@ public class SSIProcessor { protected static final String COMMAND_START = "<!--#"; /** The end pattern */ protected static final String COMMAND_END = "-->"; - protected static final int BUFFER_SIZE = 4096; - protected SSIExternalResolver ssiExternalResolver; - protected HashMap<String,SSICommand> commands = - new HashMap<String,SSICommand>(); - protected int debug; + protected final SSIExternalResolver ssiExternalResolver; + protected final HashMap<String,SSICommand> commands = new HashMap<>(); + protected final int debug; protected final boolean allowExec; @@ -98,7 +96,7 @@ public class SSIProcessor { public long process(Reader reader, long lastModifiedDate, PrintWriter writer) throws IOException { SSIMediator ssiMediator = new SSIMediator(ssiExternalResolver, - lastModifiedDate, debug); + lastModifiedDate); StringWriter stringWriter = new StringWriter(); IOTools.flow(reader, stringWriter); String fileContents = stringWriter.toString(); Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java?rev=1361823&r1=1361822&r2=1361823&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java (original) +++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java Sun Jul 15 22:16:06 2012 @@ -56,12 +56,12 @@ public class SSIServletExternalResolver "REQUEST_URI", "SCRIPT_FILENAME", "SCRIPT_NAME", "SERVER_ADDR", "SERVER_NAME", "SERVER_PORT", "SERVER_PROTOCOL", "SERVER_SOFTWARE", "UNIQUE_ID"}; - protected ServletContext context; - protected HttpServletRequest req; - protected HttpServletResponse res; - protected boolean isVirtualWebappRelative; - protected int debug; - protected String inputEncoding; + protected final ServletContext context; + protected final HttpServletRequest req; + protected final HttpServletResponse res; + protected final boolean isVirtualWebappRelative; + protected final int debug; + protected final String inputEncoding; public SSIServletExternalResolver(ServletContext context, HttpServletRequest req, HttpServletResponse res, @@ -563,8 +563,8 @@ public class SSIServletExternalResolver } protected static class ServletContextAndPath { - protected ServletContext servletContext; - protected String path; + protected final ServletContext servletContext; + protected final String path; public ServletContextAndPath(ServletContext servletContext, --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org