Rename EmitValues subclass for String to avoid naming conflict with p…

…rimitive type
qreshi · Mar 18, 2024 · cc4a634 · cc4a634
1 parent 328d01b
commit cc4a634
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...s/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.derived.txt b/...s/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.derived.txt
@@ -27,5 +27,5 @@ static_import {
     void emitDouble(org.opensearch.script.DerivedFieldScript, double) bound_to org.opensearch.script.ScriptEmitValues$Double
     void emitGeoPoint(org.opensearch.script.DerivedFieldScript, double, double) bound_to org.opensearch.script.ScriptEmitValues$GeoPoint
     void emitBoolean(org.opensearch.script.DerivedFieldScript, boolean) bound_to org.opensearch.script.ScriptEmitValues$Boolean
-    void emitString(org.opensearch.script.DerivedFieldScript, String) bound_to org.opensearch.script.ScriptEmitValues$String
+    void emitString(org.opensearch.script.DerivedFieldScript, String) bound_to org.opensearch.script.ScriptEmitValues$Strings
 }
diff --git a/server/src/main/java/org/opensearch/script/DerivedFieldScript.java b/server/src/main/java/org/opensearch/script/DerivedFieldScript.java
@@ -27,7 +27,7 @@
  *
  * @opensearch.internal
  */
-public class DerivedFieldScript {
+public abstract class DerivedFieldScript {
 
     public static final String[] PARAMETERS = {};
 

diff --git a/server/src/main/java/org/opensearch/script/ScriptEmitValues.java b/server/src/main/java/org/opensearch/script/ScriptEmitValues.java
@@ -77,11 +77,11 @@ public void emitBoolean(boolean val) {
     }
 
     // Emits a String value
-    public static final class String {
+    public static final class Strings {
 
         private final DerivedFieldScript derivedFieldScript;
 
-        public String(DerivedFieldScript derivedFieldScript) {
+        public Strings(DerivedFieldScript derivedFieldScript) {
             this.derivedFieldScript = derivedFieldScript;
         }