Skip to content

Commit b5b93a2

Browse files
authored
Rename ParameterMap to DeprecationMap (#37317)
Mechanical change to rename ParameterMap to DeprecationMap as this seems more appropriate for an extended Map to issue deprecation warnings.
1 parent 4344305 commit b5b93a2

File tree

7 files changed

+23
-23
lines changed

7 files changed

+23
-23
lines changed

server/src/main/java/org/elasticsearch/script/AbstractSortScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ abstract class AbstractSortScript implements ScorerAware {
6666
this.leafLookup = lookup.getLeafSearchLookup(leafContext);
6767
Map<String, Object> parameters = new HashMap<>(params);
6868
parameters.putAll(leafLookup.asMap());
69-
this.params = new ParameterMap(parameters, DEPRECATIONS);
69+
this.params = new DeprecationMap(parameters, DEPRECATIONS);
7070
}
7171

7272
protected AbstractSortScript() {

server/src/main/java/org/elasticsearch/script/AggregationScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public abstract class AggregationScript implements ScorerAware {
7171
private Object value;
7272

7373
public AggregationScript(Map<String, Object> params, SearchLookup lookup, LeafReaderContext leafContext) {
74-
this.params = new ParameterMap(new HashMap<>(params), DEPRECATIONS);
74+
this.params = new DeprecationMap(new HashMap<>(params), DEPRECATIONS);
7575
this.leafLookup = lookup.getLeafSearchLookup(leafContext);
7676
this.params.putAll(leafLookup.asMap());
7777
}

server/src/main/java/org/elasticsearch/script/ParameterMap.java renamed to server/src/main/java/org/elasticsearch/script/DeprecationMap.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,38 +26,38 @@
2626
import java.util.Map;
2727
import java.util.Set;
2828

29-
public final class ParameterMap implements Map<String, Object> {
29+
public final class DeprecationMap implements Map<String, Object> {
3030

3131
private static final DeprecationLogger deprecationLogger =
32-
new DeprecationLogger(LogManager.getLogger(ParameterMap.class));
32+
new DeprecationLogger(LogManager.getLogger(DeprecationMap.class));
3333

34-
private final Map<String, Object> params;
34+
private final Map<String, Object> delegate;
3535

3636
private final Map<String, String> deprecations;
3737

38-
public ParameterMap(Map<String, Object> params, Map<String, String> deprecations) {
39-
this.params = params;
38+
public DeprecationMap(Map<String, Object> delegate, Map<String, String> deprecations) {
39+
this.delegate = delegate;
4040
this.deprecations = deprecations;
4141
}
4242

4343
@Override
4444
public int size() {
45-
return params.size();
45+
return delegate.size();
4646
}
4747

4848
@Override
4949
public boolean isEmpty() {
50-
return params.isEmpty();
50+
return delegate.isEmpty();
5151
}
5252

5353
@Override
5454
public boolean containsKey(final Object key) {
55-
return params.containsKey(key);
55+
return delegate.containsKey(key);
5656
}
5757

5858
@Override
5959
public boolean containsValue(final Object value) {
60-
return params.containsValue(value);
60+
return delegate.containsValue(value);
6161
}
6262

6363
@Override
@@ -66,41 +66,41 @@ public Object get(final Object key) {
6666
if (deprecationMessage != null) {
6767
deprecationLogger.deprecated(deprecationMessage);
6868
}
69-
return params.get(key);
69+
return delegate.get(key);
7070
}
7171

7272
@Override
7373
public Object put(final String key, final Object value) {
74-
return params.put(key, value);
74+
return delegate.put(key, value);
7575
}
7676

7777
@Override
7878
public Object remove(final Object key) {
79-
return params.remove(key);
79+
return delegate.remove(key);
8080
}
8181

8282
@Override
8383
public void putAll(final Map<? extends String, ?> m) {
84-
params.putAll(m);
84+
delegate.putAll(m);
8585
}
8686

8787
@Override
8888
public void clear() {
89-
params.clear();
89+
delegate.clear();
9090
}
9191

9292
@Override
9393
public Set<String> keySet() {
94-
return params.keySet();
94+
return delegate.keySet();
9595
}
9696

9797
@Override
9898
public Collection<Object> values() {
99-
return params.values();
99+
return delegate.values();
100100
}
101101

102102
@Override
103103
public Set<Entry<String, Object>> entrySet() {
104-
return params.entrySet();
104+
return delegate.entrySet();
105105
}
106106
}

server/src/main/java/org/elasticsearch/script/FieldScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public FieldScript(Map<String, Object> params, SearchLookup lookup, LeafReaderCo
6363
this.leafLookup = lookup.getLeafSearchLookup(leafContext);
6464
params = new HashMap<>(params);
6565
params.putAll(leafLookup.asMap());
66-
this.params = new ParameterMap(params, DEPRECATIONS);
66+
this.params = new DeprecationMap(params, DEPRECATIONS);
6767
}
6868

6969
// for expression engine

server/src/main/java/org/elasticsearch/script/ScoreScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public ScoreScript(Map<String, Object> params, SearchLookup lookup, LeafReaderCo
7373
this.leafLookup = lookup.getLeafSearchLookup(leafContext);
7474
params = new HashMap<>(params);
7575
params.putAll(leafLookup.asMap());
76-
this.params = new ParameterMap(params, DEPRECATIONS);
76+
this.params = new DeprecationMap(params, DEPRECATIONS);
7777
}
7878
}
7979

server/src/main/java/org/elasticsearch/script/ScriptedMetricAggContexts.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public MapScript(Map<String, Object> params, Map<String, Object> state, SearchLo
9595
if (leafLookup != null) {
9696
params = new HashMap<>(params); // copy params so we aren't modifying input
9797
params.putAll(leafLookup.asMap()); // add lookup vars
98-
params = new ParameterMap(params, DEPRECATIONS); // wrap with deprecations
98+
params = new DeprecationMap(params, DEPRECATIONS); // wrap with deprecations
9999
}
100100
this.params = params;
101101
}

server/src/main/java/org/elasticsearch/script/TermsSetQueryScript.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public TermsSetQueryScript(Map<String, Object> params, SearchLookup lookup, Leaf
6464
Map<String, Object> parameters = new HashMap<>(params);
6565
this.leafLookup = lookup.getLeafSearchLookup(leafContext);
6666
parameters.putAll(leafLookup.asMap());
67-
this.params = new ParameterMap(parameters, DEPRECATIONS);
67+
this.params = new DeprecationMap(parameters, DEPRECATIONS);
6868
}
6969

7070
protected TermsSetQueryScript() {

0 commit comments

Comments
 (0)