Skip to content

Make RepositoriesMetaData contents unmodifiable #30361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 3, 2018
Merged

Make RepositoriesMetaData contents unmodifiable #30361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions server/src/main/java/org/elasticsearch/cluster/metadata/RepositoriesMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumSet;
import java.util.List;

Expand All @@ -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);
}

/**
Expand Down Expand Up @@ -107,7 +108,7 @@ public RepositoriesMetaData(StreamInput in) throws IOException {
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 {
Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/org/elasticsearch/snapshots/RepositoriesMetaDataSerializationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ protected Custom doParseInstance(XContentParser parser) throws IOException {
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);
}
Expand Down