Minor cleanup

Author: denisrosca

smithy-build/src/main/java/software/amazon/smithy/build/model/MavenRepository.java

@@ -62,9 +62,7 @@ public Optional<String> getHttpCredentials() {
 
     @Override
     public Builder toBuilder() {
-        Builder b = builder().url(url).httpCredentials(httpCredentials);
-        b.id(id);
-        return b;
+        return builder().id(id).url(url).httpCredentials(httpCredentials);
     }
 
     @Override

smithy-cli/src/main/java/software/amazon/smithy/cli/dependencies/MavenDependencyResolver.java

@@ -96,8 +96,8 @@ public void serviceCreationFailed(Class<?> type, Class<?> impl, Throwable except
     public void addRepository(MavenRepository repository) {
         try {
             URI uri = new URI(repository.getUrl());
-            int repoIndex = remoteRepositories.size() + 1;
-            String id = repository.getId().orElseGet(() -> repoIndex + "|" + uri.getHost());
+            int repositoryIndex = remoteRepositories.size() + 1;
+            String id = repository.getId().orElseGet(() -> repositoryIndex + "|" + uri.getHost());
             String userInfo = uri.getUserInfo();
             RemoteRepository.Builder builder = new RemoteRepository.Builder(id, "default", repository.getUrl());
             if (userInfo != null) {