(commons-validator) 04/05: Merge if statements

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-validator.git

commit 5c228cc5b518b223caf792900df664b14c03da30
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jul 11 07:21:07 2026 -0400

    Merge if statements
---
 .../java/org/apache/commons/validator/UrlValidator.java    | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/apache/commons/validator/UrlValidator.java 
b/src/main/java/org/apache/commons/validator/UrlValidator.java
index 19d596c9..b454ae1e 100644
--- a/src/main/java/org/apache/commons/validator/UrlValidator.java
+++ b/src/main/java/org/apache/commons/validator/UrlValidator.java
@@ -268,23 +268,17 @@ public class UrlValidator implements Serializable {
      */
     public boolean isValid(final String value) {
         if (value == null || !LEGAL_ASCII_PATTERN.matcher(value).matches()) {
-           return false;
+            return false;
         }
-
         // Check the whole url address structure
         final Matcher urlMatcher = URL_PATTERN.matcher(value);
-        if (!urlMatcher.matches() || 
!isValidScheme(urlMatcher.group(PARSE_URL_SCHEME)) || 
!isValidAuthority(urlMatcher.group(PARSE_URL_AUTHORITY)) || 
!isValidPath(urlMatcher.group(PARSE_URL_PATH))) {
+        if (!urlMatcher.matches() || 
!isValidScheme(urlMatcher.group(PARSE_URL_SCHEME)) || 
!isValidAuthority(urlMatcher.group(PARSE_URL_AUTHORITY))
+                || !isValidPath(urlMatcher.group(PARSE_URL_PATH))) {
             return false;
         }
-
-        if (!isValidQuery(urlMatcher.group(PARSE_URL_QUERY))) {
+        if (!isValidQuery(urlMatcher.group(PARSE_URL_QUERY)) || 
!isValidFragment(urlMatcher.group(PARSE_URL_FRAGMENT))) {
             return false;
         }
-
-        if (!isValidFragment(urlMatcher.group(PARSE_URL_FRAGMENT))) {
-            return false;
-        }
-
         return true;
     }