Migrate off JUnit 4 vintage

.policy.yml

@@ -81,6 +81,7 @@ approval_rules:
           - "^versions.lock$"
           - "^internal/generated/.*"
           - "^internal/generated_src/.*"
+          - "^gradle-baseline-java/src/main/resources/checkstyle.version$"
       has_valid_signatures_by_keys:
         key_ids: ["C9AF124A484882E0"]
 

build.gradle

@@ -6,17 +6,17 @@ buildscript {
 
     dependencies {
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.5.0'
-        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.31.0'
+        classpath 'com.palantir.gradle.jdks:gradle-jdks:0.32.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.7.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.12.0'
-        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.28.0'
+        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.30.0'
         classpath 'com.palantir.gradle.revapi:gradle-revapi:1.7.0'
         classpath 'com.netflix.nebula:gradle-dependency-lock-plugin:7.0.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:4.188.0'
-        classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.15.0'
-        classpath 'com.palantir.metricschema:gradle-metric-schema:0.16.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:5.7.0'
+        classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.0.0'
+        classpath 'com.palantir.metricschema:gradle-metric-schema:0.20.0'
         classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0'
-        classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.11.0'
+        classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.12.0'
     }
 }
 
@@ -59,11 +59,6 @@ allprojects {
 
     dependencies {
         constraints {
-            rootConfiguration 'io.dropwizard.metrics:metrics-core', {
-                version { strictly '[3, 4[' }
-                because "Spark still uses 3.X, which can't co-exist with 4.X"
-            }
-
             rootConfiguration 'com.squareup.retrofit2:retrofit', {
                 version { strictly '2.4.0' }
                 because 'Retrofit 2.5.0 breaks with our path parameter routing logic'

changelog/7.41.0/pr-2569.v2.yml

@@ -0,0 +1,6 @@
+type: improvement
+improvement:
+  description: Report metrics when unusually large strings are parsed using JSON mappers
+    created using Conjure ObjectMappers factory methods.
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2569

changelog/7.42.0/pr-2570.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: InstrumentedJsonFactory sets the expected 'JSON' format name
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2570

changelog/7.43.0/pr-2571.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Json parser string length metrics are tagged by format
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2571

changelog/7.44.0/pr-2574.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Increase string-length observability thresholds
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2574

changelog/7.46.0/pr-2583.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Interning introduces excessive contention
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2583

changelog/7.47.0/pr-2586.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Add public JsonFactory factories to ObjectMappers
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2586

changelog/7.48.0/pr-2587.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Use a TypeFactory backed by a Caffeine Cache
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2587

changelog/7.49.0/pr-2588.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Add TypeFactory cache instrumentation
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2588

changelog/7.50.0/pr-2595.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Opt out of the TypeFactory cache until we can resolve cache contention
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2595

changelog/7.51.0/pr-2597.v2.yml

@@ -0,0 +1,6 @@
+type: fix
+fix:
+  description: ObjectMappers.withDefaultModules(ObjectMapper) does not replace existing
+    TypeFactories with state from registered modules
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2597

changelog/7.52.0/pr-2601.v2.yml

@@ -0,0 +1,6 @@
+type: improvement
+improvement:
+  description: Apply a large StreamReadConstraints maxStringLength to reduce friction
+    in preparation for jackson 2.15 adoption
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2601

changelog/7.53.0/pr-2603.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Opt out of canonicalization in Conjure JsonFactories
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2603

changelog/7.54.0/pr-2609.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: SslSocketFactories avoids duplicate effort creating TLS components
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2609

changelog/7.55.0/pr-2611.v2.yml

@@ -0,0 +1,6 @@
+type: improvement
+improvement:
+  description: Overload client config creation method to allow a TrustContextFactory
+    to be passed as well.
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2611

changelog/@unreleased/pr-2616.v2.yml

@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Migrate to junit5
+  links:
+  - https://github.com/palantir/conjure-java-runtime/pull/2616

client-config/build.gradle

@@ -11,7 +11,6 @@ dependencies {
     implementation 'com.google.guava:guava'
     implementation project(":keystores")
 
-    testImplementation "junit:junit"
     testImplementation 'com.google.guava:guava'
     testImplementation "org.assertj:assertj-core"
     testImplementation "org.mockito:mockito-core"
@@ -20,4 +19,6 @@ dependencies {
     annotationProcessor "org.immutables:value"
     compileOnly 'org.immutables:value::annotations'
     implementation 'com.palantir.safe-logging:logger'
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api'
 }

client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfigurations.java

@@ -22,7 +22,9 @@
 import com.palantir.conjure.java.api.config.service.ProxyConfiguration;
 import com.palantir.conjure.java.api.config.service.ServiceConfiguration;
 import com.palantir.conjure.java.api.config.service.UserAgent;
+import com.palantir.conjure.java.api.config.ssl.SslConfiguration;
 import com.palantir.conjure.java.config.ssl.SslSocketFactories;
+import com.palantir.conjure.java.config.ssl.TrustContext;
 import com.palantir.logsafe.UnsafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalArgumentException;
 import com.palantir.logsafe.logger.SafeLogger;
@@ -75,9 +77,19 @@ private ClientConfigurations() {}
      * empty/absent configuration with the defaults specified as constants in this class.
      */
     public static ClientConfiguration of(ServiceConfiguration config) {
+        return ClientConfigurations.of(config, SslSocketFactories::createTrustContext);
+    }
+
+    /**
+     * Creates a new {@link ClientConfiguration} instance from the given {@link ServiceConfiguration} and
+     * {@link TrustContextFactory}, filling in empty/absent configuration with the defaults specified as constants
+     * in this class.
+     */
+    public static ClientConfiguration of(ServiceConfiguration config, TrustContextFactory factory) {
+        TrustContext trustContext = factory.create(config.security());
         return ClientConfiguration.builder()
-                .sslSocketFactory(SslSocketFactories.createSslSocketFactory(config.security()))
-                .trustManager(SslSocketFactories.createX509TrustManager(config.security()))
+                .sslSocketFactory(trustContext.sslSocketFactory())
+                .trustManager(trustContext.x509TrustManager())
                 .uris(config.uris())
                 .connectTimeout(config.connectTimeout().orElse(DEFAULT_CONNECT_TIMEOUT))
                 .readTimeout(config.readTimeout().orElse(DEFAULT_READ_TIMEOUT))
@@ -246,4 +258,12 @@ public String toString() {
             return "FixedProxySelector{proxy=" + proxy + '}';
         }
     }
+
+    /**
+     * A factory for {@link TrustContext} which allows to define how one will be created,
+     * based on implementer defined security configurations. See {@link SslConfiguration}.
+     */
+    public interface TrustContextFactory {
+        TrustContext create(SslConfiguration configuration);
+    }
 }

client-config/src/test/java/com/palantir/conjure/java/client/config/ClientConfigurationsTest.java

@@ -37,7 +37,7 @@
 import java.util.List;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.X509TrustManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public final class ClientConfigurationsTest {
 

client-config/src/test/java/com/palantir/conjure/java/clients/ConjureClientsTest.java

@@ -30,7 +30,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ConjureClientsTest {
 

conjure-java-client-verifier/build.gradle

@@ -9,10 +9,12 @@ dependencies {
     testImplementation project(':conjure-java-retrofit2-client')
     testImplementation project(':conjure-java-jackson-serialization')
     testImplementation project(':keystores')
-    testImplementation 'junit:junit'
     testImplementation "org.slf4j:slf4j-api"
     testImplementation 'org.assertj:assertj-core'
     testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
     testImplementation 'org.apache.commons:commons-lang3'
     testImplementation 'com.palantir.safe-logging:logger'
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api'
+    testImplementation 'org.junit.jupiter:junit-jupiter-params'
 }