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

Rename ClusterState#lookupPrototypeSafe to `lookupPrototype` and remove previous "unsafe" unused variant (#21686) 

The `lookupPrototype` method is not used anywhere. Seems like we rather use its `lookupProrotypeSafe` variant (which also throws exception if the prototype is not found) is always. This commit makes the safer variant the default one, by renaming it to  "lookupPrototype" and removes the previous "unsafe" variant.
This commit is contained in:
Luca Cavanna 2016-11-21 11:36:56 +01:00 committed by GitHub
parent d913242ca1
commit a1d88e6550
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/org/elasticsearch/cluster/ClusterState.java
View File

@ -108,13 +108,7 @@ public class ClusterState implements ToXContent, Diffable<ClusterState> {
registerPrototype(RestoreInProgress.TYPE, RestoreInProgress.PROTO); registerPrototype(RestoreInProgress.TYPE, RestoreInProgress.PROTO);
} }
@Nullable
public static <T extends Custom> T lookupPrototype(String type) { public static <T extends Custom> T lookupPrototype(String type) {
//noinspection unchecked
return (T) customPrototypes.get(type);
}
public static <T extends Custom> T lookupPrototypeSafe(String type) {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
T proto = (T) customPrototypes.get(type); T proto = (T) customPrototypes.get(type);
if (proto == null) { if (proto == null) {
@ -308,7 +302,7 @@ public class ClusterState implements ToXContent, Diffable<ClusterState> {
private final String value; private final String value;
private Metric(String value) { Metric(String value) {
this.value = value; this.value = value;
} }
@ -630,10 +624,6 @@ public class ClusterState implements ToXContent, Diffable<ClusterState> {
return this; return this;
} }
public Custom getCustom(String type) {
return customs.get(type);
}
public Builder putCustom(String type, Custom custom) { public Builder putCustom(String type, Custom custom) {
customs.put(type, custom); customs.put(type, custom);
return this; return this;
@ -707,7 +697,7 @@ public class ClusterState implements ToXContent, Diffable<ClusterState> {
int customSize = in.readVInt(); int customSize = in.readVInt();
for (int i = 0; i < customSize; i++) { for (int i = 0; i < customSize; i++) {
String type = in.readString(); String type = in.readString();
Custom customIndexMetaData = lookupPrototypeSafe(type).readFrom(in); Custom customIndexMetaData = lookupPrototype(type).readFrom(in);
builder.putCustom(type, customIndexMetaData); builder.putCustom(type, customIndexMetaData);
} }
return builder.build(); return builder.build();
@ -779,12 +769,12 @@ public class ClusterState implements ToXContent, Diffable<ClusterState> {
new DiffableUtils.DiffableValueSerializer<String, Custom>() { new DiffableUtils.DiffableValueSerializer<String, Custom>() {
@Override @Override
public Custom read(StreamInput in, String key) throws IOException { public Custom read(StreamInput in, String key) throws IOException {
return lookupPrototypeSafe(key).readFrom(in); return lookupPrototype(key).readFrom(in);
} }
@Override @Override
public Diff<Custom> readDiff(StreamInput in, String key) throws IOException { public Diff<Custom> readDiff(StreamInput in, String key) throws IOException {
return lookupPrototypeSafe(key).readDiffFrom(in); return lookupPrototype(key).readDiffFrom(in);
} }
}); });
} }