This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new e34c370a60 Unify conditional statement format (#661)
e34c370a60 is described below
commit e34c370a60d0223387f078ad9b7f147bdb00c1ff
Author: ReO <[email protected]>
AuthorDate: Wed Sep 6 22:13:18 2023 +0900
Unify conditional statement format (#661)
Remove unnecessary parentheses
Simplify some conditional statements using De Morgan's law
---
java/org/apache/catalina/ant/AbstractCatalinaTask.java | 2 +-
java/org/apache/catalina/connector/Request.java | 4 ++--
java/org/apache/catalina/connector/Response.java | 2 +-
java/org/apache/catalina/core/ApplicationContext.java | 4 ++--
java/org/apache/catalina/core/ApplicationFilterFactory.java | 2 +-
java/org/apache/catalina/core/StandardContext.java | 2 +-
java/org/apache/catalina/filters/CsrfPreventionFilter.java | 2 +-
java/org/apache/catalina/manager/ManagerServlet.java | 2 +-
java/org/apache/catalina/manager/host/HostManagerServlet.java | 2 +-
java/org/apache/catalina/realm/JNDIRealm.java | 2 +-
java/org/apache/catalina/realm/RealmBase.java | 2 +-
java/org/apache/coyote/ajp/AjpMessage.java | 2 +-
java/org/apache/coyote/http11/Http11InputBuffer.java | 10 +++++-----
java/org/apache/coyote/http11/filters/ChunkedInputFilter.java | 6 +++---
.../apache/tomcat/util/descriptor/web/SecurityConstraint.java | 4 ++--
java/org/apache/tomcat/util/digester/RulesBase.java | 2 +-
.../apache/tomcat/util/net/openssl/panama/OpenSSLContext.java | 2 +-
.../apache/tomcat/util/net/openssl/panama/OpenSSLContext.java | 4 ++--
.../apache/tomcat/util/net/openssl/panama/OpenSSLContext.java | 2 +-
19 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index 75676e2960..61ac76e5e5 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -233,7 +233,7 @@ public abstract class AbstractCatalinaTask extends
BaseRedirectorHelperTask {
int ch = reader.read();
if (ch < 0) {
break;
- } else if ((ch == '\r') || (ch == '\n')) {
+ } else if (ch == '\r' || ch == '\n') {
// in Win \r\n would cause handleOutput() to be called
// twice, the second time with an empty string,
// producing blank lines
diff --git a/java/org/apache/catalina/connector/Request.java
b/java/org/apache/catalina/connector/Request.java
index 62307c0210..af9b81fe27 100644
--- a/java/org/apache/catalina/connector/Request.java
+++ b/java/org/apache/catalina/connector/Request.java
@@ -1443,7 +1443,7 @@ public class Request implements HttpServletRequest {
return;
}
Object listeners[] = context.getApplicationEventListeners();
- if ((listeners == null) || (listeners.length == 0)) {
+ if (listeners == null || listeners.length == 0) {
return;
}
boolean replaced = (oldValue != null);
@@ -1484,7 +1484,7 @@ public class Request implements HttpServletRequest {
private void notifyAttributeRemoved(String name, Object value) {
Context context = getContext();
Object listeners[] = context.getApplicationEventListeners();
- if ((listeners == null) || (listeners.length == 0)) {
+ if (listeners == null || listeners.length == 0) {
return;
}
ServletRequestAttributeEvent event =
diff --git a/java/org/apache/catalina/connector/Response.java
b/java/org/apache/catalina/connector/Response.java
index 4de1e86b40..b149f9dec4 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -1656,7 +1656,7 @@ public class Response implements HttpServletResponse {
* @return the encoded URL
*/
protected String toEncoded(String url, String sessionId) {
- if ((url == null) || (sessionId == null)) {
+ if (url == null || sessionId == null) {
return url;
}
diff --git a/java/org/apache/catalina/core/ApplicationContext.java
b/java/org/apache/catalina/core/ApplicationContext.java
index 682ccc123b..2ebe16c967 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -608,7 +608,7 @@ public class ApplicationContext implements ServletContext {
// Notify interested application event listeners
Object listeners[] = context.getApplicationEventListeners();
- if ((listeners == null) || (listeners.length == 0)) {
+ if (listeners == null || listeners.length == 0) {
return;
}
ServletContextAttributeEvent event = new
ServletContextAttributeEvent(context.getServletContext(), name, value);
@@ -655,7 +655,7 @@ public class ApplicationContext implements ServletContext {
// Notify interested application event listeners
Object listeners[] = context.getApplicationEventListeners();
- if ((listeners == null) || (listeners.length == 0)) {
+ if (listeners == null || listeners.length == 0) {
return;
}
ServletContextAttributeEvent event = null;
diff --git a/java/org/apache/catalina/core/ApplicationFilterFactory.java
b/java/org/apache/catalina/core/ApplicationFilterFactory.java
index 610abd3364..e3d48e54eb 100644
--- a/java/org/apache/catalina/core/ApplicationFilterFactory.java
+++ b/java/org/apache/catalina/core/ApplicationFilterFactory.java
@@ -77,7 +77,7 @@ public final class ApplicationFilterFactory {
FilterMap filterMaps[] = context.findFilterMaps();
// If there are no filter mappings, we are done
- if ((filterMaps == null) || (filterMaps.length == 0)) {
+ if (filterMaps == null || filterMaps.length == 0) {
return filterChain;
}
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 1cc45173b3..f616da7be8 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -2968,7 +2968,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
@Override
public void addParameter(String name, String value) {
// Validate the proposed context initialization parameter
- if ((name == null) || (value == null)) {
+ if (name == null || value == null) {
throw new
IllegalArgumentException(sm.getString("standardContext.parameter.required"));
}
diff --git a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
index d33fdb8d08..f1c653e9b1 100644
--- a/java/org/apache/catalina/filters/CsrfPreventionFilter.java
+++ b/java/org/apache/catalina/filters/CsrfPreventionFilter.java
@@ -291,7 +291,7 @@ public class CsrfPreventionFilter extends
CsrfPreventionFilterBase {
*/
private String addNonce(String url) {
- if ((url == null) || (nonce == null)) {
+ if (url == null || nonce == null) {
return url;
}
diff --git a/java/org/apache/catalina/manager/ManagerServlet.java
b/java/org/apache/catalina/manager/ManagerServlet.java
index 8856a983f4..35e0d7cff6 100644
--- a/java/org/apache/catalina/manager/ManagerServlet.java
+++ b/java/org/apache/catalina/manager/ManagerServlet.java
@@ -476,7 +476,7 @@ public class ManagerServlet extends HttpServlet implements
ContainerServlet {
public void init() throws ServletException {
// Ensure that our ContainerServlet properties have been set
- if ((wrapper == null) || (context == null)) {
+ if (wrapper == null || context == null) {
throw new UnavailableException(
sm.getString("managerServlet.noWrapper"));
}
diff --git a/java/org/apache/catalina/manager/host/HostManagerServlet.java
b/java/org/apache/catalina/manager/host/HostManagerServlet.java
index 42ef9a9598..658ea6cafd 100644
--- a/java/org/apache/catalina/manager/host/HostManagerServlet.java
+++ b/java/org/apache/catalina/manager/host/HostManagerServlet.java
@@ -303,7 +303,7 @@ public class HostManagerServlet
public void init() throws ServletException {
// Ensure that our ContainerServlet properties have been set
- if ((wrapper == null) || (context == null)) {
+ if (wrapper == null || context == null) {
throw new UnavailableException
(sm.getString("hostManagerServlet.noWrapper"));
}
diff --git a/java/org/apache/catalina/realm/JNDIRealm.java
b/java/org/apache/catalina/realm/JNDIRealm.java
index 947eb1517f..98cd3885bc 100644
--- a/java/org/apache/catalina/realm/JNDIRealm.java
+++ b/java/org/apache/catalina/realm/JNDIRealm.java
@@ -1945,7 +1945,7 @@ public class JNDIRealm extends RealmBase {
}
// Are we configured to do role searches?
- if ((connection.roleFormat == null) || (roleName == null)) {
+ if (connection.roleFormat == null || roleName == null) {
return list;
}
diff --git a/java/org/apache/catalina/realm/RealmBase.java
b/java/org/apache/catalina/realm/RealmBase.java
index 4474ef4d12..03ea46f4dd 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -524,7 +524,7 @@ public abstract class RealmBase extends LifecycleMBeanBase
implements Realm {
ArrayList<SecurityConstraint> results = null;
// Are there any defined security constraints?
SecurityConstraint constraints[] = context.findConstraints();
- if ((constraints == null) || (constraints.length == 0)) {
+ if (constraints == null || constraints.length == 0) {
if (log.isDebugEnabled()) {
log.debug(" No applicable constraints defined");
}
diff --git a/java/org/apache/coyote/ajp/AjpMessage.java
b/java/org/apache/coyote/ajp/AjpMessage.java
index 53fca56514..1e4f0c6f3e 100644
--- a/java/org/apache/coyote/ajp/AjpMessage.java
+++ b/java/org/apache/coyote/ajp/AjpMessage.java
@@ -289,7 +289,7 @@ public class AjpMessage {
private void doGetBytes(MessageBytes mb, boolean terminated) {
int length = getInt();
- if ((length == 0xFFFF) || (length == -1)) {
+ if (length == 0xFFFF || length == -1) {
mb.recycle();
return;
}
diff --git a/java/org/apache/coyote/http11/Http11InputBuffer.java
b/java/org/apache/coyote/http11/Http11InputBuffer.java
index 36a1bb4f1c..9c125aef58 100644
--- a/java/org/apache/coyote/http11/Http11InputBuffer.java
+++ b/java/org/apache/coyote/http11/Http11InputBuffer.java
@@ -369,7 +369,7 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
request.setStartTimeNanos(System.nanoTime());
}
chr = byteBuffer.get();
- } while ((chr == Constants.CR) || (chr == Constants.LF));
+ } while (chr == Constants.CR || chr == Constants.LF);
byteBuffer.position(byteBuffer.position() - 1);
parsingRequestLineStart = byteBuffer.position();
@@ -416,7 +416,7 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
}
}
chr = byteBuffer.get();
- if (!(chr == Constants.SP || chr == Constants.HT)) {
+ if (chr != Constants.SP && chr != Constants.HT) {
space = false;
byteBuffer.position(byteBuffer.position() - 1);
}
@@ -512,7 +512,7 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
}
}
byte chr = byteBuffer.get();
- if (!(chr == Constants.SP || chr == Constants.HT)) {
+ if (chr != Constants.SP && chr != Constants.HT) {
space = false;
byteBuffer.position(byteBuffer.position() - 1);
}
@@ -932,7 +932,7 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
}
chr = byteBuffer.get();
- if (!(chr == Constants.SP || chr == Constants.HT)) {
+ if (chr != Constants.SP && chr != Constants.HT) {
headerParsePos = HeaderParsePosition.HEADER_VALUE;
byteBuffer.position(byteBuffer.position() - 1);
// Avoids prevChr = chr at start of header value
@@ -998,7 +998,7 @@ public class Http11InputBuffer implements InputBuffer,
ApplicationBufferHandler
byte peek = byteBuffer.get(byteBuffer.position());
if (headerParsePos == HeaderParsePosition.HEADER_MULTI_LINE) {
- if ((peek != Constants.SP) && (peek != Constants.HT)) {
+ if (peek != Constants.SP && peek != Constants.HT) {
headerParsePos = HeaderParsePosition.HEADER_START;
break;
} else {
diff --git a/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
b/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
index 586d070f4d..33d7feef10 100644
--- a/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
+++ b/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
@@ -484,7 +484,7 @@ public class ChunkedInputFilter implements InputFilter,
ApplicationBufferHandler
// readBytes() above will set readChunk unless it returns a value
< 0
chr = readChunk.get(readChunk.position());
- if ((chr >= Constants.A) && (chr <= Constants.Z)) {
+ if (chr >= Constants.A && chr <= Constants.Z) {
chr = (byte) (chr - Constants.LC_OFFSET);
}
@@ -522,7 +522,7 @@ public class ChunkedInputFilter implements InputFilter,
ApplicationBufferHandler
}
chr = readChunk.get(readChunk.position());
- if ((chr == Constants.SP) || (chr == Constants.HT)) {
+ if (chr == Constants.SP || chr == Constants.HT) {
readChunk.position(readChunk.position() + 1);
// If we swallow whitespace, make sure it counts towards
the
// limit placed on trailing header size
@@ -574,7 +574,7 @@ public class ChunkedInputFilter implements InputFilter,
ApplicationBufferHandler
}
chr = readChunk.get(readChunk.position());
- if ((chr != Constants.SP) && (chr != Constants.HT)) {
+ if (chr != Constants.SP && chr != Constants.HT) {
validLine = false;
} else {
eol = false;
diff --git a/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
b/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
index 54bba7f35b..b638ac6738 100644
--- a/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
+++ b/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
@@ -503,10 +503,10 @@ public class SecurityConstraint extends XmlEncodingBase
implements Serializable
private boolean matchPattern(String path, String pattern) {
// Normalize the argument strings
- if ((path == null) || (path.length() == 0)) {
+ if (path == null || path.length() == 0) {
path = "/";
}
- if ((pattern == null) || (pattern.length() == 0)) {
+ if (pattern == null || pattern.length() == 0) {
pattern = "/";
}
diff --git a/java/org/apache/tomcat/util/digester/RulesBase.java
b/java/org/apache/tomcat/util/digester/RulesBase.java
index 2531509953..be622f0f48 100644
--- a/java/org/apache/tomcat/util/digester/RulesBase.java
+++ b/java/org/apache/tomcat/util/digester/RulesBase.java
@@ -191,7 +191,7 @@ public class RulesBase implements Rules {
if (list == null) {
return null;
}
- if ((namespaceURI == null) || (namespaceURI.length() == 0)) {
+ if (namespaceURI == null || namespaceURI.length() == 0) {
return list;
}
diff --git
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index 343efb13a1..480d289794 100644
---
a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++
b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -773,7 +773,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
* callback).
*/
int keylen = 0;
- if ((type == EVP_PKEY_RSA()) || (type == EVP_PKEY_DSA())) {
+ if (type == EVP_PKEY_RSA() || type == EVP_PKEY_DSA()) {
keylen = (OPENSSL_3 ? EVP_PKEY_get_bits(pkey) :
EVP_PKEY_bits(pkey));
}
for (int i = 0; i < OpenSSLLibrary.dhParameters.length; i++) {
diff --git
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index 5aba20ae5a..60bfe1ec71 100644
---
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -650,7 +650,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
?
CLinker.toCString(SSLHostConfig.adjustRelativePath(sslHostConfig.getCaCertificateFile()),
state.contextScope) : null;
MemorySegment caCertificatePathNative =
sslHostConfig.getCaCertificatePath() != null
?
CLinker.toCString(SSLHostConfig.adjustRelativePath(sslHostConfig.getCaCertificatePath()),
state.contextScope) : null;
- if ((sslHostConfig.getCaCertificateFile() != null ||
sslHostConfig.getCaCertificatePath() != null)
+ if ((sslHostConfig.getCaCertificateFile() != null ||
sslHostConfig.getCaCertificatePath() != null)
&& SSL_CTX_load_verify_locations(state.sslCtx,
caCertificateFileNative == null ?
MemoryAddress.NULL : caCertificateFileNative,
caCertificatePathNative == null ?
MemoryAddress.NULL : caCertificatePathNative) <= 0) {
@@ -775,7 +775,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
* callback).
*/
int keylen = 0;
- if ((type == EVP_PKEY_RSA()) || (type == EVP_PKEY_DSA())) {
+ if (type == EVP_PKEY_RSA() || type == EVP_PKEY_DSA()) {
keylen = (OPENSSL_3 ? EVP_PKEY_get_bits(pkey) :
EVP_PKEY_bits(pkey));
}
for (int i = 0; i < OpenSSLLifecycleListener.dhParameters.length; i++)
{
diff --git
a/modules/openssl-java21/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
b/modules/openssl-java21/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index 61d953a1c4..5f023717fc 100644
---
a/modules/openssl-java21/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++
b/modules/openssl-java21/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -772,7 +772,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
* callback).
*/
int keylen = 0;
- if ((type == EVP_PKEY_RSA()) || (type == EVP_PKEY_DSA())) {
+ if (type == EVP_PKEY_RSA() || type == EVP_PKEY_DSA()) {
keylen = (OPENSSL_3 ? EVP_PKEY_get_bits(pkey) :
EVP_PKEY_bits(pkey));
}
for (int i = 0; i < OpenSSLLifecycleListener.dhParameters.length; i++)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
