Skip to content

Commit edd5887

Browse files
Script: Remove FieldAccess (#76109) (#76112)
Remove FieldAccess inner class from fields api classes based on changes in #76045 Co-authored-by: Stuart Tettemer <[email protected]>
1 parent 91e9c5c commit edd5887

File tree

7 files changed

+3
-66
lines changed

7 files changed

+3
-66
lines changed

modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.script.fields.numbersort.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,8 @@
88

99
# The whitelist for the fields api
1010

11-
# The scripts must be whitelisted for painless to find the classes
11+
# The scripts must be whitelisted for painless to find the classes for the field API
1212
class org.elasticsearch.script.NumberSortScript @no_import {
1313
}
1414
class org.elasticsearch.script.NumberSortScript$Factory @no_import {
1515
}
16-
17-
# Class bindings
18-
static_import {
19-
org.elasticsearch.script.Field field(org.elasticsearch.script.NumberSortScript, String) bound_to org.elasticsearch.script.NumberSortScript$FieldAccess
20-
}

modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.script.fields.score.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,8 @@
88

99
# The whitelist for the fields api
1010

11-
# The scripts must be whitelisted for painless to find the classes
11+
# The scripts must be whitelisted for painless to find the classes for the field API
1212
class org.elasticsearch.script.ScoreScript @no_import {
1313
}
1414
class org.elasticsearch.script.ScoreScript$Factory @no_import {
1515
}
16-
17-
# Class bindings
18-
static_import {
19-
org.elasticsearch.script.Field field(org.elasticsearch.script.ScoreScript, String) bound_to org.elasticsearch.script.ScoreScript$FieldAccess
20-
}

modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.script.fields.stringsort.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,8 @@
77
#
88

99
# The whitelist for the fields api
10-
# The scripts must be whitelisted for painless to find the classes
10+
# The scripts must be whitelisted for painless to find the classes for the field API
1111
class org.elasticsearch.script.StringSortScript @no_import {
1212
}
1313
class org.elasticsearch.script.StringSortScript$Factory @no_import {
1414
}
15-
16-
# Class bindings
17-
static_import {
18-
org.elasticsearch.script.Field field(org.elasticsearch.script.StringSortScript, String) bound_to org.elasticsearch.script.StringSortScript$FieldAccess
19-
}

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,4 @@ public Map<String, ScriptDocValues<?>> getDoc() {
6060
}
6161
return docReader.doc();
6262
}
63-
64-
public static class FieldAccess {
65-
private final DocBasedScript script;
66-
67-
public FieldAccess(DocBasedScript script) {
68-
this.script = script;
69-
}
70-
71-
public Field<?> field(String fieldName) {
72-
return script.field(fieldName);
73-
}
74-
}
7563
}

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,4 @@ public interface Factory extends ScriptFactory {
4949
// in LeafFactory.newInstance to set fallbacks.
5050
LeafFactory newFactory(Map<String, Object> params, SearchLookup searchLookup);
5151
}
52-
53-
public static class FieldAccess {
54-
private final NumberSortScript script;
55-
56-
public FieldAccess(NumberSortScript script) {
57-
this.script = script;
58-
}
59-
60-
public Field<?> field(String fieldName) {
61-
return script.field(fieldName);
62-
}
63-
}
6452
}

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -207,16 +207,4 @@ public interface Factory extends ScriptFactory {
207207
}
208208

209209
public static final ScriptContext<ScoreScript.Factory> CONTEXT = new ScriptContext<>("score", ScoreScript.Factory.class);
210-
211-
public static class FieldAccess {
212-
private final ScoreScript script;
213-
214-
public FieldAccess(ScoreScript script) {
215-
this.script = script;
216-
}
217-
218-
public Field<?> field(String fieldName) {
219-
return script.field(fieldName);
220-
}
221-
}
222210
}

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,4 @@ public interface LeafFactory {
3535
public interface Factory extends ScriptFactory {
3636
LeafFactory newFactory(Map<String, Object> params);
3737
}
38-
39-
public static class FieldAccess {
40-
private final StringSortScript script;
41-
42-
public FieldAccess(StringSortScript script) {
43-
this.script = script;
44-
}
45-
46-
public Field<?> field(String fieldName) {
47-
return script.field(fieldName);
48-
}
49-
}
5038
}

0 commit comments

Comments
 (0)