Shorten FQDN types and enforce it with spotless

pom.xml

@@ -74,7 +74,6 @@
     <awaitability.version>4.3.0</awaitability.version>
 
     <!-- Plugin version -->
-    <palantir.java.format.version>2.74.0</palantir.java.format.version>
     <build.helper-maven-plugin.version>3.6.1</build.helper-maven-plugin.version>
     <jacoco-maven-plugin.version>0.8.15</jacoco-maven-plugin.version>
     <spotless-maven-plugin.version>3.10.0</spotless-maven-plugin.version>
@@ -601,15 +600,14 @@
           <version>${spotless-maven-plugin.version}</version>
           <configuration>
             <java>
+              <toggleOffOn />
               <endWithNewline />
+              <shortenFullyQualifiedTypes />
               <importOrder />
               <indent>
                 <spaces>true</spaces>
               </indent>
-              <palantirJavaFormat>
-                <!-- Until http://github.com/diffplug/spotless/issues/2468 -->
-                <version>${palantir.java.format.version}</version>
-              </palantirJavaFormat>
+              <palantirJavaFormat />
               <removeUnusedImports />
               <trimTrailingWhitespace />
             </java>

src/main/java/land/oras/Registry.java

@@ -22,6 +22,7 @@
 
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import java.io.ByteArrayInputStream;
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -1176,7 +1177,7 @@ private String uploadChunks(ContainerRef ref, InputStream stream, long totalSize
                                 Const.APPLICATION_OCTET_STREAM_HEADER_VALUE,
                                 Const.CONTENT_RANGE_HEADER,
                                 contentRange),
-                        () -> new java.io.ByteArrayInputStream(chunk),
+                        () -> new ByteArrayInputStream(chunk),
                         Scopes.of(ref),
                         authProvider);
                 logResponse(patchResponse);

src/main/java/land/oras/Tags.java

@@ -35,7 +35,11 @@
 @NullMarked
 @OrasModel
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public record Tags(String name, List<String> tags, @Nullable String last, @Nullable Integer n) {
+public record Tags(
+        String name,
+        List<String> tags,
+        @Nullable String last,
+        @Nullable Integer n) {
 
     /**
      * Constructor without last

src/main/java/land/oras/auth/HttpClient.java

@@ -20,14 +20,22 @@
 
 package land.oras.auth;
 
+// spotless:off
+// Until https://github.com/diffplug/spotless/issues/3033
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.Timer;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
-import java.net.*;
+import java.net.CookieManager;
+import java.net.CookiePolicy;
+import java.net.HttpURLConnection;
+import java.net.Socket;
+import java.net.URI;
+import java.net.URLEncoder;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpTimeoutException;
@@ -66,6 +74,7 @@
 import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+// spotless:on
 
 /**
  * HTTP client for ORAS
@@ -87,12 +96,15 @@ public final class HttpClient {
     /**
      * The HTTP client builder
      */
+    // spotless:off
+    // Until https://github.com/diffplug/spotless/issues/3033
     private final java.net.http.HttpClient.Builder builder;
 
     /**
      * The HTTP client
      */
     private java.net.http.HttpClient client;
+    // spotless:on
 
     /**
      * Skip TLS verification
@@ -834,7 +846,7 @@ private static boolean isRetryableStatus(int statusCode) {
     }
 
     private static boolean isRetryableException(Exception e) {
-        return e instanceof HttpTimeoutException || e instanceof java.io.IOException;
+        return e instanceof HttpTimeoutException || e instanceof IOException;
     }
 
     private long computeRetryDelay(@Nullable HttpResponse<?> response, int attempt) {
@@ -989,7 +1001,10 @@ private void logRequest(HttpRequest request, byte[] body) {
      * @param service The service (not on response but on HTTP headers)
      */
     public record ResponseWrapper<T>(
-            T response, int statusCode, Map<String, String> headers, @Nullable String service) {}
+            T response,
+            int statusCode,
+            Map<String, String> headers,
+            @Nullable String service) {}
 
     /**
      * Insecure trust manager when skipping TLS verification

src/main/java/land/oras/auth/RegistriesConf.java

@@ -329,7 +329,9 @@ record ConfigFile(
             @JsonProperty("short-name-mode") @Nullable ShortNameMode shortNameMode,
             @JsonProperty("registry") @Nullable List<RegistryConfig> registries,
             @JsonProperty("aliases") @Nullable Map<String, String> aliases,
-            @JsonProperty("unqualified-search-registries") @Nullable List<String> unqualifiedRegistries) {}
+
+            @JsonProperty("unqualified-search-registries") @Nullable
+            List<String> unqualifiedRegistries) {}
 
     /**
      * Get the list of unqualified registries.

src/main/java/land/oras/policy/SigstoreVerifier.java

@@ -30,6 +30,7 @@
 import java.security.PublicKey;
 import java.security.Signature;
 import java.security.spec.X509EncodedKeySpec;
+import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
 import java.util.Map;
@@ -287,7 +288,7 @@ static byte[] preAuthEncoding(String payloadType, byte[] payload) {
      * @return a non-null (possibly empty) list of successfully loaded public keys.
      */
     static List<PublicKey> loadKeys(PolicyRequirement.SigstoreSigned requirement) {
-        java.util.List<PublicKey> keys = new java.util.ArrayList<>();
+        List<PublicKey> keys = new ArrayList<>();
 
         // Single-key fields
         PublicKey single = loadKey(requirement);
@@ -391,7 +392,8 @@ record DsseSignature(@JsonProperty("sig") @Nullable String sig) {}
      * @param subject The subject
      */
     @OrasModel
-    record InTotoStatement(@JsonProperty("subject") @Nullable List<Subject> subject) {}
+    record InTotoStatement(
+            @JsonProperty("subject") @Nullable List<Subject> subject) {}
 
     /**
      * An in-toto subject: a map of digest algorithm to hex value

src/test/java/land/oras/ContainerRefTest.java

@@ -40,8 +40,7 @@ class ContainerRefTest {
     @Execution(ExecutionMode.SAME_THREAD)
     void shouldReadRegistriesConfig(@TempDir Path homeDir) throws Exception {
         // language=toml
-        String config =
-                """
+        String config = """
             [[registry]]
             location = "public.ecr.aws"
             blocked = true
@@ -82,8 +81,7 @@ void shouldReadRegistriesConfig(@TempDir Path homeDir) throws Exception {
     void shouldDetermineFromAlias(@TempDir Path homeDir) throws Exception {
 
         // language=toml
-        String config =
-                """
+        String config = """
             [aliases]
             "my-library/my-namespace"="localhost:5000/test"
             "my-library"="localhost:5000/test2"
@@ -105,8 +103,7 @@ void shouldDetermineFromAlias(@TempDir Path homeDir) throws Exception {
     void shouldRewriteAllSubdomainToLocalProxy(@TempDir Path homeDir) throws Exception {
 
         // language=toml
-        String config =
-                """
+        String config = """
                 [[registry]]
                 prefix = "*.example.com"
                 location = "localhost:5000/example-com"

src/test/java/land/oras/DockerIoITCase.java

@@ -149,8 +149,7 @@ void shouldContainsCommonLinuxPlatform() {
     void shouldCopyTagToInternalRegistryViaAlias(@TempDir Path homeDir) throws Exception {
 
         // language=toml
-        String config =
-                """
+        String config = """
             [aliases]
             "dockerhub-alpine" = "docker.io/library/alpine"
             """;

src/test/java/land/oras/GitHubContainerRegistryITCase.java

@@ -85,17 +85,14 @@ void shouldPullSignedImage(@TempDir Path homeDir) throws Exception {
         Path publicKeyPath = Path.of("src/test/resources/keys/sigstore/alpine-signed.pub");
 
         // language=toml
-        String config =
-                """
+        String config = """
             [[registry]]
             location = "ghcr.io"
             insecure = false
             """;
 
         // language=json
-        Files.writeString(
-                path,
-                """
+        Files.writeString(path, """
                 {
                   "default": [{"type": "reject"}],
                   "transports": {
@@ -104,8 +101,7 @@ void shouldPullSignedImage(@TempDir Path homeDir) throws Exception {
                     }
                   }
                 }
-                """
-                        .formatted(publicKeyPath.toAbsolutePath().toString()));
+                """.formatted(publicKeyPath.toAbsolutePath().toString()));
         ContainersPolicy policy = ContainersPolicy.newPolicy(path);
         TestUtils.createRegistriesConfFile(homeDir, config);
         TestUtils.withHome(homeDir, () -> {
@@ -120,8 +116,7 @@ void shouldPullSignedImage(@TempDir Path homeDir) throws Exception {
     @Execution(ExecutionMode.SAME_THREAD)
     void shouldPullIndexWithAlias(@TempDir Path homeDir) throws Exception {
         // language=toml
-        String config =
-                """
+        String config = """
                 [aliases]
                 "oras"="ghcr.io/oras-project/oras"
                 """;

src/test/java/land/oras/HarborS3ITCase.java

@@ -178,8 +178,7 @@ void shouldPushJenkinsLibArtifact() {
     void shouldPushJenkinsScriptArtifact() {
 
         // language=groovy
-        String jenkinsfile =
-                """
+        String jenkinsfile = """
                     node {
                         stage('Build') {
                             echo 'Building...'

src/test/java/land/oras/LayerTest.java

@@ -77,8 +77,7 @@ void shouldHaveEmptyLayer() {
 
     @Test
     void shouldReadNullAnnotations() {
-        String json =
-                """
+        String json = """
             {
               "mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
               "digest": "sha256:abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890",
@@ -94,8 +93,7 @@ void shouldReadNullAnnotations() {
 
     @Test
     void shouldReadBlobData() {
-        String json =
-                """
+        String json = """
             {
               "mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
               "digest": "sha256:abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890",
@@ -155,14 +153,12 @@ private String emptyLayer() {
      * @return The manifest
      */
     private String sampleLayer() {
-        return Layer.fromJson(
-                        """
+        return Layer.fromJson("""
                             {
                               "mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",
                               "digest": "sha256:abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890",
                               "size": 32654
                             }
-                        """)
-                .toJson();
+                        """).toJson();
     }
 }

src/test/java/land/oras/OCILayoutTest.java

@@ -166,9 +166,7 @@ void shouldPushSignedLayoutAndPullItAndValidateSignature(@TempDir Path homeDir)
         Path policyPath = homeDir.resolve("policy.json");
 
         // language=json
-        Files.writeString(
-                policyPath,
-                """
+        Files.writeString(policyPath, """
                 {
                   "default": [{"type": "reject"}],
                   "transports": {
@@ -177,8 +175,7 @@ void shouldPushSignedLayoutAndPullItAndValidateSignature(@TempDir Path homeDir)
                     }
                   }
                 }
-                """
-                        .formatted(registry.getRegistry(), publicKeyPath.toAbsolutePath()));
+                """.formatted(registry.getRegistry(), publicKeyPath.toAbsolutePath()));
         ContainersPolicy policy = ContainersPolicy.newPolicy(policyPath);
 
         // Pull the manifest with the policy: the attached signature is fetched and verified.

src/test/java/land/oras/PlatformTest.java

@@ -112,8 +112,7 @@ void shouldTestUnknownPlatform() {
     @Test
     void shouldReadFromJson() {
         // language=json
-        String json =
-                """
+        String json = """
             {
               "architecture": "amd64",
               "os": "linux"
@@ -125,8 +124,7 @@ void shouldReadFromJson() {
         assertNull(platform.variant());
         assertEquals(Platform.linuxAmd64(), platform);
 
-        json =
-                """
+        json = """
             {
               "architecture": "unknown",
               "os": "unknown"
@@ -139,8 +137,7 @@ void shouldReadFromJson() {
     @Test
     void shouldReadFromJsonWithOptionalValues() {
         // language=json
-        String json =
-                """
+        String json = """
             {
               "architecture": "amd64",
               "variant": "v8",
@@ -164,8 +161,7 @@ void shouldReadFromJsonWithOptionalValues() {
                         .withVariant("v8"),
                 platform);
 
-        json =
-                """
+        json = """
             {
               "architecture": "unknown",
               "os": "unknown"

src/test/java/land/oras/PublicECRITCase.java

@@ -60,8 +60,7 @@ void shouldDetermineEffectiveRegistryWithUnqualifiedSettings() throws Exception
     void shouldRewriteDockerIOToPublicECR() throws Exception {
 
         // language=toml
-        String config =
-                """
+        String config = """
                 [[registry]]
                 prefix = "docker.io/library"
                 location = "public.ecr.aws/docker/library"