Remove RepositoriesMetaData variadic constructor (#29569)

hub-cap · web-flow · commit 62a9b8909ecc · 2018-05-01T15:02:06.000-05:00
The variadic constructor was only used in a few places and the
RepositoriesMetaData class is backed by a List anyway, so just using a
List will make it simpler to instantiate it.
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java
@@ -50,8 +50,8 @@ public class RepositoriesMetaData extends AbstractNamedDiffable<Custom> implemen
      *
      * @param repositories list of repositories
      */
-    public RepositoriesMetaData(RepositoryMetaData... repositories) {
-        this.repositories = Arrays.asList(repositories);
+    public RepositoriesMetaData(List<RepositoryMetaData> repositories) {
+        this.repositories = repositories;
     }
 
     /**
@@ -164,7 +164,7 @@ public static RepositoriesMetaData fromXContent(XContentParser parser) throws IO
                 throw new ElasticsearchParseException("failed to parse repositories");
             }
         }
-        return new RepositoriesMetaData(repository.toArray(new RepositoryMetaData[repository.size()]));
+        return new RepositoriesMetaData(repository);
     }
 
     /**
diff --git a/server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java b/server/src/main/java/org/elasticsearch/repositories/RepositoriesService.java
@@ -114,7 +114,8 @@ public ClusterState execute(ClusterState currentState) throws IOException {
                 RepositoriesMetaData repositories = metaData.custom(RepositoriesMetaData.TYPE);
                 if (repositories == null) {
                     logger.info("put repository [{}]", request.name);
-                    repositories = new RepositoriesMetaData(new RepositoryMetaData(request.name, request.type, request.settings));
+                    repositories = new RepositoriesMetaData(
+                        Collections.singletonList(new RepositoryMetaData(request.name, request.type, request.settings)));
                 } else {
                     boolean found = false;
                     List<RepositoryMetaData> repositoriesMetaData = new ArrayList<>(repositories.repositories().size() + 1);
@@ -133,7 +134,7 @@ public ClusterState execute(ClusterState currentState) throws IOException {
                     } else {
                         logger.info("update repository [{}]", request.name);
                     }
-                    repositories = new RepositoriesMetaData(repositoriesMetaData.toArray(new RepositoryMetaData[repositoriesMetaData.size()]));
+                    repositories = new RepositoriesMetaData(repositoriesMetaData);
                 }
                 mdBuilder.putCustom(RepositoriesMetaData.TYPE, repositories);
                 return ClusterState.builder(currentState).metaData(mdBuilder).build();
@@ -185,7 +186,7 @@ public ClusterState execute(ClusterState currentState) {
                         }
                     }
                     if (changed) {
-                        repositories = new RepositoriesMetaData(repositoriesMetaData.toArray(new RepositoryMetaData[repositoriesMetaData.size()]));
+                        repositories = new RepositoriesMetaData(repositoriesMetaData);
                         mdBuilder.putCustom(RepositoriesMetaData.TYPE, repositories);
                         return ClusterState.builder(currentState).metaData(mdBuilder).build();
                     }
diff --git a/server/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java b/server/src/test/java/org/elasticsearch/cluster/ClusterStateDiffIT.java
@@ -640,7 +640,7 @@ public MetaData.Builder remove(MetaData.Builder builder, String name) {
             @Override
             public MetaData.Custom randomCreate(String name) {
                 if (randomBoolean()) {
-                    return new RepositoriesMetaData();
+                    return new RepositoriesMetaData(Collections.emptyList());
                 } else {
                     return IndexGraveyardTests.createRandom();
                 }
diff --git a/server/src/test/java/org/elasticsearch/snapshots/RepositoriesMetaDataSerializationTests.java b/server/src/test/java/org/elasticsearch/snapshots/RepositoriesMetaDataSerializationTests.java
@@ -45,7 +45,7 @@ protected Custom createTestInstance() {
             entries.add(new RepositoryMetaData(randomAlphaOfLength(10), randomAlphaOfLength(10), randomSettings()));
         }
         entries.sort(Comparator.comparing(RepositoryMetaData::name));
-        return new RepositoriesMetaData(entries.toArray(new RepositoryMetaData[entries.size()]));
+        return new RepositoriesMetaData(entries);
     }
 
     @Override
@@ -62,7 +62,7 @@ protected Custom mutateInstance(Custom instance) {
         } else {
             entries.remove(randomIntBetween(0, entries.size() - 1));
         }
-        return new RepositoriesMetaData(entries.toArray(new RepositoryMetaData[entries.size()]));
+        return new RepositoriesMetaData(entries);
     }
 
     public Settings randomSettings() {
@@ -94,7 +94,7 @@ protected Custom makeTestChanges(Custom testInstance) {
                 repos.add(new RepositoryMetaData(randomAlphaOfLength(10), randomAlphaOfLength(10), randomSettings()));
             }
         }
-        return new RepositoriesMetaData(repos.toArray(new RepositoryMetaData[repos.size()]));
+        return new RepositoriesMetaData(repos);
     }
 
     @Override
@@ -114,7 +114,7 @@ protected Custom doParseInstance(XContentParser parser) throws IOException {
         assertEquals(XContentParser.Token.END_OBJECT, parser.currentToken());
         List<RepositoryMetaData> repos = repositoriesMetaData.repositories();
         repos.sort(Comparator.comparing(RepositoryMetaData::name));
-        return new RepositoriesMetaData(repos.toArray(new RepositoryMetaData[repos.size()]));
+        return new RepositoriesMetaData(repos);
     }
 
 }
diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/license/LicensesMetaDataSerializationTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/license/LicensesMetaDataSerializationTests.java
@@ -64,7 +64,7 @@ public void testLicenseMetadataParsingDoesNotSwallowOtherMetaData() throws Excep
         License license = TestUtils.generateSignedLicense(TimeValue.timeValueHours(2));
         LicensesMetaData licensesMetaData = new LicensesMetaData(license, Version.CURRENT);
         RepositoryMetaData repositoryMetaData = new RepositoryMetaData("repo", "fs", Settings.EMPTY);
-        RepositoriesMetaData repositoriesMetaData = new RepositoriesMetaData(repositoryMetaData);
+        RepositoriesMetaData repositoriesMetaData = new RepositoriesMetaData(Collections.singletonList(repositoryMetaData));
         final MetaData.Builder metaDataBuilder = MetaData.builder();
         if (randomBoolean()) { // random order of insertion
             metaDataBuilder.putCustom(licensesMetaData.getWriteableName(), licensesMetaData);
diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherMetaDataSerializationTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/WatcherMetaDataSerializationTests.java
@@ -47,7 +47,7 @@ public void testWatcherMetadataParsingDoesNotSwallowOtherMetaData() throws Excep
         boolean manuallyStopped = randomBoolean();
         WatcherMetaData watcherMetaData = new WatcherMetaData(manuallyStopped);
         RepositoryMetaData repositoryMetaData = new RepositoryMetaData("repo", "fs", Settings.EMPTY);
-        RepositoriesMetaData repositoriesMetaData = new RepositoriesMetaData(repositoryMetaData);
+        RepositoriesMetaData repositoriesMetaData = new RepositoriesMetaData(Collections.singletonList(repositoryMetaData));
         final MetaData.Builder metaDataBuilder = MetaData.builder();
         if (randomBoolean()) { // random order of insertion
             metaDataBuilder.putCustom(watcherMetaData.getWriteableName(), watcherMetaData);

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ public class RepositoriesMetaData extends AbstractNamedDiffable<Custom> implemen`
`50`	`50`	`*`
`51`	`51`	`* @param repositories list of repositories`
`52`	`52`	`*/`
`53`		`- public RepositoriesMetaData(RepositoryMetaData... repositories) {`
`54`		`- this.repositories = Arrays.asList(repositories);`
	`53`	`+ public RepositoriesMetaData(List<RepositoryMetaData> repositories) {`
	`54`	`+ this.repositories = repositories;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`
`@@ -164,7 +164,7 @@ public static RepositoriesMetaData fromXContent(XContentParser parser) throws IO`
`164`	`164`	`throw new ElasticsearchParseException("failed to parse repositories");`
`165`	`165`	`}`
`166`	`166`	`}`
`167`		`- return new RepositoriesMetaData(repository.toArray(new RepositoryMetaData[repository.size()]));`
	`167`	`+ return new RepositoriesMetaData(repository);`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,8 @@ public ClusterState execute(ClusterState currentState) throws IOException {`
`114`	`114`	`RepositoriesMetaData repositories = metaData.custom(RepositoriesMetaData.TYPE);`
`115`	`115`	`if (repositories == null) {`
`116`	`116`	`logger.info("put repository [{}]", request.name);`
`117`		`- repositories = new RepositoriesMetaData(new RepositoryMetaData(request.name, request.type, request.settings));`
	`117`	`+ repositories = new RepositoriesMetaData(`
	`118`	`+ Collections.singletonList(new RepositoryMetaData(request.name, request.type, request.settings)));`
`118`	`119`	`} else {`
`119`	`120`	`boolean found = false;`
`120`	`121`	`List<RepositoryMetaData> repositoriesMetaData = new ArrayList<>(repositories.repositories().size() + 1);`
`@@ -133,7 +134,7 @@ public ClusterState execute(ClusterState currentState) throws IOException {`
`133`	`134`	`} else {`
`134`	`135`	`logger.info("update repository [{}]", request.name);`
`135`	`136`	`}`
`136`		`- repositories = new RepositoriesMetaData(repositoriesMetaData.toArray(new RepositoryMetaData[repositoriesMetaData.size()]));`
	`137`	`+ repositories = new RepositoriesMetaData(repositoriesMetaData);`
`137`	`138`	`}`
`138`	`139`	`mdBuilder.putCustom(RepositoriesMetaData.TYPE, repositories);`
`139`	`140`	`return ClusterState.builder(currentState).metaData(mdBuilder).build();`
`@@ -185,7 +186,7 @@ public ClusterState execute(ClusterState currentState) {`
`185`	`186`	`}`
`186`	`187`	`}`
`187`	`188`	`if (changed) {`
`188`		`- repositories = new RepositoriesMetaData(repositoriesMetaData.toArray(new RepositoryMetaData[repositoriesMetaData.size()]));`
	`189`	`+ repositories = new RepositoriesMetaData(repositoriesMetaData);`
`189`	`190`	`mdBuilder.putCustom(RepositoriesMetaData.TYPE, repositories);`
`190`	`191`	`return ClusterState.builder(currentState).metaData(mdBuilder).build();`
`191`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -640,7 +640,7 @@ public MetaData.Builder remove(MetaData.Builder builder, String name) {`
`640`	`640`	`@Override`
`641`	`641`	`public MetaData.Custom randomCreate(String name) {`
`642`	`642`	`if (randomBoolean()) {`
`643`		`- return new RepositoriesMetaData();`
	`643`	`+ return new RepositoriesMetaData(Collections.emptyList());`
`644`	`644`	`} else {`
`645`	`645`	`return IndexGraveyardTests.createRandom();`
`646`	`646`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected Custom createTestInstance() {`
`45`	`45`	`entries.add(new RepositoryMetaData(randomAlphaOfLength(10), randomAlphaOfLength(10), randomSettings()));`
`46`	`46`	`}`
`47`	`47`	`entries.sort(Comparator.comparing(RepositoryMetaData::name));`
`48`		`- return new RepositoriesMetaData(entries.toArray(new RepositoryMetaData[entries.size()]));`
	`48`	`+ return new RepositoriesMetaData(entries);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Override`
`@@ -62,7 +62,7 @@ protected Custom mutateInstance(Custom instance) {`
`62`	`62`	`} else {`
`63`	`63`	`entries.remove(randomIntBetween(0, entries.size() - 1));`
`64`	`64`	`}`
`65`		`- return new RepositoriesMetaData(entries.toArray(new RepositoryMetaData[entries.size()]));`
	`65`	`+ return new RepositoriesMetaData(entries);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public Settings randomSettings() {`
`@@ -94,7 +94,7 @@ protected Custom makeTestChanges(Custom testInstance) {`
`94`	`94`	`repos.add(new RepositoryMetaData(randomAlphaOfLength(10), randomAlphaOfLength(10), randomSettings()));`
`95`	`95`	`}`
`96`	`96`	`}`
`97`		`- return new RepositoriesMetaData(repos.toArray(new RepositoryMetaData[repos.size()]));`
	`97`	`+ return new RepositoriesMetaData(repos);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Override`
`@@ -114,7 +114,7 @@ protected Custom doParseInstance(XContentParser parser) throws IOException {`
`114`	`114`	`assertEquals(XContentParser.Token.END_OBJECT, parser.currentToken());`
`115`	`115`	`List<RepositoryMetaData> repos = repositoriesMetaData.repositories();`
`116`	`116`	`repos.sort(Comparator.comparing(RepositoryMetaData::name));`
`117`		`- return new RepositoriesMetaData(repos.toArray(new RepositoryMetaData[repos.size()]));`
	`117`	`+ return new RepositoriesMetaData(repos);`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`}`