Merge branch 'master' into dependabot/gradle/com.google.errorprone-error_prone_core-2.43.0

Author: Breus

.github/workflows/build.yml

@@ -85,7 +85,7 @@ jobs:
             build
 
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v5
+        uses: mikepenz/action-junit-report@v6
         if: ${{ !cancelled() }} # always run even if the previous step fails
         with:
           report_paths: '**/build/test-results/test/TEST-*.xml'

gradle/libs.versions.toml

@@ -4,9 +4,9 @@ jmh = "1.37"
 [libraries]
 assertj-core = { group = "org.assertj", name = "assertj-core", version = "3.27.6" }
 jspecify = { group = "org.jspecify", name = "jspecify", version = "1.0.0" }
-jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version = "2.20.0" }
+jackson-databind = { group = "tools.jackson.core", name = "jackson-databind", version = "3.0.2" }
 junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api" }
-junit-bom = { group = "org.junit", name = "junit-bom", version = "6.0.0" }
+junit-bom = { group = "org.junit", name = "junit-bom", version = "6.0.1" }
 junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher" }
 junit-params = { group = "org.junit.jupiter", name = "junit-jupiter-params" }
 junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine" }
@@ -19,5 +19,5 @@ errorprone-core = { group = "com.google.errorprone", name = "error_prone_core",
 jmh = { id = "me.champeau.jmh", version = "0.7.3" }
 nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version = "2.0.0" }
 test-logger = { id = "com.adarshr.test-logger", version = "4.0.0" }
-sonarqube = { id = "org.sonarqube", version = "7.0.0.6105" }
+sonarqube = { id = "org.sonarqube", version = "7.0.1.6134" }
 errorprone = { id = "net.ltgt.errorprone", version = "4.3.0" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+distributionSha256Sum=df67a32e86e3276d011735facb1535f64d0d88df84fa87521e90becc2d735444
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -100,7 +100,7 @@ public String regexReplace(State state) {
 
     @Benchmark
     public String jacksonParseOnly(State state) throws IOException {
-        return ParseAndMaskUtil.DEFAULT_OBJECT_MAPPER.readTree(state.jsonString).toString();
+        return ParseAndMaskUtil.DEFAULT_JSON_MAPPER.readTree(state.jsonString).toString();
     }
 
     @Benchmark

src/jmh/java/dev/blaauwendraad/masker/json/BaselineBenchmark.java

@@ -1,10 +1,6 @@
 package dev.blaauwendraad.masker.json;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-
 import dev.blaauwendraad.masker.randomgen.RandomJsonGenerator;
-
 import org.jspecify.annotations.NullUnmarked;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -16,9 +12,10 @@
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.Warmup;
+import tools.jackson.databind.json.JsonMapper;
+import tools.jackson.databind.node.ArrayNode;
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -33,7 +30,7 @@
  @OutputTimeUnit(TimeUnit.SECONDS)
 @BenchmarkMode(Mode.Throughput)
 public class InstanceCreationBenchmark {
-    private static final ObjectMapper objectMapper = new ObjectMapper();
+    private static final JsonMapper jsonMapper = new JsonMapper();
 
     @org.openjdk.jmh.annotations.State(Scope.Thread)
     @NullUnmarked
@@ -45,15 +42,19 @@ public static class State {
 
         @Setup
         public synchronized void setup() throws IOException {
-            URL targetKeyFileUrl = RandomJsonGenerator.class.getResource("/target_keys.json");
-            List<String> targetKeyList = new ArrayList<>();
-            objectMapper.readValue(targetKeyFileUrl, ArrayNode.class).forEach(t -> targetKeyList.add(t.textValue()));
-            if (!"ALL".equals(numberOfTargetKeys) && Integer.parseInt(numberOfTargetKeys) <= targetKeyList.size()) {
-                Collections.shuffle(targetKeyList, new Random(RandomJsonGenerator.STATIC_RANDOM_SEED));
-                targetKeys =
-                        targetKeyList.stream().limit(Integer.parseInt(numberOfTargetKeys)).collect(Collectors.toSet());
-            } else {
-                targetKeys = targetKeyList.stream().collect(Collectors.toSet());
+            try (var stream = RandomJsonGenerator.class.getResourceAsStream("/target_keys.json")) {
+                if (stream == null) {
+                    throw new IllegalArgumentException("File not found: target_keys.json");
+                }
+                List<String> targetKeyList = new ArrayList<>();
+                jsonMapper.readValue(stream, ArrayNode.class).forEach(t -> targetKeyList.add(t.asString()));
+                if (!"ALL".equals(numberOfTargetKeys) && Integer.parseInt(numberOfTargetKeys) <= targetKeyList.size()) {
+                    Collections.shuffle(targetKeyList, new Random(RandomJsonGenerator.STATIC_RANDOM_SEED));
+                    targetKeys =
+                            targetKeyList.stream().limit(Integer.parseInt(numberOfTargetKeys)).collect(Collectors.toSet());
+                } else {
+                    targetKeys = targetKeyList.stream().collect(Collectors.toSet());
+                }
             }
         }
     }

src/jmh/java/dev/blaauwendraad/masker/json/InstanceCreationBenchmark.java

@@ -1,7 +1,5 @@
 package dev.blaauwendraad.masker.json;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
 import dev.blaauwendraad.masker.json.config.JsonMaskingConfig;
 import dev.blaauwendraad.masker.json.path.JsonPath;
 import dev.blaauwendraad.masker.json.util.FuzzingDurationUtil;
@@ -10,6 +8,7 @@
 import dev.blaauwendraad.masker.randomgen.RandomJsonGeneratorConfig;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
+import tools.jackson.databind.JsonNode;
 
 import java.time.Duration;
 import java.time.Instant;
@@ -25,7 +24,7 @@ final class FuzzingTest {
 
     @ParameterizedTest
     @MethodSource("jsonMaskingConfigs")
-    void fuzzingAgainstParseAndMaskUsingJackson(JsonMaskingConfig jsonMaskingConfig) throws JsonProcessingException {
+    void fuzzingAgainstParseAndMaskUsingJackson(JsonMaskingConfig jsonMaskingConfig) {
         long timeLimit = FuzzingDurationUtil.determineTestTimeLimit(jsonMaskingConfigs().count());
         Instant startTime = Instant.now();
         int randomTestExecuted = 0;

src/test/java/dev/blaauwendraad/masker/json/FuzzingTest.java

@@ -1,15 +1,14 @@
 package dev.blaauwendraad.masker.json;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
 import dev.blaauwendraad.masker.json.config.JsonMaskingConfig;
 import dev.blaauwendraad.masker.json.config.KeyMaskingConfig;
 import dev.blaauwendraad.masker.randomgen.RandomJsonGenerator;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
+import tools.jackson.databind.json.JsonMapper;
+import tools.jackson.databind.node.ArrayNode;
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -1587,16 +1586,11 @@ public class InstanceCreationMemoryUsageTest {
     );
 
 
-    private static final ObjectMapper objectMapper = new ObjectMapper();
+    private static final JsonMapper jsonMapper = new JsonMapper();
 
     @Test
     public void defaultInstanceCreation() throws IOException {
-        URL targetKeyFileUrl = RandomJsonGenerator.class.getResource("/target_keys.json");
-        if (targetKeyFileUrl == null) {
-            throw new IllegalStateException("target_keys.json is not found.");
-        }
-        Set<String> targetKeys = new HashSet<>();
-        objectMapper.readValue(targetKeyFileUrl.openStream(), ArrayNode.class).forEach(t -> targetKeys.add(t.textValue()));
+        var targetKeys = loadTargetKeys();
 
         long memoryBeforeInstanceCreationKb = getCurrentRetainedMemory();
 
@@ -1642,4 +1636,15 @@ private long getCurrentRetainedMemory() {
     private long bytesToKb(long bytes) {
         return bytes / 1024;
     }
+
+    private static Set<String> loadTargetKeys() throws IOException {
+        try (var stream = RandomJsonGenerator.class.getResourceAsStream("/target_keys.json")) {
+            if (stream == null) {
+                throw new IllegalArgumentException("File not found: target_keys.json");
+            }
+            Set<String> targetKeys = new HashSet<>();
+            jsonMapper.readValue(stream, ArrayNode.class).forEach(t -> targetKeys.add(t.asString()));
+            return targetKeys;
+        }
+    }
 }

src/test/java/dev/blaauwendraad/masker/json/InstanceCreationMemoryUsageTest.java

@@ -1,19 +1,18 @@
 package dev.blaauwendraad.masker.json;
 
-import com.fasterxml.jackson.core.JacksonException;
 import dev.blaauwendraad.masker.json.config.JsonMaskingConfig;
 import org.assertj.core.api.Assertions;
 import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import tools.jackson.core.JacksonException;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -90,13 +89,9 @@ void mustPassSuiteWithNoopMaskerShouldBeEquivalentToJackson(String testName, Jso
         JsonMaskerTestUtil.assertJsonMaskerApiEquivalence(jsonMasker, new String(file.originalContent, StandardCharsets.UTF_8));
 
         // must be equivalent to being parsed by jackson
-        try {
-            assertThat(ParseAndMaskUtil.DEFAULT_OBJECT_MAPPER.readTree(actual))
-                    .as("Failed for input: " + new String(actual, StandardCharsets.UTF_8))
-                    .isEqualTo(ParseAndMaskUtil.DEFAULT_OBJECT_MAPPER.readTree(file.originalContent));
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
+        assertThat(ParseAndMaskUtil.DEFAULT_JSON_MAPPER.readTree(actual))
+                .as("Failed for input: " + new String(actual, StandardCharsets.UTF_8))
+                .isEqualTo(ParseAndMaskUtil.DEFAULT_JSON_MAPPER.readTree(file.originalContent));
     }
 
     @ParameterizedTest(name = "{0}")
@@ -122,14 +117,12 @@ void mayPassSuiteWithNoopMaskerShouldNotFail(String testName, JsonTestSuiteFile
 
         // if jackson can parse it - out should be equivalent
         try {
-            assertThat(ParseAndMaskUtil.DEFAULT_OBJECT_MAPPER.readTree(actual))
+            assertThat(ParseAndMaskUtil.DEFAULT_JSON_MAPPER.readTree(actual))
                     .as("Failed for input: " + new String(actual, StandardCharsets.UTF_8))
-                    .isEqualTo(ParseAndMaskUtil.DEFAULT_OBJECT_MAPPER.readTree(file.originalContent));
+                    .isEqualTo(ParseAndMaskUtil.DEFAULT_JSON_MAPPER.readTree(file.originalContent));
         } catch (JacksonException e) {
             // JsonMasker didn't fail, but jackson can't parse it, nothing to compare
             // suck cases are also tested by shouldMaskAllTestCasesPredictably
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
         }
     }