Address review comments

gradle · Dec 14, 2022 · b2d177b · b2d177b
1 parent f3b45f2
commit b2d177b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/...rc/main/java/org/gradle/jvm/toolchain/internal/DefaultJavaToolchainRepositoryHandler.java b/...rc/main/java/org/gradle/jvm/toolchain/internal/DefaultJavaToolchainRepositoryHandler.java
@@ -38,6 +38,7 @@
 
 import javax.inject.Inject;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -105,15 +106,12 @@ public void repository(String name, Action<? super JavaToolchainRepository> conf
     @Override
     public List<JavaToolchainRepository> getAsList() {
         ArrayList<JavaToolchainRepository> copy = repositories.stream()
+                .map(it -> (JavaToolchainRepositoryInternal) it)
                 .map(ImmutableJavaToolchainRepository::new)
                 .collect(Collectors.toCollection(ArrayList::new));
         return Collections.unmodifiableList(copy);
     }
 
-    public List<JavaToolchainRepository> getAsLiveList() {
-        return repositories;
-    }
-
     @Override
     public int size() {
         return repositories.size();
@@ -142,14 +140,19 @@ private void assertMutable() {
         }
     }
 
-    private static class ImmutableJavaToolchainRepository implements JavaToolchainRepository {
+    private static class ImmutableJavaToolchainRepository implements JavaToolchainRepositoryInternal {
 
-        private final JavaToolchainRepository delegate;
+        private final JavaToolchainRepositoryInternal delegate;
 
-        public ImmutableJavaToolchainRepository(JavaToolchainRepository delegate) {
+        public ImmutableJavaToolchainRepository(JavaToolchainRepositoryInternal delegate) {
             this.delegate = delegate;
         }
 
+        @Override
+        public Collection<Authentication> getConfiguredAuthentication() {
+            return delegate.getConfiguredAuthentication();
+        }
+
         @Override
         public PasswordCredentials getCredentials() {
             return delegate.getCredentials();

diff --git a/...src/main/java/org/gradle/jvm/toolchain/internal/DefaultJavaToolchainResolverRegistry.java b/...src/main/java/org/gradle/jvm/toolchain/internal/DefaultJavaToolchainResolverRegistry.java
@@ -91,7 +91,7 @@ private void realizeRepositories() {
         realizedRepositories.clear();
 
         Set<Class<?>> resolvers = new HashSet<>();
-        for (JavaToolchainRepository repository : repositoryHandler.getAsLiveList()) {
+        for (JavaToolchainRepository repository : repositoryHandler.getAsList()) {
             if (!resolvers.add(repository.getResolverClass().get())) {
                 throw new GradleException("Duplicate configuration for repository implementation '" + repository.getResolverClass().get().getName() + "'.");
             }