fixing #505 and dependency updates

everit-org · Apr 7, 2024 · 5436bb7 · 5436bb7
1 parent 2e7b0d2
commit 5436bb7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -219,12 +219,12 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20231013</version>
+            <version>20240303</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.0.0-jre</version>
+            <version>33.1.0-jre</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -236,7 +236,7 @@
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
-            <version>1.7</version>
+            <version>1.8.0</version>
             <exclusions>
                 <exclusion>
                     <artifactId>commons-beanutils</artifactId>
@@ -259,7 +259,7 @@
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
-            <version>3.15.3</version>
+            <version>3.16.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -270,7 +270,7 @@
         <dependency>
             <groupId>com.google.re2j</groupId>
             <artifactId>re2j</artifactId>
-            <version>1.6</version>
+            <version>1.7</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>

diff --git a/core/src/main/java/org/everit/json/schema/StringSchema.java b/core/src/main/java/org/everit/json/schema/StringSchema.java
@@ -142,13 +142,30 @@ public boolean equals(Object o) {
                     Objects.equals(minLength, that.minLength) &&
                     Objects.equals(maxLength, that.maxLength) &&
                     Objects.equals(pattern, that.pattern) &&
-                    Objects.equals(formatValidator, that.formatValidator) &&
+                    sameFormatAs(that) &&
                     super.equals(that);
         } else {
             return false;
         }
     }
 
+    private boolean sameFormatAs(StringSchema that) {
+        if ((formatValidator == null) !=  (that.formatValidator == null)) {
+            return false;
+        }
+        if (formatValidator == null) {
+            return true;
+        }
+        if (!formatValidator.getClass().equals(that.formatValidator.getClass())) {
+            return false;
+        }
+        return Objects.equals(formatValidator.formatName(), that.formatValidator.formatName());
+//        return (formatValidator == null) ==  (that.formatValidator == null) &&
+//                (formatValidator == null ||
+//                        Objects.equals(formatValidator.formatName(), that.formatValidator.formatName())
+//                );
+    }
+
     public FormatValidator getFormatValidator() {
         return formatValidator;
     }

diff --git a/core/src/test/java/org/everit/json/schema/StringSchemaTest.java b/core/src/test/java/org/everit/json/schema/StringSchemaTest.java
@@ -7,6 +7,8 @@
 
 import java.util.Optional;
 
+import org.everit.json.schema.internal.EmailFormatValidator;
+import org.everit.json.schema.internal.URIFormatValidator;
 import org.everit.json.schema.loader.SchemaLoader;
 import org.everit.json.schema.regexp.RE2JRegexpFactory;
 import org.json.JSONObject;
@@ -109,6 +111,7 @@ public void equalsVerifier() {
                 .withRedefinedSuperclass()
                 .withIgnoredFields("schemaLocation", "location")
                 .withPrefabValues(Pattern.class, Pattern.compile("red"), Pattern.compile("black"))
+                .withPrefabValues(FormatValidator.class, new EmailFormatValidator(), new URIFormatValidator())
                 .suppress(Warning.STRICT_INHERITANCE)
                 .verify();
     }