honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make RepositoriesMetaData contents unmodifiable (#30361) 

This commit makes the RepositoriesMetaData backing list no longer
modifiable.

Ref #30333
This commit is contained in:
Michael Basnight 2018-05-03 13:14:54 -05:00 committed by GitHub
parent 09a6ba4fea
commit 5f8101a44c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java
View File

@ -33,6 +33,7 @@ import org.elasticsearch.common.xcontent.XContentParser;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;
@ -51,7 +52,7 @@ public class RepositoriesMetaData extends AbstractNamedDiffable<Custom> implemen
* @param repositories list of repositories
*/
public RepositoriesMetaData(List<RepositoryMetaData> repositories) {
this.repositories = repositories;
this.repositories = Collections.unmodifiableList(repositories);
}
/**
@ -107,7 +108,7 @@ public class RepositoriesMetaData extends AbstractNamedDiffable<Custom> implemen
for (int i = 0; i < repository.length; i++) {
repository[i] = new RepositoryMetaData(in);
}
this.repositories = Arrays.asList(repository);
this.repositories = Collections.unmodifiableList(Arrays.asList(repository));
}
public static NamedDiff<Custom> readDiffFrom(StreamInput in) throws IOException {

2
server/src/test/java/org/elasticsearch/snapshots/RepositoriesMetaDataSerializationTests.java
View File

@ -112,7 +112,7 @@ public class RepositoriesMetaDataSerializationTests extends AbstractDiffableSeri
assertEquals(XContentParser.Token.START_OBJECT, parser.nextToken());
RepositoriesMetaData repositoriesMetaData = RepositoriesMetaData.fromXContent(parser);
assertEquals(XContentParser.Token.END_OBJECT, parser.currentToken());
List<RepositoryMetaData> repos = repositoriesMetaData.repositories();
List<RepositoryMetaData> repos = new ArrayList<>(repositoriesMetaData.repositories());
repos.sort(Comparator.comparing(RepositoryMetaData::name));
return new RepositoriesMetaData(repos);
}