From ef455b670b1eebd4d32f86c7e7c8b8d2c72e26aa Mon Sep 17 00:00:00 2001 From: Ashutosh Panda Date: Mon, 12 Oct 2026 13:41:07 +0000 Subject: [PATCH 1/3] simplify some boolean returns --- src/main/java/org/htmlunit/WebClient.java | 6 +----- src/main/java/org/htmlunit/css/CssStyleSheet.java | 7 ++----- src/main/java/org/htmlunit/html/impl/Color.java | 5 +---- .../htmlunit/javascript/host/xml/XMLHttpRequest.java | 12 +++--------- src/main/java/org/htmlunit/util/StringUtils.java | 9 +-------- src/main/java/org/htmlunit/util/geometry/Line2D.java | 8 ++------ 6 files changed, 10 insertions(+), 37 deletions(-) diff --git a/src/main/java/org/htmlunit/WebClient.java b/src/main/java/org/htmlunit/WebClient.java index bb221c7b1b..1e429542bd 100644 --- a/src/main/java/org/htmlunit/WebClient.java +++ b/src/main/java/org/htmlunit/WebClient.java @@ -2710,11 +2710,7 @@ public boolean isOutdated() { return true; } - if (requestingWindow_.getEnclosedPage() != originalPage_.get()) { - return true; - } - - return false; + return requestingWindow_.getEnclosedPage() != originalPage_.get(); } } diff --git a/src/main/java/org/htmlunit/css/CssStyleSheet.java b/src/main/java/org/htmlunit/css/CssStyleSheet.java index 698f4a1ed8..15c12f6beb 100644 --- a/src/main/java/org/htmlunit/css/CssStyleSheet.java +++ b/src/main/java/org/htmlunit/css/CssStyleSheet.java @@ -532,11 +532,8 @@ && selects(browserVersion, gas.getSelector(), domElement, case NEXT_SIBLING_COMBINATOR: final DomElement nextSibling = element.getNextElementSibling(); - if (nextSibling != null && selects(browserVersion, rs.getSelector(), nextSibling, pseudoElement, - fromQuerySelectorAll, throwOnSyntax)) { - return true; - } - return false; + return nextSibling != null && selects(browserVersion, rs.getSelector(), nextSibling, + pseudoElement, fromQuerySelectorAll, throwOnSyntax); case SUBSEQUENT_SIBLING_COMBINATOR: for (DomNode n = element.getNextSibling(); n != null; n = n.getNextSibling()) { diff --git a/src/main/java/org/htmlunit/html/impl/Color.java b/src/main/java/org/htmlunit/html/impl/Color.java index 00af66fb7c..1758c76ced 100644 --- a/src/main/java/org/htmlunit/html/impl/Color.java +++ b/src/main/java/org/htmlunit/html/impl/Color.java @@ -137,9 +137,6 @@ public boolean equals(final Object obj) { if (green_ != other.green_) { return false; } - if (red_ != other.red_) { - return false; - } - return true; + return red_ == other.red_; } } diff --git a/src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java b/src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java index 13890ed446..15aa7f738d 100644 --- a/src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java +++ b/src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java @@ -1231,15 +1231,12 @@ private static boolean isPreflightHeader(final String name, final String value) && !lcValue.startsWith(FormEncodingType.MULTIPART.getName()) && !lcValue.startsWith(FormEncodingType.TEXT_PLAIN.getName()); } - if (HttpHeader.ACCEPT_LC.equals(name) + return !(HttpHeader.ACCEPT_LC.equals(name) || HttpHeader.ACCEPT_LANGUAGE_LC.equals(name) || HttpHeader.CONTENT_LANGUAGE_LC.equals(name) || HttpHeader.REFERER_LC.equals(name) || "accept-encoding".equals(name) - || HttpHeader.ORIGIN_LC.equals(name)) { - return false; - } - return true; + || HttpHeader.ORIGIN_LC.equals(name)); } /** @@ -1282,10 +1279,7 @@ static boolean isAuthorizedHeader(final String name) { if (PROHIBITED_HEADERS_.contains(nameLowerCase)) { return false; } - if (nameLowerCase.startsWith("proxy-") || nameLowerCase.startsWith("sec-")) { - return false; - } - return true; + return !nameLowerCase.startsWith("proxy-") && !nameLowerCase.startsWith("sec-"); } /** diff --git a/src/main/java/org/htmlunit/util/StringUtils.java b/src/main/java/org/htmlunit/util/StringUtils.java index 3da0e842a1..22123eec9a 100644 --- a/src/main/java/org/htmlunit/util/StringUtils.java +++ b/src/main/java/org/htmlunit/util/StringUtils.java @@ -508,14 +508,7 @@ private static boolean supportedByXML10(final int codepoint) { return true; } - if (codepoint < 0x10000) { - return false; - } - if (codepoint <= 0x10FFFF) { - return true; - } - - return true; + return codepoint >= 0x10000; } /** diff --git a/src/main/java/org/htmlunit/util/geometry/Line2D.java b/src/main/java/org/htmlunit/util/geometry/Line2D.java index 43d9cecbcd..f777527cc3 100644 --- a/src/main/java/org/htmlunit/util/geometry/Line2D.java +++ b/src/main/java/org/htmlunit/util/geometry/Line2D.java @@ -122,12 +122,8 @@ public boolean contains(final double x, final double y) { } } - if (y < startY_ && y < endY_ - || (y > startY_ && y > endY_)) { - return false; - } - - return true; + return !(y < startY_ && y < endY_ + || (y > startY_ && y > endY_)); } /** From 7ecc74a5c2099b507c8a13393f989f9abfa31db4 Mon Sep 17 00:00:00 2001 From: Ashutosh Panda Date: Wed, 14 Oct 2026 20:54:03 +0530 Subject: [PATCH 2/3] add Ashutosh Panda as author to the touched files and as contributor to pom.xml --- pom.xml | 3 +++ src/main/java/org/htmlunit/WebClient.java | 1 + src/main/java/org/htmlunit/css/CssStyleSheet.java | 1 + src/main/java/org/htmlunit/html/impl/Color.java | 1 + .../java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java | 1 + src/main/java/org/htmlunit/util/StringUtils.java | 1 + src/main/java/org/htmlunit/util/geometry/Line2D.java | 1 + 7 files changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index 5204e5a6e0..3d94e00238 100644 --- a/pom.xml +++ b/pom.xml @@ -1423,6 +1423,9 @@ MatrixNeoKozak matrixneo2026@tutamail.com + + Ashutosh Panda + diff --git a/src/main/java/org/htmlunit/WebClient.java b/src/main/java/org/htmlunit/WebClient.java index 1e429542bd..a9e3de3f18 100644 --- a/src/main/java/org/htmlunit/WebClient.java +++ b/src/main/java/org/htmlunit/WebClient.java @@ -152,6 +152,7 @@ * @author Lai Quang Duong * @author René Schwietzke * @author Sven Strickroth + * @author Ashutosh Panda */ @SuppressWarnings("PMD.TooManyFields") public class WebClient implements Serializable, AutoCloseable { diff --git a/src/main/java/org/htmlunit/css/CssStyleSheet.java b/src/main/java/org/htmlunit/css/CssStyleSheet.java index 15c12f6beb..3172918d7b 100644 --- a/src/main/java/org/htmlunit/css/CssStyleSheet.java +++ b/src/main/java/org/htmlunit/css/CssStyleSheet.java @@ -116,6 +116,7 @@ * @author Frank Danek * @author Carsten Steul * @author Sven Strickroth + * @author Ashutosh Panda */ public class CssStyleSheet implements Serializable { diff --git a/src/main/java/org/htmlunit/html/impl/Color.java b/src/main/java/org/htmlunit/html/impl/Color.java index 1758c76ced..91795ec1ba 100644 --- a/src/main/java/org/htmlunit/html/impl/Color.java +++ b/src/main/java/org/htmlunit/html/impl/Color.java @@ -21,6 +21,7 @@ * independent of awt (for this). * * @author Ronald Brill + * @author Ashutosh Panda */ @SuppressWarnings("PMD.AvoidDuplicateLiterals") public class Color { diff --git a/src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java b/src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java index 15aa7f738d..6f18e76612 100644 --- a/src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java +++ b/src/main/java/org/htmlunit/javascript/host/xml/XMLHttpRequest.java @@ -111,6 +111,7 @@ * @author Thorsten Wendelmuth * @author Lai Quang Duong * @author Sven Strickroth + * @author Ashutosh Panda * * @see MDN Documentation */ diff --git a/src/main/java/org/htmlunit/util/StringUtils.java b/src/main/java/org/htmlunit/util/StringUtils.java index 22123eec9a..f77b683121 100644 --- a/src/main/java/org/htmlunit/util/StringUtils.java +++ b/src/main/java/org/htmlunit/util/StringUtils.java @@ -35,6 +35,7 @@ * @author Ahmed Ashour * @author Martin Tamme * @author Ronald Brill + * @author Ashutosh Panda */ public final class StringUtils { diff --git a/src/main/java/org/htmlunit/util/geometry/Line2D.java b/src/main/java/org/htmlunit/util/geometry/Line2D.java index f777527cc3..c664fb6981 100644 --- a/src/main/java/org/htmlunit/util/geometry/Line2D.java +++ b/src/main/java/org/htmlunit/util/geometry/Line2D.java @@ -18,6 +18,7 @@ * Simple 2D line segment shape. * * @author Ronald Brill + * @author Ashutosh Panda */ public class Line2D implements Shape2D { From db245921a0a3dea19e432904ea162842ba7a4fbb Mon Sep 17 00:00:00 2001 From: Ashutosh Panda Date: Wed, 14 Oct 2026 20:54:21 +0530 Subject: [PATCH 3/3] fix indentation of the new contributor entry in pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d94e00238..22c820e4b0 100644 --- a/pom.xml +++ b/pom.xml @@ -1423,7 +1423,7 @@ MatrixNeoKozak matrixneo2026@tutamail.com - + Ashutosh Panda