Repository id should default to inded + host if not set

smithy-lang · Jul 27, 2023 · 0298fca · 0298fca
1 parent 1b189b9
commit 0298fca
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/smithy-cli/src/it/java/software/amazon/smithy/cli/MavenResolverMultipleReposTest.java b/smithy-cli/src/it/java/software/amazon/smithy/cli/MavenResolverMultipleReposTest.java
@@ -10,7 +10,8 @@
 import java.util.Collections;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.containsString;
 import static org.mockserver.integration.ClientAndServer.startClientAndServer;
 
 public class MavenResolverMultipleReposTest {

diff --git a/...c/it/resources/software/amazon/smithy/cli/projects/maven-multiple-repos/smithy-build.json b/...c/it/resources/software/amazon/smithy/cli/projects/maven-multiple-repos/smithy-build.json
@@ -4,12 +4,10 @@
         "repositories": [
             {
                 // Use HTTP instead of HTTPS because we're running a mock server during tests
-                "id": "Artifactory 1",
                 "url": "http://localhost:1234/artifactory-1"
             },
             {
                 // Use HTTP instead of HTTPS because we're running a mock server during tests
-                "id": "Artifactory 2",
                 "url": "http://localhost:1234/artifactory-2"
             }
         ],

diff --git a/...hy-cli/src/main/java/software/amazon/smithy/cli/dependencies/MavenDependencyResolver.java b/...hy-cli/src/main/java/software/amazon/smithy/cli/dependencies/MavenDependencyResolver.java
@@ -96,7 +96,8 @@ public void serviceCreationFailed(Class<?> type, Class<?> impl, Throwable except
     public void addRepository(MavenRepository repository) {
         try {
             URI uri = new URI(repository.getUrl());
-            String id = repository.getId().orElseGet(() -> uri.getHost());
+            int repoIndex = remoteRepositories.size() + 1;
+            String id = repository.getId().orElseGet(() -> repoIndex + "|" + uri.getHost());
             String userInfo = uri.getUserInfo();
             RemoteRepository.Builder builder = new RemoteRepository.Builder(id, "default", repository.getUrl());
             if (userInfo != null) {