Merge pull request #59 from sebastian-toepfer/improve_error_prone_con…

…figuration change severity of some error prone check from warn to error
sebastian-toepfer · Nov 18, 2023 · 8e69834 · 8e69834
2 parents 05a572d + baaae83
commit 8e69834
Show file tree

Hide file tree

Showing 13 changed files with 71 additions and 28 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -50,6 +50,11 @@
             <artifactId>hamcrest-optional</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>jakarta.json</groupId>

diff --git a/...va/io/github/sebastiantoepfer/jsonschema/core/vocab/validation/MultipleOfKeywordType.java b/...va/io/github/sebastiantoepfer/jsonschema/core/vocab/validation/MultipleOfKeywordType.java
@@ -63,6 +63,7 @@ public boolean hasName(final String name) {
         }
 
         @Override
+        @SuppressWarnings("BigDecimalEquals")
         public boolean isValidFor(final JsonValue instance) {
             return (
                 !InstanceType.NUMBER.isInstance(instance) ||

diff --git a/...a/io/github/sebastiantoepfer/jsonschema/core/vocab/validation/UniqueItemsKeywordType.java b/...a/io/github/sebastiantoepfer/jsonschema/core/vocab/validation/UniqueItemsKeywordType.java
@@ -119,11 +119,12 @@ public int hashCode() {
         @Override
         public boolean equals(final Object obj) {
             return (
-                this == obj || (obj != null && getClass() == obj.getClass() && equals((JsonValueNumberEqualsFix) obj))
+                this == obj || (obj != null && getClass() == obj.getClass() && isEquals((JsonValueNumberEqualsFix) obj))
             );
         }
 
-        private boolean equals(final JsonValueNumberEqualsFix other) {
+        @SuppressWarnings("BigDecimalEquals")
+        private boolean isEquals(final JsonValueNumberEqualsFix other) {
             final boolean result;
             if (isNumber() && other.isNumber()) {
                 result = normalizeValue().equals(other.normalizeValue());

diff --git a/...a/io/github/sebastiantoepfer/jsonschema/core/testsuite/JsonTestSuiteTestCaseProvider.java b/...a/io/github/sebastiantoepfer/jsonschema/core/testsuite/JsonTestSuiteTestCaseProvider.java
@@ -37,6 +37,7 @@
 class JsonTestSuiteTestCaseProvider implements ArgumentsProvider {
 
     @Override
+    @SuppressWarnings("MustBeClosedChecker")
     public Stream<? extends Arguments> provideArguments(final ExtensionContext context) throws Exception {
         return new Resources()
             .all()

diff --git a/core/src/test/java/io/github/sebastiantoepfer/jsonschema/core/testsuite/Resources.java b/core/src/test/java/io/github/sebastiantoepfer/jsonschema/core/testsuite/Resources.java
@@ -48,6 +48,7 @@ public Resources(final String baseDir) {
         this.baseDir = baseDir;
     }
 
+    @com.google.errorprone.annotations.MustBeClosed
     Stream<Resource> all() {
         try {
             return StreamSupport
@@ -83,6 +84,7 @@ public PathResources(final Path path) {
             this.path = Objects.requireNonNull(path);
         }
 
+        @SuppressWarnings("StreamResourceLeak")
         Stream<Resource> toResources() {
             final Stream<Resource> result;
             try {

diff --git a/core/src/test/java/module-info.java b/core/src/test/java/module-info.java
@@ -26,6 +26,7 @@
     requires io.github.sebastiantoepfer.jsonschema.vocabulary.spi;
     requires jakarta.json;
 
+    requires com.google.errorprone.annotations;
     requires org.junit.jupiter.api;
     requires org.junit.jupiter.params;
     requires org.junit.jupiter.engine;

diff --git a/pom.xml b/pom.xml
@@ -64,6 +64,11 @@
                 <artifactId>spotbugs-annotations</artifactId>
                 <version>4.8.1</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.errorprone</groupId>
+                <artifactId>error_prone_annotations</artifactId>
+                <version>2.23.0</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.junit</groupId>
@@ -121,7 +126,21 @@
                     <configuration>
                         <compilerArgs>
                             <arg>-XDcompilePolicy=simple</arg>
-                            <arg>-Xplugin:ErrorProne</arg>
+                            <arg>
+                                -Xplugin:ErrorProne \
+                                -XepExcludedPaths:.*/target/generated-sources/.* \
+                                -Xep:EqualsGetClass:OFF \
+                                -Xep:MissingOverride:ERROR \
+                                -Xep:DefaultCharset:ERROR \
+                                -Xep:BadImport:ERROR \
+                                -Xep:TypeParameterShadowing:ERROR \
+                                -Xep:NonCanonicalType:ERROR \
+                                -Xep:EqualsIncompatibleType:ERROR \
+                                -Xep:BigDecimalEquals:ERROR \
+                                -Xep:UndefinedEquals:ERROR \
+                                -Xep:StreamResourceLeak:ERROR \
+                                -Xep:NonOverridingEquals:ERROR
+                            </arg>
                         </compilerArgs>
                         <annotationProcessorPaths>
                             <path>

diff --git a/testsuite-junit-platform-engine/pom.xml b/testsuite-junit-platform-engine/pom.xml
@@ -27,6 +27,10 @@
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/.../github/sebastiantoepfer/jsonschema/testsuite/junit/engine/JsonSchemaTestSuiteEngine.java b/.../github/sebastiantoepfer/jsonschema/testsuite/junit/engine/JsonSchemaTestSuiteEngine.java
@@ -41,11 +41,12 @@ public String getId() {
     @Override
     public TestDescriptor discover(final EngineDiscoveryRequest discoveryRequest, final UniqueId uniqueId) {
         final TestDescriptor result = new EngineDescriptor(uniqueId, "Json Schema Test");
-        new Resources()
-            .all()
-            .filter(resource -> resource.hasExtension("json"))
-            .map(JsonSchemaSuitesTestDescriptor::new)
-            .forEach(result::addChild);
+        try (final Stream<Resource> res = new Resources().all()) {
+            res
+                .filter(resource -> resource.hasExtension("json"))
+                .map(JsonSchemaSuitesTestDescriptor::new)
+                .forEach(result::addChild);
+        }
         return result;
     }
 

diff --git a/...src/main/java/io/github/sebastiantoepfer/jsonschema/testsuite/junit/engine/Resources.java b/...src/main/java/io/github/sebastiantoepfer/jsonschema/testsuite/junit/engine/Resources.java
@@ -48,6 +48,7 @@ public Resources(final String baseDir) {
         this.baseDir = baseDir;
     }
 
+    @com.google.errorprone.annotations.MustBeClosed
     Stream<Resource> all() {
         try {
             return StreamSupport
@@ -83,6 +84,7 @@ public PathResources(final Path path) {
             this.path = Objects.requireNonNull(path);
         }
 
+        @SuppressWarnings("StreamResourceLeak")
         Stream<Resource> toResources() {
             final Stream<Resource> result;
             try {

diff --git a/testsuite-junit-platform-engine/src/main/java/module-info.java b/testsuite-junit-platform-engine/src/main/java/module-info.java
@@ -31,5 +31,6 @@
     requires org.junit.platform.engine;
     requires org.junit.platform.commons;
     requires com.github.spotbugs.annotations;
+    requires com.google.errorprone.annotations;
     requires jakarta.json;
 }
diff --git a/.../test/java/io/github/sebastiantoepfer/jsonschema/testsuite/junit/engine/ResourceTest.java b/.../test/java/io/github/sebastiantoepfer/jsonschema/testsuite/junit/engine/ResourceTest.java
@@ -26,7 +26,8 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-import io.github.sebastiantoepfer.jsonschema.testsuite.junit.engine.Resource;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import org.junit.jupiter.api.Test;
 
@@ -45,16 +46,18 @@ void should_determine_name() {
 
     @Test
     void should_return_content() throws Exception {
-        assertThat(
-            new String(new Resource("tests/test_resource.json").content().readAllBytes()),
-            is(
-                """
-                {
-                    "name": "sebastian"
-                }
-                """
-            )
-        );
+        try (final InputStream content = new Resource("tests/test_resource.json").content()) {
+            assertThat(
+                new String(content.readAllBytes(), StandardCharsets.UTF_8),
+                is(
+                    """
+                    {
+                        "name": "sebastian"
+                    }
+                    """
+                )
+            );
+        }
     }
 
     @Test

diff --git a/...test/java/io/github/sebastiantoepfer/jsonschema/testsuite/junit/engine/ResourcesTest.java b/...test/java/io/github/sebastiantoepfer/jsonschema/testsuite/junit/engine/ResourcesTest.java
@@ -26,28 +26,30 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasItems;
 
-import io.github.sebastiantoepfer.jsonschema.testsuite.junit.engine.Resource;
-import io.github.sebastiantoepfer.jsonschema.testsuite.junit.engine.Resources;
+import java.util.stream.Stream;
 import org.junit.jupiter.api.Test;
 
 class ResourcesTest {
 
     @Test
     void should_find_resources_from_classpath() {
-        assertThat(new Resources().all().toList(), hasItems(new Resource("tests/test_resource.json")));
+        try (final Stream<Resource> res = new Resources().all()) {
+            assertThat(res.toList(), hasItems(new Resource("tests/test_resource.json")));
+        }
     }
 
     @Test
     void should_find_resources_in_subdir_from_classpath() {
-        assertThat(new Resources("tests").all().toList(), hasItems(new Resource("tests/test_resource.json")));
+        try (final Stream<Resource> res = new Resources("tests").all()) {
+            assertThat(res.toList(), hasItems(new Resource("tests/test_resource.json")));
+        }
     }
 
     @Test
     void should_find_resources_in_metainf() {
-        //to kill all mutants, we need a resource from non-test classpath
-        assertThat(
-            new Resources("META-INF").all().toList(),
-            hasItems(new Resource("META-INF/services/org.junit.platform.engine.TestEngine"))
-        );
+        try (final Stream<Resource> res = new Resources("META-INF").all()) {
+            //to kill all mutants, we need a resource from non-test classpath
+            assertThat(res.toList(), hasItems(new Resource("META-INF/services/org.junit.platform.engine.TestEngine")));
+        }
     }
 }