Add more convenience methods on registry (#289)

Author: jonesbusy

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

@@ -694,6 +694,15 @@ public Builder defaults() {
             return this;
         }
 
+        /**
+         * Return a new builder with default authentication using existing host auth and registry url
+         * @param registry The registry URL (ex: localhost:5000)
+         * @return The builder
+         */
+        public Builder defaults(String registry) {
+            return defaults().withRegistry(registry);
+        }
+
         /**
          * Set username and password authentication
          * @param username The username
@@ -705,6 +714,17 @@ public Builder defaults(String username, String password) {
             return this;
         }
 
+        /**
+         * Set username and password authentication
+         * @param registry The registry URL (ex: localhost:5000)
+         * @param username The username
+         * @param password The password
+         * @return The builder
+         */
+        public Builder defaults(String registry, String username, String password) {
+            return defaults(username, password).withRegistry(registry);
+        }
+
         /**
          * Set insecure communication and no authentification
          * @return The builder
@@ -716,6 +736,26 @@ public Builder insecure() {
             return this;
         }
 
+        /**
+         * Set insecure communication and no authentification
+         * @param registry The registry (ex: localhost:5000)
+         * @return The builder
+         */
+        public Builder insecure(String registry) {
+            return insecure().withRegistry(registry);
+        }
+
+        /**
+         * Return a new insecure builder with username and password authentication
+         * @param registry The registry (ex: localhost:5000)
+         * @param username The username
+         * @param password The password
+         * @return The builder
+         */
+        public Builder insecure(String registry, String username, String password) {
+            return insecure().defaults(registry, username, password);
+        }
+
         /**
          * Set the registry URL
          * @param registry The registry URL

src/test/java/land/oras/RegistryTest.java

@@ -70,10 +70,8 @@ void before() {
     void shouldListRepositories() {
 
         // Setup
-        Registry registry = Registry.Builder.builder()
-                .defaults("myuser", "mypass")
-                .withRegistry(this.registry.getRegistry())
-                .withInsecure(true)
+        Registry registry = Registry.builder()
+                .insecure(this.registry.getRegistry(), "myuser", "mypass")
                 .build();
 
         // Test
@@ -83,13 +81,11 @@ void shouldListRepositories() {
 
     @Test
     void shouldFailToPushBlobForInvalidDigest() {
-        Registry registry = Registry.Builder.builder()
-                .defaults("myuser", "mypass")
-                .withInsecure(true)
+        Registry registry = Registry.builder()
+                .insecure(this.registry.getRegistry(), "myuser", "mypass")
                 .build();
         ContainerRef containerRef1 = ContainerRef.parse(
-                "%s/library/artifact-text@sha256:2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824"
-                        .formatted(this.registry.getRegistry()));
+                "library/artifact-text@sha256:2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824");
         // Ensure the blob is deleted
         assertThrows(OrasException.class, () -> {
             registry.pushBlob(containerRef1, "invalid".getBytes());
@@ -100,11 +96,11 @@ void shouldFailToPushBlobForInvalidDigest() {
     void shouldPushAndGetBlobThenDeleteWithSha256() {
         Registry registry = Registry.Builder.builder()
                 .defaults("myuser", "mypass")
+                .withRegistry(this.registry.getRegistry())
                 .withInsecure(true)
                 .build();
         ContainerRef containerRef = ContainerRef.parse(
-                "%s/library/artifact-text@sha256:2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824"
-                        .formatted(this.registry.getRegistry()));
+                "library/artifact-text@sha256:2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824");
         Layer layer = registry.pushBlob(containerRef, "hello".getBytes());
         assertEquals("sha256:2cf24dba5fb0a30e26e83b2ac5b9e29e1b161e5c1fa7425e73043362938b9824", layer.getDigest());
         byte[] blob = registry.getBlob(
@@ -156,12 +152,29 @@ void shouldFailWithoutAuthentication() {
         Registry registry = Registry.Builder.builder().insecure().build();
         ContainerRef containerRef =
                 ContainerRef.parse("%s/library/artifact-text".formatted(this.registry.getRegistry()));
-        assertThrows(
-                OrasException.class,
-                () -> {
-                    registry.pushBlob(containerRef, "hello".getBytes());
-                },
-                "Response code: 401");
+        assertThrows(OrasException.class, () -> {
+            registry.pushBlob(containerRef, "hello".getBytes());
+        });
+    }
+
+    @Test
+    void shouldFailWithoutAuthenticationAndRegistry() {
+        Registry registry =
+                Registry.Builder.builder().insecure(this.registry.getRegistry()).build();
+        ContainerRef containerRef = ContainerRef.parse("library/artifact-text");
+        assertThrows(OrasException.class, () -> {
+            registry.pushBlob(containerRef, "hello".getBytes());
+        });
+    }
+
+    @Test
+    void shouldFailWithSecureOnInsecure() {
+        Registry registry =
+                Registry.Builder.builder().defaults(this.registry.getRegistry()).build();
+        ContainerRef containerRef = ContainerRef.parse("library/artifact-text");
+        assertThrows(OrasException.class, () -> {
+            registry.pushBlob(containerRef, "hello".getBytes());
+        });
     }
 
     @Test