Shorten FQDN types and enforce it with spotless

pom.xml

@@ -610,6 +610,7 @@
                 <!-- Until http://github.com/diffplug/spotless/issues/2468 -->
                 <version>${palantir.java.format.version}</version>
               </palantirJavaFormat>
+              <shortenFullyQualifiedTypes />
               <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/auth/HttpClient.java

@@ -26,8 +26,11 @@
 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.http.HttpClient;
+import java.net.http.HttpClient.Builder;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.net.http.HttpTimeoutException;
@@ -87,12 +90,12 @@ public final class HttpClient {
     /**
      * The HTTP client builder
      */
-    private final java.net.http.HttpClient.Builder builder;
+    private final Builder builder;
 
     /**
      * The HTTP client
      */
-    private java.net.http.HttpClient client;
+    private HttpClient client;
 
     /**
      * Skip TLS verification
@@ -834,7 +837,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) {

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);

src/test/java/land/oras/RegistryMirrorTest.java

@@ -385,7 +385,7 @@ void shouldSkipDigestOnlyMirrorWhenPullingByTag(@TempDir Path blobDir) throws Ex
             // Pull by tag: digest-only mirror is skipped; fallback to "original" (also down) → must fail
             ContainerRef ref = ContainerRef.parse("localhost:59998/test/digest-only-mirror:v1");
             assertThrows(
-                    land.oras.exception.OrasException.class,
+                    OrasException.class,
                     () -> registry.getManifest(ref),
                     "digest-only mirror must be skipped for a tag-based pull");
         });
@@ -468,7 +468,7 @@ void shouldApplyMirrorByDigestOnly(@TempDir Path blobDir) throws Exception {
             // Tag pull, mirror-by-digest-only skips all mirrors. Fail with original down
             ContainerRef tagRef = ContainerRef.parse("localhost:59998/test/mbd-mirror:v1");
             assertThrows(
-                    land.oras.exception.OrasException.class,
+                    OrasException.class,
                     () -> registry.getManifest(tagRef),
                     "mirror-by-digest-only must skip mirrors for tag-based pulls");
 

src/test/java/land/oras/RegistryWireMockTest.java

@@ -39,6 +39,7 @@
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -1517,8 +1518,7 @@ void shouldFailChunkedUploadWhenInitiationReturnsNon202(WireMockRuntimeInfo wmRu
 
         OrasException exStream = assertThrows(
                 OrasException.class,
-                () -> registry.pushBlobChunked(
-                        refStream, new java.io.ByteArrayInputStream(content), content.length, 4L));
+                () -> registry.pushBlobChunked(refStream, new ByteArrayInputStream(content), content.length, 4L));
         assertEquals(
                 "Failed to initiate chunked blob upload: status 500",
                 exStream.getMessage(),

src/test/java/land/oras/auth/RegistryConfTest.java

@@ -26,6 +26,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
@@ -520,7 +521,7 @@ private Path writeTempToml(String content) {
             temp.toFile().deleteOnExit();
             Files.writeString(temp, content);
             return temp;
-        } catch (java.io.IOException e) {
+        } catch (IOException e) {
             throw new RuntimeException(e);
         }
     }

src/test/java/land/oras/policy/SigstoreVerifierTest.java

@@ -142,13 +142,13 @@ void loadsKeysFromKeyPathsAndKeyDatas(@TempDir Path dir) throws Exception {
         // keyPaths list
         PolicyRequirement.SigstoreSigned fromPaths = new PolicyRequirement.SigstoreSigned(
                 null, null, List.of(keyFile1.toString(), keyFile2.toString()), null);
-        List<java.security.PublicKey> loadedFromPaths = SigstoreVerifier.loadKeys(fromPaths);
+        List<PublicKey> loadedFromPaths = SigstoreVerifier.loadKeys(fromPaths);
         assertEquals(2, loadedFromPaths.size());
 
         // keyDatas list
         PolicyRequirement.SigstoreSigned fromDatas =
                 new PolicyRequirement.SigstoreSigned(null, null, null, List.of(keyData1, keyData2));
-        List<java.security.PublicKey> loadedFromDatas = SigstoreVerifier.loadKeys(fromDatas);
+        List<PublicKey> loadedFromDatas = SigstoreVerifier.loadKeys(fromDatas);
         assertEquals(2, loadedFromDatas.size());
     }
 

src/test/java/land/oras/utils/ArchiveUtilsTest.java

@@ -30,6 +30,8 @@
 import java.nio.file.Paths;
 import java.nio.file.attribute.PosixFilePermission;
 import java.util.Set;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 import land.oras.LocalPath;
 import land.oras.exception.OrasException;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
@@ -410,17 +412,17 @@ void shouldUnzipOverwriteExistingFiles(@TempDir Path tmp) throws IOException {
         byte[] secondContent = "second-overwritten".getBytes();
 
         Path zip1 = tmp.resolve("first.zip");
-        try (java.util.zip.ZipOutputStream zout = new java.util.zip.ZipOutputStream(Files.newOutputStream(zip1))) {
-            zout.putNextEntry(new java.util.zip.ZipEntry("file.txt"));
+        try (ZipOutputStream zout = new ZipOutputStream(Files.newOutputStream(zip1))) {
+            zout.putNextEntry(new ZipEntry("file.txt"));
             zout.write(firstContent);
             zout.closeEntry();
         }
         ArchiveUtils.unzip(zip1, target);
         assertEquals("first", Files.readString(target.resolve("file.txt")));
 
         Path zip2 = tmp.resolve("second.zip");
-        try (java.util.zip.ZipOutputStream zout = new java.util.zip.ZipOutputStream(Files.newOutputStream(zip2))) {
-            zout.putNextEntry(new java.util.zip.ZipEntry("file.txt"));
+        try (ZipOutputStream zout = new ZipOutputStream(Files.newOutputStream(zip2))) {
+            zout.putNextEntry(new ZipEntry("file.txt"));
             zout.write(secondContent);
             zout.closeEntry();
         }