Skip to content

Commit c271d39

Browse files
authored
Move runtime fields base scripts out of scripting fields api package. (#88488)
Two runtime fields script classes were placed into the package for the scripting fields api. These have been moved to the script package where the rest of the runtime fields script classes live. This is a purely mechanical change.
1 parent 08c54f1 commit c271d39

7 files changed

+8
-7
lines changed

server/src/main/java/org/elasticsearch/index/mapper/DateFieldMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
import org.elasticsearch.script.DateFieldScript;
4343
import org.elasticsearch.script.Script;
4444
import org.elasticsearch.script.ScriptCompiler;
45+
import org.elasticsearch.script.SortedNumericDocValuesLongFieldScript;
4546
import org.elasticsearch.script.field.DateMillisDocValuesField;
4647
import org.elasticsearch.script.field.DateNanosDocValuesField;
47-
import org.elasticsearch.script.field.SortedNumericDocValuesLongFieldScript;
4848
import org.elasticsearch.script.field.ToScriptFieldFactory;
4949
import org.elasticsearch.search.DocValueFormat;
5050
import org.elasticsearch.search.lookup.FieldValues;

server/src/main/java/org/elasticsearch/index/mapper/GeoPointFieldMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import org.elasticsearch.script.GeoPointFieldScript;
3535
import org.elasticsearch.script.Script;
3636
import org.elasticsearch.script.ScriptCompiler;
37+
import org.elasticsearch.script.SortedNumericDocValuesLongFieldScript;
3738
import org.elasticsearch.script.field.GeoPointDocValuesField;
38-
import org.elasticsearch.script.field.SortedNumericDocValuesLongFieldScript;
3939
import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
4040
import org.elasticsearch.search.lookup.FieldValues;
4141
import org.elasticsearch.search.lookup.SearchLookup;

server/src/main/java/org/elasticsearch/index/mapper/KeywordFieldMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
import org.elasticsearch.index.similarity.SimilarityProvider;
5353
import org.elasticsearch.script.Script;
5454
import org.elasticsearch.script.ScriptCompiler;
55+
import org.elasticsearch.script.SortedSetDocValuesStringFieldScript;
5556
import org.elasticsearch.script.StringFieldScript;
5657
import org.elasticsearch.script.field.KeywordDocValuesField;
57-
import org.elasticsearch.script.field.SortedSetDocValuesStringFieldScript;
5858
import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
5959
import org.elasticsearch.search.lookup.FieldValues;
6060
import org.elasticsearch.search.lookup.SearchLookup;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.script.field;
9+
package org.elasticsearch.script;
1010

1111
import org.apache.lucene.index.DocValues;
1212
import org.apache.lucene.index.LeafReaderContext;
13-
import org.elasticsearch.script.AbstractLongFieldScript;
13+
import org.elasticsearch.script.field.LongDocValuesField;
1414
import org.elasticsearch.search.lookup.SearchLookup;
1515

1616
import java.io.IOException;

server/src/main/java/org/elasticsearch/script/field/SortedSetDocValuesStringFieldScript.java renamed to server/src/main/java/org/elasticsearch/script/SortedSetDocValuesStringFieldScript.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
* Side Public License, v 1.
77
*/
88

9-
package org.elasticsearch.script.field;
9+
package org.elasticsearch.script;
1010

1111
import org.apache.lucene.index.DocValues;
1212
import org.apache.lucene.index.LeafReaderContext;
1313
import org.apache.lucene.index.SortedSetDocValues;
1414
import org.apache.lucene.util.BytesRef;
15-
import org.elasticsearch.script.StringFieldScript;
1615
import org.elasticsearch.search.lookup.SearchLookup;
1716

1817
import java.io.IOException;

server/src/test/java/org/elasticsearch/script/field/SortedNumericDocValuesLongFieldScriptTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.apache.lucene.store.Directory;
1717
import org.apache.lucene.tests.index.RandomIndexWriter;
1818
import org.elasticsearch.script.AbstractFieldScript;
19+
import org.elasticsearch.script.SortedNumericDocValuesLongFieldScript;
1920
import org.elasticsearch.search.lookup.SearchLookup;
2021
import org.elasticsearch.test.ESTestCase;
2122

server/src/test/java/org/elasticsearch/script/field/SortedSetDocValuesStringFieldScriptTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.apache.lucene.tests.index.RandomIndexWriter;
1818
import org.apache.lucene.util.BytesRef;
1919
import org.elasticsearch.script.AbstractFieldScript;
20+
import org.elasticsearch.script.SortedSetDocValuesStringFieldScript;
2021
import org.elasticsearch.search.lookup.SearchLookup;
2122
import org.elasticsearch.test.ESTestCase;
2223

0 commit comments

Comments
 (0)