Author: ebourg Date: Wed May 10 13:13:47 2017 New Revision: 1794718 URL: http://svn.apache.org/viewvc?rev=1794718&view=rev Log: Removed more unnecessary parentheses in return statements
Modified: tomcat/trunk/java/javax/el/ArrayELResolver.java tomcat/trunk/java/javax/el/ListELResolver.java tomcat/trunk/java/org/apache/catalina/ContainerEvent.java tomcat/trunk/java/org/apache/catalina/SessionEvent.java tomcat/trunk/java/org/apache/catalina/connector/Request.java tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java tomcat/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java tomcat/trunk/java/org/apache/catalina/session/FileStore.java tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java tomcat/trunk/webapps/examples/WEB-INF/classes/util/HTMLFilter.java tomcat/trunk/webapps/examples/WEB-INF/classes/validators/DebugValidator.java Modified: tomcat/trunk/java/javax/el/ArrayELResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ArrayELResolver.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/javax/el/ArrayELResolver.java (original) +++ tomcat/trunk/java/javax/el/ArrayELResolver.java Wed May 10 13:13:47 2017 @@ -138,7 +138,7 @@ public class ArrayELResolver extends ELR return ((Character) property).charValue(); } if (property instanceof Boolean) { - return (((Boolean) property).booleanValue() ? 1 : 0); + return (Boolean) property ? 1 : 0; } if (property instanceof String) { return Integer.parseInt((String) property); Modified: tomcat/trunk/java/javax/el/ListELResolver.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ListELResolver.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/javax/el/ListELResolver.java (original) +++ tomcat/trunk/java/javax/el/ListELResolver.java Wed May 10 13:13:47 2017 @@ -144,7 +144,7 @@ public class ListELResolver extends ELRe return ((Character) property).charValue(); } if (property instanceof Boolean) { - return (((Boolean) property).booleanValue() ? 1 : 0); + return (Boolean) property ? 1 : 0; } if (property instanceof String) { return Integer.parseInt((String) property); Modified: tomcat/trunk/java/org/apache/catalina/ContainerEvent.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ContainerEvent.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ContainerEvent.java (original) +++ tomcat/trunk/java/org/apache/catalina/ContainerEvent.java Wed May 10 13:13:47 2017 @@ -90,7 +90,7 @@ public final class ContainerEvent extend */ @Override public String toString() { - return ("ContainerEvent['" + getContainer() + "','" + - getType() + "','" + getData() + "']"); + return "ContainerEvent['" + getContainer() + "','" + + getType() + "','" + getData() + "']"; } } Modified: tomcat/trunk/java/org/apache/catalina/SessionEvent.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/SessionEvent.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/SessionEvent.java (original) +++ tomcat/trunk/java/org/apache/catalina/SessionEvent.java Wed May 10 13:13:47 2017 @@ -93,10 +93,7 @@ public final class SessionEvent extends @Override public String toString() { - - return ("SessionEvent['" + getSession() + "','" + - getType() + "']"); - + return "SessionEvent['" + getSession() + "','" + getType() + "']"; } Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original) +++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed May 10 13:13:47 2017 @@ -865,7 +865,7 @@ public class Request implements HttpServ Object attr=attributes.get(name); if(attr!=null) { - return(attr); + return attr; } attr = coyoteRequest.getAttribute(name); @@ -2174,7 +2174,7 @@ public class Request implements HttpServ String value = getHeader(name); if (value == null) { - return (-1L); + return -1L; } // Attempt to convert the date header in a variety of formats @@ -2237,7 +2237,7 @@ public class Request implements HttpServ String value = getHeader(name); if (value == null) { - return (-1); + return -1; } return Integer.parseInt(value); Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java Wed May 10 13:13:47 2017 @@ -212,8 +212,8 @@ public final class ApplicationFilterFact && (period != requestPath.length() - 1) && ((requestPath.length() - period) == (testPath.length() - 1))) { - return (testPath.regionMatches(2, requestPath, period + 1, - testPath.length() - 2)); + return testPath.regionMatches(2, requestPath, period + 1, + testPath.length() - 2); } } Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed May 10 13:13:47 2017 @@ -3551,13 +3551,10 @@ public class StandardContext extends Con */ @Override public String[] findServletMappings() { - synchronized (servletMappingsLock) { String results[] = new String[servletMappings.size()]; - return - (servletMappings.keySet().toArray(results)); + return servletMappings.keySet().toArray(results); } - } Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Wed May 10 13:13:47 2017 @@ -1557,7 +1557,7 @@ public class StandardWrapper extends Con try { Class<?> clazz = this.getClass().getClassLoader().loadClass(classname); - return (ContainerServlet.class.isAssignableFrom(clazz)); + return ContainerServlet.class.isAssignableFrom(clazz); } catch (Throwable t) { ExceptionUtils.handleThrowable(t); return false; Modified: tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java Wed May 10 13:13:47 2017 @@ -918,7 +918,7 @@ public class StatusTransformer { public static String filter(Object obj) { if (obj == null) - return ("?"); + return "?"; String message = obj.toString(); char content[] = new char[message.length()]; Modified: tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java (original) +++ tomcat/trunk/java/org/apache/catalina/mapper/MapperListener.java Wed May 10 13:13:47 2017 @@ -141,7 +141,7 @@ public class MapperListener extends Life @Override protected String getObjectNameKeyProperties() { // Same as connector but Mapper rather than Connector - return ("type=Mapper"); + return "type=Mapper"; } // --------------------------------------------- Container Listener methods Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Wed May 10 13:13:47 2017 @@ -1206,7 +1206,7 @@ public abstract class RealmBase extends if(log.isDebugEnabled()) log.debug(sm.getString("realmBase.gotX509Username", username)); - return(getPrincipal(username)); + return getPrincipal(username); } @@ -1285,7 +1285,7 @@ public abstract class RealmBase extends } // Digest the credentials and return as hexadecimal - return (HexUtils.toHexString(md.digest())); + return HexUtils.toHexString(md.digest()); } catch(Exception ex) { log.error(ex); return credentials; Modified: tomcat/trunk/java/org/apache/catalina/session/FileStore.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/FileStore.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/FileStore.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/FileStore.java Wed May 10 13:13:47 2017 @@ -129,7 +129,7 @@ public final class FileStore extends Sto // Acquire the list of files in our storage directory File file = directory(); if (file == null) { - return (0); + return 0; } String files[] = file.list(); Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java Wed May 10 13:13:47 2017 @@ -63,9 +63,9 @@ public class Http11AprProtocol extends A @Override protected String getNamePrefix() { if (isSSLEnabled()) { - return ("https-openssl-apr"); + return "https-openssl-apr"; } else { - return ("http-apr"); + return "http-apr"; } } } Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Protocol.java Wed May 10 13:13:47 2017 @@ -44,9 +44,9 @@ public class Http11Nio2Protocol extends @Override protected String getNamePrefix() { if (isSSLEnabled()) { - return ("https-" + getSslImplementationShortName()+ "-nio2"); + return "https-" + getSslImplementationShortName()+ "-nio2"; } else { - return ("http-nio2"); + return "http-nio2"; } } } Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Wed May 10 13:13:47 2017 @@ -76,9 +76,9 @@ public class Http11NioProtocol extends A @Override protected String getNamePrefix() { if (isSSLEnabled()) { - return ("https-" + getSslImplementationShortName()+ "-nio"); + return "https-" + getSslImplementationShortName()+ "-nio"; } else { - return ("http-nio"); + return "http-nio"; } } } Modified: tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java (original) +++ tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java Wed May 10 13:13:47 2017 @@ -106,11 +106,11 @@ public class TokenMgrError extends Error * Note: You can customize the lexical error message by modifying this method. */ protected static String LexicalError(boolean EOFSeen, int lexState, int errorLine, int errorColumn, String errorAfter, char curChar) { - return("Lexical error at line " + + return "Lexical error at line " + errorLine + ", column " + errorColumn + ". Encountered: " + (EOFSeen ? "<EOF> " : ("\"" + addEscapes(String.valueOf(curChar)) + "\"") + " (" + (int)curChar + "), ") + - "after : \"" + addEscapes(errorAfter) + "\""); + "after : \"" + addEscapes(errorAfter) + "\""; } /** Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java (original) +++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Wed May 10 13:13:47 2017 @@ -406,7 +406,7 @@ public class JspCServletContext implemen */ @Override public String getServerInfo() { - return ("JspC/ApacheTomcat8"); + return "JspC/ApacheTomcat8"; } Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java (original) +++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java Wed May 10 13:13:47 2017 @@ -254,7 +254,7 @@ public class Util { (HttpServletRequest) pageContext.getRequest(); if (context == null) { if (url.startsWith("/")) - return (request.getContextPath() + url); + return request.getContextPath() + url; else return url; } else { @@ -268,7 +268,7 @@ public class Util { // path on same host. return url; } else { - return (context + url); + return context + url; } } } Modified: tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/http/FastHttpDateFormat.java Wed May 10 13:13:47 2017 @@ -160,7 +160,7 @@ public final class FastHttpDateFormat { throw new IllegalArgumentException(); } if (date == null) { - return (-1L); + return -1L; } return date.longValue(); Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/net/SocketWrapperBase.java Wed May 10 13:13:47 2017 @@ -185,9 +185,13 @@ public abstract class SocketWrapperBase< return this.writeTimeout; } + public void setKeepAliveLeft(int keepAliveLeft) { + this.keepAliveLeft = keepAliveLeft; + } - public void setKeepAliveLeft(int keepAliveLeft) { this.keepAliveLeft = keepAliveLeft;} - public int decrementKeepAlive() { return (--keepAliveLeft);} + public int decrementKeepAlive() { + return --keepAliveLeft; + } public String getRemoteHost() { if (remoteHost == null) { Modified: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java Wed May 10 13:13:47 2017 @@ -197,9 +197,9 @@ public class PojoMethodMapping { private boolean isMethodOverride(Method method1, Method method2) { - return (method1.getName().equals(method2.getName()) + return method1.getName().equals(method2.getName()) && method1.getReturnType().equals(method2.getReturnType()) - && Arrays.equals(method1.getParameterTypes(), method2.getParameterTypes())); + && Arrays.equals(method1.getParameterTypes(), method2.getParameterTypes()); } Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java (original) +++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java Wed May 10 13:13:47 2017 @@ -71,7 +71,7 @@ public class ProxyConnection extends Jdb if (iface == XAConnection.class && connection.getXAConnection()!=null) { return true; } else { - return (iface.isInstance(connection.getConnection())); + return iface.isInstance(connection.getConnection()); } } Modified: tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java (original) +++ tomcat/trunk/test/org/apache/catalina/valves/Benchmarks.java Wed May 10 13:13:47 2017 @@ -195,7 +195,7 @@ public class Benchmarks { } catch (Throwable t) { index = 0; // cannot happen, in theory } - return (months[index]); + return months[index]; } } Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java Wed May 10 13:13:47 2017 @@ -229,8 +229,7 @@ public class CompressionServletResponseW System.out.println("stream is set to "+stream+" in getOutputStream"); } - return (stream); - + return stream; } /** @@ -244,7 +243,7 @@ public class CompressionServletResponseW public PrintWriter getWriter() throws IOException { if (writer != null) - return (writer); + return writer; if (stream != null) throw new IllegalStateException("getOutputStream() has already been called for this response"); @@ -265,7 +264,7 @@ public class CompressionServletResponseW writer = new PrintWriter(stream); } - return (writer); + return writer; } @Override Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/util/HTMLFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/util/HTMLFilter.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/util/HTMLFilter.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/util/HTMLFilter.java Wed May 10 13:13:47 2017 @@ -37,7 +37,7 @@ public final class HTMLFilter { public static String filter(String message) { if (message == null) - return (null); + return null; char content[] = new char[message.length()]; message.getChars(0, message.length(), content, 0); @@ -60,8 +60,7 @@ public final class HTMLFilter { result.append(content[i]); } } - return (result.toString()); - + return result.toString(); } Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/validators/DebugValidator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/validators/DebugValidator.java?rev=1794718&r1=1794717&r2=1794718&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/validators/DebugValidator.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/validators/DebugValidator.java Wed May 10 13:13:47 2017 @@ -76,7 +76,7 @@ public class DebugValidator extends TagL } System.out.println(); System.out.println("-----------------------------------------------"); - return (null); + return null; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org