diff --git a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPainlessExtension.java b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPainlessExtension.java index c85ba06b602..48687801888 100644 --- a/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPainlessExtension.java +++ b/modules/analysis-common/src/main/java/org/opensearch/analysis/common/AnalysisPainlessExtension.java @@ -19,9 +19,9 @@ package org.opensearch.analysis.common; -import org.elasticsearch.painless.spi.PainlessExtension; -import org.elasticsearch.painless.spi.Whitelist; -import org.elasticsearch.painless.spi.WhitelistLoader; +import org.opensearch.painless.spi.PainlessExtension; +import org.opensearch.painless.spi.Whitelist; +import org.opensearch.painless.spi.WhitelistLoader; import org.elasticsearch.script.ScriptContext; import java.util.Collections; diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ProcessorsWhitelistExtension.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ProcessorsWhitelistExtension.java index cb9285a7467..9415ebf4298 100644 --- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ProcessorsWhitelistExtension.java +++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/ProcessorsWhitelistExtension.java @@ -19,9 +19,9 @@ package org.opensearch.ingest.common; -import org.elasticsearch.painless.spi.PainlessExtension; -import org.elasticsearch.painless.spi.Whitelist; -import org.elasticsearch.painless.spi.WhitelistLoader; +import org.opensearch.painless.spi.PainlessExtension; +import org.opensearch.painless.spi.Whitelist; +import org.opensearch.painless.spi.WhitelistLoader; import org.elasticsearch.script.IngestScript; import org.elasticsearch.script.ScriptContext; diff --git a/modules/ingest-common/src/main/resources/META-INF/services/org.elasticsearch.painless.spi.PainlessExtension b/modules/ingest-common/src/main/resources/META-INF/services/org.opensearch.painless.spi.PainlessExtension similarity index 100% rename from modules/ingest-common/src/main/resources/META-INF/services/org.elasticsearch.painless.spi.PainlessExtension rename to modules/ingest-common/src/main/resources/META-INF/services/org.opensearch.painless.spi.PainlessExtension diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle index 12d18b84f77..0a70d7ced63 100644 --- a/modules/lang-painless/build.gradle +++ b/modules/lang-painless/build.gradle @@ -17,13 +17,13 @@ * under the License. */ -import org.elasticsearch.gradle.testclusters.DefaultTestClustersTask; -apply plugin: 'elasticsearch.validate-rest-spec' -apply plugin: 'elasticsearch.yaml-rest-test' +import org.opensearch.gradle.testclusters.DefaultTestClustersTask; +apply plugin: 'opensearch.validate-rest-spec' +apply plugin: 'opensearch.yaml-rest-test' esplugin { - description 'An easy, safe and fast scripting language for Elasticsearch' - classname 'org.elasticsearch.painless.PainlessPlugin' + description 'An easy, safe and fast scripting language for OpenSearch' + classname 'org.opensearch.painless.PainlessPlugin' } testClusters.all { @@ -64,7 +64,7 @@ tasks.named("test").configure { tasks.register("apiJavadoc", Javadoc) { source = sourceSets.main.allJava classpath = sourceSets.main.runtimeClasspath - include '**/org/elasticsearch/painless/api/' + include '**/org/opensearch/painless/api/' destinationDir = new File(docsDir, 'apiJavadoc') } @@ -100,7 +100,7 @@ tasks.register("generateContextDoc", DefaultTestClustersTask) { useCluster testClusters.generateContextCluster doFirst { project.javaexec { - main = 'org.elasticsearch.painless.ContextDocGenerator' + main = 'org.opensearch.painless.ContextDocGenerator' classpath = sourceSets.doc.runtimeClasspath systemProperty "cluster.uri", "${-> testClusters.generateContextCluster.singleNode().getAllHttpSocketURI().get(0)}" }.assertNormalExitValue() @@ -120,7 +120,7 @@ dependencies { } String grammarPath = 'src/main/antlr' -String outputPath = 'src/main/java/org/elasticsearch/painless/antlr' +String outputPath = 'src/main/java/org/opensearch/painless/antlr' tasks.register("cleanGenerated", Delete) { delete fileTree(grammarPath) { @@ -140,7 +140,7 @@ tasks.register("regenLexer", JavaExec) { systemProperty 'user.country', 'US' systemProperty 'user.variant', '' args '-Werror', - '-package', 'org.elasticsearch.painless.antlr', + '-package', 'org.opensearch.painless.antlr', '-o', outputPath, "${file(grammarPath)}/PainlessLexer.g4" } @@ -154,7 +154,7 @@ tasks.register("regenParser", JavaExec) { systemProperty 'user.country', 'US' systemProperty 'user.variant', '' args '-Werror', - '-package', 'org.elasticsearch.painless.antlr', + '-package', 'org.opensearch.painless.antlr', '-no-listener', '-visitor', // '-Xlog', diff --git a/modules/lang-painless/spi/build.gradle b/modules/lang-painless/spi/build.gradle index d0bf8639045..0f8fb469e13 100644 --- a/modules/lang-painless/spi/build.gradle +++ b/modules/lang-painless/spi/build.gradle @@ -17,11 +17,11 @@ * under the License. */ -apply plugin: 'elasticsearch.build' -apply plugin: 'elasticsearch.publish' +apply plugin: 'opensearch.build' +apply plugin: 'opensearch.publish' -group = 'org.elasticsearch.plugin' -archivesBaseName = 'elasticsearch-scripting-painless-spi' +group = 'org.opensearch.plugin' +archivesBaseName = 'opensearch-scripting-painless-spi' dependencies { api project(":server") diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/PainlessExtension.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/PainlessExtension.java similarity index 96% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/PainlessExtension.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/PainlessExtension.java index eb971353437..c7068d49ca0 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/PainlessExtension.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/PainlessExtension.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi; +package org.opensearch.painless.spi; import org.elasticsearch.script.ScriptContext; diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/Whitelist.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/Whitelist.java similarity index 96% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/Whitelist.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/Whitelist.java index d79c6059868..55494aeab6e 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/Whitelist.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/Whitelist.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless.spi; +package org.opensearch.painless.spi; -import org.elasticsearch.painless.spi.annotation.WhitelistAnnotationParser; +import org.opensearch.painless.spi.annotation.WhitelistAnnotationParser; import java.util.Collections; import java.util.List; @@ -38,7 +38,7 @@ import java.util.Objects; public final class Whitelist { private static final String[] BASE_WHITELIST_FILES = new String[] { - "org.elasticsearch.txt", + "org.opensearch.txt", "java.lang.txt", "java.math.txt", "java.text.txt", diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistClass.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistClass.java similarity index 99% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistClass.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistClass.java index 3f2bf3e997a..7b594766e20 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistClass.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistClass.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi; +package org.opensearch.painless.spi; import java.util.AbstractMap; import java.util.Collections; diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistClassBinding.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistClassBinding.java similarity index 98% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistClassBinding.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistClassBinding.java index f3ba052156d..c26d7d62e87 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistClassBinding.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistClassBinding.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi; +package org.opensearch.painless.spi; import java.util.AbstractMap; import java.util.Collections; diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistConstructor.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistConstructor.java similarity index 98% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistConstructor.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistConstructor.java index 13aec63fceb..6507616c6e0 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistConstructor.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistConstructor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi; +package org.opensearch.painless.spi; import java.util.AbstractMap; import java.util.Collections; diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistField.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistField.java similarity index 98% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistField.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistField.java index 84f12e90758..fdfbfcb8d44 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistField.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistField.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi; +package org.opensearch.painless.spi; import java.util.AbstractMap; import java.util.Collections; diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistInstanceBinding.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistInstanceBinding.java similarity index 98% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistInstanceBinding.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistInstanceBinding.java index 2a41f873bf8..805fa658ab9 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistInstanceBinding.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistInstanceBinding.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi; +package org.opensearch.painless.spi; import java.util.AbstractMap; import java.util.Collections; diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistLoader.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistLoader.java similarity index 99% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistLoader.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistLoader.java index 73e3a6634ac..f05d3be343b 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistLoader.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistLoader.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless.spi; +package org.opensearch.painless.spi; -import org.elasticsearch.painless.spi.annotation.WhitelistAnnotationParser; +import org.opensearch.painless.spi.annotation.WhitelistAnnotationParser; import java.io.InputStreamReader; import java.io.LineNumberReader; diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistMethod.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistMethod.java similarity index 99% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistMethod.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistMethod.java index 838fcba5034..e5edbb9843c 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistMethod.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/WhitelistMethod.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi; +package org.opensearch.painless.spi; import java.util.AbstractMap; import java.util.Collections; diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/DeprecatedAnnotation.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/DeprecatedAnnotation.java similarity index 95% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/DeprecatedAnnotation.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/DeprecatedAnnotation.java index b7162e3d6bf..0d123a09042 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/DeprecatedAnnotation.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/DeprecatedAnnotation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi.annotation; +package org.opensearch.painless.spi.annotation; public class DeprecatedAnnotation { diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/DeprecatedAnnotationParser.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/DeprecatedAnnotationParser.java similarity index 96% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/DeprecatedAnnotationParser.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/DeprecatedAnnotationParser.java index c0992969c22..b0c3758237e 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/DeprecatedAnnotationParser.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/DeprecatedAnnotationParser.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi.annotation; +package org.opensearch.painless.spi.annotation; import java.util.Map; diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/InjectConstantAnnotation.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/InjectConstantAnnotation.java similarity index 96% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/InjectConstantAnnotation.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/InjectConstantAnnotation.java index b4b810ffc96..134c02e4f94 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/InjectConstantAnnotation.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/InjectConstantAnnotation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi.annotation; +package org.opensearch.painless.spi.annotation; import java.util.Collections; import java.util.List; diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/InjectConstantAnnotationParser.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/InjectConstantAnnotationParser.java similarity index 97% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/InjectConstantAnnotationParser.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/InjectConstantAnnotationParser.java index 765c1b22245..bb9633a2636 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/InjectConstantAnnotationParser.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/InjectConstantAnnotationParser.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi.annotation; +package org.opensearch.painless.spi.annotation; import java.util.ArrayList; import java.util.Map; diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/NoImportAnnotation.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/NoImportAnnotation.java similarity index 95% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/NoImportAnnotation.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/NoImportAnnotation.java index ceec4740b39..732984fa257 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/NoImportAnnotation.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/NoImportAnnotation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi.annotation; +package org.opensearch.painless.spi.annotation; public class NoImportAnnotation { diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/NoImportAnnotationParser.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/NoImportAnnotationParser.java similarity index 96% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/NoImportAnnotationParser.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/NoImportAnnotationParser.java index e8027b56e41..06255d8979e 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/NoImportAnnotationParser.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/NoImportAnnotationParser.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi.annotation; +package org.opensearch.painless.spi.annotation; import java.util.Map; diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/NonDeterministicAnnotation.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/NonDeterministicAnnotation.java similarity index 95% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/NonDeterministicAnnotation.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/NonDeterministicAnnotation.java index 9724e424314..4b6ac426778 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/NonDeterministicAnnotation.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/NonDeterministicAnnotation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi.annotation; +package org.opensearch.painless.spi.annotation; public class NonDeterministicAnnotation { diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/NonDeterministicAnnotationParser.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/NonDeterministicAnnotationParser.java similarity index 96% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/NonDeterministicAnnotationParser.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/NonDeterministicAnnotationParser.java index 4277cf3b1d6..92a8b7f13a9 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/NonDeterministicAnnotationParser.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/NonDeterministicAnnotationParser.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi.annotation; +package org.opensearch.painless.spi.annotation; import java.util.Map; diff --git a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/WhitelistAnnotationParser.java b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/WhitelistAnnotationParser.java similarity index 97% rename from modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/WhitelistAnnotationParser.java rename to modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/WhitelistAnnotationParser.java index 43acf061e06..ef117a64848 100644 --- a/modules/lang-painless/spi/src/main/java/org/elasticsearch/painless/spi/annotation/WhitelistAnnotationParser.java +++ b/modules/lang-painless/spi/src/main/java/org/opensearch/painless/spi/annotation/WhitelistAnnotationParser.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.spi.annotation; +package org.opensearch.painless.spi.annotation; import java.util.AbstractMap; import java.util.Collections; diff --git a/modules/lang-painless/src/doc/java/org/elasticsearch/painless/ContextDocGenerator.java b/modules/lang-painless/src/doc/java/org/opensearch/painless/ContextDocGenerator.java similarity index 96% rename from modules/lang-painless/src/doc/java/org/elasticsearch/painless/ContextDocGenerator.java rename to modules/lang-painless/src/doc/java/org/opensearch/painless/ContextDocGenerator.java index 85b60b13043..05ecea20df0 100644 --- a/modules/lang-painless/src/doc/java/org/elasticsearch/painless/ContextDocGenerator.java +++ b/modules/lang-painless/src/doc/java/org/opensearch/painless/ContextDocGenerator.java @@ -17,20 +17,20 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.io.PathUtils; import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.core.internal.io.IOUtils; -import org.elasticsearch.painless.action.PainlessContextClassBindingInfo; -import org.elasticsearch.painless.action.PainlessContextClassInfo; -import org.elasticsearch.painless.action.PainlessContextConstructorInfo; -import org.elasticsearch.painless.action.PainlessContextFieldInfo; -import org.elasticsearch.painless.action.PainlessContextInfo; -import org.elasticsearch.painless.action.PainlessContextInstanceBindingInfo; -import org.elasticsearch.painless.action.PainlessContextMethodInfo; +import org.opensearch.painless.action.PainlessContextClassBindingInfo; +import org.opensearch.painless.action.PainlessContextClassInfo; +import org.opensearch.painless.action.PainlessContextConstructorInfo; +import org.opensearch.painless.action.PainlessContextFieldInfo; +import org.opensearch.painless.action.PainlessContextInfo; +import org.opensearch.painless.action.PainlessContextInstanceBindingInfo; +import org.opensearch.painless.action.PainlessContextMethodInfo; import java.io.IOException; import java.io.PrintStream; @@ -488,9 +488,9 @@ public final class ContextDocGenerator { stream.print("* " + getType(javaNamesToDisplayNames, classBindingInfo.getRtn()) + " " + classBindingInfo.getName() + "("); for (int parameterIndex = 0; parameterIndex < classBindingInfo.getParameters().size(); ++parameterIndex) { - // temporary fix to not print org.elasticsearch.script.ScoreScript parameter until + // temporary fix to not print org.opensearch.script.ScoreScript parameter until // class instance bindings are created and the information is appropriately added to the context info classes - if ("org.elasticsearch.script.ScoreScript".equals( + if ("org.opensearch.script.ScoreScript".equals( getType(javaNamesToDisplayNames, classBindingInfo.getParameters().get(parameterIndex)))) { continue; } @@ -572,7 +572,7 @@ public final class ContextDocGenerator { javaType = "float"; } else if ("D".equals(javaType) || "double".equals(javaType)) { javaType = "double"; - } else if ("org.elasticsearch.painless.lookup.def".equals(javaType)) { + } else if ("org.opensearch.painless.lookup.def".equals(javaType)) { javaType = "def"; } else { javaType = javaNamesToDisplayNames.get(javaType); @@ -670,7 +670,7 @@ public final class ContextDocGenerator { javaType = "float"; } else if ("D".equals(javaType) || "double".equals(javaType)) { javaType = "double"; - } else if ("org.elasticsearch.painless.lookup.def".equals(javaType)) { + } else if ("org.opensearch.painless.lookup.def".equals(javaType)) { javaType = "java.lang.Object"; } @@ -748,7 +748,7 @@ public final class ContextDocGenerator { "void".equals(v.getName()) || "boolean".equals(v.getName()) || "byte".equals(v.getName()) || "short".equals(v.getName()) || "char".equals(v.getName()) || "int".equals(v.getName()) || "long".equals(v.getName()) || "float".equals(v.getName()) || "double".equals(v.getName()) || - "org.elasticsearch.painless.lookup.def".equals(v.getName()) || + "org.opensearch.painless.lookup.def".equals(v.getName()) || isInternalClass(v.getName()) || classExcludes.contains(v) ); @@ -797,8 +797,8 @@ public final class ContextDocGenerator { } private static boolean isInternalClass(String javaName) { - return javaName.equals("org.elasticsearch.script.ScoreScript") || - javaName.equals("org.elasticsearch.script.ScoreScript$ExplanationHolder"); + return javaName.equals("org.opensearch.script.ScoreScript") || + javaName.equals("org.opensearch.script.ScoreScript$ExplanationHolder"); } private ContextDocGenerator() { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/AnalyzerCaster.java b/modules/lang-painless/src/main/java/org/opensearch/painless/AnalyzerCaster.java similarity index 99% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/AnalyzerCaster.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/AnalyzerCaster.java index 4a8f95d0a69..02cf44f13c6 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/AnalyzerCaster.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/AnalyzerCaster.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.lookup.PainlessCast; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.lookup.def; +import org.opensearch.painless.lookup.PainlessCast; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.def; import org.elasticsearch.script.JodaCompatibleZonedDateTime; import java.time.ZonedDateTime; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ClassWriter.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ClassWriter.java similarity index 99% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ClassWriter.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ClassWriter.java index 320eee3b928..116389c64a7 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ClassWriter.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ClassWriter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.Opcodes; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Compiler.java b/modules/lang-painless/src/main/java/org/opensearch/painless/Compiler.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/Compiler.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/Compiler.java index 890b2f22d13..9c450b277b5 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Compiler.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/Compiler.java @@ -17,22 +17,22 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.elasticsearch.bootstrap.BootstrapInfo; -import org.elasticsearch.painless.antlr.Walker; -import org.elasticsearch.painless.ir.ClassNode; -import org.elasticsearch.painless.lookup.PainlessLookup; -import org.elasticsearch.painless.node.SClass; -import org.elasticsearch.painless.phase.DefaultConstantFoldingOptimizationPhase; -import org.elasticsearch.painless.phase.DefaultStringConcatenationOptimizationPhase; -import org.elasticsearch.painless.phase.DocFieldsPhase; -import org.elasticsearch.painless.phase.PainlessSemanticAnalysisPhase; -import org.elasticsearch.painless.phase.PainlessSemanticHeaderPhase; -import org.elasticsearch.painless.phase.PainlessUserTreeToIRTreePhase; -import org.elasticsearch.painless.spi.Whitelist; -import org.elasticsearch.painless.symbol.Decorations.IRNodeDecoration; -import org.elasticsearch.painless.symbol.ScriptScope; +import org.opensearch.painless.antlr.Walker; +import org.opensearch.painless.ir.ClassNode; +import org.opensearch.painless.lookup.PainlessLookup; +import org.opensearch.painless.node.SClass; +import org.opensearch.painless.phase.DefaultConstantFoldingOptimizationPhase; +import org.opensearch.painless.phase.DefaultStringConcatenationOptimizationPhase; +import org.opensearch.painless.phase.DocFieldsPhase; +import org.opensearch.painless.phase.PainlessSemanticAnalysisPhase; +import org.opensearch.painless.phase.PainlessSemanticHeaderPhase; +import org.opensearch.painless.phase.PainlessUserTreeToIRTreePhase; +import org.opensearch.painless.spi.Whitelist; +import org.opensearch.painless.symbol.Decorations.IRNodeDecoration; +import org.opensearch.painless.symbol.ScriptScope; import org.objectweb.asm.util.Printer; import java.lang.reflect.Method; @@ -46,7 +46,7 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import static org.elasticsearch.painless.WriterConstants.CLASS_NAME; +import static org.opensearch.painless.WriterConstants.CLASS_NAME; /** * The Compiler is the entry point for generating a Painless script. The compiler will receive a Painless diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/CompilerSettings.java b/modules/lang-painless/src/main/java/org/opensearch/painless/CompilerSettings.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/CompilerSettings.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/CompilerSettings.java index 8909e11cf3c..a780b7b1db2 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/CompilerSettings.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/CompilerSettings.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting.Property; -import org.elasticsearch.painless.api.Augmentation; +import org.opensearch.painless.api.Augmentation; import java.util.HashMap; import java.util.Map; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Constant.java b/modules/lang-painless/src/main/java/org/opensearch/painless/Constant.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/Constant.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/Constant.java index d42c267fc3f..e4c37e0f9b6 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Constant.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/Constant.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import java.util.function.Consumer; @@ -29,7 +29,7 @@ public class Constant { public final String name; public final org.objectweb.asm.Type type; public final Consumer initializer; - + /** * Create a new constant. * diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Def.java b/modules/lang-painless/src/main/java/org/opensearch/painless/Def.java similarity index 99% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/Def.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/Def.java index a473d1e5d19..d9fedec4740 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Def.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/Def.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.lookup.PainlessLookup; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.symbol.FunctionTable; +import org.opensearch.painless.lookup.PainlessLookup; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.symbol.FunctionTable; import org.elasticsearch.script.JodaCompatibleZonedDateTime; import java.lang.invoke.CallSite; @@ -39,7 +39,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.elasticsearch.painless.lookup.PainlessLookupUtility.typeToCanonicalTypeName; +import static org.opensearch.painless.lookup.PainlessLookupUtility.typeToCanonicalTypeName; /** * Support for dynamic type (def). diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/DefBootstrap.java b/modules/lang-painless/src/main/java/org/opensearch/painless/DefBootstrap.java similarity index 99% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/DefBootstrap.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/DefBootstrap.java index f67f8a53348..578e7c95a74 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/DefBootstrap.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/DefBootstrap.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.elasticsearch.common.SuppressForbidden; -import org.elasticsearch.painless.lookup.PainlessLookup; -import org.elasticsearch.painless.symbol.FunctionTable; +import org.opensearch.painless.lookup.PainlessLookup; +import org.opensearch.painless.symbol.FunctionTable; import java.lang.invoke.CallSite; import java.lang.invoke.MethodHandle; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/DefMath.java b/modules/lang-painless/src/main/java/org/opensearch/painless/DefMath.java similarity index 99% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/DefMath.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/DefMath.java index 01d627e3962..6f0b1d89c3e 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/DefMath.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/DefMath.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/FunctionRef.java b/modules/lang-painless/src/main/java/org/opensearch/painless/FunctionRef.java similarity index 96% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/FunctionRef.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/FunctionRef.java index ed8402b74a0..81ec3c8c8cc 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/FunctionRef.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/FunctionRef.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.lookup.PainlessConstructor; -import org.elasticsearch.painless.lookup.PainlessLookup; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.symbol.FunctionTable; -import org.elasticsearch.painless.symbol.FunctionTable.LocalFunction; +import org.opensearch.painless.lookup.PainlessConstructor; +import org.opensearch.painless.lookup.PainlessLookup; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.symbol.FunctionTable; +import org.opensearch.painless.symbol.FunctionTable.LocalFunction; import java.lang.invoke.MethodType; import java.lang.reflect.Modifier; @@ -33,7 +33,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import static org.elasticsearch.painless.WriterConstants.CLASS_NAME; +import static org.opensearch.painless.WriterConstants.CLASS_NAME; import static org.objectweb.asm.Opcodes.H_INVOKEINTERFACE; import static org.objectweb.asm.Opcodes.H_INVOKESTATIC; import static org.objectweb.asm.Opcodes.H_INVOKEVIRTUAL; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Globals.java b/modules/lang-painless/src/main/java/org/opensearch/painless/Globals.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/Globals.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/Globals.java index 31cefbcf0c2..e77cef786c8 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Globals.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/Globals.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import java.util.BitSet; import java.util.HashMap; @@ -29,12 +29,12 @@ import java.util.Map; public class Globals { private final Map constantInitializers = new HashMap<>(); private final BitSet statements; - + /** Create a new Globals from the set of statement boundaries */ public Globals(BitSet statements) { this.statements = statements; } - + /** Adds a new constant initializer to be written */ public void addConstantInitializer(Constant constant) { if (constantInitializers.put(constant.name, constant) != null) { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/LambdaBootstrap.java b/modules/lang-painless/src/main/java/org/opensearch/painless/LambdaBootstrap.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/LambdaBootstrap.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/LambdaBootstrap.java index 12a9ccc34bd..f7fe6d29988 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/LambdaBootstrap.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/LambdaBootstrap.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.FieldVisitor; @@ -36,9 +36,9 @@ import java.security.AccessController; import java.security.PrivilegedAction; import static java.lang.invoke.MethodHandles.Lookup; -import static org.elasticsearch.painless.WriterConstants.CLASS_VERSION; -import static org.elasticsearch.painless.WriterConstants.CTOR_METHOD_NAME; -import static org.elasticsearch.painless.WriterConstants.DELEGATE_BOOTSTRAP_HANDLE; +import static org.opensearch.painless.WriterConstants.CLASS_VERSION; +import static org.opensearch.painless.WriterConstants.CTOR_METHOD_NAME; +import static org.opensearch.painless.WriterConstants.DELEGATE_BOOTSTRAP_HANDLE; import static org.objectweb.asm.Opcodes.ACC_FINAL; import static org.objectweb.asm.Opcodes.ACC_PRIVATE; import static org.objectweb.asm.Opcodes.ACC_PUBLIC; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Location.java b/modules/lang-painless/src/main/java/org/opensearch/painless/Location.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/Location.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/Location.java index d90baa06551..e5f4b3a9e3c 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Location.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/Location.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/MethodWriter.java b/modules/lang-painless/src/main/java/org/opensearch/painless/MethodWriter.java similarity index 82% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/MethodWriter.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/MethodWriter.java index 692d9aa0655..97d6c17356a 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/MethodWriter.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/MethodWriter.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.lookup.PainlessCast; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.lookup.def; +import org.opensearch.painless.lookup.PainlessCast; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.lookup.def; import org.elasticsearch.script.JodaCompatibleZonedDateTime; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.Label; @@ -39,61 +39,61 @@ import java.util.BitSet; import java.util.Deque; import java.util.List; -import static org.elasticsearch.painless.WriterConstants.CHAR_TO_STRING; -import static org.elasticsearch.painless.WriterConstants.DEF_BOOTSTRAP_HANDLE; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_BOOLEAN; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_BYTE_EXPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_BYTE_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_CHARACTER_EXPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_CHARACTER_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_DOUBLE_EXPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_DOUBLE_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_FLOAT_EXPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_FLOAT_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_INTEGER_EXPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_INTEGER_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_LONG_EXPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_LONG_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_SHORT_EXPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_SHORT_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_P_BOOLEAN; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_P_BYTE_EXPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_P_BYTE_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_P_CHAR_EXPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_P_CHAR_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_P_DOUBLE_EXPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_P_DOUBLE_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_P_FLOAT_EXPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_P_FLOAT_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_P_INT_EXPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_P_INT_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_P_LONG_EXPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_P_LONG_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_P_SHORT_EXPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_P_SHORT_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_STRING_EXPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_STRING_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_ZONEDDATETIME; -import static org.elasticsearch.painless.WriterConstants.DEF_UTIL_TYPE; -import static org.elasticsearch.painless.WriterConstants.INDY_STRING_CONCAT_BOOTSTRAP_HANDLE; -import static org.elasticsearch.painless.WriterConstants.JCZDT_TO_ZONEDDATETIME; -import static org.elasticsearch.painless.WriterConstants.LAMBDA_BOOTSTRAP_HANDLE; -import static org.elasticsearch.painless.WriterConstants.MAX_INDY_STRING_CONCAT_ARGS; -import static org.elasticsearch.painless.WriterConstants.PAINLESS_ERROR_TYPE; -import static org.elasticsearch.painless.WriterConstants.STRINGBUILDER_APPEND_BOOLEAN; -import static org.elasticsearch.painless.WriterConstants.STRINGBUILDER_APPEND_CHAR; -import static org.elasticsearch.painless.WriterConstants.STRINGBUILDER_APPEND_DOUBLE; -import static org.elasticsearch.painless.WriterConstants.STRINGBUILDER_APPEND_FLOAT; -import static org.elasticsearch.painless.WriterConstants.STRINGBUILDER_APPEND_INT; -import static org.elasticsearch.painless.WriterConstants.STRINGBUILDER_APPEND_LONG; -import static org.elasticsearch.painless.WriterConstants.STRINGBUILDER_APPEND_OBJECT; -import static org.elasticsearch.painless.WriterConstants.STRINGBUILDER_APPEND_STRING; -import static org.elasticsearch.painless.WriterConstants.STRINGBUILDER_CONSTRUCTOR; -import static org.elasticsearch.painless.WriterConstants.STRINGBUILDER_TOSTRING; -import static org.elasticsearch.painless.WriterConstants.STRINGBUILDER_TYPE; -import static org.elasticsearch.painless.WriterConstants.STRING_TO_CHAR; -import static org.elasticsearch.painless.WriterConstants.STRING_TYPE; -import static org.elasticsearch.painless.WriterConstants.UTILITY_TYPE; +import static org.opensearch.painless.WriterConstants.CHAR_TO_STRING; +import static org.opensearch.painless.WriterConstants.DEF_BOOTSTRAP_HANDLE; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_BOOLEAN; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_BYTE_EXPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_BYTE_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_CHARACTER_EXPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_CHARACTER_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_DOUBLE_EXPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_DOUBLE_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_FLOAT_EXPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_FLOAT_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_INTEGER_EXPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_INTEGER_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_LONG_EXPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_LONG_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_SHORT_EXPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_SHORT_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_P_BOOLEAN; +import static org.opensearch.painless.WriterConstants.DEF_TO_P_BYTE_EXPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_P_BYTE_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_P_CHAR_EXPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_P_CHAR_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_P_DOUBLE_EXPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_P_DOUBLE_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_P_FLOAT_EXPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_P_FLOAT_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_P_INT_EXPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_P_INT_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_P_LONG_EXPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_P_LONG_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_P_SHORT_EXPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_P_SHORT_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_STRING_EXPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_STRING_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_ZONEDDATETIME; +import static org.opensearch.painless.WriterConstants.DEF_UTIL_TYPE; +import static org.opensearch.painless.WriterConstants.INDY_STRING_CONCAT_BOOTSTRAP_HANDLE; +import static org.opensearch.painless.WriterConstants.JCZDT_TO_ZONEDDATETIME; +import static org.opensearch.painless.WriterConstants.LAMBDA_BOOTSTRAP_HANDLE; +import static org.opensearch.painless.WriterConstants.MAX_INDY_STRING_CONCAT_ARGS; +import static org.opensearch.painless.WriterConstants.PAINLESS_ERROR_TYPE; +import static org.opensearch.painless.WriterConstants.STRINGBUILDER_APPEND_BOOLEAN; +import static org.opensearch.painless.WriterConstants.STRINGBUILDER_APPEND_CHAR; +import static org.opensearch.painless.WriterConstants.STRINGBUILDER_APPEND_DOUBLE; +import static org.opensearch.painless.WriterConstants.STRINGBUILDER_APPEND_FLOAT; +import static org.opensearch.painless.WriterConstants.STRINGBUILDER_APPEND_INT; +import static org.opensearch.painless.WriterConstants.STRINGBUILDER_APPEND_LONG; +import static org.opensearch.painless.WriterConstants.STRINGBUILDER_APPEND_OBJECT; +import static org.opensearch.painless.WriterConstants.STRINGBUILDER_APPEND_STRING; +import static org.opensearch.painless.WriterConstants.STRINGBUILDER_CONSTRUCTOR; +import static org.opensearch.painless.WriterConstants.STRINGBUILDER_TOSTRING; +import static org.opensearch.painless.WriterConstants.STRINGBUILDER_TYPE; +import static org.opensearch.painless.WriterConstants.STRING_TO_CHAR; +import static org.opensearch.painless.WriterConstants.STRING_TYPE; +import static org.opensearch.painless.WriterConstants.UTILITY_TYPE; /** * Extension of {@link GeneratorAdapter} with some utility methods. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Operation.java b/modules/lang-painless/src/main/java/org/opensearch/painless/Operation.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/Operation.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/Operation.java index 6171a671606..e44d963a5c6 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Operation.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/Operation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** * Provides a way to represent operations independently of ASM, to keep ASM diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessError.java b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessError.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessError.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/PainlessError.java index f2709272667..e432b97c4c3 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessError.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessError.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** * The PainlessError class is used to throw internal errors caused by Painless scripts that cannot be diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessExplainError.java b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessExplainError.java similarity index 90% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessExplainError.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/PainlessExplainError.java index e4988103bc6..e3b2531dae3 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessExplainError.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessExplainError.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.api.Debug; -import org.elasticsearch.painless.lookup.PainlessClass; -import org.elasticsearch.painless.lookup.PainlessLookup; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.api.Debug; +import org.opensearch.painless.lookup.PainlessClass; +import org.opensearch.painless.lookup.PainlessLookup; +import org.opensearch.painless.lookup.PainlessLookupUtility; import org.elasticsearch.script.ScriptException; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java similarity index 96% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java index 6cf1fd85535..13b49296dc7 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessPlugin.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.apache.lucene.util.SetOnce; @@ -36,11 +36,11 @@ import org.elasticsearch.common.settings.SettingsFilter; import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.env.Environment; import org.elasticsearch.env.NodeEnvironment; -import org.elasticsearch.painless.action.PainlessContextAction; -import org.elasticsearch.painless.action.PainlessExecuteAction; -import org.elasticsearch.painless.spi.PainlessExtension; -import org.elasticsearch.painless.spi.Whitelist; -import org.elasticsearch.painless.spi.WhitelistLoader; +import org.opensearch.painless.action.PainlessContextAction; +import org.opensearch.painless.action.PainlessExecuteAction; +import org.opensearch.painless.spi.PainlessExtension; +import org.opensearch.painless.spi.Whitelist; +import org.opensearch.painless.spi.WhitelistLoader; import org.elasticsearch.plugins.ActionPlugin; import org.elasticsearch.plugins.ExtensiblePlugin; import org.elasticsearch.plugins.Plugin; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScript.java b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScript.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScript.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScript.java index 280783921d5..136b32e92be 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScript.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScript.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.elasticsearch.script.ScriptException; @@ -102,7 +102,7 @@ public interface PainlessScript { /** returns true for methods that are part of the runtime */ default boolean shouldFilter(StackTraceElement element) { - return element.getClassName().startsWith("org.elasticsearch.painless.") || + return element.getClassName().startsWith("org.opensearch.painless.") || element.getClassName().startsWith("java.lang.invoke.") || element.getClassName().startsWith("sun.invoke."); } diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScriptEngine.java b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScriptEngine.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScriptEngine.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScriptEngine.java index 8706b96549d..cb3730636bf 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessScriptEngine.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/PainlessScriptEngine.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.elasticsearch.SpecialPermission; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.painless.Compiler.Loader; -import org.elasticsearch.painless.lookup.PainlessLookup; -import org.elasticsearch.painless.lookup.PainlessLookupBuilder; -import org.elasticsearch.painless.spi.Whitelist; -import org.elasticsearch.painless.symbol.ScriptScope; +import org.opensearch.painless.Compiler.Loader; +import org.opensearch.painless.lookup.PainlessLookup; +import org.opensearch.painless.lookup.PainlessLookupBuilder; +import org.opensearch.painless.spi.Whitelist; +import org.opensearch.painless.symbol.ScriptScope; import org.elasticsearch.script.ScriptContext; import org.elasticsearch.script.ScriptEngine; import org.elasticsearch.script.ScriptException; @@ -49,7 +49,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.elasticsearch.painless.WriterConstants.OBJECT_TYPE; +import static org.opensearch.painless.WriterConstants.OBJECT_TYPE; /** * Implementation of a ScriptEngine for the Painless language. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ScriptClassInfo.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ScriptClassInfo.java similarity index 96% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ScriptClassInfo.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ScriptClassInfo.java index 40c4d6503b2..3172e2c39db 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ScriptClassInfo.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ScriptClassInfo.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.lookup.PainlessLookup; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.lookup.def; -import org.elasticsearch.painless.symbol.FunctionTable; +import org.opensearch.painless.lookup.PainlessLookup; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.def; +import org.opensearch.painless.symbol.FunctionTable; import java.lang.invoke.MethodType; import java.lang.reflect.Field; @@ -33,7 +33,7 @@ import java.util.List; import java.util.function.Function; import static java.util.Collections.unmodifiableList; -import static org.elasticsearch.painless.WriterConstants.NEEDS_PARAMETER_METHOD_TYPE; +import static org.opensearch.painless.WriterConstants.NEEDS_PARAMETER_METHOD_TYPE; /** * Information about the interface being implemented by the painless script. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/SimpleChecksAdapter.java b/modules/lang-painless/src/main/java/org/opensearch/painless/SimpleChecksAdapter.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/SimpleChecksAdapter.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/SimpleChecksAdapter.java index 6f3b4d296ed..9f62ff0b21d 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/SimpleChecksAdapter.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/SimpleChecksAdapter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.Label; @@ -27,7 +27,7 @@ import org.objectweb.asm.util.CheckMethodAdapter; import java.util.HashMap; -/** +/** * A CheckClassAdapter that does not use setAccessible to try to access private fields of Label! *

* This means jump insns are not checked, but we still get all the other checking. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Utility.java b/modules/lang-painless/src/main/java/org/opensearch/painless/Utility.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/Utility.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/Utility.java index 7588ad0f96e..0e19cfd8577 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/Utility.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/Utility.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.elasticsearch.script.JodaCompatibleZonedDateTime; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/WriterConstants.java b/modules/lang-painless/src/main/java/org/opensearch/painless/WriterConstants.java similarity index 99% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/WriterConstants.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/WriterConstants.java index 5398579b091..5dfae2b893d 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/WriterConstants.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/WriterConstants.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.elasticsearch.script.JodaCompatibleZonedDateTime; import org.objectweb.asm.Handle; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextAction.java b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextAction.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextAction.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextAction.java index 97e35f5acf2..4a6c16b7587 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextAction.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextAction.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.action; +package org.opensearch.painless.action; import org.opensearch.action.ActionListener; import org.opensearch.action.ActionRequest; @@ -34,8 +34,8 @@ import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.painless.PainlessScriptEngine; -import org.elasticsearch.painless.lookup.PainlessLookup; +import org.opensearch.painless.PainlessScriptEngine; +import org.opensearch.painless.lookup.PainlessLookup; import org.opensearch.rest.BaseRestHandler; import org.opensearch.rest.RestRequest; import org.opensearch.rest.action.RestToXContentListener; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextClassBindingInfo.java b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextClassBindingInfo.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextClassBindingInfo.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextClassBindingInfo.java index 33576dfb734..06a3fb5bacc 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextClassBindingInfo.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextClassBindingInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.action; +package org.opensearch.painless.action; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; @@ -28,8 +28,8 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.painless.lookup.PainlessClassBinding; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.PainlessClassBinding; +import org.opensearch.painless.lookup.PainlessLookupUtility; import java.io.IOException; import java.util.Collections; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextClassInfo.java b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextClassInfo.java similarity index 99% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextClassInfo.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextClassInfo.java index c76fa1383b3..1883e3c1731 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextClassInfo.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextClassInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.action; +package org.opensearch.painless.action; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; @@ -27,7 +27,7 @@ import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.painless.lookup.PainlessClass; +import org.opensearch.painless.lookup.PainlessClass; import java.io.IOException; import java.util.ArrayList; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextConstructorInfo.java b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextConstructorInfo.java similarity index 96% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextConstructorInfo.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextConstructorInfo.java index d5683bd621f..6a77f1bcc73 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextConstructorInfo.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextConstructorInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.action; +package org.opensearch.painless.action; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; @@ -28,8 +28,8 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.painless.lookup.PainlessConstructor; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.PainlessConstructor; +import org.opensearch.painless.lookup.PainlessLookupUtility; import java.io.IOException; import java.util.Collections; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextFieldInfo.java b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextFieldInfo.java similarity index 96% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextFieldInfo.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextFieldInfo.java index fbfac1e492b..7a505a69c91 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextFieldInfo.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextFieldInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.action; +package org.opensearch.painless.action; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; @@ -27,8 +27,8 @@ import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.painless.lookup.PainlessField; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.PainlessField; +import org.opensearch.painless.lookup.PainlessLookupUtility; import java.io.IOException; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextInfo.java b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextInfo.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextInfo.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextInfo.java index 540c79a6d03..45c7558dc02 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextInfo.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.action; +package org.opensearch.painless.action; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; @@ -27,10 +27,10 @@ import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.painless.lookup.PainlessClassBinding; -import org.elasticsearch.painless.lookup.PainlessInstanceBinding; -import org.elasticsearch.painless.lookup.PainlessLookup; -import org.elasticsearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.lookup.PainlessClassBinding; +import org.opensearch.painless.lookup.PainlessInstanceBinding; +import org.opensearch.painless.lookup.PainlessLookup; +import org.opensearch.painless.lookup.PainlessMethod; import org.elasticsearch.script.ScriptContext; import java.io.IOException; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextInstanceBindingInfo.java b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextInstanceBindingInfo.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextInstanceBindingInfo.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextInstanceBindingInfo.java index eb57517def3..8c877ca1133 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextInstanceBindingInfo.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextInstanceBindingInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.action; +package org.opensearch.painless.action; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; @@ -28,8 +28,8 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.painless.lookup.PainlessInstanceBinding; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.PainlessInstanceBinding; +import org.opensearch.painless.lookup.PainlessLookupUtility; import java.io.IOException; import java.util.Collections; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextMethodInfo.java b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextMethodInfo.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextMethodInfo.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextMethodInfo.java index 342844b6d41..5ddb5b017b5 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessContextMethodInfo.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessContextMethodInfo.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.action; +package org.opensearch.painless.action; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.io.stream.StreamInput; @@ -28,8 +28,8 @@ import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.PainlessMethod; import java.io.IOException; import java.util.Collections; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessExecuteAction.java b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java similarity index 99% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessExecuteAction.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java index 4b9345b4ba7..19033d2fd14 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessExecuteAction.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/action/PainlessExecuteAction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.elasticsearch.painless.action; +package org.opensearch.painless.action; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.index.DirectoryReader; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/EnhancedPainlessLexer.java b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/EnhancedPainlessLexer.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/EnhancedPainlessLexer.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/antlr/EnhancedPainlessLexer.java index 0c05fa9440c..221baf3d27c 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/EnhancedPainlessLexer.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/EnhancedPainlessLexer.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.antlr; +package org.opensearch.painless.antlr; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.LexerNoViableAltException; import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.misc.Interval; -import org.elasticsearch.painless.Location; +import org.opensearch.painless.Location; /** * A lexer that is customized for painless. It: diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessLexer.java b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessLexer.java similarity index 94% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessLexer.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessLexer.java index 0ef95c671d8..14c71d45cae 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessLexer.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessLexer.java @@ -1,5 +1,24 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + // ANTLR GENERATED CODE: DO NOT EDIT -package org.elasticsearch.painless.antlr; +package org.opensearch.painless.antlr; import org.antlr.v4.runtime.Lexer; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.Token; @@ -17,16 +36,16 @@ abstract class PainlessLexer extends Lexer { protected static final PredictionContextCache _sharedContextCache = new PredictionContextCache(); public static final int - WS=1, COMMENT=2, LBRACK=3, RBRACK=4, LBRACE=5, RBRACE=6, LP=7, RP=8, DOT=9, - NSDOT=10, COMMA=11, SEMICOLON=12, IF=13, IN=14, ELSE=15, WHILE=16, DO=17, - FOR=18, CONTINUE=19, BREAK=20, RETURN=21, NEW=22, TRY=23, CATCH=24, THROW=25, - THIS=26, INSTANCEOF=27, BOOLNOT=28, BWNOT=29, MUL=30, DIV=31, REM=32, - ADD=33, SUB=34, LSH=35, RSH=36, USH=37, LT=38, LTE=39, GT=40, GTE=41, - EQ=42, EQR=43, NE=44, NER=45, BWAND=46, XOR=47, BWOR=48, BOOLAND=49, BOOLOR=50, - COND=51, COLON=52, ELVIS=53, REF=54, ARROW=55, FIND=56, MATCH=57, INCR=58, - DECR=59, ASSIGN=60, AADD=61, ASUB=62, AMUL=63, ADIV=64, AREM=65, AAND=66, - AXOR=67, AOR=68, ALSH=69, ARSH=70, AUSH=71, OCTAL=72, HEX=73, INTEGER=74, - DECIMAL=75, STRING=76, REGEX=77, TRUE=78, FALSE=79, NULL=80, PRIMITIVE=81, + WS=1, COMMENT=2, LBRACK=3, RBRACK=4, LBRACE=5, RBRACE=6, LP=7, RP=8, DOT=9, + NSDOT=10, COMMA=11, SEMICOLON=12, IF=13, IN=14, ELSE=15, WHILE=16, DO=17, + FOR=18, CONTINUE=19, BREAK=20, RETURN=21, NEW=22, TRY=23, CATCH=24, THROW=25, + THIS=26, INSTANCEOF=27, BOOLNOT=28, BWNOT=29, MUL=30, DIV=31, REM=32, + ADD=33, SUB=34, LSH=35, RSH=36, USH=37, LT=38, LTE=39, GT=40, GTE=41, + EQ=42, EQR=43, NE=44, NER=45, BWAND=46, XOR=47, BWOR=48, BOOLAND=49, BOOLOR=50, + COND=51, COLON=52, ELVIS=53, REF=54, ARROW=55, FIND=56, MATCH=57, INCR=58, + DECR=59, ASSIGN=60, AADD=61, ASUB=62, AMUL=63, ADIV=64, AREM=65, AAND=66, + AXOR=67, AOR=68, ALSH=69, ARSH=70, AUSH=71, OCTAL=72, HEX=73, INTEGER=74, + DECIMAL=75, STRING=76, REGEX=77, TRUE=78, FALSE=79, NULL=80, PRIMITIVE=81, DEF=82, ID=83, DOTINTEGER=84, DOTID=85; public static final int AFTER_DOT = 1; public static String[] modeNames = { @@ -34,39 +53,39 @@ abstract class PainlessLexer extends Lexer { }; public static final String[] ruleNames = { - "WS", "COMMENT", "LBRACK", "RBRACK", "LBRACE", "RBRACE", "LP", "RP", "DOT", - "NSDOT", "COMMA", "SEMICOLON", "IF", "IN", "ELSE", "WHILE", "DO", "FOR", - "CONTINUE", "BREAK", "RETURN", "NEW", "TRY", "CATCH", "THROW", "THIS", - "INSTANCEOF", "BOOLNOT", "BWNOT", "MUL", "DIV", "REM", "ADD", "SUB", "LSH", - "RSH", "USH", "LT", "LTE", "GT", "GTE", "EQ", "EQR", "NE", "NER", "BWAND", - "XOR", "BWOR", "BOOLAND", "BOOLOR", "COND", "COLON", "ELVIS", "REF", "ARROW", - "FIND", "MATCH", "INCR", "DECR", "ASSIGN", "AADD", "ASUB", "AMUL", "ADIV", - "AREM", "AAND", "AXOR", "AOR", "ALSH", "ARSH", "AUSH", "OCTAL", "HEX", - "INTEGER", "DECIMAL", "STRING", "REGEX", "TRUE", "FALSE", "NULL", "PRIMITIVE", + "WS", "COMMENT", "LBRACK", "RBRACK", "LBRACE", "RBRACE", "LP", "RP", "DOT", + "NSDOT", "COMMA", "SEMICOLON", "IF", "IN", "ELSE", "WHILE", "DO", "FOR", + "CONTINUE", "BREAK", "RETURN", "NEW", "TRY", "CATCH", "THROW", "THIS", + "INSTANCEOF", "BOOLNOT", "BWNOT", "MUL", "DIV", "REM", "ADD", "SUB", "LSH", + "RSH", "USH", "LT", "LTE", "GT", "GTE", "EQ", "EQR", "NE", "NER", "BWAND", + "XOR", "BWOR", "BOOLAND", "BOOLOR", "COND", "COLON", "ELVIS", "REF", "ARROW", + "FIND", "MATCH", "INCR", "DECR", "ASSIGN", "AADD", "ASUB", "AMUL", "ADIV", + "AREM", "AAND", "AXOR", "AOR", "ALSH", "ARSH", "AUSH", "OCTAL", "HEX", + "INTEGER", "DECIMAL", "STRING", "REGEX", "TRUE", "FALSE", "NULL", "PRIMITIVE", "DEF", "ID", "DOTINTEGER", "DOTID" }; private static final String[] _LITERAL_NAMES = { - null, null, null, "'{'", "'}'", "'['", "']'", "'('", "')'", "'.'", "'?.'", - "','", "';'", "'if'", "'in'", "'else'", "'while'", "'do'", "'for'", "'continue'", - "'break'", "'return'", "'new'", "'try'", "'catch'", "'throw'", "'this'", - "'instanceof'", "'!'", "'~'", "'*'", "'/'", "'%'", "'+'", "'-'", "'<<'", - "'>>'", "'>>>'", "'<'", "'<='", "'>'", "'>='", "'=='", "'==='", "'!='", - "'!=='", "'&'", "'^'", "'|'", "'&&'", "'||'", "'?'", "':'", "'?:'", "'::'", - "'->'", "'=~'", "'==~'", "'++'", "'--'", "'='", "'+='", "'-='", "'*='", - "'/='", "'%='", "'&='", "'^='", "'|='", "'<<='", "'>>='", "'>>>='", null, + null, null, null, "'{'", "'}'", "'['", "']'", "'('", "')'", "'.'", "'?.'", + "','", "';'", "'if'", "'in'", "'else'", "'while'", "'do'", "'for'", "'continue'", + "'break'", "'return'", "'new'", "'try'", "'catch'", "'throw'", "'this'", + "'instanceof'", "'!'", "'~'", "'*'", "'/'", "'%'", "'+'", "'-'", "'<<'", + "'>>'", "'>>>'", "'<'", "'<='", "'>'", "'>='", "'=='", "'==='", "'!='", + "'!=='", "'&'", "'^'", "'|'", "'&&'", "'||'", "'?'", "':'", "'?:'", "'::'", + "'->'", "'=~'", "'==~'", "'++'", "'--'", "'='", "'+='", "'-='", "'*='", + "'/='", "'%='", "'&='", "'^='", "'|='", "'<<='", "'>>='", "'>>>='", null, null, null, null, null, null, "'true'", "'false'", "'null'", null, "'def'" }; private static final String[] _SYMBOLIC_NAMES = { - null, "WS", "COMMENT", "LBRACK", "RBRACK", "LBRACE", "RBRACE", "LP", "RP", - "DOT", "NSDOT", "COMMA", "SEMICOLON", "IF", "IN", "ELSE", "WHILE", "DO", - "FOR", "CONTINUE", "BREAK", "RETURN", "NEW", "TRY", "CATCH", "THROW", - "THIS", "INSTANCEOF", "BOOLNOT", "BWNOT", "MUL", "DIV", "REM", "ADD", - "SUB", "LSH", "RSH", "USH", "LT", "LTE", "GT", "GTE", "EQ", "EQR", "NE", - "NER", "BWAND", "XOR", "BWOR", "BOOLAND", "BOOLOR", "COND", "COLON", "ELVIS", - "REF", "ARROW", "FIND", "MATCH", "INCR", "DECR", "ASSIGN", "AADD", "ASUB", - "AMUL", "ADIV", "AREM", "AAND", "AXOR", "AOR", "ALSH", "ARSH", "AUSH", - "OCTAL", "HEX", "INTEGER", "DECIMAL", "STRING", "REGEX", "TRUE", "FALSE", + null, "WS", "COMMENT", "LBRACK", "RBRACK", "LBRACE", "RBRACE", "LP", "RP", + "DOT", "NSDOT", "COMMA", "SEMICOLON", "IF", "IN", "ELSE", "WHILE", "DO", + "FOR", "CONTINUE", "BREAK", "RETURN", "NEW", "TRY", "CATCH", "THROW", + "THIS", "INSTANCEOF", "BOOLNOT", "BWNOT", "MUL", "DIV", "REM", "ADD", + "SUB", "LSH", "RSH", "USH", "LT", "LTE", "GT", "GTE", "EQ", "EQR", "NE", + "NER", "BWAND", "XOR", "BWOR", "BOOLAND", "BOOLOR", "COND", "COLON", "ELVIS", + "REF", "ARROW", "FIND", "MATCH", "INCR", "DECR", "ASSIGN", "AADD", "ASUB", + "AMUL", "ADIV", "AREM", "AAND", "AXOR", "AOR", "ALSH", "ARSH", "AUSH", + "OCTAL", "HEX", "INTEGER", "DECIMAL", "STRING", "REGEX", "TRUE", "FALSE", "NULL", "PRIMITIVE", "DEF", "ID", "DOTINTEGER", "DOTID" }; public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParser.java b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParser.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParser.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParser.java index ef58500303f..1e8a977acdf 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParser.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParser.java @@ -1,5 +1,24 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + // ANTLR GENERATED CODE: DO NOT EDIT -package org.elasticsearch.painless.antlr; +package org.opensearch.painless.antlr; import org.antlr.v4.runtime.atn.*; import org.antlr.v4.runtime.dfa.DFA; import org.antlr.v4.runtime.*; @@ -17,60 +36,60 @@ class PainlessParser extends Parser { protected static final PredictionContextCache _sharedContextCache = new PredictionContextCache(); public static final int - WS=1, COMMENT=2, LBRACK=3, RBRACK=4, LBRACE=5, RBRACE=6, LP=7, RP=8, DOT=9, - NSDOT=10, COMMA=11, SEMICOLON=12, IF=13, IN=14, ELSE=15, WHILE=16, DO=17, - FOR=18, CONTINUE=19, BREAK=20, RETURN=21, NEW=22, TRY=23, CATCH=24, THROW=25, - THIS=26, INSTANCEOF=27, BOOLNOT=28, BWNOT=29, MUL=30, DIV=31, REM=32, - ADD=33, SUB=34, LSH=35, RSH=36, USH=37, LT=38, LTE=39, GT=40, GTE=41, - EQ=42, EQR=43, NE=44, NER=45, BWAND=46, XOR=47, BWOR=48, BOOLAND=49, BOOLOR=50, - COND=51, COLON=52, ELVIS=53, REF=54, ARROW=55, FIND=56, MATCH=57, INCR=58, - DECR=59, ASSIGN=60, AADD=61, ASUB=62, AMUL=63, ADIV=64, AREM=65, AAND=66, - AXOR=67, AOR=68, ALSH=69, ARSH=70, AUSH=71, OCTAL=72, HEX=73, INTEGER=74, - DECIMAL=75, STRING=76, REGEX=77, TRUE=78, FALSE=79, NULL=80, PRIMITIVE=81, + WS=1, COMMENT=2, LBRACK=3, RBRACK=4, LBRACE=5, RBRACE=6, LP=7, RP=8, DOT=9, + NSDOT=10, COMMA=11, SEMICOLON=12, IF=13, IN=14, ELSE=15, WHILE=16, DO=17, + FOR=18, CONTINUE=19, BREAK=20, RETURN=21, NEW=22, TRY=23, CATCH=24, THROW=25, + THIS=26, INSTANCEOF=27, BOOLNOT=28, BWNOT=29, MUL=30, DIV=31, REM=32, + ADD=33, SUB=34, LSH=35, RSH=36, USH=37, LT=38, LTE=39, GT=40, GTE=41, + EQ=42, EQR=43, NE=44, NER=45, BWAND=46, XOR=47, BWOR=48, BOOLAND=49, BOOLOR=50, + COND=51, COLON=52, ELVIS=53, REF=54, ARROW=55, FIND=56, MATCH=57, INCR=58, + DECR=59, ASSIGN=60, AADD=61, ASUB=62, AMUL=63, ADIV=64, AREM=65, AAND=66, + AXOR=67, AOR=68, ALSH=69, ARSH=70, AUSH=71, OCTAL=72, HEX=73, INTEGER=74, + DECIMAL=75, STRING=76, REGEX=77, TRUE=78, FALSE=79, NULL=80, PRIMITIVE=81, DEF=82, ID=83, DOTINTEGER=84, DOTID=85; public static final int - RULE_source = 0, RULE_function = 1, RULE_parameters = 2, RULE_statement = 3, - RULE_rstatement = 4, RULE_dstatement = 5, RULE_trailer = 6, RULE_block = 7, - RULE_empty = 8, RULE_initializer = 9, RULE_afterthought = 10, RULE_declaration = 11, - RULE_decltype = 12, RULE_type = 13, RULE_declvar = 14, RULE_trap = 15, - RULE_noncondexpression = 16, RULE_expression = 17, RULE_unary = 18, RULE_unarynotaddsub = 19, - RULE_castexpression = 20, RULE_primordefcasttype = 21, RULE_refcasttype = 22, - RULE_chain = 23, RULE_primary = 24, RULE_postfix = 25, RULE_postdot = 26, - RULE_callinvoke = 27, RULE_fieldaccess = 28, RULE_braceaccess = 29, RULE_arrayinitializer = 30, - RULE_listinitializer = 31, RULE_mapinitializer = 32, RULE_maptoken = 33, - RULE_arguments = 34, RULE_argument = 35, RULE_lambda = 36, RULE_lamtype = 37, + RULE_source = 0, RULE_function = 1, RULE_parameters = 2, RULE_statement = 3, + RULE_rstatement = 4, RULE_dstatement = 5, RULE_trailer = 6, RULE_block = 7, + RULE_empty = 8, RULE_initializer = 9, RULE_afterthought = 10, RULE_declaration = 11, + RULE_decltype = 12, RULE_type = 13, RULE_declvar = 14, RULE_trap = 15, + RULE_noncondexpression = 16, RULE_expression = 17, RULE_unary = 18, RULE_unarynotaddsub = 19, + RULE_castexpression = 20, RULE_primordefcasttype = 21, RULE_refcasttype = 22, + RULE_chain = 23, RULE_primary = 24, RULE_postfix = 25, RULE_postdot = 26, + RULE_callinvoke = 27, RULE_fieldaccess = 28, RULE_braceaccess = 29, RULE_arrayinitializer = 30, + RULE_listinitializer = 31, RULE_mapinitializer = 32, RULE_maptoken = 33, + RULE_arguments = 34, RULE_argument = 35, RULE_lambda = 36, RULE_lamtype = 37, RULE_funcref = 38; public static final String[] ruleNames = { - "source", "function", "parameters", "statement", "rstatement", "dstatement", - "trailer", "block", "empty", "initializer", "afterthought", "declaration", - "decltype", "type", "declvar", "trap", "noncondexpression", "expression", - "unary", "unarynotaddsub", "castexpression", "primordefcasttype", "refcasttype", - "chain", "primary", "postfix", "postdot", "callinvoke", "fieldaccess", - "braceaccess", "arrayinitializer", "listinitializer", "mapinitializer", + "source", "function", "parameters", "statement", "rstatement", "dstatement", + "trailer", "block", "empty", "initializer", "afterthought", "declaration", + "decltype", "type", "declvar", "trap", "noncondexpression", "expression", + "unary", "unarynotaddsub", "castexpression", "primordefcasttype", "refcasttype", + "chain", "primary", "postfix", "postdot", "callinvoke", "fieldaccess", + "braceaccess", "arrayinitializer", "listinitializer", "mapinitializer", "maptoken", "arguments", "argument", "lambda", "lamtype", "funcref" }; private static final String[] _LITERAL_NAMES = { - null, null, null, "'{'", "'}'", "'['", "']'", "'('", "')'", "'.'", "'?.'", - "','", "';'", "'if'", "'in'", "'else'", "'while'", "'do'", "'for'", "'continue'", - "'break'", "'return'", "'new'", "'try'", "'catch'", "'throw'", "'this'", - "'instanceof'", "'!'", "'~'", "'*'", "'/'", "'%'", "'+'", "'-'", "'<<'", - "'>>'", "'>>>'", "'<'", "'<='", "'>'", "'>='", "'=='", "'==='", "'!='", - "'!=='", "'&'", "'^'", "'|'", "'&&'", "'||'", "'?'", "':'", "'?:'", "'::'", - "'->'", "'=~'", "'==~'", "'++'", "'--'", "'='", "'+='", "'-='", "'*='", - "'/='", "'%='", "'&='", "'^='", "'|='", "'<<='", "'>>='", "'>>>='", null, + null, null, null, "'{'", "'}'", "'['", "']'", "'('", "')'", "'.'", "'?.'", + "','", "';'", "'if'", "'in'", "'else'", "'while'", "'do'", "'for'", "'continue'", + "'break'", "'return'", "'new'", "'try'", "'catch'", "'throw'", "'this'", + "'instanceof'", "'!'", "'~'", "'*'", "'/'", "'%'", "'+'", "'-'", "'<<'", + "'>>'", "'>>>'", "'<'", "'<='", "'>'", "'>='", "'=='", "'==='", "'!='", + "'!=='", "'&'", "'^'", "'|'", "'&&'", "'||'", "'?'", "':'", "'?:'", "'::'", + "'->'", "'=~'", "'==~'", "'++'", "'--'", "'='", "'+='", "'-='", "'*='", + "'/='", "'%='", "'&='", "'^='", "'|='", "'<<='", "'>>='", "'>>>='", null, null, null, null, null, null, "'true'", "'false'", "'null'", null, "'def'" }; private static final String[] _SYMBOLIC_NAMES = { - null, "WS", "COMMENT", "LBRACK", "RBRACK", "LBRACE", "RBRACE", "LP", "RP", - "DOT", "NSDOT", "COMMA", "SEMICOLON", "IF", "IN", "ELSE", "WHILE", "DO", - "FOR", "CONTINUE", "BREAK", "RETURN", "NEW", "TRY", "CATCH", "THROW", - "THIS", "INSTANCEOF", "BOOLNOT", "BWNOT", "MUL", "DIV", "REM", "ADD", - "SUB", "LSH", "RSH", "USH", "LT", "LTE", "GT", "GTE", "EQ", "EQR", "NE", - "NER", "BWAND", "XOR", "BWOR", "BOOLAND", "BOOLOR", "COND", "COLON", "ELVIS", - "REF", "ARROW", "FIND", "MATCH", "INCR", "DECR", "ASSIGN", "AADD", "ASUB", - "AMUL", "ADIV", "AREM", "AAND", "AXOR", "AOR", "ALSH", "ARSH", "AUSH", - "OCTAL", "HEX", "INTEGER", "DECIMAL", "STRING", "REGEX", "TRUE", "FALSE", + null, "WS", "COMMENT", "LBRACK", "RBRACK", "LBRACE", "RBRACE", "LP", "RP", + "DOT", "NSDOT", "COMMA", "SEMICOLON", "IF", "IN", "ELSE", "WHILE", "DO", + "FOR", "CONTINUE", "BREAK", "RETURN", "NEW", "TRY", "CATCH", "THROW", + "THIS", "INSTANCEOF", "BOOLNOT", "BWNOT", "MUL", "DIV", "REM", "ADD", + "SUB", "LSH", "RSH", "USH", "LT", "LTE", "GT", "GTE", "EQ", "EQR", "NE", + "NER", "BWAND", "XOR", "BWOR", "BOOLAND", "BOOLOR", "COND", "COLON", "ELVIS", + "REF", "ARROW", "FIND", "MATCH", "INCR", "DECR", "ASSIGN", "AADD", "ASUB", + "AMUL", "ADIV", "AREM", "AAND", "AXOR", "AOR", "ALSH", "ARSH", "AUSH", + "OCTAL", "HEX", "INTEGER", "DECIMAL", "STRING", "REGEX", "TRUE", "FALSE", "NULL", "PRIMITIVE", "DEF", "ID", "DOTINTEGER", "DOTID" }; public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); @@ -165,7 +184,7 @@ class PainlessParser extends Parser { setState(78); function(); } - } + } } setState(83); _errHandler.sync(this); @@ -426,7 +445,7 @@ class PainlessParser extends Parser { super(parent, invokingState); } @Override public int getRuleIndex() { return RULE_rstatement; } - + public RstatementContext() { } public void copyFrom(RstatementContext ctx) { super.copyFrom(ctx); @@ -807,7 +826,7 @@ class PainlessParser extends Parser { match(TRY); setState(173); block(); - setState(175); + setState(175); _errHandler.sync(this); _alt = 1; do { @@ -823,7 +842,7 @@ class PainlessParser extends Parser { default: throw new NoViableAltException(this); } - setState(177); + setState(177); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,11,_ctx); } while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ); @@ -847,7 +866,7 @@ class PainlessParser extends Parser { super(parent, invokingState); } @Override public int getRuleIndex() { return RULE_dstatement; } - + public DstatementContext() { } public void copyFrom(DstatementContext ctx) { super.copyFrom(ctx); @@ -1159,7 +1178,7 @@ class PainlessParser extends Parser { setState(205); statement(); } - } + } } setState(210); _errHandler.sync(this); @@ -1420,7 +1439,7 @@ class PainlessParser extends Parser { setState(235); match(RBRACE); } - } + } } setState(240); _errHandler.sync(this); @@ -1500,7 +1519,7 @@ class PainlessParser extends Parser { setState(245); match(DOTID); } - } + } } setState(250); _errHandler.sync(this); @@ -1631,7 +1650,7 @@ class PainlessParser extends Parser { super(parent, invokingState); } @Override public int getRuleIndex() { return RULE_noncondexpression; } - + public NoncondexpressionContext() { } public void copyFrom(NoncondexpressionContext ctx) { super.copyFrom(ctx); @@ -1967,7 +1986,7 @@ class PainlessParser extends Parser { } break; } - } + } } setState(311); _errHandler.sync(this); @@ -1991,7 +2010,7 @@ class PainlessParser extends Parser { super(parent, invokingState); } @Override public int getRuleIndex() { return RULE_expression; } - + public ExpressionContext() { } public void copyFrom(ExpressionContext ctx) { super.copyFrom(ctx); @@ -2121,7 +2140,7 @@ class PainlessParser extends Parser { super(parent, invokingState); } @Override public int getRuleIndex() { return RULE_unary; } - + public UnaryContext() { } public void copyFrom(UnaryContext ctx) { super.copyFrom(ctx); @@ -2246,7 +2265,7 @@ class PainlessParser extends Parser { super(parent, invokingState); } @Override public int getRuleIndex() { return RULE_unarynotaddsub; } - + public UnarynotaddsubContext() { } public void copyFrom(UnarynotaddsubContext ctx) { super.copyFrom(ctx); @@ -2373,7 +2392,7 @@ class PainlessParser extends Parser { super(parent, invokingState); } @Override public int getRuleIndex() { return RULE_castexpression; } - + public CastexpressionContext() { } public void copyFrom(CastexpressionContext ctx) { super.copyFrom(ctx); @@ -2544,7 +2563,7 @@ class PainlessParser extends Parser { { setState(355); match(DEF); - setState(358); + setState(358); _errHandler.sync(this); _la = _input.LA(1); do { @@ -2556,7 +2575,7 @@ class PainlessParser extends Parser { match(RBRACE); } } - setState(360); + setState(360); _errHandler.sync(this); _la = _input.LA(1); } while ( _la==LBRACE ); @@ -2567,7 +2586,7 @@ class PainlessParser extends Parser { { setState(362); match(PRIMITIVE); - setState(365); + setState(365); _errHandler.sync(this); _la = _input.LA(1); do { @@ -2579,7 +2598,7 @@ class PainlessParser extends Parser { match(RBRACE); } } - setState(367); + setState(367); _errHandler.sync(this); _la = _input.LA(1); } while ( _la==LBRACE ); @@ -2644,7 +2663,7 @@ class PainlessParser extends Parser { super(parent, invokingState); } @Override public int getRuleIndex() { return RULE_chain; } - + public ChainContext() { } public void copyFrom(ChainContext ctx) { super.copyFrom(ctx); @@ -2703,7 +2722,7 @@ class PainlessParser extends Parser { setState(387); postfix(); } - } + } } setState(392); _errHandler.sync(this); @@ -2737,7 +2756,7 @@ class PainlessParser extends Parser { super(parent, invokingState); } @Override public int getRuleIndex() { return RULE_primary; } - + public PrimaryContext() { } public void copyFrom(PrimaryContext ctx) { super.copyFrom(ctx); @@ -3264,7 +3283,7 @@ class PainlessParser extends Parser { super(parent, invokingState); } @Override public int getRuleIndex() { return RULE_arrayinitializer; } - + public ArrayinitializerContext() { } public void copyFrom(ArrayinitializerContext ctx) { super.copyFrom(ctx); @@ -3355,7 +3374,7 @@ class PainlessParser extends Parser { match(NEW); setState(438); type(); - setState(443); + setState(443); _errHandler.sync(this); _alt = 1; do { @@ -3375,7 +3394,7 @@ class PainlessParser extends Parser { default: throw new NoViableAltException(this); } - setState(445); + setState(445); _errHandler.sync(this); _alt = getInterpreter().adaptivePredict(_input,40,_ctx); } while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ); @@ -3396,7 +3415,7 @@ class PainlessParser extends Parser { setState(448); postfix(); } - } + } } setState(453); _errHandler.sync(this); @@ -3458,7 +3477,7 @@ class PainlessParser extends Parser { setState(472); postfix(); } - } + } } setState(477); _errHandler.sync(this); @@ -4011,7 +4030,7 @@ class PainlessParser extends Parser { super(parent, invokingState); } @Override public int getRuleIndex() { return RULE_funcref; } - + public FuncrefContext() { } public void copyFrom(FuncrefContext ctx) { super.copyFrom(ctx); diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParserBaseVisitor.java b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParserBaseVisitor.java similarity index 96% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParserBaseVisitor.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParserBaseVisitor.java index 2c705c0040e..5fab7f45a16 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParserBaseVisitor.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParserBaseVisitor.java @@ -1,5 +1,24 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + // ANTLR GENERATED CODE: DO NOT EDIT -package org.elasticsearch.painless.antlr; +package org.opensearch.painless.antlr; import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor; /** diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParserVisitor.java b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParserVisitor.java similarity index 95% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParserVisitor.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParserVisitor.java index 421ca8ffc4f..63d98d43502 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParserVisitor.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/PainlessParserVisitor.java @@ -1,5 +1,24 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + // ANTLR GENERATED CODE: DO NOT EDIT -package org.elasticsearch.painless.antlr; +package org.opensearch.painless.antlr; import org.antlr.v4.runtime.tree.ParseTreeVisitor; /** diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/ParserErrorStrategy.java b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/ParserErrorStrategy.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/ParserErrorStrategy.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/antlr/ParserErrorStrategy.java index b7d495fbe9b..5abda736026 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/ParserErrorStrategy.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/ParserErrorStrategy.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.antlr; +package org.opensearch.painless.antlr; import org.antlr.v4.runtime.DefaultErrorStrategy; import org.antlr.v4.runtime.InputMismatchException; @@ -25,14 +25,14 @@ import org.antlr.v4.runtime.NoViableAltException; import org.antlr.v4.runtime.Parser; import org.antlr.v4.runtime.RecognitionException; import org.antlr.v4.runtime.Token; -import org.elasticsearch.painless.Location; +import org.opensearch.painless.Location; /** * An error strategy that will override the default error behavior to fail on the first parser error. */ final class ParserErrorStrategy extends DefaultErrorStrategy { final String sourceName; - + ParserErrorStrategy(String sourceName) { this.sourceName = sourceName; } diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/Walker.java b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/Walker.java similarity index 82% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/Walker.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/antlr/Walker.java index c59537a40ca..fba8496f517 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/Walker.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/Walker.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.antlr; +package org.opensearch.painless.antlr; import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.BaseErrorListener; @@ -28,132 +28,132 @@ import org.antlr.v4.runtime.RecognitionException; import org.antlr.v4.runtime.Recognizer; import org.antlr.v4.runtime.atn.PredictionMode; import org.antlr.v4.runtime.tree.TerminalNode; -import org.elasticsearch.painless.CompilerSettings; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.Operation; -import org.elasticsearch.painless.antlr.PainlessParser.AddsubContext; -import org.elasticsearch.painless.antlr.PainlessParser.AfterthoughtContext; -import org.elasticsearch.painless.antlr.PainlessParser.ArgumentContext; -import org.elasticsearch.painless.antlr.PainlessParser.ArgumentsContext; -import org.elasticsearch.painless.antlr.PainlessParser.AssignmentContext; -import org.elasticsearch.painless.antlr.PainlessParser.BinaryContext; -import org.elasticsearch.painless.antlr.PainlessParser.BlockContext; -import org.elasticsearch.painless.antlr.PainlessParser.BoolContext; -import org.elasticsearch.painless.antlr.PainlessParser.BraceaccessContext; -import org.elasticsearch.painless.antlr.PainlessParser.BreakContext; -import org.elasticsearch.painless.antlr.PainlessParser.CallinvokeContext; -import org.elasticsearch.painless.antlr.PainlessParser.CalllocalContext; -import org.elasticsearch.painless.antlr.PainlessParser.CastContext; -import org.elasticsearch.painless.antlr.PainlessParser.ClassfuncrefContext; -import org.elasticsearch.painless.antlr.PainlessParser.CompContext; -import org.elasticsearch.painless.antlr.PainlessParser.ConditionalContext; -import org.elasticsearch.painless.antlr.PainlessParser.ConstructorfuncrefContext; -import org.elasticsearch.painless.antlr.PainlessParser.ContinueContext; -import org.elasticsearch.painless.antlr.PainlessParser.DeclContext; -import org.elasticsearch.painless.antlr.PainlessParser.DeclarationContext; -import org.elasticsearch.painless.antlr.PainlessParser.DecltypeContext; -import org.elasticsearch.painless.antlr.PainlessParser.DeclvarContext; -import org.elasticsearch.painless.antlr.PainlessParser.DoContext; -import org.elasticsearch.painless.antlr.PainlessParser.DynamicContext; -import org.elasticsearch.painless.antlr.PainlessParser.EachContext; -import org.elasticsearch.painless.antlr.PainlessParser.ElvisContext; -import org.elasticsearch.painless.antlr.PainlessParser.EmptyContext; -import org.elasticsearch.painless.antlr.PainlessParser.ExprContext; -import org.elasticsearch.painless.antlr.PainlessParser.ExpressionContext; -import org.elasticsearch.painless.antlr.PainlessParser.FalseContext; -import org.elasticsearch.painless.antlr.PainlessParser.FieldaccessContext; -import org.elasticsearch.painless.antlr.PainlessParser.ForContext; -import org.elasticsearch.painless.antlr.PainlessParser.FunctionContext; -import org.elasticsearch.painless.antlr.PainlessParser.IfContext; -import org.elasticsearch.painless.antlr.PainlessParser.IneachContext; -import org.elasticsearch.painless.antlr.PainlessParser.InitializerContext; -import org.elasticsearch.painless.antlr.PainlessParser.InstanceofContext; -import org.elasticsearch.painless.antlr.PainlessParser.LambdaContext; -import org.elasticsearch.painless.antlr.PainlessParser.LamtypeContext; -import org.elasticsearch.painless.antlr.PainlessParser.ListinitContext; -import org.elasticsearch.painless.antlr.PainlessParser.ListinitializerContext; -import org.elasticsearch.painless.antlr.PainlessParser.LocalfuncrefContext; -import org.elasticsearch.painless.antlr.PainlessParser.MapinitContext; -import org.elasticsearch.painless.antlr.PainlessParser.MapinitializerContext; -import org.elasticsearch.painless.antlr.PainlessParser.MaptokenContext; -import org.elasticsearch.painless.antlr.PainlessParser.NewarrayContext; -import org.elasticsearch.painless.antlr.PainlessParser.NewinitializedarrayContext; -import org.elasticsearch.painless.antlr.PainlessParser.NewobjectContext; -import org.elasticsearch.painless.antlr.PainlessParser.NewstandardarrayContext; -import org.elasticsearch.painless.antlr.PainlessParser.NonconditionalContext; -import org.elasticsearch.painless.antlr.PainlessParser.NotContext; -import org.elasticsearch.painless.antlr.PainlessParser.NotaddsubContext; -import org.elasticsearch.painless.antlr.PainlessParser.NullContext; -import org.elasticsearch.painless.antlr.PainlessParser.NumericContext; -import org.elasticsearch.painless.antlr.PainlessParser.ParametersContext; -import org.elasticsearch.painless.antlr.PainlessParser.PostContext; -import org.elasticsearch.painless.antlr.PainlessParser.PostdotContext; -import org.elasticsearch.painless.antlr.PainlessParser.PostfixContext; -import org.elasticsearch.painless.antlr.PainlessParser.PreContext; -import org.elasticsearch.painless.antlr.PainlessParser.PrecedenceContext; -import org.elasticsearch.painless.antlr.PainlessParser.ReadContext; -import org.elasticsearch.painless.antlr.PainlessParser.RegexContext; -import org.elasticsearch.painless.antlr.PainlessParser.ReturnContext; -import org.elasticsearch.painless.antlr.PainlessParser.SingleContext; -import org.elasticsearch.painless.antlr.PainlessParser.SourceContext; -import org.elasticsearch.painless.antlr.PainlessParser.StatementContext; -import org.elasticsearch.painless.antlr.PainlessParser.StringContext; -import org.elasticsearch.painless.antlr.PainlessParser.ThrowContext; -import org.elasticsearch.painless.antlr.PainlessParser.TrailerContext; -import org.elasticsearch.painless.antlr.PainlessParser.TrapContext; -import org.elasticsearch.painless.antlr.PainlessParser.TrueContext; -import org.elasticsearch.painless.antlr.PainlessParser.TryContext; -import org.elasticsearch.painless.antlr.PainlessParser.TypeContext; -import org.elasticsearch.painless.antlr.PainlessParser.VariableContext; -import org.elasticsearch.painless.antlr.PainlessParser.WhileContext; -import org.elasticsearch.painless.node.AExpression; -import org.elasticsearch.painless.node.ANode; -import org.elasticsearch.painless.node.AStatement; -import org.elasticsearch.painless.node.EAssignment; -import org.elasticsearch.painless.node.EBinary; -import org.elasticsearch.painless.node.EBooleanComp; -import org.elasticsearch.painless.node.EBooleanConstant; -import org.elasticsearch.painless.node.EBrace; -import org.elasticsearch.painless.node.ECall; -import org.elasticsearch.painless.node.ECallLocal; -import org.elasticsearch.painless.node.EComp; -import org.elasticsearch.painless.node.EConditional; -import org.elasticsearch.painless.node.EDecimal; -import org.elasticsearch.painless.node.EDot; -import org.elasticsearch.painless.node.EElvis; -import org.elasticsearch.painless.node.EExplicit; -import org.elasticsearch.painless.node.EFunctionRef; -import org.elasticsearch.painless.node.EInstanceof; -import org.elasticsearch.painless.node.ELambda; -import org.elasticsearch.painless.node.EListInit; -import org.elasticsearch.painless.node.EMapInit; -import org.elasticsearch.painless.node.ENewArray; -import org.elasticsearch.painless.node.ENewArrayFunctionRef; -import org.elasticsearch.painless.node.ENewObj; -import org.elasticsearch.painless.node.ENull; -import org.elasticsearch.painless.node.ENumeric; -import org.elasticsearch.painless.node.ERegex; -import org.elasticsearch.painless.node.EString; -import org.elasticsearch.painless.node.ESymbol; -import org.elasticsearch.painless.node.EUnary; -import org.elasticsearch.painless.node.SBlock; -import org.elasticsearch.painless.node.SBreak; -import org.elasticsearch.painless.node.SCatch; -import org.elasticsearch.painless.node.SClass; -import org.elasticsearch.painless.node.SContinue; -import org.elasticsearch.painless.node.SDeclBlock; -import org.elasticsearch.painless.node.SDeclaration; -import org.elasticsearch.painless.node.SDo; -import org.elasticsearch.painless.node.SEach; -import org.elasticsearch.painless.node.SExpression; -import org.elasticsearch.painless.node.SFor; -import org.elasticsearch.painless.node.SFunction; -import org.elasticsearch.painless.node.SIf; -import org.elasticsearch.painless.node.SIfElse; -import org.elasticsearch.painless.node.SReturn; -import org.elasticsearch.painless.node.SThrow; -import org.elasticsearch.painless.node.STry; -import org.elasticsearch.painless.node.SWhile; +import org.opensearch.painless.CompilerSettings; +import org.opensearch.painless.Location; +import org.opensearch.painless.Operation; +import org.opensearch.painless.antlr.PainlessParser.AddsubContext; +import org.opensearch.painless.antlr.PainlessParser.AfterthoughtContext; +import org.opensearch.painless.antlr.PainlessParser.ArgumentContext; +import org.opensearch.painless.antlr.PainlessParser.ArgumentsContext; +import org.opensearch.painless.antlr.PainlessParser.AssignmentContext; +import org.opensearch.painless.antlr.PainlessParser.BinaryContext; +import org.opensearch.painless.antlr.PainlessParser.BlockContext; +import org.opensearch.painless.antlr.PainlessParser.BoolContext; +import org.opensearch.painless.antlr.PainlessParser.BraceaccessContext; +import org.opensearch.painless.antlr.PainlessParser.BreakContext; +import org.opensearch.painless.antlr.PainlessParser.CallinvokeContext; +import org.opensearch.painless.antlr.PainlessParser.CalllocalContext; +import org.opensearch.painless.antlr.PainlessParser.CastContext; +import org.opensearch.painless.antlr.PainlessParser.ClassfuncrefContext; +import org.opensearch.painless.antlr.PainlessParser.CompContext; +import org.opensearch.painless.antlr.PainlessParser.ConditionalContext; +import org.opensearch.painless.antlr.PainlessParser.ConstructorfuncrefContext; +import org.opensearch.painless.antlr.PainlessParser.ContinueContext; +import org.opensearch.painless.antlr.PainlessParser.DeclContext; +import org.opensearch.painless.antlr.PainlessParser.DeclarationContext; +import org.opensearch.painless.antlr.PainlessParser.DecltypeContext; +import org.opensearch.painless.antlr.PainlessParser.DeclvarContext; +import org.opensearch.painless.antlr.PainlessParser.DoContext; +import org.opensearch.painless.antlr.PainlessParser.DynamicContext; +import org.opensearch.painless.antlr.PainlessParser.EachContext; +import org.opensearch.painless.antlr.PainlessParser.ElvisContext; +import org.opensearch.painless.antlr.PainlessParser.EmptyContext; +import org.opensearch.painless.antlr.PainlessParser.ExprContext; +import org.opensearch.painless.antlr.PainlessParser.ExpressionContext; +import org.opensearch.painless.antlr.PainlessParser.FalseContext; +import org.opensearch.painless.antlr.PainlessParser.FieldaccessContext; +import org.opensearch.painless.antlr.PainlessParser.ForContext; +import org.opensearch.painless.antlr.PainlessParser.FunctionContext; +import org.opensearch.painless.antlr.PainlessParser.IfContext; +import org.opensearch.painless.antlr.PainlessParser.IneachContext; +import org.opensearch.painless.antlr.PainlessParser.InitializerContext; +import org.opensearch.painless.antlr.PainlessParser.InstanceofContext; +import org.opensearch.painless.antlr.PainlessParser.LambdaContext; +import org.opensearch.painless.antlr.PainlessParser.LamtypeContext; +import org.opensearch.painless.antlr.PainlessParser.ListinitContext; +import org.opensearch.painless.antlr.PainlessParser.ListinitializerContext; +import org.opensearch.painless.antlr.PainlessParser.LocalfuncrefContext; +import org.opensearch.painless.antlr.PainlessParser.MapinitContext; +import org.opensearch.painless.antlr.PainlessParser.MapinitializerContext; +import org.opensearch.painless.antlr.PainlessParser.MaptokenContext; +import org.opensearch.painless.antlr.PainlessParser.NewarrayContext; +import org.opensearch.painless.antlr.PainlessParser.NewinitializedarrayContext; +import org.opensearch.painless.antlr.PainlessParser.NewobjectContext; +import org.opensearch.painless.antlr.PainlessParser.NewstandardarrayContext; +import org.opensearch.painless.antlr.PainlessParser.NonconditionalContext; +import org.opensearch.painless.antlr.PainlessParser.NotContext; +import org.opensearch.painless.antlr.PainlessParser.NotaddsubContext; +import org.opensearch.painless.antlr.PainlessParser.NullContext; +import org.opensearch.painless.antlr.PainlessParser.NumericContext; +import org.opensearch.painless.antlr.PainlessParser.ParametersContext; +import org.opensearch.painless.antlr.PainlessParser.PostContext; +import org.opensearch.painless.antlr.PainlessParser.PostdotContext; +import org.opensearch.painless.antlr.PainlessParser.PostfixContext; +import org.opensearch.painless.antlr.PainlessParser.PreContext; +import org.opensearch.painless.antlr.PainlessParser.PrecedenceContext; +import org.opensearch.painless.antlr.PainlessParser.ReadContext; +import org.opensearch.painless.antlr.PainlessParser.RegexContext; +import org.opensearch.painless.antlr.PainlessParser.ReturnContext; +import org.opensearch.painless.antlr.PainlessParser.SingleContext; +import org.opensearch.painless.antlr.PainlessParser.SourceContext; +import org.opensearch.painless.antlr.PainlessParser.StatementContext; +import org.opensearch.painless.antlr.PainlessParser.StringContext; +import org.opensearch.painless.antlr.PainlessParser.ThrowContext; +import org.opensearch.painless.antlr.PainlessParser.TrailerContext; +import org.opensearch.painless.antlr.PainlessParser.TrapContext; +import org.opensearch.painless.antlr.PainlessParser.TrueContext; +import org.opensearch.painless.antlr.PainlessParser.TryContext; +import org.opensearch.painless.antlr.PainlessParser.TypeContext; +import org.opensearch.painless.antlr.PainlessParser.VariableContext; +import org.opensearch.painless.antlr.PainlessParser.WhileContext; +import org.opensearch.painless.node.AExpression; +import org.opensearch.painless.node.ANode; +import org.opensearch.painless.node.AStatement; +import org.opensearch.painless.node.EAssignment; +import org.opensearch.painless.node.EBinary; +import org.opensearch.painless.node.EBooleanComp; +import org.opensearch.painless.node.EBooleanConstant; +import org.opensearch.painless.node.EBrace; +import org.opensearch.painless.node.ECall; +import org.opensearch.painless.node.ECallLocal; +import org.opensearch.painless.node.EComp; +import org.opensearch.painless.node.EConditional; +import org.opensearch.painless.node.EDecimal; +import org.opensearch.painless.node.EDot; +import org.opensearch.painless.node.EElvis; +import org.opensearch.painless.node.EExplicit; +import org.opensearch.painless.node.EFunctionRef; +import org.opensearch.painless.node.EInstanceof; +import org.opensearch.painless.node.ELambda; +import org.opensearch.painless.node.EListInit; +import org.opensearch.painless.node.EMapInit; +import org.opensearch.painless.node.ENewArray; +import org.opensearch.painless.node.ENewArrayFunctionRef; +import org.opensearch.painless.node.ENewObj; +import org.opensearch.painless.node.ENull; +import org.opensearch.painless.node.ENumeric; +import org.opensearch.painless.node.ERegex; +import org.opensearch.painless.node.EString; +import org.opensearch.painless.node.ESymbol; +import org.opensearch.painless.node.EUnary; +import org.opensearch.painless.node.SBlock; +import org.opensearch.painless.node.SBreak; +import org.opensearch.painless.node.SCatch; +import org.opensearch.painless.node.SClass; +import org.opensearch.painless.node.SContinue; +import org.opensearch.painless.node.SDeclBlock; +import org.opensearch.painless.node.SDeclaration; +import org.opensearch.painless.node.SDo; +import org.opensearch.painless.node.SEach; +import org.opensearch.painless.node.SExpression; +import org.opensearch.painless.node.SFor; +import org.opensearch.painless.node.SFunction; +import org.opensearch.painless.node.SIf; +import org.opensearch.painless.node.SIfElse; +import org.opensearch.painless.node.SReturn; +import org.opensearch.painless.node.SThrow; +import org.opensearch.painless.node.STry; +import org.opensearch.painless.node.SWhile; import java.util.ArrayList; import java.util.Collections; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/package-info.java b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/package-info.java similarity index 89% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/package-info.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/antlr/package-info.java index 041118ba029..7af6a75476d 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/package-info.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/antlr/package-info.java @@ -19,6 +19,6 @@ /** * Lexer, parser, and tree {@link Walker} responsible for turning the code - * generating nodes in {@link org.elasticsearch.painless.node}. + * generating nodes in {@link org.opensearch.painless.node}. */ -package org.elasticsearch.painless.antlr; +package org.opensearch.painless.antlr; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/api/Augmentation.java b/modules/lang-painless/src/main/java/org/opensearch/painless/api/Augmentation.java similarity index 99% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/api/Augmentation.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/api/Augmentation.java index 41e79883034..7e5ba851c4f 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/api/Augmentation.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/api/Augmentation.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.api; +package org.opensearch.painless.api; import org.elasticsearch.common.hash.MessageDigests; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/api/Debug.java b/modules/lang-painless/src/main/java/org/opensearch/painless/api/Debug.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/api/Debug.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/api/Debug.java index de0c9b3adbd..6c74f92694d 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/api/Debug.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/api/Debug.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless.api; +package org.opensearch.painless.api; -import org.elasticsearch.painless.PainlessExplainError; +import org.opensearch.painless.PainlessExplainError; /** * Utility methods for debugging painless scripts that are accessible to painless scripts. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/api/Json.java b/modules/lang-painless/src/main/java/org/opensearch/painless/api/Json.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/api/Json.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/api/Json.java index b8bdafe9fba..98585563988 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/api/Json.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/api/Json.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.api; +package org.opensearch.painless.api; import org.elasticsearch.common.xcontent.DeprecationHandler; import org.elasticsearch.common.xcontent.NamedXContentRegistry; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/api/LimitedCharSequence.java b/modules/lang-painless/src/main/java/org/opensearch/painless/api/LimitedCharSequence.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/api/LimitedCharSequence.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/api/LimitedCharSequence.java index b3ded2fdca3..ae8fac126ed 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/api/LimitedCharSequence.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/api/LimitedCharSequence.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.painless.api; +package org.opensearch.painless.api; import org.elasticsearch.common.breaker.CircuitBreaker; import org.elasticsearch.common.breaker.CircuitBreakingException; -import org.elasticsearch.painless.CompilerSettings; +import org.opensearch.painless.CompilerSettings; import java.util.regex.Pattern; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/api/package-info.java b/modules/lang-painless/src/main/java/org/opensearch/painless/api/package-info.java similarity index 95% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/api/package-info.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/api/package-info.java index b1c78e28ec1..289bf08e6eb 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/api/package-info.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/api/package-info.java @@ -20,4 +20,4 @@ /** * Java code publicly exposed to Painless code. */ -package org.elasticsearch.painless.api; +package org.opensearch.painless.api; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ArgumentsNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ArgumentsNode.java similarity index 94% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ArgumentsNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ArgumentsNode.java index e944e7ef1ac..702821e29e5 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ArgumentsNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ArgumentsNode.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.Location; +import org.opensearch.painless.Location; import java.util.ArrayList; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BinaryImplNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/BinaryImplNode.java similarity index 84% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BinaryImplNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/BinaryImplNode.java index 88797329cb7..270a1edef2f 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BinaryImplNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/BinaryImplNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class BinaryImplNode extends BinaryNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BinaryMathNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/BinaryMathNode.java similarity index 89% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BinaryMathNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/BinaryMathNode.java index 5f8ef3e123b..8a127cb379d 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BinaryMathNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/BinaryMathNode.java @@ -17,18 +17,18 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.Operation; -import org.elasticsearch.painless.WriterConstants; -import org.elasticsearch.painless.api.Augmentation; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.lookup.def; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.Operation; +import org.opensearch.painless.WriterConstants; +import org.opensearch.painless.api.Augmentation; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.def; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import java.util.regex.Matcher; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BinaryNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/BinaryNode.java similarity index 94% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BinaryNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/BinaryNode.java index c0fd3ac5650..07a46f7b918 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BinaryNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/BinaryNode.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.Location; +import org.opensearch.painless.Location; public abstract class BinaryNode extends ExpressionNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BlockNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/BlockNode.java similarity index 89% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BlockNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/BlockNode.java index 428a5f1c1a8..0bb7fb221c2 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BlockNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/BlockNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import java.util.ArrayList; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BooleanNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/BooleanNode.java similarity index 90% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BooleanNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/BooleanNode.java index 89300083744..727cd17359a 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BooleanNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/BooleanNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.Operation; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.Operation; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BreakNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/BreakNode.java similarity index 83% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BreakNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/BreakNode.java index 7b211817d4e..673455e8aa6 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/BreakNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/BreakNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class BreakNode extends StatementNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/CastNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/CastNode.java similarity index 84% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/CastNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/CastNode.java index 5806c75de57..4159b711d2c 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/CastNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/CastNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessCast; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessCast; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class CastNode extends UnaryNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/CatchNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/CatchNode.java similarity index 89% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/CatchNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/CatchNode.java index 54c95e6e114..26cda467aa4 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/CatchNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/CatchNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; -import org.elasticsearch.painless.symbol.WriteScope.Variable; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; +import org.opensearch.painless.symbol.WriteScope.Variable; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ClassNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ClassNode.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ClassNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ClassNode.java index 8dacee8534f..73ab5dd0d06 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ClassNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ClassNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.ScriptClassInfo; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.ScriptScope; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.ScriptClassInfo; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.ScriptScope; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; @@ -37,8 +37,8 @@ import java.util.ArrayList; import java.util.BitSet; import java.util.List; -import static org.elasticsearch.painless.WriterConstants.BASE_INTERFACE_TYPE; -import static org.elasticsearch.painless.WriterConstants.CLASS_TYPE; +import static org.opensearch.painless.WriterConstants.BASE_INTERFACE_TYPE; +import static org.opensearch.painless.WriterConstants.CLASS_TYPE; public class ClassNode extends IRNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ComparisonNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ComparisonNode.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ComparisonNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ComparisonNode.java index 3729000c816..a8cc2f9674b 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ComparisonNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ComparisonNode.java @@ -17,22 +17,22 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.DefBootstrap; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.Operation; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.lookup.def; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.DefBootstrap; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.Operation; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.def; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Label; import org.objectweb.asm.Type; -import static org.elasticsearch.painless.WriterConstants.EQUALS; -import static org.elasticsearch.painless.WriterConstants.OBJECTS_TYPE; +import static org.opensearch.painless.WriterConstants.EQUALS; +import static org.opensearch.painless.WriterConstants.OBJECTS_TYPE; public class ComparisonNode extends BinaryNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ConditionNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ConditionNode.java similarity index 94% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ConditionNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ConditionNode.java index 829d44334b1..f32d3935145 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ConditionNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ConditionNode.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.Location; +import org.opensearch.painless.Location; public abstract class ConditionNode extends StatementNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ConditionalNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ConditionalNode.java similarity index 89% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ConditionalNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ConditionalNode.java index ccc73c8970b..c0f3280b8bd 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ConditionalNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ConditionalNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ConstantNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ConstantNode.java similarity index 89% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ConstantNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ConstantNode.java index 122ade69e0a..6db98ab61c4 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ConstantNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ConstantNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class ConstantNode extends ExpressionNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ContinueNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ContinueNode.java similarity index 83% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ContinueNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ContinueNode.java index ab7cd1c0118..d9a1f4ab115 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ContinueNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ContinueNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class ContinueNode extends StatementNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/DeclarationBlockNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/DeclarationBlockNode.java similarity index 88% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/DeclarationBlockNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/DeclarationBlockNode.java index bd554e7d2cf..1e5353c0037 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/DeclarationBlockNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/DeclarationBlockNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import java.util.ArrayList; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/DeclarationNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/DeclarationNode.java similarity index 89% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/DeclarationNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/DeclarationNode.java index d60fe62fe97..c821a9231ce 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/DeclarationNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/DeclarationNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; -import org.elasticsearch.painless.symbol.WriteScope.Variable; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; +import org.opensearch.painless.symbol.WriteScope.Variable; import org.objectweb.asm.Opcodes; public class DeclarationNode extends StatementNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/DefInterfaceReferenceNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/DefInterfaceReferenceNode.java similarity index 88% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/DefInterfaceReferenceNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/DefInterfaceReferenceNode.java index c28103293aa..efad39e265a 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/DefInterfaceReferenceNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/DefInterfaceReferenceNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Opcodes; public class DefInterfaceReferenceNode extends ReferenceNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/DoWhileLoopNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/DoWhileLoopNode.java similarity index 87% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/DoWhileLoopNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/DoWhileLoopNode.java index 9335f403453..b6010cd3cef 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/DoWhileLoopNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/DoWhileLoopNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; -import org.elasticsearch.painless.symbol.WriteScope.Variable; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; +import org.opensearch.painless.symbol.WriteScope.Variable; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/DupNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/DupNode.java similarity index 86% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/DupNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/DupNode.java index 34de12f9fe5..e1a28db1376 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/DupNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/DupNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class DupNode extends UnaryNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ElvisNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ElvisNode.java similarity index 86% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ElvisNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ElvisNode.java index 1946fdaf7ca..38150572779 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ElvisNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ElvisNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Label; public class ElvisNode extends BinaryNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ExpressionNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ExpressionNode.java similarity index 90% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ExpressionNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ExpressionNode.java index cf70697dbbd..b7b9665f2a6 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ExpressionNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ExpressionNode.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.Location; +import org.opensearch.painless.lookup.PainlessLookupUtility; public abstract class ExpressionNode extends IRNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/FieldNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/FieldNode.java similarity index 86% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/FieldNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/FieldNode.java index f50410beb1d..8e19e422621 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/FieldNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/FieldNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Type; public class FieldNode extends IRNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/FlipArrayIndexNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/FlipArrayIndexNode.java similarity index 86% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/FlipArrayIndexNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/FlipArrayIndexNode.java index b97294f70f7..a718a426a95 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/FlipArrayIndexNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/FlipArrayIndexNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/FlipCollectionIndexNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/FlipCollectionIndexNode.java similarity index 85% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/FlipCollectionIndexNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/FlipCollectionIndexNode.java index ad311e5c660..64255524429 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/FlipCollectionIndexNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/FlipCollectionIndexNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.WriterConstants; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.WriterConstants; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/FlipDefIndexNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/FlipDefIndexNode.java similarity index 83% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/FlipDefIndexNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/FlipDefIndexNode.java index ae84de8401e..bcb2ab40191 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/FlipDefIndexNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/FlipDefIndexNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.DefBootstrap; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.def; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.DefBootstrap; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.def; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Type; public class FlipDefIndexNode extends UnaryNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ForEachLoopNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ForEachLoopNode.java similarity index 86% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ForEachLoopNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ForEachLoopNode.java index 551fc333706..be0005d19f4 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ForEachLoopNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ForEachLoopNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class ForEachLoopNode extends StatementNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ForEachSubArrayNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ForEachSubArrayNode.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ForEachSubArrayNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ForEachSubArrayNode.java index a4e48f2e06c..42d9f7985f9 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ForEachSubArrayNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ForEachSubArrayNode.java @@ -17,16 +17,16 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessCast; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; -import org.elasticsearch.painless.symbol.WriteScope.Variable; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessCast; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; +import org.opensearch.painless.symbol.WriteScope.Variable; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ForEachSubIterableNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ForEachSubIterableNode.java similarity index 86% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ForEachSubIterableNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ForEachSubIterableNode.java index e9a4579600d..52ffeb0c604 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ForEachSubIterableNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ForEachSubIterableNode.java @@ -17,25 +17,25 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.DefBootstrap; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessCast; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; -import org.elasticsearch.painless.symbol.WriteScope.Variable; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.DefBootstrap; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessCast; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; +import org.opensearch.painless.symbol.WriteScope.Variable; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; import java.util.Iterator; -import static org.elasticsearch.painless.WriterConstants.ITERATOR_HASNEXT; -import static org.elasticsearch.painless.WriterConstants.ITERATOR_NEXT; -import static org.elasticsearch.painless.WriterConstants.ITERATOR_TYPE; +import static org.opensearch.painless.WriterConstants.ITERATOR_HASNEXT; +import static org.opensearch.painless.WriterConstants.ITERATOR_NEXT; +import static org.opensearch.painless.WriterConstants.ITERATOR_TYPE; /** * Represents a for-each loop for iterables. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ForLoopNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ForLoopNode.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ForLoopNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ForLoopNode.java index 32087ae1197..9592898f0b1 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ForLoopNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ForLoopNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; -import org.elasticsearch.painless.symbol.WriteScope.Variable; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; +import org.opensearch.painless.symbol.WriteScope.Variable; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/FunctionNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/FunctionNode.java similarity index 93% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/FunctionNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/FunctionNode.java index be27ebae7ff..595203a1cf6 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/FunctionNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/FunctionNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; -import org.elasticsearch.painless.symbol.WriteScope.Variable; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; +import org.opensearch.painless.symbol.WriteScope.Variable; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; import org.objectweb.asm.commons.Method; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/IRNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/IRNode.java similarity index 83% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/IRNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/IRNode.java index c677701536d..0c81b524e29 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/IRNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/IRNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public abstract class IRNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/IfElseNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/IfElseNode.java similarity index 90% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/IfElseNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/IfElseNode.java index 7daf9c9f38c..6f203a66d1b 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/IfElseNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/IfElseNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/IfNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/IfNode.java similarity index 87% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/IfNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/IfNode.java index e9e7dd7f67b..1abad16f7dc 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/IfNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/IfNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/InstanceofNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/InstanceofNode.java similarity index 86% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/InstanceofNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/InstanceofNode.java index 0fee7e85a2d..f40b2d9515a 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/InstanceofNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/InstanceofNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.lookup.def; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.def; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class InstanceofNode extends UnaryNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/InvokeCallDefNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/InvokeCallDefNode.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/InvokeCallDefNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/InvokeCallDefNode.java index f454b2c448d..f87232e8685 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/InvokeCallDefNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/InvokeCallDefNode.java @@ -17,20 +17,20 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.DefBootstrap; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.DefBootstrap; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Type; import java.util.ArrayList; import java.util.List; -import static org.elasticsearch.painless.symbol.WriteScope.Variable; +import static org.opensearch.painless.symbol.WriteScope.Variable; public class InvokeCallDefNode extends ArgumentsNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/InvokeCallMemberNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/InvokeCallMemberNode.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/InvokeCallMemberNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/InvokeCallMemberNode.java index a1240264973..2ed0ee45606 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/InvokeCallMemberNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/InvokeCallMemberNode.java @@ -17,22 +17,22 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessClassBinding; -import org.elasticsearch.painless.lookup.PainlessInstanceBinding; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.FunctionTable.LocalFunction; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessClassBinding; +import org.opensearch.painless.lookup.PainlessInstanceBinding; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.FunctionTable.LocalFunction; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Label; import org.objectweb.asm.Type; import org.objectweb.asm.commons.Method; -import static org.elasticsearch.painless.WriterConstants.CLASS_TYPE; +import static org.opensearch.painless.WriterConstants.CLASS_TYPE; public class InvokeCallMemberNode extends ArgumentsNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/InvokeCallNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/InvokeCallNode.java similarity index 86% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/InvokeCallNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/InvokeCallNode.java index 53102211a79..7962951eb51 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/InvokeCallNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/InvokeCallNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class InvokeCallNode extends ArgumentsNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ListInitializationNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ListInitializationNode.java similarity index 86% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ListInitializationNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ListInitializationNode.java index 52aa75f723a..50712f6994e 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ListInitializationNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ListInitializationNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessConstructor; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessConstructor; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Type; import org.objectweb.asm.commons.Method; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadBraceDefNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadBraceDefNode.java similarity index 82% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadBraceDefNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadBraceDefNode.java index 9cc78d986bc..120f1bf1110 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadBraceDefNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadBraceDefNode.java @@ -17,16 +17,16 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.DefBootstrap; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.lookup.def; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.DefBootstrap; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.def; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Type; public class LoadBraceDefNode extends ExpressionNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadBraceNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadBraceNode.java similarity index 84% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadBraceNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadBraceNode.java index 77824481838..774ffd4ea81 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadBraceNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadBraceNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class LoadBraceNode extends ExpressionNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadDotArrayLengthNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadDotArrayLengthNode.java similarity index 84% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadDotArrayLengthNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadDotArrayLengthNode.java index e48c6002ccf..ef98d6fff66 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadDotArrayLengthNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadDotArrayLengthNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class LoadDotArrayLengthNode extends ExpressionNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadDotDefNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadDotDefNode.java similarity index 83% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadDotDefNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadDotDefNode.java index 2bfab4e581a..bfde95e10b1 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadDotDefNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadDotDefNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.DefBootstrap; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.def; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.DefBootstrap; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.def; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Type; public class LoadDotDefNode extends ExpressionNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadDotNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadDotNode.java similarity index 86% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadDotNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadDotNode.java index ad81a0d5f0d..745a720dd8e 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadDotNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadDotNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessField; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessField; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Type; public class LoadDotNode extends ExpressionNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadDotShortcutNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadDotShortcutNode.java similarity index 84% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadDotShortcutNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadDotShortcutNode.java index 37f4e2e3ed9..860c7d1fa7b 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadDotShortcutNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadDotShortcutNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class LoadDotShortcutNode extends ExpressionNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadFieldMemberNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadFieldMemberNode.java similarity index 86% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadFieldMemberNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadFieldMemberNode.java index 267b3336545..c06f02be2ab 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadFieldMemberNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadFieldMemberNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; -import static org.elasticsearch.painless.WriterConstants.CLASS_TYPE; +import static org.opensearch.painless.WriterConstants.CLASS_TYPE; /** * Represents reading a value from a member field from diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadListShortcutNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadListShortcutNode.java similarity index 84% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadListShortcutNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadListShortcutNode.java index 33f3031064e..d9f06db1ac5 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadListShortcutNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadListShortcutNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class LoadListShortcutNode extends ExpressionNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadMapShortcutNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadMapShortcutNode.java similarity index 84% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadMapShortcutNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadMapShortcutNode.java index b8b5214da5c..f5f30e8c32c 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadMapShortcutNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadMapShortcutNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class LoadMapShortcutNode extends ExpressionNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadVariableNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadVariableNode.java similarity index 84% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadVariableNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadVariableNode.java index e3610f6f8d4..1d8371b0ba4 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoadVariableNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoadVariableNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; -import org.elasticsearch.painless.symbol.WriteScope.Variable; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; +import org.opensearch.painless.symbol.WriteScope.Variable; import org.objectweb.asm.Opcodes; public class LoadVariableNode extends ExpressionNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoopNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoopNode.java similarity index 93% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoopNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoopNode.java index 0ce4d9d6d6e..b57ca0d4737 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/LoopNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/LoopNode.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.Location; +import org.opensearch.painless.Location; public abstract class LoopNode extends ConditionNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/MapInitializationNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/MapInitializationNode.java similarity index 90% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/MapInitializationNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/MapInitializationNode.java index 3bdd2f24b41..df5dd747b71 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/MapInitializationNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/MapInitializationNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessConstructor; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessConstructor; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Type; import org.objectweb.asm.commons.Method; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/NewArrayNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/NewArrayNode.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/NewArrayNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/NewArrayNode.java index 5e001f8e784..d210a31d6db 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/NewArrayNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/NewArrayNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class NewArrayNode extends ArgumentsNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/NewObjectNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/NewObjectNode.java similarity index 87% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/NewObjectNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/NewObjectNode.java index cad999a19ff..dd7945d2c95 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/NewObjectNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/NewObjectNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessConstructor; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessConstructor; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Type; import org.objectweb.asm.commons.Method; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/NullNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/NullNode.java similarity index 83% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/NullNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/NullNode.java index 71f9233717b..5800a783187 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/NullNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/NullNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Opcodes; public class NullNode extends ExpressionNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/NullSafeSubNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/NullSafeSubNode.java similarity index 85% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/NullSafeSubNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/NullSafeSubNode.java index a1c09e282b5..b8dd83c17ec 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/NullSafeSubNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/NullSafeSubNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Label; public class NullSafeSubNode extends UnaryNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ReferenceNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ReferenceNode.java similarity index 93% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ReferenceNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ReferenceNode.java index dc4b4862836..7287db02535 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ReferenceNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ReferenceNode.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.Location; +import org.opensearch.painless.Location; import java.util.ArrayList; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ReturnNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ReturnNode.java similarity index 87% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ReturnNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ReturnNode.java index 45a2d681673..e56e227af9f 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ReturnNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ReturnNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class ReturnNode extends StatementNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StatementExpressionNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StatementExpressionNode.java similarity index 87% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StatementExpressionNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/StatementExpressionNode.java index c34804fc92c..70cfddded75 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StatementExpressionNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StatementExpressionNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class StatementExpressionNode extends StatementNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StatementNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StatementNode.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StatementNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/StatementNode.java index 7937415fc05..076d634772f 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StatementNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StatementNode.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.Location; +import org.opensearch.painless.Location; import org.objectweb.asm.Label; public abstract class StatementNode extends IRNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StaticNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StaticNode.java similarity index 83% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StaticNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/StaticNode.java index 73213e2881b..6a6021b4d00 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StaticNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StaticNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class StaticNode extends ExpressionNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreBraceDefNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreBraceDefNode.java similarity index 83% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreBraceDefNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreBraceDefNode.java index 2130b950d39..5d2e5ec43f7 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreBraceDefNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreBraceDefNode.java @@ -17,16 +17,16 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.DefBootstrap; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.lookup.def; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.DefBootstrap; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.def; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Type; public class StoreBraceDefNode extends StoreNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreBraceNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreBraceNode.java similarity index 84% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreBraceNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreBraceNode.java index b58d0c8ddfa..91b2762558c 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreBraceNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreBraceNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class StoreBraceNode extends StoreNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreDotDefNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreDotDefNode.java similarity index 84% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreDotDefNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreDotDefNode.java index 3d81f83c1bd..27c39fc2213 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreDotDefNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreDotDefNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.DefBootstrap; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.def; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.DefBootstrap; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.def; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Type; public class StoreDotDefNode extends StoreNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreDotNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreDotNode.java similarity index 86% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreDotNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreDotNode.java index a64ac878a91..d62d9c16c35 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreDotNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreDotNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessField; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessField; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Type; public class StoreDotNode extends StoreNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreDotShortcutNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreDotShortcutNode.java similarity index 84% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreDotShortcutNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreDotShortcutNode.java index cf59ad33e78..c2ff0516484 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreDotShortcutNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreDotShortcutNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class StoreDotShortcutNode extends StoreNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreFieldMemberNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreFieldMemberNode.java similarity index 87% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreFieldMemberNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreFieldMemberNode.java index 4b22c4abf16..0f12f34e128 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreFieldMemberNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreFieldMemberNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; -import static org.elasticsearch.painless.WriterConstants.CLASS_TYPE; +import static org.opensearch.painless.WriterConstants.CLASS_TYPE; /** * Represents a member field assignment on the main class. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreListShortcutNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreListShortcutNode.java similarity index 84% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreListShortcutNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreListShortcutNode.java index d4f5a03aed6..75dfddef8f7 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreListShortcutNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreListShortcutNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class StoreListShortcutNode extends StoreNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreMapShortcutNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreMapShortcutNode.java similarity index 84% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreMapShortcutNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreMapShortcutNode.java index c7c63f67050..8129af42035 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreMapShortcutNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreMapShortcutNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class StoreMapShortcutNode extends StoreNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreNode.java similarity index 89% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreNode.java index c4dd2b995f9..5db72fba7d5 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreNode.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.Location; +import org.opensearch.painless.lookup.PainlessLookupUtility; public abstract class StoreNode extends UnaryNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreVariableNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreVariableNode.java similarity index 84% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreVariableNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreVariableNode.java index 8f8dd345c4f..f874e1279d4 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StoreVariableNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StoreVariableNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; -import org.elasticsearch.painless.symbol.WriteScope.Variable; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; +import org.opensearch.painless.symbol.WriteScope.Variable; import org.objectweb.asm.Opcodes; public class StoreVariableNode extends StoreNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StringConcatenationNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StringConcatenationNode.java similarity index 86% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StringConcatenationNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/StringConcatenationNode.java index a8e20ba236e..36f8be36553 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/StringConcatenationNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/StringConcatenationNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class StringConcatenationNode extends ArgumentsNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ThrowNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ThrowNode.java similarity index 86% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ThrowNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/ThrowNode.java index ac3ae087604..eeeea22fe16 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/ThrowNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/ThrowNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; public class ThrowNode extends StatementNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/TryNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/TryNode.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/TryNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/TryNode.java index 22b88e28b5c..bac38525cdd 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/TryNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/TryNode.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Label; import java.util.ArrayList; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/TypedCaptureReferenceNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/TypedCaptureReferenceNode.java similarity index 84% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/TypedCaptureReferenceNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/TypedCaptureReferenceNode.java index 813b0740c70..c8613082435 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/TypedCaptureReferenceNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/TypedCaptureReferenceNode.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.DefBootstrap; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; -import org.elasticsearch.painless.symbol.WriteScope.Variable; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.DefBootstrap; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; +import org.opensearch.painless.symbol.WriteScope.Variable; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/TypedInterfaceReferenceNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/TypedInterfaceReferenceNode.java similarity index 86% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/TypedInterfaceReferenceNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/TypedInterfaceReferenceNode.java index b4abf274562..59f29e7eee7 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/TypedInterfaceReferenceNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/TypedInterfaceReferenceNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.FunctionRef; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.FunctionRef; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Opcodes; public class TypedInterfaceReferenceNode extends ReferenceNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/UnaryMathNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/UnaryMathNode.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/UnaryMathNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/UnaryMathNode.java index f015ed2aaa2..deb691798e0 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/UnaryMathNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/UnaryMathNode.java @@ -17,17 +17,17 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.DefBootstrap; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.Operation; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.lookup.def; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.DefBootstrap; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.Operation; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.def; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/UnaryNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/UnaryNode.java similarity index 93% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/UnaryNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/UnaryNode.java index 061f62d51a3..c1463013e01 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/UnaryNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/UnaryNode.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.Location; +import org.opensearch.painless.Location; public abstract class UnaryNode extends ExpressionNode { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/WhileLoopNode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/WhileLoopNode.java similarity index 88% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/WhileLoopNode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/ir/WhileLoopNode.java index 0f5c349d2fc..472da9b1a5c 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/ir/WhileLoopNode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/ir/WhileLoopNode.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless.ir; +package org.opensearch.painless.ir; -import org.elasticsearch.painless.ClassWriter; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.phase.IRTreeVisitor; -import org.elasticsearch.painless.symbol.WriteScope; -import org.elasticsearch.painless.symbol.WriteScope.Variable; +import org.opensearch.painless.ClassWriter; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.phase.IRTreeVisitor; +import org.opensearch.painless.symbol.WriteScope; +import org.opensearch.painless.symbol.WriteScope.Variable; import org.objectweb.asm.Label; import org.objectweb.asm.Opcodes; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessCast.java b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessCast.java similarity index 99% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessCast.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessCast.java index 1956323029c..09ef212b6ea 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessCast.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessCast.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.lookup; +package org.opensearch.painless.lookup; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessClass.java b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessClass.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessClass.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessClass.java index d6b89aa623f..b56801ef3ba 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessClass.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessClass.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.lookup; +package org.opensearch.painless.lookup; import org.elasticsearch.common.util.CollectionUtils; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessClassBinding.java b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessClassBinding.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessClassBinding.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessClassBinding.java index 971c39d3fe6..04ae10741a1 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessClassBinding.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessClassBinding.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.lookup; +package org.opensearch.painless.lookup; import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessClassBuilder.java b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessClassBuilder.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessClassBuilder.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessClassBuilder.java index 04e086e2f4d..2d9ea31e094 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessClassBuilder.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessClassBuilder.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.lookup; +package org.opensearch.painless.lookup; import java.lang.invoke.MethodHandle; import java.util.HashMap; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessConstructor.java b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessConstructor.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessConstructor.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessConstructor.java index b9b7a65925c..57816940c81 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessConstructor.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessConstructor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.lookup; +package org.opensearch.painless.lookup; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodType; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessField.java b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessField.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessField.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessField.java index 72a57159b44..bda6fbb8c65 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessField.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessField.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.lookup; +package org.opensearch.painless.lookup; import java.lang.invoke.MethodHandle; import java.lang.reflect.Field; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessInstanceBinding.java b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessInstanceBinding.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessInstanceBinding.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessInstanceBinding.java index 6952a3f05fb..6052de75551 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessInstanceBinding.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessInstanceBinding.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.lookup; +package org.opensearch.painless.lookup; import java.lang.reflect.Method; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessLookup.java b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessLookup.java similarity index 95% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessLookup.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessLookup.java index ae77440e573..d5063effdcd 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessLookup.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessLookup.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.lookup; +package org.opensearch.painless.lookup; import org.elasticsearch.common.util.CollectionUtils; @@ -27,11 +27,11 @@ import java.util.Objects; import java.util.Set; import java.util.function.Function; -import static org.elasticsearch.painless.lookup.PainlessLookupUtility.DEF_CLASS_NAME; -import static org.elasticsearch.painless.lookup.PainlessLookupUtility.buildPainlessConstructorKey; -import static org.elasticsearch.painless.lookup.PainlessLookupUtility.buildPainlessFieldKey; -import static org.elasticsearch.painless.lookup.PainlessLookupUtility.buildPainlessMethodKey; -import static org.elasticsearch.painless.lookup.PainlessLookupUtility.typeToBoxedType; +import static org.opensearch.painless.lookup.PainlessLookupUtility.DEF_CLASS_NAME; +import static org.opensearch.painless.lookup.PainlessLookupUtility.buildPainlessConstructorKey; +import static org.opensearch.painless.lookup.PainlessLookupUtility.buildPainlessFieldKey; +import static org.opensearch.painless.lookup.PainlessLookupUtility.buildPainlessMethodKey; +import static org.opensearch.painless.lookup.PainlessLookupUtility.typeToBoxedType; public final class PainlessLookup { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessLookupBuilder.java b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessLookupBuilder.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessLookupBuilder.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessLookupBuilder.java index 517c742b3d6..2b6eac310b6 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessLookupBuilder.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessLookupBuilder.java @@ -17,21 +17,21 @@ * under the License. */ -package org.elasticsearch.painless.lookup; +package org.opensearch.painless.lookup; import org.elasticsearch.bootstrap.BootstrapInfo; -import org.elasticsearch.painless.Def; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.WriterConstants; -import org.elasticsearch.painless.spi.Whitelist; -import org.elasticsearch.painless.spi.WhitelistClass; -import org.elasticsearch.painless.spi.WhitelistClassBinding; -import org.elasticsearch.painless.spi.WhitelistConstructor; -import org.elasticsearch.painless.spi.WhitelistField; -import org.elasticsearch.painless.spi.WhitelistInstanceBinding; -import org.elasticsearch.painless.spi.WhitelistMethod; -import org.elasticsearch.painless.spi.annotation.InjectConstantAnnotation; -import org.elasticsearch.painless.spi.annotation.NoImportAnnotation; +import org.opensearch.painless.Def; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.WriterConstants; +import org.opensearch.painless.spi.Whitelist; +import org.opensearch.painless.spi.WhitelistClass; +import org.opensearch.painless.spi.WhitelistClassBinding; +import org.opensearch.painless.spi.WhitelistConstructor; +import org.opensearch.painless.spi.WhitelistField; +import org.opensearch.painless.spi.WhitelistInstanceBinding; +import org.opensearch.painless.spi.WhitelistMethod; +import org.opensearch.painless.spi.annotation.InjectConstantAnnotation; +import org.opensearch.painless.spi.annotation.NoImportAnnotation; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Opcodes; import org.objectweb.asm.commons.GeneratorAdapter; @@ -58,22 +58,22 @@ import java.util.Map; import java.util.Objects; import java.util.regex.Pattern; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_BYTE_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_CHARACTER_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_DOUBLE_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_FLOAT_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_INTEGER_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_LONG_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_TO_B_SHORT_IMPLICIT; -import static org.elasticsearch.painless.WriterConstants.DEF_UTIL_TYPE; -import static org.elasticsearch.painless.WriterConstants.OBJECT_TYPE; -import static org.elasticsearch.painless.lookup.PainlessLookupUtility.DEF_CLASS_NAME; -import static org.elasticsearch.painless.lookup.PainlessLookupUtility.buildPainlessConstructorKey; -import static org.elasticsearch.painless.lookup.PainlessLookupUtility.buildPainlessFieldKey; -import static org.elasticsearch.painless.lookup.PainlessLookupUtility.buildPainlessMethodKey; -import static org.elasticsearch.painless.lookup.PainlessLookupUtility.typeToCanonicalTypeName; -import static org.elasticsearch.painless.lookup.PainlessLookupUtility.typeToJavaType; -import static org.elasticsearch.painless.lookup.PainlessLookupUtility.typesToCanonicalTypeNames; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_BYTE_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_CHARACTER_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_DOUBLE_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_FLOAT_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_INTEGER_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_LONG_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_TO_B_SHORT_IMPLICIT; +import static org.opensearch.painless.WriterConstants.DEF_UTIL_TYPE; +import static org.opensearch.painless.WriterConstants.OBJECT_TYPE; +import static org.opensearch.painless.lookup.PainlessLookupUtility.DEF_CLASS_NAME; +import static org.opensearch.painless.lookup.PainlessLookupUtility.buildPainlessConstructorKey; +import static org.opensearch.painless.lookup.PainlessLookupUtility.buildPainlessFieldKey; +import static org.opensearch.painless.lookup.PainlessLookupUtility.buildPainlessMethodKey; +import static org.opensearch.painless.lookup.PainlessLookupUtility.typeToCanonicalTypeName; +import static org.opensearch.painless.lookup.PainlessLookupUtility.typeToJavaType; +import static org.opensearch.painless.lookup.PainlessLookupUtility.typesToCanonicalTypeNames; public final class PainlessLookupBuilder { @@ -1384,7 +1384,7 @@ public final class PainlessLookupBuilder { int bridgeClassFrames = ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS; int bridgeClassAccess = Opcodes.ACC_PUBLIC | Opcodes.ACC_SUPER | Opcodes.ACC_FINAL; String bridgeClassName = - "org/elasticsearch/painless/Bridge$" + javaMethod.getDeclaringClass().getSimpleName() + "$" + javaMethod.getName(); + "org/opensearch/painless/Bridge$" + javaMethod.getDeclaringClass().getSimpleName() + "$" + javaMethod.getName(); ClassWriter bridgeClassWriter = new ClassWriter(bridgeClassFrames); bridgeClassWriter.visit( WriterConstants.CLASS_VERSION, bridgeClassAccess, bridgeClassName, null, OBJECT_TYPE.getInternalName(), null); diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessLookupUtility.java b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessLookupUtility.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessLookupUtility.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessLookupUtility.java index 99de1393474..7c0edf4c60e 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessLookupUtility.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessLookupUtility.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless.lookup; +package org.opensearch.painless.lookup; -import org.elasticsearch.painless.spi.annotation.InjectConstantAnnotation; +import org.opensearch.painless.spi.annotation.InjectConstantAnnotation; import java.util.Arrays; import java.util.List; @@ -364,7 +364,7 @@ public final class PainlessLookupUtility { /** * Constructs an array of injectable constants for a specific {@link PainlessMethod} - * derived from an {@link org.elasticsearch.painless.spi.annotation.InjectConstantAnnotation}. + * derived from an {@link org.opensearch.painless.spi.annotation.InjectConstantAnnotation}. */ public static Object[] buildInjections(PainlessMethod painlessMethod, Map constants) { if (painlessMethod.annotations.containsKey(InjectConstantAnnotation.class) == false) { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessMethod.java b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessMethod.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessMethod.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessMethod.java index 4ab14083a52..29586f93b10 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessMethod.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/PainlessMethod.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.lookup; +package org.opensearch.painless.lookup; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodType; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/def.java b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/def.java similarity index 95% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/def.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/lookup/def.java index 4336236be3f..0e4cef634d6 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/lookup/def.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/lookup/def.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.lookup; +package org.opensearch.painless.lookup; /** Marker class for def type to be used during type analysis. */ public final class def { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/AExpression.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/AExpression.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/AExpression.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/AExpression.java index cbbb807c91d..4ef318ad4dd 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/AExpression.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/AExpression.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; +import org.opensearch.painless.Location; /** * The superclass for all E* (expression) and P* (postfix) nodes. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ANode.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ANode.java similarity index 93% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ANode.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/ANode.java index 411501e1917..b85aba42c67 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ANode.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ANode.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/AStatement.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/AStatement.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/AStatement.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/AStatement.java index 32d47fc4358..c1cf077e3e3 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/AStatement.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/AStatement.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; +import org.opensearch.painless.Location; /** * The superclass for all S* (statement) nodes. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EAssignment.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EAssignment.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EAssignment.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EAssignment.java index 9b32e78878b..0c97dcebbe2 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EAssignment.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EAssignment.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.Operation; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.Operation; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBinary.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EBinary.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBinary.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EBinary.java index e4ab63fc40a..a762c39c2bf 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBinary.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EBinary.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.Operation; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.Operation; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBooleanComp.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EBooleanComp.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBooleanComp.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EBooleanComp.java index 3d75eaa8f5b..a78f1e00335 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBooleanComp.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EBooleanComp.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.Operation; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.Operation; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBooleanConstant.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EBooleanConstant.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBooleanConstant.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EBooleanConstant.java index e3dc7202c21..c453cff40ee 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBooleanConstant.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EBooleanConstant.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; /** * Represents a boolean constant. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBrace.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EBrace.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBrace.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EBrace.java index cd3ba00728b..aa90196eb9c 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EBrace.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EBrace.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; @@ -51,7 +51,7 @@ public class EBrace extends AExpression { public void visit(UserTreeVisitor userTreeVisitor, Scope scope) { userTreeVisitor.visitBrace(this, scope); } - + @Override public void visitChildren(UserTreeVisitor userTreeVisitor, Scope scope) { prefixNode.visit(userTreeVisitor, scope); diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECall.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ECall.java similarity index 94% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECall.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/ECall.java index eafcddc1d3f..cc8440cdb41 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECall.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ECall.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Collections; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECallLocal.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ECallLocal.java similarity index 93% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECallLocal.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/ECallLocal.java index 451a0061005..2dd7550a812 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ECallLocal.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ECallLocal.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Collections; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EComp.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EComp.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EComp.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EComp.java index 6032acd5cfd..29cd960e17b 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EComp.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EComp.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.Operation; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.Operation; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EConditional.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EConditional.java similarity index 93% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EConditional.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EConditional.java index b0dd8b00a6a..5e18c67e7e2 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EConditional.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EConditional.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EDecimal.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EDecimal.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EDecimal.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EDecimal.java index 7321f7a8a66..48402989978 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EDecimal.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EDecimal.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EDot.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EDot.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EDot.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EDot.java index b67859859ef..9b557d3c09e 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EDot.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EDot.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EElvis.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EElvis.java similarity index 93% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EElvis.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EElvis.java index 887f2695803..5da47dc2646 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EElvis.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EElvis.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import static java.util.Objects.requireNonNull; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EExplicit.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EExplicit.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EExplicit.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EExplicit.java index b8d2dd752be..3cb6878b908 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EExplicit.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EExplicit.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EFunctionRef.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EFunctionRef.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EFunctionRef.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EFunctionRef.java index 6d49ff31528..69d1d8c899c 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EFunctionRef.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EFunctionRef.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EInstanceof.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EInstanceof.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EInstanceof.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EInstanceof.java index f2f1b2b523b..aa01ba51281 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EInstanceof.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EInstanceof.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ELambda.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ELambda.java similarity index 95% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ELambda.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/ELambda.java index dc991f54b87..042294935b6 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ELambda.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ELambda.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Collections; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EListInit.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EListInit.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EListInit.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EListInit.java index 46bf6dcc8ff..8342411541a 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EListInit.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EListInit.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Collections; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EMapInit.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EMapInit.java similarity index 93% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EMapInit.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EMapInit.java index 4c2f6d2aa44..7e6e31d278c 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EMapInit.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EMapInit.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Collections; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewArray.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ENewArray.java similarity index 93% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewArray.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/ENewArray.java index cc8f522c503..6529898e8f5 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewArray.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ENewArray.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Collections; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewArrayFunctionRef.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ENewArrayFunctionRef.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewArrayFunctionRef.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/ENewArrayFunctionRef.java index b63d852c8ea..0b5efff0675 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewArrayFunctionRef.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ENewArrayFunctionRef.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewObj.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ENewObj.java similarity index 93% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewObj.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/ENewObj.java index 5c41275f455..ac2481f0bc7 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENewObj.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ENewObj.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Collections; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENull.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ENull.java similarity index 90% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENull.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/ENull.java index 2895e746e85..7a9fcb152a2 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENull.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ENull.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; /** * Represents a null constant. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENumeric.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ENumeric.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENumeric.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/ENumeric.java index a64288a46d2..e1a5cc235c0 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ENumeric.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ENumeric.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ERegex.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ERegex.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ERegex.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/ERegex.java index cdf8aa9c28c..3519ed6129d 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ERegex.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ERegex.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EString.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EString.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EString.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EString.java index 0fbddfdcadc..9d1f4c6d620 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EString.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EString.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ESymbol.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ESymbol.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ESymbol.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/ESymbol.java index c65146cbe8a..51a2025ec55 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/ESymbol.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/ESymbol.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EUnary.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EUnary.java similarity index 90% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EUnary.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/EUnary.java index 85a1527b961..f0a767ce292 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/EUnary.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/EUnary.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.Operation; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.Operation; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SBlock.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SBlock.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SBlock.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SBlock.java index 78ddb49e222..42e94c87508 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SBlock.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SBlock.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Collections; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SBreak.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SBreak.java similarity index 90% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SBreak.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SBreak.java index 6395b763de6..d0dcdce11bc 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SBreak.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SBreak.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; /** * Represents a break statement. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SCatch.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SCatch.java similarity index 93% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SCatch.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SCatch.java index b51ec696fc6..9fd6c93c6b5 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SCatch.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SCatch.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SClass.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SClass.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SClass.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SClass.java index 4f424b9993f..ff2b21b0fb6 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SClass.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SClass.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Collections; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SContinue.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SContinue.java similarity index 90% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SContinue.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SContinue.java index 9ec2693c03a..df5108ae698 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SContinue.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SContinue.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; /** * Represents a continue statement. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDeclBlock.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SDeclBlock.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDeclBlock.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SDeclBlock.java index d62468ce93a..8a55f629951 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDeclBlock.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SDeclBlock.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Collections; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDeclaration.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SDeclaration.java similarity index 93% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDeclaration.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SDeclaration.java index 15cba6f02f5..f44778321fc 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDeclaration.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SDeclaration.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDo.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SDo.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDo.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SDo.java index 4e5fdd3896c..8f936accea6 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SDo.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SDo.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SEach.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SEach.java similarity index 94% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SEach.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SEach.java index e8bf90b90fa..69e15eaa39d 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SEach.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SEach.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SExpression.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SExpression.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SExpression.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SExpression.java index 244ca547bf4..a73f2c541d9 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SExpression.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SExpression.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFor.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SFor.java similarity index 94% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFor.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SFor.java index 506102775ab..f6a9b293849 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFor.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SFor.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; /** * Represents a for loop. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFunction.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SFunction.java similarity index 96% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFunction.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SFunction.java index d6802a744ca..794901d56be 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SFunction.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SFunction.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Collections; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SIf.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SIf.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SIf.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SIf.java index 6b1865e3797..c3eb6df1502 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SIf.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SIf.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SIfElse.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SIfElse.java similarity index 93% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SIfElse.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SIfElse.java index ce7865d92e4..828fcc105d5 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SIfElse.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SIfElse.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SReturn.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SReturn.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SReturn.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SReturn.java index b2e301ca675..984a21a2f7e 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SReturn.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SReturn.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; /** * Represents a return statement. diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SThrow.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SThrow.java similarity index 91% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SThrow.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SThrow.java index a5a9c661830..392e8e2bf7f 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SThrow.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SThrow.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/STry.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/STry.java similarity index 93% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/STry.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/STry.java index 96d0a5d3cfe..ef1230a6b27 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/STry.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/STry.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Collections; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SWhile.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SWhile.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SWhile.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/SWhile.java index e38c52a831e..1feb2d0aa0b 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/SWhile.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/SWhile.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.phase.UserTreeVisitor; +import org.opensearch.painless.Location; +import org.opensearch.painless.phase.UserTreeVisitor; import java.util.Objects; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/package-info.java b/modules/lang-painless/src/main/java/org/opensearch/painless/node/package-info.java similarity index 55% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/node/package-info.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/node/package-info.java index 4144630d770..cf594317c48 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/node/package-info.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/node/package-info.java @@ -30,52 +30,52 @@ * *Sub* (sub) - These are partial nodes with a parent (S/E/P)* node used to split up logic into smaller pieces. *

* The following is a brief description of each node: - * {@link org.elasticsearch.painless.node.AExpression} - The superclass for all E* (expression) and P* (postfix) nodes. - * {@link org.elasticsearch.painless.node.ANode} - The superclass for all nodes. - * {@link org.elasticsearch.painless.node.AStatement} - The superclass for all S* (statement) nodes. - * {@link org.elasticsearch.painless.node.EAssignment} - Represents an assignment with the lhs and rhs as child nodes. - * {@link org.elasticsearch.painless.node.EBinary} - Represents a binary math expression. - * {@link org.elasticsearch.painless.node.EBooleanComp} - Represents a boolean expression. - * {@link org.elasticsearch.painless.node.EBooleanConstant} - Represents a boolean constant. - * {@link org.elasticsearch.painless.node.ECallLocal} - Represents a user-defined call. - * {@link org.elasticsearch.painless.node.EComp} - Represents a comparison expression. - * {@link org.elasticsearch.painless.node.EConditional} - Represents a conditional expression. - * {@link org.elasticsearch.painless.node.EDecimal} - Represents a decimal constant. - * {@link org.elasticsearch.painless.node.EExplicit} - Represents an explicit cast. - * {@link org.elasticsearch.painless.node.EFunctionRef} - Represents a function reference (non-capturing). - * {@link org.elasticsearch.painless.node.EInstanceof} - Represents an instanceof check. - * {@link org.elasticsearch.painless.node.ELambda} - Represents a lambda function. - * {@link org.elasticsearch.painless.node.EListInit} - Represents a list initialization shortcut. - * {@link org.elasticsearch.painless.node.EMapInit} - Represents a map initialization shortcut. - * {@link org.elasticsearch.painless.node.ENewArray} - Represents an array instantiation. - * {@link org.elasticsearch.painless.node.ENewObj} - Represents and object instantiation. - * {@link org.elasticsearch.painless.node.ENull} - Represents a null constant. - * {@link org.elasticsearch.painless.node.ENumeric} - Represents a non-decimal numeric constant. - * {@link org.elasticsearch.painless.node.ERegex} - Represents a regular expression constant. - * {@link org.elasticsearch.painless.node.EString} - Represents a string constant. - * {@link org.elasticsearch.painless.node.EUnary} - Represents a unary math expression. - * {@link org.elasticsearch.painless.node.ESymbol} - Represents a variable load/store. - * {@link org.elasticsearch.painless.node.EBrace} - Represents an array load/store and defers to a child subnode. - * {@link org.elasticsearch.painless.node.ECall} - Represents a method call and defers to a child subnode. - * {@link org.elasticsearch.painless.node.EDot} - Represents a field load/store and defers to a child subnode. - * {@link org.elasticsearch.painless.node.SBlock} - Represents a set of statements as a branch of control-flow. - * {@link org.elasticsearch.painless.node.SBreak} - Represents a break statement. - * {@link org.elasticsearch.painless.node.SCatch} - Represents a catch block as part of a try-catch block. - * {@link org.elasticsearch.painless.node.SContinue} - Represents a continue statement. - * {@link org.elasticsearch.painless.node.SDeclaration} - Represents a single variable declaration. - * {@link org.elasticsearch.painless.node.SDeclBlock} - Represents a series of declarations. - * {@link org.elasticsearch.painless.node.SDo} - Represents a do-while loop. - * {@link org.elasticsearch.painless.node.SEach} - Represents a for-each loop and defers to subnodes depending on type. - * {@link org.elasticsearch.painless.node.SExpression} - Represents the top-level node for an expression as a statement. - * {@link org.elasticsearch.painless.node.SFor} - Represents a for loop. - * {@link org.elasticsearch.painless.node.SFunction} - Represents a user-defined function. - * {@link org.elasticsearch.painless.node.SIf} - Represents an if block. - * {@link org.elasticsearch.painless.node.SIfElse} - Represents an if/else block. - * {@link org.elasticsearch.painless.node.SReturn} - Represents a return statement. - * {@link org.elasticsearch.painless.node.SClass} - The root of all Painless trees. Contains a series of statements. - * {@link org.elasticsearch.painless.node.SThrow} - Represents a throw statement. - * {@link org.elasticsearch.painless.node.STry} - Represents the try block as part of a try-catch block. - * {@link org.elasticsearch.painless.node.SWhile} - Represents a while loop. + * {@link org.opensearch.painless.node.AExpression} - The superclass for all E* (expression) and P* (postfix) nodes. + * {@link org.opensearch.painless.node.ANode} - The superclass for all nodes. + * {@link org.opensearch.painless.node.AStatement} - The superclass for all S* (statement) nodes. + * {@link org.opensearch.painless.node.EAssignment} - Represents an assignment with the lhs and rhs as child nodes. + * {@link org.opensearch.painless.node.EBinary} - Represents a binary math expression. + * {@link org.opensearch.painless.node.EBooleanComp} - Represents a boolean expression. + * {@link org.opensearch.painless.node.EBooleanConstant} - Represents a boolean constant. + * {@link org.opensearch.painless.node.ECallLocal} - Represents a user-defined call. + * {@link org.opensearch.painless.node.EComp} - Represents a comparison expression. + * {@link org.opensearch.painless.node.EConditional} - Represents a conditional expression. + * {@link org.opensearch.painless.node.EDecimal} - Represents a decimal constant. + * {@link org.opensearch.painless.node.EExplicit} - Represents an explicit cast. + * {@link org.opensearch.painless.node.EFunctionRef} - Represents a function reference (non-capturing). + * {@link org.opensearch.painless.node.EInstanceof} - Represents an instanceof check. + * {@link org.opensearch.painless.node.ELambda} - Represents a lambda function. + * {@link org.opensearch.painless.node.EListInit} - Represents a list initialization shortcut. + * {@link org.opensearch.painless.node.EMapInit} - Represents a map initialization shortcut. + * {@link org.opensearch.painless.node.ENewArray} - Represents an array instantiation. + * {@link org.opensearch.painless.node.ENewObj} - Represents and object instantiation. + * {@link org.opensearch.painless.node.ENull} - Represents a null constant. + * {@link org.opensearch.painless.node.ENumeric} - Represents a non-decimal numeric constant. + * {@link org.opensearch.painless.node.ERegex} - Represents a regular expression constant. + * {@link org.opensearch.painless.node.EString} - Represents a string constant. + * {@link org.opensearch.painless.node.EUnary} - Represents a unary math expression. + * {@link org.opensearch.painless.node.ESymbol} - Represents a variable load/store. + * {@link org.opensearch.painless.node.EBrace} - Represents an array load/store and defers to a child subnode. + * {@link org.opensearch.painless.node.ECall} - Represents a method call and defers to a child subnode. + * {@link org.opensearch.painless.node.EDot} - Represents a field load/store and defers to a child subnode. + * {@link org.opensearch.painless.node.SBlock} - Represents a set of statements as a branch of control-flow. + * {@link org.opensearch.painless.node.SBreak} - Represents a break statement. + * {@link org.opensearch.painless.node.SCatch} - Represents a catch block as part of a try-catch block. + * {@link org.opensearch.painless.node.SContinue} - Represents a continue statement. + * {@link org.opensearch.painless.node.SDeclaration} - Represents a single variable declaration. + * {@link org.opensearch.painless.node.SDeclBlock} - Represents a series of declarations. + * {@link org.opensearch.painless.node.SDo} - Represents a do-while loop. + * {@link org.opensearch.painless.node.SEach} - Represents a for-each loop and defers to subnodes depending on type. + * {@link org.opensearch.painless.node.SExpression} - Represents the top-level node for an expression as a statement. + * {@link org.opensearch.painless.node.SFor} - Represents a for loop. + * {@link org.opensearch.painless.node.SFunction} - Represents a user-defined function. + * {@link org.opensearch.painless.node.SIf} - Represents an if block. + * {@link org.opensearch.painless.node.SIfElse} - Represents an if/else block. + * {@link org.opensearch.painless.node.SReturn} - Represents a return statement. + * {@link org.opensearch.painless.node.SClass} - The root of all Painless trees. Contains a series of statements. + * {@link org.opensearch.painless.node.SThrow} - Represents a throw statement. + * {@link org.opensearch.painless.node.STry} - Represents the try block as part of a try-catch block. + * {@link org.opensearch.painless.node.SWhile} - Represents a while loop. *

* Note that internal nodes are generated during the analysis phase by modifying the tree on-the-fly * for clarity of development and convenience during the writing phase. @@ -137,4 +137,4 @@ * somewhere in their class hierarchy so the parent node can defer some analysis and writing to * the sub node. */ -package org.elasticsearch.painless.node; +package org.opensearch.painless.node; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/package-info.java b/modules/lang-painless/src/main/java/org/opensearch/painless/package-info.java similarity index 95% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/package-info.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/package-info.java index d45d4fb6d49..a82a843ae07 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/package-info.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/package-info.java @@ -20,4 +20,4 @@ /** * Implementation of the Painless language. */ -package org.elasticsearch.painless; +package org.opensearch.painless; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultConstantFoldingOptimizationPhase.java b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/DefaultConstantFoldingOptimizationPhase.java similarity index 94% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultConstantFoldingOptimizationPhase.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/phase/DefaultConstantFoldingOptimizationPhase.java index 9f29e7dd35a..9d9e54d4050 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultConstantFoldingOptimizationPhase.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/DefaultConstantFoldingOptimizationPhase.java @@ -17,56 +17,56 @@ * under the License. */ -package org.elasticsearch.painless.phase; +package org.opensearch.painless.phase; -import org.elasticsearch.painless.AnalyzerCaster; -import org.elasticsearch.painless.Operation; -import org.elasticsearch.painless.ir.BinaryMathNode; -import org.elasticsearch.painless.ir.BinaryImplNode; -import org.elasticsearch.painless.ir.BooleanNode; -import org.elasticsearch.painless.ir.CastNode; -import org.elasticsearch.painless.ir.ComparisonNode; -import org.elasticsearch.painless.ir.ConditionalNode; -import org.elasticsearch.painless.ir.ConstantNode; -import org.elasticsearch.painless.ir.DeclarationNode; -import org.elasticsearch.painless.ir.DoWhileLoopNode; -import org.elasticsearch.painless.ir.DupNode; -import org.elasticsearch.painless.ir.ElvisNode; -import org.elasticsearch.painless.ir.ExpressionNode; -import org.elasticsearch.painless.ir.FlipArrayIndexNode; -import org.elasticsearch.painless.ir.FlipCollectionIndexNode; -import org.elasticsearch.painless.ir.FlipDefIndexNode; -import org.elasticsearch.painless.ir.ForEachSubArrayNode; -import org.elasticsearch.painless.ir.ForEachSubIterableNode; -import org.elasticsearch.painless.ir.ForLoopNode; -import org.elasticsearch.painless.ir.IfElseNode; -import org.elasticsearch.painless.ir.IfNode; -import org.elasticsearch.painless.ir.InstanceofNode; -import org.elasticsearch.painless.ir.InvokeCallDefNode; -import org.elasticsearch.painless.ir.InvokeCallMemberNode; -import org.elasticsearch.painless.ir.InvokeCallNode; -import org.elasticsearch.painless.ir.ListInitializationNode; -import org.elasticsearch.painless.ir.MapInitializationNode; -import org.elasticsearch.painless.ir.NewArrayNode; -import org.elasticsearch.painless.ir.NewObjectNode; -import org.elasticsearch.painless.ir.NullNode; -import org.elasticsearch.painless.ir.NullSafeSubNode; -import org.elasticsearch.painless.ir.ReturnNode; -import org.elasticsearch.painless.ir.StatementExpressionNode; -import org.elasticsearch.painless.ir.StoreBraceDefNode; -import org.elasticsearch.painless.ir.StoreBraceNode; -import org.elasticsearch.painless.ir.StoreDotDefNode; -import org.elasticsearch.painless.ir.StoreDotNode; -import org.elasticsearch.painless.ir.StoreDotShortcutNode; -import org.elasticsearch.painless.ir.StoreFieldMemberNode; -import org.elasticsearch.painless.ir.StoreListShortcutNode; -import org.elasticsearch.painless.ir.StoreMapShortcutNode; -import org.elasticsearch.painless.ir.StoreVariableNode; -import org.elasticsearch.painless.ir.StringConcatenationNode; -import org.elasticsearch.painless.ir.ThrowNode; -import org.elasticsearch.painless.ir.UnaryMathNode; -import org.elasticsearch.painless.ir.WhileLoopNode; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.AnalyzerCaster; +import org.opensearch.painless.Operation; +import org.opensearch.painless.ir.BinaryMathNode; +import org.opensearch.painless.ir.BinaryImplNode; +import org.opensearch.painless.ir.BooleanNode; +import org.opensearch.painless.ir.CastNode; +import org.opensearch.painless.ir.ComparisonNode; +import org.opensearch.painless.ir.ConditionalNode; +import org.opensearch.painless.ir.ConstantNode; +import org.opensearch.painless.ir.DeclarationNode; +import org.opensearch.painless.ir.DoWhileLoopNode; +import org.opensearch.painless.ir.DupNode; +import org.opensearch.painless.ir.ElvisNode; +import org.opensearch.painless.ir.ExpressionNode; +import org.opensearch.painless.ir.FlipArrayIndexNode; +import org.opensearch.painless.ir.FlipCollectionIndexNode; +import org.opensearch.painless.ir.FlipDefIndexNode; +import org.opensearch.painless.ir.ForEachSubArrayNode; +import org.opensearch.painless.ir.ForEachSubIterableNode; +import org.opensearch.painless.ir.ForLoopNode; +import org.opensearch.painless.ir.IfElseNode; +import org.opensearch.painless.ir.IfNode; +import org.opensearch.painless.ir.InstanceofNode; +import org.opensearch.painless.ir.InvokeCallDefNode; +import org.opensearch.painless.ir.InvokeCallMemberNode; +import org.opensearch.painless.ir.InvokeCallNode; +import org.opensearch.painless.ir.ListInitializationNode; +import org.opensearch.painless.ir.MapInitializationNode; +import org.opensearch.painless.ir.NewArrayNode; +import org.opensearch.painless.ir.NewObjectNode; +import org.opensearch.painless.ir.NullNode; +import org.opensearch.painless.ir.NullSafeSubNode; +import org.opensearch.painless.ir.ReturnNode; +import org.opensearch.painless.ir.StatementExpressionNode; +import org.opensearch.painless.ir.StoreBraceDefNode; +import org.opensearch.painless.ir.StoreBraceNode; +import org.opensearch.painless.ir.StoreDotDefNode; +import org.opensearch.painless.ir.StoreDotNode; +import org.opensearch.painless.ir.StoreDotShortcutNode; +import org.opensearch.painless.ir.StoreFieldMemberNode; +import org.opensearch.painless.ir.StoreListShortcutNode; +import org.opensearch.painless.ir.StoreMapShortcutNode; +import org.opensearch.painless.ir.StoreVariableNode; +import org.opensearch.painless.ir.StringConcatenationNode; +import org.opensearch.painless.ir.ThrowNode; +import org.opensearch.painless.ir.UnaryMathNode; +import org.opensearch.painless.ir.WhileLoopNode; +import org.opensearch.painless.lookup.PainlessLookupUtility; import java.util.function.Consumer; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultSemanticAnalysisPhase.java b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/DefaultSemanticAnalysisPhase.java similarity index 95% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultSemanticAnalysisPhase.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/phase/DefaultSemanticAnalysisPhase.java index ee863150050..5ab5e6bc073 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultSemanticAnalysisPhase.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/DefaultSemanticAnalysisPhase.java @@ -17,128 +17,128 @@ * under the License. */ -package org.elasticsearch.painless.phase; +package org.opensearch.painless.phase; -import org.elasticsearch.painless.AnalyzerCaster; -import org.elasticsearch.painless.CompilerSettings; -import org.elasticsearch.painless.FunctionRef; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.Operation; -import org.elasticsearch.painless.lookup.PainlessCast; -import org.elasticsearch.painless.lookup.PainlessClassBinding; -import org.elasticsearch.painless.lookup.PainlessConstructor; -import org.elasticsearch.painless.lookup.PainlessField; -import org.elasticsearch.painless.lookup.PainlessInstanceBinding; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.lookup.def; -import org.elasticsearch.painless.node.AExpression; -import org.elasticsearch.painless.node.ANode; -import org.elasticsearch.painless.node.AStatement; -import org.elasticsearch.painless.node.EAssignment; -import org.elasticsearch.painless.node.EBinary; -import org.elasticsearch.painless.node.EBooleanComp; -import org.elasticsearch.painless.node.EBooleanConstant; -import org.elasticsearch.painless.node.EBrace; -import org.elasticsearch.painless.node.ECall; -import org.elasticsearch.painless.node.ECallLocal; -import org.elasticsearch.painless.node.EComp; -import org.elasticsearch.painless.node.EConditional; -import org.elasticsearch.painless.node.EDecimal; -import org.elasticsearch.painless.node.EDot; -import org.elasticsearch.painless.node.EElvis; -import org.elasticsearch.painless.node.EExplicit; -import org.elasticsearch.painless.node.EFunctionRef; -import org.elasticsearch.painless.node.EInstanceof; -import org.elasticsearch.painless.node.ELambda; -import org.elasticsearch.painless.node.EListInit; -import org.elasticsearch.painless.node.EMapInit; -import org.elasticsearch.painless.node.ENewArray; -import org.elasticsearch.painless.node.ENewArrayFunctionRef; -import org.elasticsearch.painless.node.ENewObj; -import org.elasticsearch.painless.node.ENull; -import org.elasticsearch.painless.node.ENumeric; -import org.elasticsearch.painless.node.ERegex; -import org.elasticsearch.painless.node.EString; -import org.elasticsearch.painless.node.ESymbol; -import org.elasticsearch.painless.node.EUnary; -import org.elasticsearch.painless.node.SBlock; -import org.elasticsearch.painless.node.SBreak; -import org.elasticsearch.painless.node.SCatch; -import org.elasticsearch.painless.node.SClass; -import org.elasticsearch.painless.node.SContinue; -import org.elasticsearch.painless.node.SDeclBlock; -import org.elasticsearch.painless.node.SDeclaration; -import org.elasticsearch.painless.node.SDo; -import org.elasticsearch.painless.node.SEach; -import org.elasticsearch.painless.node.SExpression; -import org.elasticsearch.painless.node.SFor; -import org.elasticsearch.painless.node.SFunction; -import org.elasticsearch.painless.node.SIf; -import org.elasticsearch.painless.node.SIfElse; -import org.elasticsearch.painless.node.SReturn; -import org.elasticsearch.painless.node.SThrow; -import org.elasticsearch.painless.node.STry; -import org.elasticsearch.painless.node.SWhile; -import org.elasticsearch.painless.spi.annotation.NonDeterministicAnnotation; -import org.elasticsearch.painless.symbol.Decorations; -import org.elasticsearch.painless.symbol.Decorations.AllEscape; -import org.elasticsearch.painless.symbol.Decorations.AnyBreak; -import org.elasticsearch.painless.symbol.Decorations.AnyContinue; -import org.elasticsearch.painless.symbol.Decorations.BeginLoop; -import org.elasticsearch.painless.symbol.Decorations.BinaryType; -import org.elasticsearch.painless.symbol.Decorations.CapturesDecoration; -import org.elasticsearch.painless.symbol.Decorations.ComparisonType; -import org.elasticsearch.painless.symbol.Decorations.CompoundType; -import org.elasticsearch.painless.symbol.Decorations.ContinuousLoop; -import org.elasticsearch.painless.symbol.Decorations.DefOptimized; -import org.elasticsearch.painless.symbol.Decorations.DowncastPainlessCast; -import org.elasticsearch.painless.symbol.Decorations.EncodingDecoration; -import org.elasticsearch.painless.symbol.Decorations.Explicit; -import org.elasticsearch.painless.symbol.Decorations.ExpressionPainlessCast; -import org.elasticsearch.painless.symbol.Decorations.GetterPainlessMethod; -import org.elasticsearch.painless.symbol.Decorations.InLoop; -import org.elasticsearch.painless.symbol.Decorations.InstanceType; -import org.elasticsearch.painless.symbol.Decorations.Internal; -import org.elasticsearch.painless.symbol.Decorations.IterablePainlessMethod; -import org.elasticsearch.painless.symbol.Decorations.LastLoop; -import org.elasticsearch.painless.symbol.Decorations.LastSource; -import org.elasticsearch.painless.symbol.Decorations.ListShortcut; -import org.elasticsearch.painless.symbol.Decorations.LoopEscape; -import org.elasticsearch.painless.symbol.Decorations.MapShortcut; -import org.elasticsearch.painless.symbol.Decorations.MethodEscape; -import org.elasticsearch.painless.symbol.Decorations.MethodNameDecoration; -import org.elasticsearch.painless.symbol.Decorations.Negate; -import org.elasticsearch.painless.symbol.Decorations.ParameterNames; -import org.elasticsearch.painless.symbol.Decorations.PartialCanonicalTypeName; -import org.elasticsearch.painless.symbol.Decorations.Read; -import org.elasticsearch.painless.symbol.Decorations.ReferenceDecoration; -import org.elasticsearch.painless.symbol.Decorations.ReturnType; -import org.elasticsearch.painless.symbol.Decorations.SemanticVariable; -import org.elasticsearch.painless.symbol.Decorations.SetterPainlessMethod; -import org.elasticsearch.painless.symbol.Decorations.ShiftType; -import org.elasticsearch.painless.symbol.Decorations.Shortcut; -import org.elasticsearch.painless.symbol.Decorations.StandardConstant; -import org.elasticsearch.painless.symbol.Decorations.StandardLocalFunction; -import org.elasticsearch.painless.symbol.Decorations.StandardPainlessClassBinding; -import org.elasticsearch.painless.symbol.Decorations.StandardPainlessConstructor; -import org.elasticsearch.painless.symbol.Decorations.StandardPainlessField; -import org.elasticsearch.painless.symbol.Decorations.StandardPainlessInstanceBinding; -import org.elasticsearch.painless.symbol.Decorations.StandardPainlessMethod; -import org.elasticsearch.painless.symbol.Decorations.StaticType; -import org.elasticsearch.painless.symbol.Decorations.TargetType; -import org.elasticsearch.painless.symbol.Decorations.TypeParameters; -import org.elasticsearch.painless.symbol.Decorations.UnaryType; -import org.elasticsearch.painless.symbol.Decorations.UpcastPainlessCast; -import org.elasticsearch.painless.symbol.Decorations.ValueType; -import org.elasticsearch.painless.symbol.Decorations.Write; -import org.elasticsearch.painless.symbol.FunctionTable; -import org.elasticsearch.painless.symbol.FunctionTable.LocalFunction; -import org.elasticsearch.painless.symbol.ScriptScope; -import org.elasticsearch.painless.symbol.SemanticScope; -import org.elasticsearch.painless.symbol.SemanticScope.FunctionScope; -import org.elasticsearch.painless.symbol.SemanticScope.LambdaScope; -import org.elasticsearch.painless.symbol.SemanticScope.Variable; +import org.opensearch.painless.AnalyzerCaster; +import org.opensearch.painless.CompilerSettings; +import org.opensearch.painless.FunctionRef; +import org.opensearch.painless.Location; +import org.opensearch.painless.Operation; +import org.opensearch.painless.lookup.PainlessCast; +import org.opensearch.painless.lookup.PainlessClassBinding; +import org.opensearch.painless.lookup.PainlessConstructor; +import org.opensearch.painless.lookup.PainlessField; +import org.opensearch.painless.lookup.PainlessInstanceBinding; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.lookup.def; +import org.opensearch.painless.node.AExpression; +import org.opensearch.painless.node.ANode; +import org.opensearch.painless.node.AStatement; +import org.opensearch.painless.node.EAssignment; +import org.opensearch.painless.node.EBinary; +import org.opensearch.painless.node.EBooleanComp; +import org.opensearch.painless.node.EBooleanConstant; +import org.opensearch.painless.node.EBrace; +import org.opensearch.painless.node.ECall; +import org.opensearch.painless.node.ECallLocal; +import org.opensearch.painless.node.EComp; +import org.opensearch.painless.node.EConditional; +import org.opensearch.painless.node.EDecimal; +import org.opensearch.painless.node.EDot; +import org.opensearch.painless.node.EElvis; +import org.opensearch.painless.node.EExplicit; +import org.opensearch.painless.node.EFunctionRef; +import org.opensearch.painless.node.EInstanceof; +import org.opensearch.painless.node.ELambda; +import org.opensearch.painless.node.EListInit; +import org.opensearch.painless.node.EMapInit; +import org.opensearch.painless.node.ENewArray; +import org.opensearch.painless.node.ENewArrayFunctionRef; +import org.opensearch.painless.node.ENewObj; +import org.opensearch.painless.node.ENull; +import org.opensearch.painless.node.ENumeric; +import org.opensearch.painless.node.ERegex; +import org.opensearch.painless.node.EString; +import org.opensearch.painless.node.ESymbol; +import org.opensearch.painless.node.EUnary; +import org.opensearch.painless.node.SBlock; +import org.opensearch.painless.node.SBreak; +import org.opensearch.painless.node.SCatch; +import org.opensearch.painless.node.SClass; +import org.opensearch.painless.node.SContinue; +import org.opensearch.painless.node.SDeclBlock; +import org.opensearch.painless.node.SDeclaration; +import org.opensearch.painless.node.SDo; +import org.opensearch.painless.node.SEach; +import org.opensearch.painless.node.SExpression; +import org.opensearch.painless.node.SFor; +import org.opensearch.painless.node.SFunction; +import org.opensearch.painless.node.SIf; +import org.opensearch.painless.node.SIfElse; +import org.opensearch.painless.node.SReturn; +import org.opensearch.painless.node.SThrow; +import org.opensearch.painless.node.STry; +import org.opensearch.painless.node.SWhile; +import org.opensearch.painless.spi.annotation.NonDeterministicAnnotation; +import org.opensearch.painless.symbol.Decorations; +import org.opensearch.painless.symbol.Decorations.AllEscape; +import org.opensearch.painless.symbol.Decorations.AnyBreak; +import org.opensearch.painless.symbol.Decorations.AnyContinue; +import org.opensearch.painless.symbol.Decorations.BeginLoop; +import org.opensearch.painless.symbol.Decorations.BinaryType; +import org.opensearch.painless.symbol.Decorations.CapturesDecoration; +import org.opensearch.painless.symbol.Decorations.ComparisonType; +import org.opensearch.painless.symbol.Decorations.CompoundType; +import org.opensearch.painless.symbol.Decorations.ContinuousLoop; +import org.opensearch.painless.symbol.Decorations.DefOptimized; +import org.opensearch.painless.symbol.Decorations.DowncastPainlessCast; +import org.opensearch.painless.symbol.Decorations.EncodingDecoration; +import org.opensearch.painless.symbol.Decorations.Explicit; +import org.opensearch.painless.symbol.Decorations.ExpressionPainlessCast; +import org.opensearch.painless.symbol.Decorations.GetterPainlessMethod; +import org.opensearch.painless.symbol.Decorations.InLoop; +import org.opensearch.painless.symbol.Decorations.InstanceType; +import org.opensearch.painless.symbol.Decorations.Internal; +import org.opensearch.painless.symbol.Decorations.IterablePainlessMethod; +import org.opensearch.painless.symbol.Decorations.LastLoop; +import org.opensearch.painless.symbol.Decorations.LastSource; +import org.opensearch.painless.symbol.Decorations.ListShortcut; +import org.opensearch.painless.symbol.Decorations.LoopEscape; +import org.opensearch.painless.symbol.Decorations.MapShortcut; +import org.opensearch.painless.symbol.Decorations.MethodEscape; +import org.opensearch.painless.symbol.Decorations.MethodNameDecoration; +import org.opensearch.painless.symbol.Decorations.Negate; +import org.opensearch.painless.symbol.Decorations.ParameterNames; +import org.opensearch.painless.symbol.Decorations.PartialCanonicalTypeName; +import org.opensearch.painless.symbol.Decorations.Read; +import org.opensearch.painless.symbol.Decorations.ReferenceDecoration; +import org.opensearch.painless.symbol.Decorations.ReturnType; +import org.opensearch.painless.symbol.Decorations.SemanticVariable; +import org.opensearch.painless.symbol.Decorations.SetterPainlessMethod; +import org.opensearch.painless.symbol.Decorations.ShiftType; +import org.opensearch.painless.symbol.Decorations.Shortcut; +import org.opensearch.painless.symbol.Decorations.StandardConstant; +import org.opensearch.painless.symbol.Decorations.StandardLocalFunction; +import org.opensearch.painless.symbol.Decorations.StandardPainlessClassBinding; +import org.opensearch.painless.symbol.Decorations.StandardPainlessConstructor; +import org.opensearch.painless.symbol.Decorations.StandardPainlessField; +import org.opensearch.painless.symbol.Decorations.StandardPainlessInstanceBinding; +import org.opensearch.painless.symbol.Decorations.StandardPainlessMethod; +import org.opensearch.painless.symbol.Decorations.StaticType; +import org.opensearch.painless.symbol.Decorations.TargetType; +import org.opensearch.painless.symbol.Decorations.TypeParameters; +import org.opensearch.painless.symbol.Decorations.UnaryType; +import org.opensearch.painless.symbol.Decorations.UpcastPainlessCast; +import org.opensearch.painless.symbol.Decorations.ValueType; +import org.opensearch.painless.symbol.Decorations.Write; +import org.opensearch.painless.symbol.FunctionTable; +import org.opensearch.painless.symbol.FunctionTable.LocalFunction; +import org.opensearch.painless.symbol.ScriptScope; +import org.opensearch.painless.symbol.SemanticScope; +import org.opensearch.painless.symbol.SemanticScope.FunctionScope; +import org.opensearch.painless.symbol.SemanticScope.LambdaScope; +import org.opensearch.painless.symbol.SemanticScope.Variable; import java.lang.reflect.Modifier; import java.time.ZonedDateTime; @@ -150,8 +150,8 @@ import java.util.Map; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import static org.elasticsearch.painless.lookup.PainlessLookupUtility.typeToCanonicalTypeName; -import static org.elasticsearch.painless.symbol.SemanticScope.newFunctionScope; +import static org.opensearch.painless.lookup.PainlessLookupUtility.typeToCanonicalTypeName; +import static org.opensearch.painless.symbol.SemanticScope.newFunctionScope; /** * Semantically validates a user tree visiting all user tree nodes to check for @@ -2056,7 +2056,7 @@ public class DefaultSemanticAnalysisPhase extends UserTreeBaseVisitor { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultUserTreeToIRTreePhase.java b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/DefaultUserTreeToIRTreePhase.java similarity index 89% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultUserTreeToIRTreePhase.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/phase/DefaultUserTreeToIRTreePhase.java index abecf1ac88e..e2f7891c5a3 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DefaultUserTreeToIRTreePhase.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/DefaultUserTreeToIRTreePhase.java @@ -17,190 +17,190 @@ * under the License. */ -package org.elasticsearch.painless.phase; +package org.opensearch.painless.phase; -import org.elasticsearch.painless.DefBootstrap; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.Operation; -import org.elasticsearch.painless.WriterConstants; -import org.elasticsearch.painless.ir.BinaryImplNode; -import org.elasticsearch.painless.ir.BinaryMathNode; -import org.elasticsearch.painless.ir.BlockNode; -import org.elasticsearch.painless.ir.BooleanNode; -import org.elasticsearch.painless.ir.BreakNode; -import org.elasticsearch.painless.ir.CastNode; -import org.elasticsearch.painless.ir.CatchNode; -import org.elasticsearch.painless.ir.ClassNode; -import org.elasticsearch.painless.ir.ComparisonNode; -import org.elasticsearch.painless.ir.ConditionNode; -import org.elasticsearch.painless.ir.ConditionalNode; -import org.elasticsearch.painless.ir.ConstantNode; -import org.elasticsearch.painless.ir.ContinueNode; -import org.elasticsearch.painless.ir.DeclarationBlockNode; -import org.elasticsearch.painless.ir.DeclarationNode; -import org.elasticsearch.painless.ir.DefInterfaceReferenceNode; -import org.elasticsearch.painless.ir.DoWhileLoopNode; -import org.elasticsearch.painless.ir.DupNode; -import org.elasticsearch.painless.ir.ElvisNode; -import org.elasticsearch.painless.ir.ExpressionNode; -import org.elasticsearch.painless.ir.FieldNode; -import org.elasticsearch.painless.ir.FlipArrayIndexNode; -import org.elasticsearch.painless.ir.FlipCollectionIndexNode; -import org.elasticsearch.painless.ir.FlipDefIndexNode; -import org.elasticsearch.painless.ir.ForEachLoopNode; -import org.elasticsearch.painless.ir.ForEachSubArrayNode; -import org.elasticsearch.painless.ir.ForEachSubIterableNode; -import org.elasticsearch.painless.ir.ForLoopNode; -import org.elasticsearch.painless.ir.FunctionNode; -import org.elasticsearch.painless.ir.IRNode; -import org.elasticsearch.painless.ir.IfElseNode; -import org.elasticsearch.painless.ir.IfNode; -import org.elasticsearch.painless.ir.InstanceofNode; -import org.elasticsearch.painless.ir.InvokeCallDefNode; -import org.elasticsearch.painless.ir.InvokeCallMemberNode; -import org.elasticsearch.painless.ir.InvokeCallNode; -import org.elasticsearch.painless.ir.ListInitializationNode; -import org.elasticsearch.painless.ir.LoadBraceDefNode; -import org.elasticsearch.painless.ir.LoadBraceNode; -import org.elasticsearch.painless.ir.LoadDotArrayLengthNode; -import org.elasticsearch.painless.ir.LoadDotDefNode; -import org.elasticsearch.painless.ir.LoadDotNode; -import org.elasticsearch.painless.ir.LoadDotShortcutNode; -import org.elasticsearch.painless.ir.LoadFieldMemberNode; -import org.elasticsearch.painless.ir.LoadListShortcutNode; -import org.elasticsearch.painless.ir.LoadMapShortcutNode; -import org.elasticsearch.painless.ir.LoadVariableNode; -import org.elasticsearch.painless.ir.MapInitializationNode; -import org.elasticsearch.painless.ir.NewArrayNode; -import org.elasticsearch.painless.ir.NewObjectNode; -import org.elasticsearch.painless.ir.NullNode; -import org.elasticsearch.painless.ir.NullSafeSubNode; -import org.elasticsearch.painless.ir.ReferenceNode; -import org.elasticsearch.painless.ir.ReturnNode; -import org.elasticsearch.painless.ir.StatementExpressionNode; -import org.elasticsearch.painless.ir.StatementNode; -import org.elasticsearch.painless.ir.StaticNode; -import org.elasticsearch.painless.ir.StoreBraceDefNode; -import org.elasticsearch.painless.ir.StoreBraceNode; -import org.elasticsearch.painless.ir.StoreDotDefNode; -import org.elasticsearch.painless.ir.StoreDotNode; -import org.elasticsearch.painless.ir.StoreDotShortcutNode; -import org.elasticsearch.painless.ir.StoreFieldMemberNode; -import org.elasticsearch.painless.ir.StoreListShortcutNode; -import org.elasticsearch.painless.ir.StoreMapShortcutNode; -import org.elasticsearch.painless.ir.StoreNode; -import org.elasticsearch.painless.ir.StoreVariableNode; -import org.elasticsearch.painless.ir.StringConcatenationNode; -import org.elasticsearch.painless.ir.ThrowNode; -import org.elasticsearch.painless.ir.TryNode; -import org.elasticsearch.painless.ir.TypedCaptureReferenceNode; -import org.elasticsearch.painless.ir.TypedInterfaceReferenceNode; -import org.elasticsearch.painless.ir.UnaryMathNode; -import org.elasticsearch.painless.ir.WhileLoopNode; -import org.elasticsearch.painless.lookup.PainlessCast; -import org.elasticsearch.painless.lookup.PainlessClassBinding; -import org.elasticsearch.painless.lookup.PainlessField; -import org.elasticsearch.painless.lookup.PainlessInstanceBinding; -import org.elasticsearch.painless.lookup.PainlessLookup; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.lookup.def; -import org.elasticsearch.painless.node.AExpression; -import org.elasticsearch.painless.node.ANode; -import org.elasticsearch.painless.node.AStatement; -import org.elasticsearch.painless.node.EAssignment; -import org.elasticsearch.painless.node.EBinary; -import org.elasticsearch.painless.node.EBooleanComp; -import org.elasticsearch.painless.node.EBooleanConstant; -import org.elasticsearch.painless.node.EBrace; -import org.elasticsearch.painless.node.ECall; -import org.elasticsearch.painless.node.ECallLocal; -import org.elasticsearch.painless.node.EComp; -import org.elasticsearch.painless.node.EConditional; -import org.elasticsearch.painless.node.EDecimal; -import org.elasticsearch.painless.node.EDot; -import org.elasticsearch.painless.node.EElvis; -import org.elasticsearch.painless.node.EExplicit; -import org.elasticsearch.painless.node.EFunctionRef; -import org.elasticsearch.painless.node.EInstanceof; -import org.elasticsearch.painless.node.ELambda; -import org.elasticsearch.painless.node.EListInit; -import org.elasticsearch.painless.node.EMapInit; -import org.elasticsearch.painless.node.ENewArray; -import org.elasticsearch.painless.node.ENewArrayFunctionRef; -import org.elasticsearch.painless.node.ENewObj; -import org.elasticsearch.painless.node.ENull; -import org.elasticsearch.painless.node.ENumeric; -import org.elasticsearch.painless.node.ERegex; -import org.elasticsearch.painless.node.EString; -import org.elasticsearch.painless.node.ESymbol; -import org.elasticsearch.painless.node.EUnary; -import org.elasticsearch.painless.node.SBlock; -import org.elasticsearch.painless.node.SBreak; -import org.elasticsearch.painless.node.SCatch; -import org.elasticsearch.painless.node.SClass; -import org.elasticsearch.painless.node.SContinue; -import org.elasticsearch.painless.node.SDeclBlock; -import org.elasticsearch.painless.node.SDeclaration; -import org.elasticsearch.painless.node.SDo; -import org.elasticsearch.painless.node.SEach; -import org.elasticsearch.painless.node.SExpression; -import org.elasticsearch.painless.node.SFor; -import org.elasticsearch.painless.node.SFunction; -import org.elasticsearch.painless.node.SIf; -import org.elasticsearch.painless.node.SIfElse; -import org.elasticsearch.painless.node.SReturn; -import org.elasticsearch.painless.node.SThrow; -import org.elasticsearch.painless.node.STry; -import org.elasticsearch.painless.node.SWhile; -import org.elasticsearch.painless.symbol.Decorations.AccessDepth; -import org.elasticsearch.painless.symbol.Decorations.AllEscape; -import org.elasticsearch.painless.symbol.Decorations.BinaryType; -import org.elasticsearch.painless.symbol.Decorations.CapturesDecoration; -import org.elasticsearch.painless.symbol.Decorations.ComparisonType; -import org.elasticsearch.painless.symbol.Decorations.Compound; -import org.elasticsearch.painless.symbol.Decorations.CompoundType; -import org.elasticsearch.painless.symbol.Decorations.ContinuousLoop; -import org.elasticsearch.painless.symbol.Decorations.DowncastPainlessCast; -import org.elasticsearch.painless.symbol.Decorations.EncodingDecoration; -import org.elasticsearch.painless.symbol.Decorations.Explicit; -import org.elasticsearch.painless.symbol.Decorations.ExpressionPainlessCast; -import org.elasticsearch.painless.symbol.Decorations.GetterPainlessMethod; -import org.elasticsearch.painless.symbol.Decorations.IRNodeDecoration; -import org.elasticsearch.painless.symbol.Decorations.InstanceType; -import org.elasticsearch.painless.symbol.Decorations.IterablePainlessMethod; -import org.elasticsearch.painless.symbol.Decorations.ListShortcut; -import org.elasticsearch.painless.symbol.Decorations.MapShortcut; -import org.elasticsearch.painless.symbol.Decorations.MethodEscape; -import org.elasticsearch.painless.symbol.Decorations.MethodNameDecoration; -import org.elasticsearch.painless.symbol.Decorations.Negate; -import org.elasticsearch.painless.symbol.Decorations.ParameterNames; -import org.elasticsearch.painless.symbol.Decorations.Read; -import org.elasticsearch.painless.symbol.Decorations.ReferenceDecoration; -import org.elasticsearch.painless.symbol.Decorations.ReturnType; -import org.elasticsearch.painless.symbol.Decorations.SemanticVariable; -import org.elasticsearch.painless.symbol.Decorations.SetterPainlessMethod; -import org.elasticsearch.painless.symbol.Decorations.ShiftType; -import org.elasticsearch.painless.symbol.Decorations.Shortcut; -import org.elasticsearch.painless.symbol.Decorations.StandardConstant; -import org.elasticsearch.painless.symbol.Decorations.StandardLocalFunction; -import org.elasticsearch.painless.symbol.Decorations.StandardPainlessClassBinding; -import org.elasticsearch.painless.symbol.Decorations.StandardPainlessConstructor; -import org.elasticsearch.painless.symbol.Decorations.StandardPainlessField; -import org.elasticsearch.painless.symbol.Decorations.StandardPainlessInstanceBinding; -import org.elasticsearch.painless.symbol.Decorations.StandardPainlessMethod; -import org.elasticsearch.painless.symbol.Decorations.StaticType; -import org.elasticsearch.painless.symbol.Decorations.TargetType; -import org.elasticsearch.painless.symbol.Decorations.TypeParameters; -import org.elasticsearch.painless.symbol.Decorations.UnaryType; -import org.elasticsearch.painless.symbol.Decorations.UpcastPainlessCast; -import org.elasticsearch.painless.symbol.Decorations.ValueType; -import org.elasticsearch.painless.symbol.Decorations.Write; -import org.elasticsearch.painless.symbol.FunctionTable; -import org.elasticsearch.painless.symbol.FunctionTable.LocalFunction; -import org.elasticsearch.painless.symbol.ScriptScope; -import org.elasticsearch.painless.symbol.SemanticScope.Variable; +import org.opensearch.painless.DefBootstrap; +import org.opensearch.painless.Location; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.Operation; +import org.opensearch.painless.WriterConstants; +import org.opensearch.painless.ir.BinaryImplNode; +import org.opensearch.painless.ir.BinaryMathNode; +import org.opensearch.painless.ir.BlockNode; +import org.opensearch.painless.ir.BooleanNode; +import org.opensearch.painless.ir.BreakNode; +import org.opensearch.painless.ir.CastNode; +import org.opensearch.painless.ir.CatchNode; +import org.opensearch.painless.ir.ClassNode; +import org.opensearch.painless.ir.ComparisonNode; +import org.opensearch.painless.ir.ConditionNode; +import org.opensearch.painless.ir.ConditionalNode; +import org.opensearch.painless.ir.ConstantNode; +import org.opensearch.painless.ir.ContinueNode; +import org.opensearch.painless.ir.DeclarationBlockNode; +import org.opensearch.painless.ir.DeclarationNode; +import org.opensearch.painless.ir.DefInterfaceReferenceNode; +import org.opensearch.painless.ir.DoWhileLoopNode; +import org.opensearch.painless.ir.DupNode; +import org.opensearch.painless.ir.ElvisNode; +import org.opensearch.painless.ir.ExpressionNode; +import org.opensearch.painless.ir.FieldNode; +import org.opensearch.painless.ir.FlipArrayIndexNode; +import org.opensearch.painless.ir.FlipCollectionIndexNode; +import org.opensearch.painless.ir.FlipDefIndexNode; +import org.opensearch.painless.ir.ForEachLoopNode; +import org.opensearch.painless.ir.ForEachSubArrayNode; +import org.opensearch.painless.ir.ForEachSubIterableNode; +import org.opensearch.painless.ir.ForLoopNode; +import org.opensearch.painless.ir.FunctionNode; +import org.opensearch.painless.ir.IRNode; +import org.opensearch.painless.ir.IfElseNode; +import org.opensearch.painless.ir.IfNode; +import org.opensearch.painless.ir.InstanceofNode; +import org.opensearch.painless.ir.InvokeCallDefNode; +import org.opensearch.painless.ir.InvokeCallMemberNode; +import org.opensearch.painless.ir.InvokeCallNode; +import org.opensearch.painless.ir.ListInitializationNode; +import org.opensearch.painless.ir.LoadBraceDefNode; +import org.opensearch.painless.ir.LoadBraceNode; +import org.opensearch.painless.ir.LoadDotArrayLengthNode; +import org.opensearch.painless.ir.LoadDotDefNode; +import org.opensearch.painless.ir.LoadDotNode; +import org.opensearch.painless.ir.LoadDotShortcutNode; +import org.opensearch.painless.ir.LoadFieldMemberNode; +import org.opensearch.painless.ir.LoadListShortcutNode; +import org.opensearch.painless.ir.LoadMapShortcutNode; +import org.opensearch.painless.ir.LoadVariableNode; +import org.opensearch.painless.ir.MapInitializationNode; +import org.opensearch.painless.ir.NewArrayNode; +import org.opensearch.painless.ir.NewObjectNode; +import org.opensearch.painless.ir.NullNode; +import org.opensearch.painless.ir.NullSafeSubNode; +import org.opensearch.painless.ir.ReferenceNode; +import org.opensearch.painless.ir.ReturnNode; +import org.opensearch.painless.ir.StatementExpressionNode; +import org.opensearch.painless.ir.StatementNode; +import org.opensearch.painless.ir.StaticNode; +import org.opensearch.painless.ir.StoreBraceDefNode; +import org.opensearch.painless.ir.StoreBraceNode; +import org.opensearch.painless.ir.StoreDotDefNode; +import org.opensearch.painless.ir.StoreDotNode; +import org.opensearch.painless.ir.StoreDotShortcutNode; +import org.opensearch.painless.ir.StoreFieldMemberNode; +import org.opensearch.painless.ir.StoreListShortcutNode; +import org.opensearch.painless.ir.StoreMapShortcutNode; +import org.opensearch.painless.ir.StoreNode; +import org.opensearch.painless.ir.StoreVariableNode; +import org.opensearch.painless.ir.StringConcatenationNode; +import org.opensearch.painless.ir.ThrowNode; +import org.opensearch.painless.ir.TryNode; +import org.opensearch.painless.ir.TypedCaptureReferenceNode; +import org.opensearch.painless.ir.TypedInterfaceReferenceNode; +import org.opensearch.painless.ir.UnaryMathNode; +import org.opensearch.painless.ir.WhileLoopNode; +import org.opensearch.painless.lookup.PainlessCast; +import org.opensearch.painless.lookup.PainlessClassBinding; +import org.opensearch.painless.lookup.PainlessField; +import org.opensearch.painless.lookup.PainlessInstanceBinding; +import org.opensearch.painless.lookup.PainlessLookup; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.lookup.def; +import org.opensearch.painless.node.AExpression; +import org.opensearch.painless.node.ANode; +import org.opensearch.painless.node.AStatement; +import org.opensearch.painless.node.EAssignment; +import org.opensearch.painless.node.EBinary; +import org.opensearch.painless.node.EBooleanComp; +import org.opensearch.painless.node.EBooleanConstant; +import org.opensearch.painless.node.EBrace; +import org.opensearch.painless.node.ECall; +import org.opensearch.painless.node.ECallLocal; +import org.opensearch.painless.node.EComp; +import org.opensearch.painless.node.EConditional; +import org.opensearch.painless.node.EDecimal; +import org.opensearch.painless.node.EDot; +import org.opensearch.painless.node.EElvis; +import org.opensearch.painless.node.EExplicit; +import org.opensearch.painless.node.EFunctionRef; +import org.opensearch.painless.node.EInstanceof; +import org.opensearch.painless.node.ELambda; +import org.opensearch.painless.node.EListInit; +import org.opensearch.painless.node.EMapInit; +import org.opensearch.painless.node.ENewArray; +import org.opensearch.painless.node.ENewArrayFunctionRef; +import org.opensearch.painless.node.ENewObj; +import org.opensearch.painless.node.ENull; +import org.opensearch.painless.node.ENumeric; +import org.opensearch.painless.node.ERegex; +import org.opensearch.painless.node.EString; +import org.opensearch.painless.node.ESymbol; +import org.opensearch.painless.node.EUnary; +import org.opensearch.painless.node.SBlock; +import org.opensearch.painless.node.SBreak; +import org.opensearch.painless.node.SCatch; +import org.opensearch.painless.node.SClass; +import org.opensearch.painless.node.SContinue; +import org.opensearch.painless.node.SDeclBlock; +import org.opensearch.painless.node.SDeclaration; +import org.opensearch.painless.node.SDo; +import org.opensearch.painless.node.SEach; +import org.opensearch.painless.node.SExpression; +import org.opensearch.painless.node.SFor; +import org.opensearch.painless.node.SFunction; +import org.opensearch.painless.node.SIf; +import org.opensearch.painless.node.SIfElse; +import org.opensearch.painless.node.SReturn; +import org.opensearch.painless.node.SThrow; +import org.opensearch.painless.node.STry; +import org.opensearch.painless.node.SWhile; +import org.opensearch.painless.symbol.Decorations.AccessDepth; +import org.opensearch.painless.symbol.Decorations.AllEscape; +import org.opensearch.painless.symbol.Decorations.BinaryType; +import org.opensearch.painless.symbol.Decorations.CapturesDecoration; +import org.opensearch.painless.symbol.Decorations.ComparisonType; +import org.opensearch.painless.symbol.Decorations.Compound; +import org.opensearch.painless.symbol.Decorations.CompoundType; +import org.opensearch.painless.symbol.Decorations.ContinuousLoop; +import org.opensearch.painless.symbol.Decorations.DowncastPainlessCast; +import org.opensearch.painless.symbol.Decorations.EncodingDecoration; +import org.opensearch.painless.symbol.Decorations.Explicit; +import org.opensearch.painless.symbol.Decorations.ExpressionPainlessCast; +import org.opensearch.painless.symbol.Decorations.GetterPainlessMethod; +import org.opensearch.painless.symbol.Decorations.IRNodeDecoration; +import org.opensearch.painless.symbol.Decorations.InstanceType; +import org.opensearch.painless.symbol.Decorations.IterablePainlessMethod; +import org.opensearch.painless.symbol.Decorations.ListShortcut; +import org.opensearch.painless.symbol.Decorations.MapShortcut; +import org.opensearch.painless.symbol.Decorations.MethodEscape; +import org.opensearch.painless.symbol.Decorations.MethodNameDecoration; +import org.opensearch.painless.symbol.Decorations.Negate; +import org.opensearch.painless.symbol.Decorations.ParameterNames; +import org.opensearch.painless.symbol.Decorations.Read; +import org.opensearch.painless.symbol.Decorations.ReferenceDecoration; +import org.opensearch.painless.symbol.Decorations.ReturnType; +import org.opensearch.painless.symbol.Decorations.SemanticVariable; +import org.opensearch.painless.symbol.Decorations.SetterPainlessMethod; +import org.opensearch.painless.symbol.Decorations.ShiftType; +import org.opensearch.painless.symbol.Decorations.Shortcut; +import org.opensearch.painless.symbol.Decorations.StandardConstant; +import org.opensearch.painless.symbol.Decorations.StandardLocalFunction; +import org.opensearch.painless.symbol.Decorations.StandardPainlessClassBinding; +import org.opensearch.painless.symbol.Decorations.StandardPainlessConstructor; +import org.opensearch.painless.symbol.Decorations.StandardPainlessField; +import org.opensearch.painless.symbol.Decorations.StandardPainlessInstanceBinding; +import org.opensearch.painless.symbol.Decorations.StandardPainlessMethod; +import org.opensearch.painless.symbol.Decorations.StaticType; +import org.opensearch.painless.symbol.Decorations.TargetType; +import org.opensearch.painless.symbol.Decorations.TypeParameters; +import org.opensearch.painless.symbol.Decorations.UnaryType; +import org.opensearch.painless.symbol.Decorations.UpcastPainlessCast; +import org.opensearch.painless.symbol.Decorations.ValueType; +import org.opensearch.painless.symbol.Decorations.Write; +import org.opensearch.painless.symbol.FunctionTable; +import org.opensearch.painless.symbol.FunctionTable.LocalFunction; +import org.opensearch.painless.symbol.ScriptScope; +import org.opensearch.painless.symbol.SemanticScope.Variable; import org.objectweb.asm.Opcodes; import java.lang.invoke.CallSite; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DocFieldsPhase.java b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/DocFieldsPhase.java similarity index 87% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DocFieldsPhase.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/phase/DocFieldsPhase.java index 9dce5e536dc..1e79b3f7612 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/DocFieldsPhase.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/DocFieldsPhase.java @@ -17,16 +17,16 @@ * under the License. */ -package org.elasticsearch.painless.phase; +package org.opensearch.painless.phase; -import org.elasticsearch.painless.node.AExpression; -import org.elasticsearch.painless.node.EBrace; -import org.elasticsearch.painless.node.ECall; -import org.elasticsearch.painless.node.EDot; -import org.elasticsearch.painless.node.EString; -import org.elasticsearch.painless.node.ESymbol; -import org.elasticsearch.painless.symbol.Decorations; -import org.elasticsearch.painless.symbol.ScriptScope; +import org.opensearch.painless.node.AExpression; +import org.opensearch.painless.node.EBrace; +import org.opensearch.painless.node.ECall; +import org.opensearch.painless.node.EDot; +import org.opensearch.painless.node.EString; +import org.opensearch.painless.node.ESymbol; +import org.opensearch.painless.symbol.Decorations; +import org.opensearch.painless.symbol.ScriptScope; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/IRTreeBaseVisitor.java b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/IRTreeBaseVisitor.java similarity index 75% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/IRTreeBaseVisitor.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/phase/IRTreeBaseVisitor.java index e4043ac7564..d07df8c762d 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/IRTreeBaseVisitor.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/IRTreeBaseVisitor.java @@ -17,76 +17,76 @@ * under the License. */ -package org.elasticsearch.painless.phase; +package org.opensearch.painless.phase; -import org.elasticsearch.painless.ir.BinaryMathNode; -import org.elasticsearch.painless.ir.BinaryImplNode; -import org.elasticsearch.painless.ir.BlockNode; -import org.elasticsearch.painless.ir.BooleanNode; -import org.elasticsearch.painless.ir.BreakNode; -import org.elasticsearch.painless.ir.CastNode; -import org.elasticsearch.painless.ir.CatchNode; -import org.elasticsearch.painless.ir.ClassNode; -import org.elasticsearch.painless.ir.ComparisonNode; -import org.elasticsearch.painless.ir.ConditionalNode; -import org.elasticsearch.painless.ir.ConstantNode; -import org.elasticsearch.painless.ir.ContinueNode; -import org.elasticsearch.painless.ir.DeclarationBlockNode; -import org.elasticsearch.painless.ir.DeclarationNode; -import org.elasticsearch.painless.ir.DefInterfaceReferenceNode; -import org.elasticsearch.painless.ir.DoWhileLoopNode; -import org.elasticsearch.painless.ir.DupNode; -import org.elasticsearch.painless.ir.ElvisNode; -import org.elasticsearch.painless.ir.FieldNode; -import org.elasticsearch.painless.ir.FlipArrayIndexNode; -import org.elasticsearch.painless.ir.FlipCollectionIndexNode; -import org.elasticsearch.painless.ir.FlipDefIndexNode; -import org.elasticsearch.painless.ir.ForEachLoopNode; -import org.elasticsearch.painless.ir.ForEachSubArrayNode; -import org.elasticsearch.painless.ir.ForEachSubIterableNode; -import org.elasticsearch.painless.ir.ForLoopNode; -import org.elasticsearch.painless.ir.FunctionNode; -import org.elasticsearch.painless.ir.IfElseNode; -import org.elasticsearch.painless.ir.IfNode; -import org.elasticsearch.painless.ir.InstanceofNode; -import org.elasticsearch.painless.ir.InvokeCallDefNode; -import org.elasticsearch.painless.ir.InvokeCallMemberNode; -import org.elasticsearch.painless.ir.InvokeCallNode; -import org.elasticsearch.painless.ir.ListInitializationNode; -import org.elasticsearch.painless.ir.LoadBraceDefNode; -import org.elasticsearch.painless.ir.LoadBraceNode; -import org.elasticsearch.painless.ir.LoadDotArrayLengthNode; -import org.elasticsearch.painless.ir.LoadDotDefNode; -import org.elasticsearch.painless.ir.LoadDotNode; -import org.elasticsearch.painless.ir.LoadDotShortcutNode; -import org.elasticsearch.painless.ir.LoadFieldMemberNode; -import org.elasticsearch.painless.ir.LoadListShortcutNode; -import org.elasticsearch.painless.ir.LoadMapShortcutNode; -import org.elasticsearch.painless.ir.LoadVariableNode; -import org.elasticsearch.painless.ir.MapInitializationNode; -import org.elasticsearch.painless.ir.NewArrayNode; -import org.elasticsearch.painless.ir.NewObjectNode; -import org.elasticsearch.painless.ir.NullNode; -import org.elasticsearch.painless.ir.NullSafeSubNode; -import org.elasticsearch.painless.ir.ReturnNode; -import org.elasticsearch.painless.ir.StatementExpressionNode; -import org.elasticsearch.painless.ir.StaticNode; -import org.elasticsearch.painless.ir.StoreBraceDefNode; -import org.elasticsearch.painless.ir.StoreBraceNode; -import org.elasticsearch.painless.ir.StoreDotDefNode; -import org.elasticsearch.painless.ir.StoreDotNode; -import org.elasticsearch.painless.ir.StoreDotShortcutNode; -import org.elasticsearch.painless.ir.StoreFieldMemberNode; -import org.elasticsearch.painless.ir.StoreListShortcutNode; -import org.elasticsearch.painless.ir.StoreMapShortcutNode; -import org.elasticsearch.painless.ir.StoreVariableNode; -import org.elasticsearch.painless.ir.StringConcatenationNode; -import org.elasticsearch.painless.ir.ThrowNode; -import org.elasticsearch.painless.ir.TryNode; -import org.elasticsearch.painless.ir.TypedCaptureReferenceNode; -import org.elasticsearch.painless.ir.TypedInterfaceReferenceNode; -import org.elasticsearch.painless.ir.UnaryMathNode; -import org.elasticsearch.painless.ir.WhileLoopNode; +import org.opensearch.painless.ir.BinaryMathNode; +import org.opensearch.painless.ir.BinaryImplNode; +import org.opensearch.painless.ir.BlockNode; +import org.opensearch.painless.ir.BooleanNode; +import org.opensearch.painless.ir.BreakNode; +import org.opensearch.painless.ir.CastNode; +import org.opensearch.painless.ir.CatchNode; +import org.opensearch.painless.ir.ClassNode; +import org.opensearch.painless.ir.ComparisonNode; +import org.opensearch.painless.ir.ConditionalNode; +import org.opensearch.painless.ir.ConstantNode; +import org.opensearch.painless.ir.ContinueNode; +import org.opensearch.painless.ir.DeclarationBlockNode; +import org.opensearch.painless.ir.DeclarationNode; +import org.opensearch.painless.ir.DefInterfaceReferenceNode; +import org.opensearch.painless.ir.DoWhileLoopNode; +import org.opensearch.painless.ir.DupNode; +import org.opensearch.painless.ir.ElvisNode; +import org.opensearch.painless.ir.FieldNode; +import org.opensearch.painless.ir.FlipArrayIndexNode; +import org.opensearch.painless.ir.FlipCollectionIndexNode; +import org.opensearch.painless.ir.FlipDefIndexNode; +import org.opensearch.painless.ir.ForEachLoopNode; +import org.opensearch.painless.ir.ForEachSubArrayNode; +import org.opensearch.painless.ir.ForEachSubIterableNode; +import org.opensearch.painless.ir.ForLoopNode; +import org.opensearch.painless.ir.FunctionNode; +import org.opensearch.painless.ir.IfElseNode; +import org.opensearch.painless.ir.IfNode; +import org.opensearch.painless.ir.InstanceofNode; +import org.opensearch.painless.ir.InvokeCallDefNode; +import org.opensearch.painless.ir.InvokeCallMemberNode; +import org.opensearch.painless.ir.InvokeCallNode; +import org.opensearch.painless.ir.ListInitializationNode; +import org.opensearch.painless.ir.LoadBraceDefNode; +import org.opensearch.painless.ir.LoadBraceNode; +import org.opensearch.painless.ir.LoadDotArrayLengthNode; +import org.opensearch.painless.ir.LoadDotDefNode; +import org.opensearch.painless.ir.LoadDotNode; +import org.opensearch.painless.ir.LoadDotShortcutNode; +import org.opensearch.painless.ir.LoadFieldMemberNode; +import org.opensearch.painless.ir.LoadListShortcutNode; +import org.opensearch.painless.ir.LoadMapShortcutNode; +import org.opensearch.painless.ir.LoadVariableNode; +import org.opensearch.painless.ir.MapInitializationNode; +import org.opensearch.painless.ir.NewArrayNode; +import org.opensearch.painless.ir.NewObjectNode; +import org.opensearch.painless.ir.NullNode; +import org.opensearch.painless.ir.NullSafeSubNode; +import org.opensearch.painless.ir.ReturnNode; +import org.opensearch.painless.ir.StatementExpressionNode; +import org.opensearch.painless.ir.StaticNode; +import org.opensearch.painless.ir.StoreBraceDefNode; +import org.opensearch.painless.ir.StoreBraceNode; +import org.opensearch.painless.ir.StoreDotDefNode; +import org.opensearch.painless.ir.StoreDotNode; +import org.opensearch.painless.ir.StoreDotShortcutNode; +import org.opensearch.painless.ir.StoreFieldMemberNode; +import org.opensearch.painless.ir.StoreListShortcutNode; +import org.opensearch.painless.ir.StoreMapShortcutNode; +import org.opensearch.painless.ir.StoreVariableNode; +import org.opensearch.painless.ir.StringConcatenationNode; +import org.opensearch.painless.ir.ThrowNode; +import org.opensearch.painless.ir.TryNode; +import org.opensearch.painless.ir.TypedCaptureReferenceNode; +import org.opensearch.painless.ir.TypedInterfaceReferenceNode; +import org.opensearch.painless.ir.UnaryMathNode; +import org.opensearch.painless.ir.WhileLoopNode; public class IRTreeBaseVisitor implements IRTreeVisitor { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/IRTreeVisitor.java b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/IRTreeVisitor.java similarity index 61% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/IRTreeVisitor.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/phase/IRTreeVisitor.java index 2f15257dc9b..98be681fefd 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/IRTreeVisitor.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/IRTreeVisitor.java @@ -17,76 +17,76 @@ * under the License. */ -package org.elasticsearch.painless.phase; +package org.opensearch.painless.phase; -import org.elasticsearch.painless.ir.BinaryMathNode; -import org.elasticsearch.painless.ir.BinaryImplNode; -import org.elasticsearch.painless.ir.BlockNode; -import org.elasticsearch.painless.ir.BooleanNode; -import org.elasticsearch.painless.ir.BreakNode; -import org.elasticsearch.painless.ir.CastNode; -import org.elasticsearch.painless.ir.CatchNode; -import org.elasticsearch.painless.ir.ClassNode; -import org.elasticsearch.painless.ir.ComparisonNode; -import org.elasticsearch.painless.ir.ConditionalNode; -import org.elasticsearch.painless.ir.ConstantNode; -import org.elasticsearch.painless.ir.ContinueNode; -import org.elasticsearch.painless.ir.DeclarationBlockNode; -import org.elasticsearch.painless.ir.DeclarationNode; -import org.elasticsearch.painless.ir.DefInterfaceReferenceNode; -import org.elasticsearch.painless.ir.DoWhileLoopNode; -import org.elasticsearch.painless.ir.DupNode; -import org.elasticsearch.painless.ir.ElvisNode; -import org.elasticsearch.painless.ir.FieldNode; -import org.elasticsearch.painless.ir.FlipArrayIndexNode; -import org.elasticsearch.painless.ir.FlipCollectionIndexNode; -import org.elasticsearch.painless.ir.FlipDefIndexNode; -import org.elasticsearch.painless.ir.ForEachLoopNode; -import org.elasticsearch.painless.ir.ForEachSubArrayNode; -import org.elasticsearch.painless.ir.ForEachSubIterableNode; -import org.elasticsearch.painless.ir.ForLoopNode; -import org.elasticsearch.painless.ir.FunctionNode; -import org.elasticsearch.painless.ir.IfElseNode; -import org.elasticsearch.painless.ir.IfNode; -import org.elasticsearch.painless.ir.InstanceofNode; -import org.elasticsearch.painless.ir.InvokeCallDefNode; -import org.elasticsearch.painless.ir.InvokeCallMemberNode; -import org.elasticsearch.painless.ir.InvokeCallNode; -import org.elasticsearch.painless.ir.ListInitializationNode; -import org.elasticsearch.painless.ir.LoadBraceDefNode; -import org.elasticsearch.painless.ir.LoadBraceNode; -import org.elasticsearch.painless.ir.LoadDotArrayLengthNode; -import org.elasticsearch.painless.ir.LoadDotDefNode; -import org.elasticsearch.painless.ir.LoadDotNode; -import org.elasticsearch.painless.ir.LoadDotShortcutNode; -import org.elasticsearch.painless.ir.LoadFieldMemberNode; -import org.elasticsearch.painless.ir.LoadListShortcutNode; -import org.elasticsearch.painless.ir.LoadMapShortcutNode; -import org.elasticsearch.painless.ir.LoadVariableNode; -import org.elasticsearch.painless.ir.MapInitializationNode; -import org.elasticsearch.painless.ir.NewArrayNode; -import org.elasticsearch.painless.ir.NewObjectNode; -import org.elasticsearch.painless.ir.NullNode; -import org.elasticsearch.painless.ir.NullSafeSubNode; -import org.elasticsearch.painless.ir.ReturnNode; -import org.elasticsearch.painless.ir.StatementExpressionNode; -import org.elasticsearch.painless.ir.StaticNode; -import org.elasticsearch.painless.ir.StoreBraceDefNode; -import org.elasticsearch.painless.ir.StoreBraceNode; -import org.elasticsearch.painless.ir.StoreDotDefNode; -import org.elasticsearch.painless.ir.StoreDotNode; -import org.elasticsearch.painless.ir.StoreDotShortcutNode; -import org.elasticsearch.painless.ir.StoreFieldMemberNode; -import org.elasticsearch.painless.ir.StoreListShortcutNode; -import org.elasticsearch.painless.ir.StoreMapShortcutNode; -import org.elasticsearch.painless.ir.StoreVariableNode; -import org.elasticsearch.painless.ir.StringConcatenationNode; -import org.elasticsearch.painless.ir.ThrowNode; -import org.elasticsearch.painless.ir.TryNode; -import org.elasticsearch.painless.ir.TypedCaptureReferenceNode; -import org.elasticsearch.painless.ir.TypedInterfaceReferenceNode; -import org.elasticsearch.painless.ir.UnaryMathNode; -import org.elasticsearch.painless.ir.WhileLoopNode; +import org.opensearch.painless.ir.BinaryMathNode; +import org.opensearch.painless.ir.BinaryImplNode; +import org.opensearch.painless.ir.BlockNode; +import org.opensearch.painless.ir.BooleanNode; +import org.opensearch.painless.ir.BreakNode; +import org.opensearch.painless.ir.CastNode; +import org.opensearch.painless.ir.CatchNode; +import org.opensearch.painless.ir.ClassNode; +import org.opensearch.painless.ir.ComparisonNode; +import org.opensearch.painless.ir.ConditionalNode; +import org.opensearch.painless.ir.ConstantNode; +import org.opensearch.painless.ir.ContinueNode; +import org.opensearch.painless.ir.DeclarationBlockNode; +import org.opensearch.painless.ir.DeclarationNode; +import org.opensearch.painless.ir.DefInterfaceReferenceNode; +import org.opensearch.painless.ir.DoWhileLoopNode; +import org.opensearch.painless.ir.DupNode; +import org.opensearch.painless.ir.ElvisNode; +import org.opensearch.painless.ir.FieldNode; +import org.opensearch.painless.ir.FlipArrayIndexNode; +import org.opensearch.painless.ir.FlipCollectionIndexNode; +import org.opensearch.painless.ir.FlipDefIndexNode; +import org.opensearch.painless.ir.ForEachLoopNode; +import org.opensearch.painless.ir.ForEachSubArrayNode; +import org.opensearch.painless.ir.ForEachSubIterableNode; +import org.opensearch.painless.ir.ForLoopNode; +import org.opensearch.painless.ir.FunctionNode; +import org.opensearch.painless.ir.IfElseNode; +import org.opensearch.painless.ir.IfNode; +import org.opensearch.painless.ir.InstanceofNode; +import org.opensearch.painless.ir.InvokeCallDefNode; +import org.opensearch.painless.ir.InvokeCallMemberNode; +import org.opensearch.painless.ir.InvokeCallNode; +import org.opensearch.painless.ir.ListInitializationNode; +import org.opensearch.painless.ir.LoadBraceDefNode; +import org.opensearch.painless.ir.LoadBraceNode; +import org.opensearch.painless.ir.LoadDotArrayLengthNode; +import org.opensearch.painless.ir.LoadDotDefNode; +import org.opensearch.painless.ir.LoadDotNode; +import org.opensearch.painless.ir.LoadDotShortcutNode; +import org.opensearch.painless.ir.LoadFieldMemberNode; +import org.opensearch.painless.ir.LoadListShortcutNode; +import org.opensearch.painless.ir.LoadMapShortcutNode; +import org.opensearch.painless.ir.LoadVariableNode; +import org.opensearch.painless.ir.MapInitializationNode; +import org.opensearch.painless.ir.NewArrayNode; +import org.opensearch.painless.ir.NewObjectNode; +import org.opensearch.painless.ir.NullNode; +import org.opensearch.painless.ir.NullSafeSubNode; +import org.opensearch.painless.ir.ReturnNode; +import org.opensearch.painless.ir.StatementExpressionNode; +import org.opensearch.painless.ir.StaticNode; +import org.opensearch.painless.ir.StoreBraceDefNode; +import org.opensearch.painless.ir.StoreBraceNode; +import org.opensearch.painless.ir.StoreDotDefNode; +import org.opensearch.painless.ir.StoreDotNode; +import org.opensearch.painless.ir.StoreDotShortcutNode; +import org.opensearch.painless.ir.StoreFieldMemberNode; +import org.opensearch.painless.ir.StoreListShortcutNode; +import org.opensearch.painless.ir.StoreMapShortcutNode; +import org.opensearch.painless.ir.StoreVariableNode; +import org.opensearch.painless.ir.StringConcatenationNode; +import org.opensearch.painless.ir.ThrowNode; +import org.opensearch.painless.ir.TryNode; +import org.opensearch.painless.ir.TypedCaptureReferenceNode; +import org.opensearch.painless.ir.TypedInterfaceReferenceNode; +import org.opensearch.painless.ir.UnaryMathNode; +import org.opensearch.painless.ir.WhileLoopNode; public interface IRTreeVisitor { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessSemanticAnalysisPhase.java b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/PainlessSemanticAnalysisPhase.java similarity index 85% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessSemanticAnalysisPhase.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/phase/PainlessSemanticAnalysisPhase.java index 040a816d066..d0ce301a197 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessSemanticAnalysisPhase.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/PainlessSemanticAnalysisPhase.java @@ -17,37 +17,37 @@ * under the License. */ -package org.elasticsearch.painless.phase; +package org.opensearch.painless.phase; -import org.elasticsearch.painless.AnalyzerCaster; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.ScriptClassInfo; -import org.elasticsearch.painless.lookup.PainlessCast; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.lookup.def; -import org.elasticsearch.painless.node.AExpression; -import org.elasticsearch.painless.node.AStatement; -import org.elasticsearch.painless.node.SBlock; -import org.elasticsearch.painless.node.SExpression; -import org.elasticsearch.painless.node.SFunction; -import org.elasticsearch.painless.node.SReturn; -import org.elasticsearch.painless.symbol.Decorations; -import org.elasticsearch.painless.symbol.Decorations.AllEscape; -import org.elasticsearch.painless.symbol.Decorations.ExpressionPainlessCast; -import org.elasticsearch.painless.symbol.Decorations.Internal; -import org.elasticsearch.painless.symbol.Decorations.LastSource; -import org.elasticsearch.painless.symbol.Decorations.LoopEscape; -import org.elasticsearch.painless.symbol.Decorations.MethodEscape; -import org.elasticsearch.painless.symbol.Decorations.Read; -import org.elasticsearch.painless.symbol.Decorations.TargetType; -import org.elasticsearch.painless.symbol.FunctionTable.LocalFunction; -import org.elasticsearch.painless.symbol.ScriptScope; -import org.elasticsearch.painless.symbol.SemanticScope; -import org.elasticsearch.painless.symbol.SemanticScope.FunctionScope; +import org.opensearch.painless.AnalyzerCaster; +import org.opensearch.painless.Location; +import org.opensearch.painless.ScriptClassInfo; +import org.opensearch.painless.lookup.PainlessCast; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.def; +import org.opensearch.painless.node.AExpression; +import org.opensearch.painless.node.AStatement; +import org.opensearch.painless.node.SBlock; +import org.opensearch.painless.node.SExpression; +import org.opensearch.painless.node.SFunction; +import org.opensearch.painless.node.SReturn; +import org.opensearch.painless.symbol.Decorations; +import org.opensearch.painless.symbol.Decorations.AllEscape; +import org.opensearch.painless.symbol.Decorations.ExpressionPainlessCast; +import org.opensearch.painless.symbol.Decorations.Internal; +import org.opensearch.painless.symbol.Decorations.LastSource; +import org.opensearch.painless.symbol.Decorations.LoopEscape; +import org.opensearch.painless.symbol.Decorations.MethodEscape; +import org.opensearch.painless.symbol.Decorations.Read; +import org.opensearch.painless.symbol.Decorations.TargetType; +import org.opensearch.painless.symbol.FunctionTable.LocalFunction; +import org.opensearch.painless.symbol.ScriptScope; +import org.opensearch.painless.symbol.SemanticScope; +import org.opensearch.painless.symbol.SemanticScope.FunctionScope; import java.util.List; -import static org.elasticsearch.painless.symbol.SemanticScope.newFunctionScope; +import static org.opensearch.painless.symbol.SemanticScope.newFunctionScope; public class PainlessSemanticAnalysisPhase extends DefaultSemanticAnalysisPhase { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessSemanticHeaderPhase.java b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/PainlessSemanticHeaderPhase.java similarity index 87% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessSemanticHeaderPhase.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/phase/PainlessSemanticHeaderPhase.java index e4460c12dd0..4ad746f70ea 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessSemanticHeaderPhase.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/PainlessSemanticHeaderPhase.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.phase; +package org.opensearch.painless.phase; -import org.elasticsearch.painless.ScriptClassInfo; -import org.elasticsearch.painless.ScriptClassInfo.MethodArgument; -import org.elasticsearch.painless.node.SFunction; -import org.elasticsearch.painless.symbol.FunctionTable; -import org.elasticsearch.painless.symbol.ScriptScope; +import org.opensearch.painless.ScriptClassInfo; +import org.opensearch.painless.ScriptClassInfo.MethodArgument; +import org.opensearch.painless.node.SFunction; +import org.opensearch.painless.symbol.FunctionTable; +import org.opensearch.painless.symbol.ScriptScope; import java.util.ArrayList; import java.util.List; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessUserTreeToIRTreePhase.java b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/PainlessUserTreeToIRTreePhase.java similarity index 92% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessUserTreeToIRTreePhase.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/phase/PainlessUserTreeToIRTreePhase.java index 3b155ae54a6..0787e24dfec 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/PainlessUserTreeToIRTreePhase.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/PainlessUserTreeToIRTreePhase.java @@ -17,42 +17,42 @@ * under the License. */ -package org.elasticsearch.painless.phase; +package org.opensearch.painless.phase; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.PainlessError; -import org.elasticsearch.painless.PainlessExplainError; -import org.elasticsearch.painless.ScriptClassInfo; -import org.elasticsearch.painless.ScriptClassInfo.MethodArgument; -import org.elasticsearch.painless.ir.BinaryImplNode; -import org.elasticsearch.painless.ir.BlockNode; -import org.elasticsearch.painless.ir.CatchNode; -import org.elasticsearch.painless.ir.ConstantNode; -import org.elasticsearch.painless.ir.DeclarationNode; -import org.elasticsearch.painless.ir.ExpressionNode; -import org.elasticsearch.painless.ir.FieldNode; -import org.elasticsearch.painless.ir.FunctionNode; -import org.elasticsearch.painless.ir.IRNode; -import org.elasticsearch.painless.ir.InvokeCallMemberNode; -import org.elasticsearch.painless.ir.InvokeCallNode; -import org.elasticsearch.painless.ir.LoadFieldMemberNode; -import org.elasticsearch.painless.ir.LoadVariableNode; -import org.elasticsearch.painless.ir.NullNode; -import org.elasticsearch.painless.ir.ReturnNode; -import org.elasticsearch.painless.ir.StaticNode; -import org.elasticsearch.painless.ir.ThrowNode; -import org.elasticsearch.painless.ir.TryNode; -import org.elasticsearch.painless.lookup.PainlessLookup; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.node.AStatement; -import org.elasticsearch.painless.node.SExpression; -import org.elasticsearch.painless.node.SFunction; -import org.elasticsearch.painless.node.SReturn; -import org.elasticsearch.painless.symbol.Decorations.Converter; -import org.elasticsearch.painless.symbol.Decorations.IRNodeDecoration; -import org.elasticsearch.painless.symbol.Decorations.MethodEscape; -import org.elasticsearch.painless.symbol.FunctionTable.LocalFunction; -import org.elasticsearch.painless.symbol.ScriptScope; +import org.opensearch.painless.Location; +import org.opensearch.painless.PainlessError; +import org.opensearch.painless.PainlessExplainError; +import org.opensearch.painless.ScriptClassInfo; +import org.opensearch.painless.ScriptClassInfo.MethodArgument; +import org.opensearch.painless.ir.BinaryImplNode; +import org.opensearch.painless.ir.BlockNode; +import org.opensearch.painless.ir.CatchNode; +import org.opensearch.painless.ir.ConstantNode; +import org.opensearch.painless.ir.DeclarationNode; +import org.opensearch.painless.ir.ExpressionNode; +import org.opensearch.painless.ir.FieldNode; +import org.opensearch.painless.ir.FunctionNode; +import org.opensearch.painless.ir.IRNode; +import org.opensearch.painless.ir.InvokeCallMemberNode; +import org.opensearch.painless.ir.InvokeCallNode; +import org.opensearch.painless.ir.LoadFieldMemberNode; +import org.opensearch.painless.ir.LoadVariableNode; +import org.opensearch.painless.ir.NullNode; +import org.opensearch.painless.ir.ReturnNode; +import org.opensearch.painless.ir.StaticNode; +import org.opensearch.painless.ir.ThrowNode; +import org.opensearch.painless.ir.TryNode; +import org.opensearch.painless.lookup.PainlessLookup; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.node.AStatement; +import org.opensearch.painless.node.SExpression; +import org.opensearch.painless.node.SFunction; +import org.opensearch.painless.node.SReturn; +import org.opensearch.painless.symbol.Decorations.Converter; +import org.opensearch.painless.symbol.Decorations.IRNodeDecoration; +import org.opensearch.painless.symbol.Decorations.MethodEscape; +import org.opensearch.painless.symbol.FunctionTable.LocalFunction; +import org.opensearch.painless.symbol.ScriptScope; import org.elasticsearch.script.ScriptException; import org.objectweb.asm.Opcodes; import org.objectweb.asm.commons.Method; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/UserTreeBaseVisitor.java b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/UserTreeBaseVisitor.java similarity index 76% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/UserTreeBaseVisitor.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/phase/UserTreeBaseVisitor.java index 3166164453b..981e7104ff2 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/UserTreeBaseVisitor.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/UserTreeBaseVisitor.java @@ -17,53 +17,53 @@ * under the License. */ -package org.elasticsearch.painless.phase; +package org.opensearch.painless.phase; -import org.elasticsearch.painless.node.EAssignment; -import org.elasticsearch.painless.node.EBinary; -import org.elasticsearch.painless.node.EBooleanComp; -import org.elasticsearch.painless.node.EBooleanConstant; -import org.elasticsearch.painless.node.EBrace; -import org.elasticsearch.painless.node.ECall; -import org.elasticsearch.painless.node.ECallLocal; -import org.elasticsearch.painless.node.EComp; -import org.elasticsearch.painless.node.EConditional; -import org.elasticsearch.painless.node.EDecimal; -import org.elasticsearch.painless.node.EDot; -import org.elasticsearch.painless.node.EElvis; -import org.elasticsearch.painless.node.EExplicit; -import org.elasticsearch.painless.node.EFunctionRef; -import org.elasticsearch.painless.node.EInstanceof; -import org.elasticsearch.painless.node.ELambda; -import org.elasticsearch.painless.node.EListInit; -import org.elasticsearch.painless.node.EMapInit; -import org.elasticsearch.painless.node.ENewArray; -import org.elasticsearch.painless.node.ENewArrayFunctionRef; -import org.elasticsearch.painless.node.ENewObj; -import org.elasticsearch.painless.node.ENull; -import org.elasticsearch.painless.node.ENumeric; -import org.elasticsearch.painless.node.ERegex; -import org.elasticsearch.painless.node.EString; -import org.elasticsearch.painless.node.ESymbol; -import org.elasticsearch.painless.node.EUnary; -import org.elasticsearch.painless.node.SBlock; -import org.elasticsearch.painless.node.SBreak; -import org.elasticsearch.painless.node.SCatch; -import org.elasticsearch.painless.node.SClass; -import org.elasticsearch.painless.node.SContinue; -import org.elasticsearch.painless.node.SDeclBlock; -import org.elasticsearch.painless.node.SDeclaration; -import org.elasticsearch.painless.node.SDo; -import org.elasticsearch.painless.node.SEach; -import org.elasticsearch.painless.node.SExpression; -import org.elasticsearch.painless.node.SFor; -import org.elasticsearch.painless.node.SFunction; -import org.elasticsearch.painless.node.SIf; -import org.elasticsearch.painless.node.SIfElse; -import org.elasticsearch.painless.node.SReturn; -import org.elasticsearch.painless.node.SThrow; -import org.elasticsearch.painless.node.STry; -import org.elasticsearch.painless.node.SWhile; +import org.opensearch.painless.node.EAssignment; +import org.opensearch.painless.node.EBinary; +import org.opensearch.painless.node.EBooleanComp; +import org.opensearch.painless.node.EBooleanConstant; +import org.opensearch.painless.node.EBrace; +import org.opensearch.painless.node.ECall; +import org.opensearch.painless.node.ECallLocal; +import org.opensearch.painless.node.EComp; +import org.opensearch.painless.node.EConditional; +import org.opensearch.painless.node.EDecimal; +import org.opensearch.painless.node.EDot; +import org.opensearch.painless.node.EElvis; +import org.opensearch.painless.node.EExplicit; +import org.opensearch.painless.node.EFunctionRef; +import org.opensearch.painless.node.EInstanceof; +import org.opensearch.painless.node.ELambda; +import org.opensearch.painless.node.EListInit; +import org.opensearch.painless.node.EMapInit; +import org.opensearch.painless.node.ENewArray; +import org.opensearch.painless.node.ENewArrayFunctionRef; +import org.opensearch.painless.node.ENewObj; +import org.opensearch.painless.node.ENull; +import org.opensearch.painless.node.ENumeric; +import org.opensearch.painless.node.ERegex; +import org.opensearch.painless.node.EString; +import org.opensearch.painless.node.ESymbol; +import org.opensearch.painless.node.EUnary; +import org.opensearch.painless.node.SBlock; +import org.opensearch.painless.node.SBreak; +import org.opensearch.painless.node.SCatch; +import org.opensearch.painless.node.SClass; +import org.opensearch.painless.node.SContinue; +import org.opensearch.painless.node.SDeclBlock; +import org.opensearch.painless.node.SDeclaration; +import org.opensearch.painless.node.SDo; +import org.opensearch.painless.node.SEach; +import org.opensearch.painless.node.SExpression; +import org.opensearch.painless.node.SFor; +import org.opensearch.painless.node.SFunction; +import org.opensearch.painless.node.SIf; +import org.opensearch.painless.node.SIfElse; +import org.opensearch.painless.node.SReturn; +import org.opensearch.painless.node.SThrow; +import org.opensearch.painless.node.STry; +import org.opensearch.painless.node.SWhile; public class UserTreeBaseVisitor implements UserTreeVisitor { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/UserTreeVisitor.java b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/UserTreeVisitor.java similarity index 61% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/UserTreeVisitor.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/phase/UserTreeVisitor.java index 17483e78aae..82e88bf632f 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/phase/UserTreeVisitor.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/phase/UserTreeVisitor.java @@ -17,53 +17,53 @@ * under the License. */ -package org.elasticsearch.painless.phase; +package org.opensearch.painless.phase; -import org.elasticsearch.painless.node.EAssignment; -import org.elasticsearch.painless.node.EBinary; -import org.elasticsearch.painless.node.EBooleanComp; -import org.elasticsearch.painless.node.EBooleanConstant; -import org.elasticsearch.painless.node.EBrace; -import org.elasticsearch.painless.node.ECall; -import org.elasticsearch.painless.node.ECallLocal; -import org.elasticsearch.painless.node.EComp; -import org.elasticsearch.painless.node.EConditional; -import org.elasticsearch.painless.node.EDecimal; -import org.elasticsearch.painless.node.EDot; -import org.elasticsearch.painless.node.EElvis; -import org.elasticsearch.painless.node.EExplicit; -import org.elasticsearch.painless.node.EFunctionRef; -import org.elasticsearch.painless.node.EInstanceof; -import org.elasticsearch.painless.node.ELambda; -import org.elasticsearch.painless.node.EListInit; -import org.elasticsearch.painless.node.EMapInit; -import org.elasticsearch.painless.node.ENewArray; -import org.elasticsearch.painless.node.ENewArrayFunctionRef; -import org.elasticsearch.painless.node.ENewObj; -import org.elasticsearch.painless.node.ENull; -import org.elasticsearch.painless.node.ENumeric; -import org.elasticsearch.painless.node.ERegex; -import org.elasticsearch.painless.node.EString; -import org.elasticsearch.painless.node.ESymbol; -import org.elasticsearch.painless.node.EUnary; -import org.elasticsearch.painless.node.SBlock; -import org.elasticsearch.painless.node.SBreak; -import org.elasticsearch.painless.node.SCatch; -import org.elasticsearch.painless.node.SClass; -import org.elasticsearch.painless.node.SContinue; -import org.elasticsearch.painless.node.SDeclBlock; -import org.elasticsearch.painless.node.SDeclaration; -import org.elasticsearch.painless.node.SDo; -import org.elasticsearch.painless.node.SEach; -import org.elasticsearch.painless.node.SExpression; -import org.elasticsearch.painless.node.SFor; -import org.elasticsearch.painless.node.SFunction; -import org.elasticsearch.painless.node.SIf; -import org.elasticsearch.painless.node.SIfElse; -import org.elasticsearch.painless.node.SReturn; -import org.elasticsearch.painless.node.SThrow; -import org.elasticsearch.painless.node.STry; -import org.elasticsearch.painless.node.SWhile; +import org.opensearch.painless.node.EAssignment; +import org.opensearch.painless.node.EBinary; +import org.opensearch.painless.node.EBooleanComp; +import org.opensearch.painless.node.EBooleanConstant; +import org.opensearch.painless.node.EBrace; +import org.opensearch.painless.node.ECall; +import org.opensearch.painless.node.ECallLocal; +import org.opensearch.painless.node.EComp; +import org.opensearch.painless.node.EConditional; +import org.opensearch.painless.node.EDecimal; +import org.opensearch.painless.node.EDot; +import org.opensearch.painless.node.EElvis; +import org.opensearch.painless.node.EExplicit; +import org.opensearch.painless.node.EFunctionRef; +import org.opensearch.painless.node.EInstanceof; +import org.opensearch.painless.node.ELambda; +import org.opensearch.painless.node.EListInit; +import org.opensearch.painless.node.EMapInit; +import org.opensearch.painless.node.ENewArray; +import org.opensearch.painless.node.ENewArrayFunctionRef; +import org.opensearch.painless.node.ENewObj; +import org.opensearch.painless.node.ENull; +import org.opensearch.painless.node.ENumeric; +import org.opensearch.painless.node.ERegex; +import org.opensearch.painless.node.EString; +import org.opensearch.painless.node.ESymbol; +import org.opensearch.painless.node.EUnary; +import org.opensearch.painless.node.SBlock; +import org.opensearch.painless.node.SBreak; +import org.opensearch.painless.node.SCatch; +import org.opensearch.painless.node.SClass; +import org.opensearch.painless.node.SContinue; +import org.opensearch.painless.node.SDeclBlock; +import org.opensearch.painless.node.SDeclaration; +import org.opensearch.painless.node.SDo; +import org.opensearch.painless.node.SEach; +import org.opensearch.painless.node.SExpression; +import org.opensearch.painless.node.SFor; +import org.opensearch.painless.node.SFunction; +import org.opensearch.painless.node.SIf; +import org.opensearch.painless.node.SIfElse; +import org.opensearch.painless.node.SReturn; +import org.opensearch.painless.node.SThrow; +import org.opensearch.painless.node.STry; +import org.opensearch.painless.node.SWhile; public interface UserTreeVisitor { diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/Decorations.java b/modules/lang-painless/src/main/java/org/opensearch/painless/symbol/Decorations.java similarity index 95% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/Decorations.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/symbol/Decorations.java index 7b639c42991..5fd9b253660 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/Decorations.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/symbol/Decorations.java @@ -17,21 +17,21 @@ * under the License. */ -package org.elasticsearch.painless.symbol; +package org.opensearch.painless.symbol; -import org.elasticsearch.painless.FunctionRef; -import org.elasticsearch.painless.ir.IRNode; -import org.elasticsearch.painless.lookup.PainlessCast; -import org.elasticsearch.painless.lookup.PainlessClassBinding; -import org.elasticsearch.painless.lookup.PainlessConstructor; -import org.elasticsearch.painless.lookup.PainlessField; -import org.elasticsearch.painless.lookup.PainlessInstanceBinding; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.lookup.PainlessMethod; -import org.elasticsearch.painless.symbol.Decorator.Condition; -import org.elasticsearch.painless.symbol.Decorator.Decoration; -import org.elasticsearch.painless.symbol.FunctionTable.LocalFunction; -import org.elasticsearch.painless.symbol.SemanticScope.Variable; +import org.opensearch.painless.FunctionRef; +import org.opensearch.painless.ir.IRNode; +import org.opensearch.painless.lookup.PainlessCast; +import org.opensearch.painless.lookup.PainlessClassBinding; +import org.opensearch.painless.lookup.PainlessConstructor; +import org.opensearch.painless.lookup.PainlessField; +import org.opensearch.painless.lookup.PainlessInstanceBinding; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.PainlessMethod; +import org.opensearch.painless.symbol.Decorator.Condition; +import org.opensearch.painless.symbol.Decorator.Decoration; +import org.opensearch.painless.symbol.FunctionTable.LocalFunction; +import org.opensearch.painless.symbol.SemanticScope.Variable; import java.util.ArrayList; import java.util.Collections; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/Decorator.java b/modules/lang-painless/src/main/java/org/opensearch/painless/symbol/Decorator.java similarity index 98% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/Decorator.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/symbol/Decorator.java index 431da10aff1..ac7a9319432 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/Decorator.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/symbol/Decorator.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.symbol; +package org.opensearch.painless.symbol; import java.util.ArrayList; import java.util.HashMap; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/FunctionTable.java b/modules/lang-painless/src/main/java/org/opensearch/painless/symbol/FunctionTable.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/FunctionTable.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/symbol/FunctionTable.java index 4025c22b791..935b1cf38b0 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/FunctionTable.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/symbol/FunctionTable.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless.symbol; +package org.opensearch.painless.symbol; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.lookup.PainlessLookupUtility; import org.objectweb.asm.commons.Method; import java.lang.invoke.MethodType; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/ScriptScope.java b/modules/lang-painless/src/main/java/org/opensearch/painless/symbol/ScriptScope.java similarity index 95% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/ScriptScope.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/symbol/ScriptScope.java index 4edd2837982..ede95979401 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/ScriptScope.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/symbol/ScriptScope.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.painless.symbol; +package org.opensearch.painless.symbol; -import org.elasticsearch.painless.CompilerSettings; -import org.elasticsearch.painless.ScriptClassInfo; -import org.elasticsearch.painless.lookup.PainlessLookup; -import org.elasticsearch.painless.node.ANode; +import org.opensearch.painless.CompilerSettings; +import org.opensearch.painless.ScriptClassInfo; +import org.opensearch.painless.lookup.PainlessLookup; +import org.opensearch.painless.node.ANode; import java.util.ArrayList; import java.util.Collections; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/SemanticScope.java b/modules/lang-painless/src/main/java/org/opensearch/painless/symbol/SemanticScope.java similarity index 97% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/SemanticScope.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/symbol/SemanticScope.java index e6bca849983..205b5bfabaf 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/SemanticScope.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/symbol/SemanticScope.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless.symbol; +package org.opensearch.painless.symbol; -import org.elasticsearch.painless.Location; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; -import org.elasticsearch.painless.node.ANode; -import org.elasticsearch.painless.symbol.Decorator.Condition; -import org.elasticsearch.painless.symbol.Decorator.Decoration; +import org.opensearch.painless.Location; +import org.opensearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.node.ANode; +import org.opensearch.painless.symbol.Decorator.Condition; +import org.opensearch.painless.symbol.Decorator.Decoration; import java.util.Collections; import java.util.HashMap; diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/WriteScope.java b/modules/lang-painless/src/main/java/org/opensearch/painless/symbol/WriteScope.java similarity index 95% rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/WriteScope.java rename to modules/lang-painless/src/main/java/org/opensearch/painless/symbol/WriteScope.java index 3bb36a61811..9cb0b85746c 100644 --- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/symbol/WriteScope.java +++ b/modules/lang-painless/src/main/java/org/opensearch/painless/symbol/WriteScope.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless.symbol; +package org.opensearch.painless.symbol; -import org.elasticsearch.painless.MethodWriter; -import org.elasticsearch.painless.lookup.PainlessLookupUtility; +import org.opensearch.painless.MethodWriter; +import org.opensearch.painless.lookup.PainlessLookupUtility; import org.objectweb.asm.Type; import java.util.HashMap; diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.lang.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.lang.txt similarity index 96% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.lang.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.lang.txt index b900f62d7fe..c955dfd3d3e 100644 --- a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.lang.txt +++ b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.lang.txt @@ -36,8 +36,8 @@ class java.lang.CharSequence { IntStream chars() IntStream codePoints() int length() - String org.elasticsearch.painless.api.Augmentation replaceAll(Pattern,Function) - String org.elasticsearch.painless.api.Augmentation replaceFirst(Pattern,Function) + String org.opensearch.painless.api.Augmentation replaceAll(Pattern,Function) + String org.opensearch.painless.api.Augmentation replaceFirst(Pattern,Function) CharSequence subSequence(int,int) String toString() } @@ -53,17 +53,17 @@ class java.lang.Iterable { Iterator iterator() Spliterator spliterator() # some adaptations of groovy wmethods - boolean org.elasticsearch.painless.api.Augmentation any(Predicate) - Collection org.elasticsearch.painless.api.Augmentation asCollection() - List org.elasticsearch.painless.api.Augmentation asList() - def org.elasticsearch.painless.api.Augmentation each(Consumer) - def org.elasticsearch.painless.api.Augmentation eachWithIndex(ObjIntConsumer) - boolean org.elasticsearch.painless.api.Augmentation every(Predicate) - List org.elasticsearch.painless.api.Augmentation findResults(Function) - Map org.elasticsearch.painless.api.Augmentation groupBy(Function) - String org.elasticsearch.painless.api.Augmentation join(String) - double org.elasticsearch.painless.api.Augmentation sum() - double org.elasticsearch.painless.api.Augmentation sum(ToDoubleFunction) + boolean org.opensearch.painless.api.Augmentation any(Predicate) + Collection org.opensearch.painless.api.Augmentation asCollection() + List org.opensearch.painless.api.Augmentation asList() + def org.opensearch.painless.api.Augmentation each(Consumer) + def org.opensearch.painless.api.Augmentation eachWithIndex(ObjIntConsumer) + boolean org.opensearch.painless.api.Augmentation every(Predicate) + List org.opensearch.painless.api.Augmentation findResults(Function) + Map org.opensearch.painless.api.Augmentation groupBy(Function) + String org.opensearch.painless.api.Augmentation join(String) + double org.opensearch.painless.api.Augmentation sum() + double org.opensearch.painless.api.Augmentation sum(ToDoubleFunction) } # Readable: i/o @@ -756,10 +756,10 @@ class java.lang.String { boolean contentEquals(CharSequence) String copyValueOf(char[]) String copyValueOf(char[],int,int) - String org.elasticsearch.painless.api.Augmentation decodeBase64() - String org.elasticsearch.painless.api.Augmentation encodeBase64() - String[] org.elasticsearch.painless.api.Augmentation splitOnToken(String) - String[] org.elasticsearch.painless.api.Augmentation splitOnToken(String, int) + String org.opensearch.painless.api.Augmentation decodeBase64() + String org.opensearch.painless.api.Augmentation encodeBase64() + String[] org.opensearch.painless.api.Augmentation splitOnToken(String) + String[] org.opensearch.painless.api.Augmentation splitOnToken(String, int) boolean endsWith(String) boolean equalsIgnoreCase(String) String format(Locale,String,def[]) diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.math.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.math.txt similarity index 100% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.math.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.math.txt diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.text.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.text.txt similarity index 100% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.text.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.text.txt diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.time.chrono.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.time.chrono.txt similarity index 100% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.time.chrono.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.time.chrono.txt diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.time.format.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.time.format.txt similarity index 100% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.time.format.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.time.format.txt diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.time.temporal.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.time.temporal.txt similarity index 100% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.time.temporal.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.time.temporal.txt diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.time.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.time.txt similarity index 100% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.time.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.time.txt diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.time.zone.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.time.zone.txt similarity index 100% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.time.zone.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.time.zone.txt diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.util.function.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.util.function.txt similarity index 100% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.util.function.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.util.function.txt diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.util.regex.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.util.regex.txt similarity index 77% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.util.regex.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.util.regex.txt index bf8be701b7d..ab12664824b 100644 --- a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.util.regex.txt +++ b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.util.regex.txt @@ -27,12 +27,12 @@ class java.util.regex.Pattern { # the script is run which is super slow. LRegex generates code that calls this method but it skips these checks. Predicate asPredicate() int flags() - Matcher org.elasticsearch.painless.api.Augmentation matcher(int, CharSequence) @inject_constant[1="regex_limit_factor"] + Matcher org.opensearch.painless.api.Augmentation matcher(int, CharSequence) @inject_constant[1="regex_limit_factor"] String pattern() String quote(String) - String[] org.elasticsearch.painless.api.Augmentation split(int, CharSequence) @inject_constant[1="regex_limit_factor"] - String[] org.elasticsearch.painless.api.Augmentation split(int, CharSequence,int) @inject_constant[1="regex_limit_factor"] - Stream org.elasticsearch.painless.api.Augmentation splitAsStream(int, CharSequence) @inject_constant[1="regex_limit_factor"] + String[] org.opensearch.painless.api.Augmentation split(int, CharSequence) @inject_constant[1="regex_limit_factor"] + String[] org.opensearch.painless.api.Augmentation split(int, CharSequence,int) @inject_constant[1="regex_limit_factor"] + Stream org.opensearch.painless.api.Augmentation splitAsStream(int, CharSequence) @inject_constant[1="regex_limit_factor"] } class java.util.regex.Matcher { @@ -42,7 +42,7 @@ class java.util.regex.Matcher { boolean find(int) String group() String group(int) - String org.elasticsearch.painless.api.Augmentation namedGroup(String) + String org.opensearch.painless.api.Augmentation namedGroup(String) int groupCount() boolean hasAnchoringBounds() boolean hasTransparentBounds() diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.util.stream.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.util.stream.txt similarity index 100% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.util.stream.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.util.stream.txt diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.util.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.util.txt similarity index 93% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.util.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.util.txt index 12da1f67942..1746614805e 100644 --- a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/java.util.txt +++ b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/java.util.txt @@ -41,13 +41,13 @@ class java.util.Collection { def[] toArray(def[]) # some adaptations of groovy methods - List org.elasticsearch.painless.api.Augmentation collect(Function) - def org.elasticsearch.painless.api.Augmentation collect(Collection,Function) - def org.elasticsearch.painless.api.Augmentation find(Predicate) - List org.elasticsearch.painless.api.Augmentation findAll(Predicate) - def org.elasticsearch.painless.api.Augmentation findResult(Function) - def org.elasticsearch.painless.api.Augmentation findResult(def,Function) - List org.elasticsearch.painless.api.Augmentation split(Predicate) + List org.opensearch.painless.api.Augmentation collect(Function) + def org.opensearch.painless.api.Augmentation collect(Collection,Function) + def org.opensearch.painless.api.Augmentation find(Predicate) + List org.opensearch.painless.api.Augmentation findAll(Predicate) + def org.opensearch.painless.api.Augmentation findResult(Function) + def org.opensearch.painless.api.Augmentation findResult(def,Function) + List org.opensearch.painless.api.Augmentation split(Predicate) } class java.util.Comparator { @@ -123,11 +123,11 @@ class java.util.List { def remove(int) void replaceAll(UnaryOperator) def set(int,def) - int org.elasticsearch.painless.api.Augmentation getLength() + int org.opensearch.painless.api.Augmentation getLength() void sort(Comparator) List subList(int,int) - Object org.elasticsearch.painless.api.Augmentation getByPath(String) - Object org.elasticsearch.painless.api.Augmentation getByPath(String, Object) + Object org.opensearch.painless.api.Augmentation getByPath(String) + Object org.opensearch.painless.api.Augmentation getByPath(String, Object) } class java.util.ListIterator { @@ -163,21 +163,21 @@ class java.util.Map { void replaceAll(BiFunction) int size() Collection values() - Object org.elasticsearch.painless.api.Augmentation getByPath(String) - Object org.elasticsearch.painless.api.Augmentation getByPath(String, Object) + Object org.opensearch.painless.api.Augmentation getByPath(String) + Object org.opensearch.painless.api.Augmentation getByPath(String, Object) # some adaptations of groovy methods - List org.elasticsearch.painless.api.Augmentation collect(BiFunction) - def org.elasticsearch.painless.api.Augmentation collect(Collection,BiFunction) - int org.elasticsearch.painless.api.Augmentation count(BiPredicate) - def org.elasticsearch.painless.api.Augmentation each(BiConsumer) - boolean org.elasticsearch.painless.api.Augmentation every(BiPredicate) - Map.Entry org.elasticsearch.painless.api.Augmentation find(BiPredicate) - Map org.elasticsearch.painless.api.Augmentation findAll(BiPredicate) - def org.elasticsearch.painless.api.Augmentation findResult(BiFunction) - def org.elasticsearch.painless.api.Augmentation findResult(def,BiFunction) - List org.elasticsearch.painless.api.Augmentation findResults(BiFunction) - Map org.elasticsearch.painless.api.Augmentation groupBy(BiFunction) + List org.opensearch.painless.api.Augmentation collect(BiFunction) + def org.opensearch.painless.api.Augmentation collect(Collection,BiFunction) + int org.opensearch.painless.api.Augmentation count(BiPredicate) + def org.opensearch.painless.api.Augmentation each(BiConsumer) + boolean org.opensearch.painless.api.Augmentation every(BiPredicate) + Map.Entry org.opensearch.painless.api.Augmentation find(BiPredicate) + Map org.opensearch.painless.api.Augmentation findAll(BiPredicate) + def org.opensearch.painless.api.Augmentation findResult(BiFunction) + def org.opensearch.painless.api.Augmentation findResult(def,BiFunction) + List org.opensearch.painless.api.Augmentation findResults(BiFunction) + Map org.opensearch.painless.api.Augmentation groupBy(BiFunction) } class java.util.Map$Entry { diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.aggs.movfn.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.aggs.movfn.txt similarity index 94% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.aggs.movfn.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.aggs.movfn.txt index 87f6f7d9aea..ed75c44ce9f 100644 --- a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.aggs.movfn.txt +++ b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.aggs.movfn.txt @@ -19,7 +19,7 @@ # This file contains a whitelist for the Moving Function pipeline aggregator in core -class org.elasticsearch.search.aggregations.pipeline.MovingFunctions { +class org.opensearch.search.aggregations.pipeline.MovingFunctions { double max(double[]) double min(double[]) double sum(double[]) @@ -29,4 +29,4 @@ class org.elasticsearch.search.aggregations.pipeline.MovingFunctions { double ewma(double[], double) double holt(double[], double, double) double holtWinters(double[], double, double, double, int, boolean) -} \ No newline at end of file +} diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.ingest.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.ingest.txt similarity index 87% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.ingest.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.ingest.txt index 3d50b10f32a..36f3c8e418d 100644 --- a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.ingest.txt +++ b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.ingest.txt @@ -20,6 +20,6 @@ # This file contains a whitelist for the ingest scripts class java.lang.String { - String org.elasticsearch.painless.api.Augmentation sha1() - String org.elasticsearch.painless.api.Augmentation sha256() + String org.opensearch.painless.api.Augmentation sha1() + String org.opensearch.painless.api.Augmentation sha256() } diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.score.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.score.txt similarity index 54% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.score.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.score.txt index fd49cbb2d52..9c8b8fd0d2c 100644 --- a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.score.txt +++ b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.score.txt @@ -19,22 +19,22 @@ # This file contains a whitelist for functions to be used in Score context -class org.elasticsearch.script.ScoreScript @no_import { +class org.opensearch.script.ScoreScript @no_import { } static_import { - double saturation(double, double) from_class org.elasticsearch.script.ScoreScriptUtils - double sigmoid(double, double, double) from_class org.elasticsearch.script.ScoreScriptUtils - double randomScore(org.elasticsearch.script.ScoreScript, int, String) bound_to org.elasticsearch.script.ScoreScriptUtils$RandomScoreField - double randomScore(org.elasticsearch.script.ScoreScript, int) bound_to org.elasticsearch.script.ScoreScriptUtils$RandomScoreDoc - double decayGeoLinear(String, String, String, double, GeoPoint) bound_to org.elasticsearch.script.ScoreScriptUtils$DecayGeoLinear - double decayGeoExp(String, String, String, double, GeoPoint) bound_to org.elasticsearch.script.ScoreScriptUtils$DecayGeoExp - double decayGeoGauss(String, String, String, double, GeoPoint) bound_to org.elasticsearch.script.ScoreScriptUtils$DecayGeoGauss - double decayNumericLinear(double, double, double, double, double)bound_to org.elasticsearch.script.ScoreScriptUtils$DecayNumericLinear - double decayNumericExp(double, double, double, double, double) bound_to org.elasticsearch.script.ScoreScriptUtils$DecayNumericExp - double decayNumericGauss(double, double, double, double, double) bound_to org.elasticsearch.script.ScoreScriptUtils$DecayNumericGauss - double decayDateLinear(String, String, String, double, JodaCompatibleZonedDateTime) bound_to org.elasticsearch.script.ScoreScriptUtils$DecayDateLinear - double decayDateExp(String, String, String, double, JodaCompatibleZonedDateTime) bound_to org.elasticsearch.script.ScoreScriptUtils$DecayDateExp - double decayDateGauss(String, String, String, double, JodaCompatibleZonedDateTime) bound_to org.elasticsearch.script.ScoreScriptUtils$DecayDateGauss + double saturation(double, double) from_class org.opensearch.script.ScoreScriptUtils + double sigmoid(double, double, double) from_class org.opensearch.script.ScoreScriptUtils + double randomScore(org.opensearch.script.ScoreScript, int, String) bound_to org.opensearch.script.ScoreScriptUtils$RandomScoreField + double randomScore(org.opensearch.script.ScoreScript, int) bound_to org.opensearch.script.ScoreScriptUtils$RandomScoreDoc + double decayGeoLinear(String, String, String, double, GeoPoint) bound_to org.opensearch.script.ScoreScriptUtils$DecayGeoLinear + double decayGeoExp(String, String, String, double, GeoPoint) bound_to org.opensearch.script.ScoreScriptUtils$DecayGeoExp + double decayGeoGauss(String, String, String, double, GeoPoint) bound_to org.opensearch.script.ScoreScriptUtils$DecayGeoGauss + double decayNumericLinear(double, double, double, double, double)bound_to org.opensearch.script.ScoreScriptUtils$DecayNumericLinear + double decayNumericExp(double, double, double, double, double) bound_to org.opensearch.script.ScoreScriptUtils$DecayNumericExp + double decayNumericGauss(double, double, double, double, double) bound_to org.opensearch.script.ScoreScriptUtils$DecayNumericGauss + double decayDateLinear(String, String, String, double, JodaCompatibleZonedDateTime) bound_to org.opensearch.script.ScoreScriptUtils$DecayDateLinear + double decayDateExp(String, String, String, double, JodaCompatibleZonedDateTime) bound_to org.opensearch.script.ScoreScriptUtils$DecayDateExp + double decayDateGauss(String, String, String, double, JodaCompatibleZonedDateTime) bound_to org.opensearch.script.ScoreScriptUtils$DecayDateGauss } diff --git a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.txt b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.txt similarity index 78% rename from modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.txt rename to modules/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.txt index 7bdb34d91ac..debccf8ed4b 100644 --- a/modules/lang-painless/src/main/resources/org/elasticsearch/painless/spi/org.elasticsearch.txt +++ b/modules/lang-painless/src/main/resources/org/opensearch/painless/spi/org.opensearch.txt @@ -53,28 +53,28 @@ class double @no_import { #### Painless debugging API -class org.elasticsearch.painless.api.Debug { +class org.opensearch.painless.api.Debug { void explain(Object) } #### ES Scripting API -class org.elasticsearch.common.geo.GeoPoint { +class org.opensearch.common.geo.GeoPoint { double getLat() double getLon() } -class org.elasticsearch.index.fielddata.ScriptDocValues$Strings { +class org.opensearch.index.fielddata.ScriptDocValues$Strings { String get(int) String getValue() } -class org.elasticsearch.index.fielddata.ScriptDocValues$Longs { +class org.opensearch.index.fielddata.ScriptDocValues$Longs { Long get(int) long getValue() } -class org.elasticsearch.script.JodaCompatibleZonedDateTime { +class org.opensearch.script.JodaCompatibleZonedDateTime { ##### ZonedDateTime methods int getDayOfMonth() int getDayOfYear() @@ -149,19 +149,19 @@ class org.elasticsearch.script.JodaCompatibleZonedDateTime { int getDayOfWeek() } -class org.elasticsearch.index.fielddata.ScriptDocValues$Dates { +class org.opensearch.index.fielddata.ScriptDocValues$Dates { JodaCompatibleZonedDateTime get(int) JodaCompatibleZonedDateTime getValue() } -class org.elasticsearch.index.fielddata.ScriptDocValues$Doubles { +class org.opensearch.index.fielddata.ScriptDocValues$Doubles { Double get(int) double getValue() } -class org.elasticsearch.index.fielddata.ScriptDocValues$GeoPoints { - org.elasticsearch.common.geo.GeoPoint get(int) - org.elasticsearch.common.geo.GeoPoint getValue() +class org.opensearch.index.fielddata.ScriptDocValues$GeoPoints { + org.opensearch.common.geo.GeoPoint get(int) + org.opensearch.common.geo.GeoPoint getValue() double getLat() double getLon() double[] getLats() @@ -176,12 +176,12 @@ class org.elasticsearch.index.fielddata.ScriptDocValues$GeoPoints { double geohashDistanceWithDefault(String,double) } -class org.elasticsearch.index.fielddata.ScriptDocValues$Booleans { +class org.opensearch.index.fielddata.ScriptDocValues$Booleans { Boolean get(int) boolean getValue() } -class org.elasticsearch.index.fielddata.ScriptDocValues$BytesRefs { +class org.opensearch.index.fielddata.ScriptDocValues$BytesRefs { BytesRef get(int) BytesRef getValue() } @@ -194,43 +194,43 @@ class org.apache.lucene.util.BytesRef { String utf8ToString() } -class org.elasticsearch.index.mapper.IpFieldMapper$IpFieldType$IpScriptDocValues { +class org.opensearch.index.mapper.IpFieldMapper$IpFieldType$IpScriptDocValues { String get(int) String getValue() } -class org.elasticsearch.search.lookup.FieldLookup { +class org.opensearch.search.lookup.FieldLookup { def getValue() List getValues() boolean isEmpty() } -class org.elasticsearch.index.similarity.ScriptedSimilarity$Query { +class org.opensearch.index.similarity.ScriptedSimilarity$Query { float getBoost() } -class org.elasticsearch.index.similarity.ScriptedSimilarity$Field { +class org.opensearch.index.similarity.ScriptedSimilarity$Field { long getDocCount() long getSumDocFreq() long getSumTotalTermFreq() } -class org.elasticsearch.index.similarity.ScriptedSimilarity$Term { +class org.opensearch.index.similarity.ScriptedSimilarity$Term { long getDocFreq() long getTotalTermFreq() } -class org.elasticsearch.index.similarity.ScriptedSimilarity$Doc { +class org.opensearch.index.similarity.ScriptedSimilarity$Doc { int getLength() float getFreq() } -class org.elasticsearch.index.query.IntervalFilterScript$Interval { +class org.opensearch.index.query.IntervalFilterScript$Interval { int getStart() int getEnd() int getGaps() } -class org.elasticsearch.script.ScoreScript$ExplanationHolder { +class org.opensearch.script.ScoreScript$ExplanationHolder { void set(String) } diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/AdditionTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/AdditionTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/AdditionTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/AdditionTests.java index f124d088bf2..9a13e2b39e0 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/AdditionTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/AdditionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** Tests for addition operator across all types */ //TODO: NaN/Inf/overflow/... diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/AnalyzerCasterTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/AnalyzerCasterTests.java similarity index 97% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/AnalyzerCasterTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/AnalyzerCasterTests.java index 58864d73c41..732e77b1987 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/AnalyzerCasterTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/AnalyzerCasterTests.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.lookup.PainlessCast; +import org.opensearch.painless.lookup.PainlessCast; import org.elasticsearch.test.ESTestCase; public class AnalyzerCasterTests extends ESTestCase { diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/AndTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/AndTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/AndTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/AndTests.java index e7a764f3d0f..02bc5281551 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/AndTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/AndTests.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** Tests for and operator across all types */ public class AndTests extends ScriptTestCase { - + public void testBasics() throws Exception { assertEquals(5 & 3, exec("return 5 & 3;")); assertEquals(5 & 3L, exec("return 5 & 3L;")); @@ -52,7 +52,7 @@ public class AndTests extends ScriptTestCase { assertEquals(5L & -12L, exec("return 5L & -12L;")); assertEquals(7L & 15L & 3L, exec("return 7L & 15L & 3L;")); } - + public void testIllegal() throws Exception { expectScriptThrows(ClassCastException.class, () -> { exec("float x = (float)4; int y = 1; return x & y"); @@ -61,7 +61,7 @@ public class AndTests extends ScriptTestCase { exec("double x = (double)4; int y = 1; return x & y"); }); } - + public void testDef() { expectScriptThrows(ClassCastException.class, () -> { exec("def x = (float)4; def y = (byte)1; return x & y"); @@ -110,7 +110,7 @@ public class AndTests extends ScriptTestCase { assertEquals(false, exec("def x = false; def y = true; return x & y")); assertEquals(false, exec("def x = false; def y = false; return x & y")); } - + public void testDefTypedLHS() { expectScriptThrows(ClassCastException.class, () -> { exec("float x = (float)4; def y = (byte)1; return x & y"); @@ -159,7 +159,7 @@ public class AndTests extends ScriptTestCase { assertEquals(false, exec("boolean x = false; def y = true; return x & y")); assertEquals(false, exec("boolean x = false; def y = false; return x & y")); } - + public void testDefTypedRHS() { expectScriptThrows(ClassCastException.class, () -> { exec("def x = (float)4; byte y = (byte)1; return x & y"); @@ -208,7 +208,7 @@ public class AndTests extends ScriptTestCase { assertEquals(false, exec("def x = false; boolean y = true; return x & y")); assertEquals(false, exec("def x = false; boolean y = false; return x & y")); } - + public void testCompoundAssignment() { // boolean assertEquals(true, exec("boolean x = true; x &= true; return x;")); @@ -231,7 +231,7 @@ public class AndTests extends ScriptTestCase { // long assertEquals((long) (13 & 14), exec("long x = 13L; x &= 14; return x;")); } - + public void testBogusCompoundAssignment() { expectScriptThrows(ClassCastException.class, () -> { exec("float x = 4; int y = 1; x &= y"); @@ -246,7 +246,7 @@ public class AndTests extends ScriptTestCase { exec("int x = 4; double y = 1; x &= y"); }); } - + public void testDefCompoundAssignment() { // boolean assertEquals(true, exec("def x = true; x &= true; return x;")); @@ -269,7 +269,7 @@ public class AndTests extends ScriptTestCase { // long assertEquals((long) (13 & 14), exec("def x = 13L; x &= 14; return x;")); } - + public void testDefBogusCompoundAssignment() { expectScriptThrows(ClassCastException.class, () -> { exec("def x = 4F; int y = 1; x &= y"); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/AnnotationTestObject.java b/modules/lang-painless/src/test/java/org/opensearch/painless/AnnotationTestObject.java similarity index 95% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/AnnotationTestObject.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/AnnotationTestObject.java index bc9309bbbb6..6269bdfd845 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/AnnotationTestObject.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/AnnotationTestObject.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.spi.annotation.WhitelistAnnotationParser; +import org.opensearch.painless.spi.annotation.WhitelistAnnotationParser; import java.util.Map; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ArrayLikeObjectTestCase.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ArrayLikeObjectTestCase.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/ArrayLikeObjectTestCase.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/ArrayLikeObjectTestCase.java index 13400fcc253..a11a06e1836 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ArrayLikeObjectTestCase.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ArrayLikeObjectTestCase.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.elasticsearch.common.Nullable; import org.hamcrest.Matcher; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ArrayTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ArrayTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/ArrayTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/ArrayTests.java index 86b17fb3531..18666843807 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ArrayTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ArrayTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.apache.lucene.util.Constants; import org.elasticsearch.bootstrap.JavaVersion; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/AugmentationTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/AugmentationTests.java similarity index 94% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/AugmentationTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/AugmentationTests.java index 8fe095beeb3..a5495fa02da 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/AugmentationTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/AugmentationTests.java @@ -17,10 +17,10 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.spi.Whitelist; -import org.elasticsearch.painless.spi.WhitelistLoader; +import org.opensearch.painless.spi.Whitelist; +import org.opensearch.painless.spi.WhitelistLoader; import org.elasticsearch.script.ScriptContext; import java.util.ArrayList; @@ -37,7 +37,7 @@ public class AugmentationTests extends ScriptTestCase { protected Map, List> scriptContexts() { Map, List> contexts = super.scriptContexts(); List digestWhitelist = new ArrayList<>(Whitelist.BASE_WHITELISTS); - digestWhitelist.add(WhitelistLoader.loadFromResourceFiles(Whitelist.class, "org.elasticsearch.ingest.txt")); + digestWhitelist.add(WhitelistLoader.loadFromResourceFiles(Whitelist.class, "org.opensearch.ingest.txt")); contexts.put(DigestTestScript.CONTEXT, digestWhitelist); return contexts; @@ -218,13 +218,13 @@ public class AugmentationTests extends ScriptTestCase { } public void testFeatureTest() { - assertEquals(5, exec("org.elasticsearch.painless.FeatureTestObject ft = new org.elasticsearch.painless.FeatureTestObject();" + + assertEquals(5, exec("org.opensearch.painless.FeatureTestObject ft = new org.opensearch.painless.FeatureTestObject();" + " ft.setX(3); ft.setY(2); return ft.getTotal()")); - assertEquals(5, exec("def ft = new org.elasticsearch.painless.FeatureTestObject();" + + assertEquals(5, exec("def ft = new org.opensearch.painless.FeatureTestObject();" + " ft.setX(3); ft.setY(2); return ft.getTotal()")); - assertEquals(8, exec("org.elasticsearch.painless.FeatureTestObject ft = new org.elasticsearch.painless.FeatureTestObject();" + + assertEquals(8, exec("org.opensearch.painless.FeatureTestObject ft = new org.opensearch.painless.FeatureTestObject();" + " ft.setX(3); ft.setY(2); return ft.addToTotal(3)")); - assertEquals(8, exec("def ft = new org.elasticsearch.painless.FeatureTestObject();" + + assertEquals(8, exec("def ft = new org.opensearch.painless.FeatureTestObject();" + " ft.setX(3); ft.setY(2); return ft.addToTotal(3)")); } diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BaseClassTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/BaseClassTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/BaseClassTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/BaseClassTests.java index b43e6afcaf6..fc732256752 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BaseClassTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/BaseClassTests.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.spi.Whitelist; +import org.opensearch.painless.spi.Whitelist; import org.elasticsearch.script.ScriptContext; import java.util.Collections; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicAPITests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/BasicAPITests.java similarity index 97% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicAPITests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/BasicAPITests.java index c62a31a242b..92917de971c 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicAPITests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/BasicAPITests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import java.text.MessageFormat.Field; import java.text.Normalizer; @@ -130,7 +130,7 @@ public class BasicAPITests extends ScriptTestCase { } public void testPublicMemberAccess() { - assertEquals(5, exec("org.elasticsearch.painless.FeatureTestObject ft = new org.elasticsearch.painless.FeatureTestObject();" + + assertEquals(5, exec("org.opensearch.painless.FeatureTestObject ft = new org.opensearch.painless.FeatureTestObject();" + "ft.z = 5; return ft.z;")); } diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicExpressionTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/BasicExpressionTests.java similarity index 95% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicExpressionTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/BasicExpressionTests.java index 4269a93e4dc..7db370de787 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicExpressionTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/BasicExpressionTests.java @@ -1,9 +1,3 @@ -package org.elasticsearch.painless; - -import java.util.Collections; - -import static java.util.Collections.singletonMap; - /* * Licensed to Elasticsearch under one or more contributor * license agreements. See the NOTICE file distributed with @@ -23,6 +17,12 @@ import static java.util.Collections.singletonMap; * under the License. */ +package org.opensearch.painless; + +import java.util.Collections; + +import static java.util.Collections.singletonMap; + public class BasicExpressionTests extends ScriptTestCase { /** simple tests returning a constant value */ @@ -191,11 +191,11 @@ public class BasicExpressionTests extends ScriptTestCase { assertNull( exec("def a = null; return a?.length()")); assertEquals(3, exec("def a = 'foo'; return a?.length()")); // Read shortcut - assertMustBeNullable( "org.elasticsearch.painless.FeatureTestObject a = null; return a?.x"); + assertMustBeNullable( "org.opensearch.painless.FeatureTestObject a = null; return a?.x"); assertMustBeNullable( - "org.elasticsearch.painless.FeatureTestObject a = new org.elasticsearch.painless.FeatureTestObject(); return a?.x"); + "org.opensearch.painless.FeatureTestObject a = new org.opensearch.painless.FeatureTestObject(); return a?.x"); assertNull( exec("def a = null; return a?.x")); - assertEquals(0, exec("def a = new org.elasticsearch.painless.FeatureTestObject(); return a?.x")); + assertEquals(0, exec("def a = new org.opensearch.painless.FeatureTestObject(); return a?.x")); // Maps // Call @@ -254,8 +254,8 @@ public class BasicExpressionTests extends ScriptTestCase { + "return a.missing_length", true)); // Writes, all unsupported at this point -// assertEquals(null, exec("org.elasticsearch.painless.FeatureTestObject a = null; return a?.x")); // Read field -// assertEquals(null, exec("org.elasticsearch.painless.FeatureTestObject a = null; a?.x = 7; return a?.x")); // Write field +// assertEquals(null, exec("org.opensearch.painless.FeatureTestObject a = null; return a?.x")); // Read field +// assertEquals(null, exec("org.opensearch.painless.FeatureTestObject a = null; a?.x = 7; return a?.x")); // Write field // assertEquals(null, exec("Map a = null; a?.other = 'wow'; return a?.other")); // Write shortcut // assertEquals(null, exec("def a = null; a?.other = 'cat'; return a?.other")); // Write shortcut // assertEquals(null, exec("Map a = ['thing': 'bar']; a.other?.cat = 'no'; return a.other?.cat")); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicStatementTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/BasicStatementTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicStatementTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/BasicStatementTests.java index e4d1db2243b..6dc1a630904 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BasicStatementTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/BasicStatementTests.java @@ -1,16 +1,3 @@ -package org.elasticsearch.painless; - -import org.elasticsearch.painless.spi.Whitelist; -import org.elasticsearch.script.ScriptContext; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static java.util.Collections.emptyMap; - /* * Licensed to Elasticsearch under one or more contributor * license agreements. See the NOTICE file distributed with @@ -30,6 +17,19 @@ import static java.util.Collections.emptyMap; * under the License. */ +package org.opensearch.painless; + +import org.opensearch.painless.spi.Whitelist; +import org.elasticsearch.script.ScriptContext; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static java.util.Collections.emptyMap; + public class BasicStatementTests extends ScriptTestCase { protected Map, List> scriptContexts() { diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BindingsTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/BindingsTests.java similarity index 96% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/BindingsTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/BindingsTests.java index 171880abd79..3c0aeb06e07 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BindingsTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/BindingsTests.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.spi.Whitelist; -import org.elasticsearch.painless.spi.WhitelistInstanceBinding; -import org.elasticsearch.painless.spi.WhitelistLoader; +import org.opensearch.painless.spi.Whitelist; +import org.opensearch.painless.spi.WhitelistInstanceBinding; +import org.opensearch.painless.spi.WhitelistLoader; import org.elasticsearch.script.ScriptContext; import java.util.ArrayList; @@ -99,7 +99,7 @@ public class BindingsTests extends ScriptTestCase { protected Map, List> scriptContexts() { Map, List> contexts = super.scriptContexts(); List whitelists = new ArrayList<>(Whitelist.BASE_WHITELISTS); - whitelists.add(WhitelistLoader.loadFromResourceFiles(Whitelist.class, "org.elasticsearch.painless.test")); + whitelists.add(WhitelistLoader.loadFromResourceFiles(Whitelist.class, "org.opensearch.painless.test")); InstanceBindingTestClass instanceBindingTestClass = new InstanceBindingTestClass(1); WhitelistInstanceBinding getter = new WhitelistInstanceBinding("test", instanceBindingTestClass, diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BoxedCastTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/BoxedCastTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/BoxedCastTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/BoxedCastTests.java index d5da8d6ac64..12a9f33a9e6 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/BoxedCastTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/BoxedCastTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; public class BoxedCastTests extends ScriptTestCase { @@ -576,7 +576,7 @@ public class BoxedCastTests extends ScriptTestCase { expectScriptThrows(ClassCastException.class, () -> exec("Short rtn() {def d = Float.valueOf((float)1); return d} rtn()")); expectScriptThrows(ClassCastException.class, () -> exec("Short rtn() {def d = Double.valueOf((double)1); return d} rtn()")); } - + public void testReturnToCharacterBoxedCasts() { expectScriptThrows(ClassCastException.class, () -> exec("Character rtn() {return (byte)1} rtn()")); expectScriptThrows(ClassCastException.class, () -> exec("Character rtn() {return (short)1} rtn()")); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ComparisonTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ComparisonTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/ComparisonTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/ComparisonTests.java index d9259cf2008..443b779e2b0 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ComparisonTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ComparisonTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; public class ComparisonTests extends ScriptTestCase { @@ -37,7 +37,7 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(false, exec("def x = (long)5; def y = (double)3; return x == y")); assertEquals(false, exec("def x = (float)6; def y = (double)2; return x == y")); assertEquals(false, exec("def x = (double)7; def y = (double)1; return x == y")); - + assertEquals(false, exec("def x = false; def y = true; return x == y")); assertEquals(false, exec("def x = true; def y = false; return x == y")); assertEquals(false, exec("def x = true; def y = null; return x == y")); @@ -50,7 +50,7 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(true, exec("def x = new HashMap(); x.put(3, 3); def y = new HashMap(); y.put(3, 3); return x == y")); assertEquals(true, exec("def x = new HashMap(); def y = x; x.put(3, 3); y.put(3, 3); return x == y")); } - + public void testDefEqTypedLHS() { assertEquals(true, exec("byte x = (byte)7; def y = (int)7; return x == y")); assertEquals(true, exec("short x = (short)6; def y = (int)6; return x == y")); @@ -67,7 +67,7 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(false, exec("long x = (long)5; def y = (double)3; return x == y")); assertEquals(false, exec("float x = (float)6; def y = (double)2; return x == y")); assertEquals(false, exec("double x = (double)7; def y = (double)1; return x == y")); - + assertEquals(false, exec("boolean x = false; def y = true; return x == y")); assertEquals(false, exec("boolean x = true; def y = false; return x == y")); assertEquals(false, exec("boolean x = true; def y = null; return x == y")); @@ -79,7 +79,7 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(true, exec("Map x = new HashMap(); x.put(3, 3); def y = new HashMap(); y.put(3, 3); return x == y")); assertEquals(true, exec("Map x = new HashMap(); def y = x; x.put(3, 3); y.put(3, 3); return x == y")); } - + public void testDefEqTypedRHS() { assertEquals(true, exec("def x = (byte)7; int y = (int)7; return x == y")); assertEquals(true, exec("def x = (short)6; int y = (int)6; return x == y")); @@ -96,7 +96,7 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(false, exec("def x = (long)5; double y = (double)3; return x == y")); assertEquals(false, exec("def x = (float)6; double y = (double)2; return x == y")); assertEquals(false, exec("def x = (double)7; double y = (double)1; return x == y")); - + assertEquals(false, exec("def x = false; boolean y = true; return x == y")); assertEquals(false, exec("def x = true; boolean y = false; return x == y")); assertEquals(false, exec("def x = null; boolean y = true; return x == y")); @@ -146,13 +146,13 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(true, exec("def x = new HashMap(); x.put(3, 3); def y = new HashMap(); return x != y")); assertEquals(false, exec("def x = new HashMap(); x.put(3, 3); def y = new HashMap(); y.put(3, 3); return x != y")); assertEquals(false, exec("def x = new HashMap(); def y = x; x.put(3, 3); y.put(3, 3); return x != y")); - + assertEquals(false, exec("def x = true; def y = true; return x != y")); assertEquals(true, exec("def x = true; def y = false; return x != y")); assertEquals(true, exec("def x = false; def y = true; return x != y")); assertEquals(false, exec("def x = false; def y = false; return x != y")); } - + public void testDefNeTypedLHS() { assertEquals(false, exec("byte x = (byte)7; def y = (int)7; return x != y")); assertEquals(false, exec("short x = (short)6; def y = (int)6; return x != y")); @@ -174,13 +174,13 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(true, exec("Map x = new HashMap(); x.put(3, 3); def y = new HashMap(); return x != y")); assertEquals(false, exec("Map x = new HashMap(); x.put(3, 3); def y = new HashMap(); y.put(3, 3); return x != y")); assertEquals(false, exec("Map x = new HashMap(); def y = x; x.put(3, 3); y.put(3, 3); return x != y")); - + assertEquals(false, exec("boolean x = true; def y = true; return x != y")); assertEquals(true, exec("boolean x = true; def y = false; return x != y")); assertEquals(true, exec("boolean x = false; def y = true; return x != y")); assertEquals(false, exec("boolean x = false; def y = false; return x != y")); } - + public void testDefNeTypedRHS() { assertEquals(false, exec("def x = (byte)7; int y = (int)7; return x != y")); assertEquals(false, exec("def x = (short)6; int y = (int)6; return x != y")); @@ -202,7 +202,7 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(true, exec("def x = new HashMap(); x.put(3, 3); Map y = new HashMap(); return x != y")); assertEquals(false, exec("def x = new HashMap(); x.put(3, 3); Map y = new HashMap(); y.put(3, 3); return x != y")); assertEquals(false, exec("def x = new HashMap(); Map y = x; x.put(3, 3); y.put(3, 3); return x != y")); - + assertEquals(false, exec("def x = true; boolean y = true; return x != y")); assertEquals(true, exec("def x = true; boolean y = false; return x != y")); assertEquals(true, exec("def x = false; boolean y = true; return x != y")); @@ -241,7 +241,7 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(false, exec("def x = (float)6; def y = (double)2; return x < y")); assertEquals(false, exec("def x = (double)7; def y = (double)1; return x < y")); } - + public void testDefLtTypedLHS() { assertEquals(true, exec("byte x = (byte)1; def y = (int)7; return x < y")); assertEquals(true, exec("short x = (short)2; def y = (int)6; return x < y")); @@ -259,7 +259,7 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(false, exec("float x = (float)6; def y = (double)2; return x < y")); assertEquals(false, exec("double x = (double)7; def y = (double)1; return x < y")); } - + public void testDefLtTypedRHS() { assertEquals(true, exec("def x = (byte)1; int y = (int)7; return x < y")); assertEquals(true, exec("def x = (short)2; int y = (int)6; return x < y")); @@ -295,7 +295,7 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(false, exec("def x = (float)6; def y = (double)2; return x <= y")); assertEquals(false, exec("def x = (double)7; def y = (double)1; return x <= y")); } - + public void testDefLteTypedLHS() { assertEquals(true, exec("byte x = (byte)1; def y = (int)7; return x <= y")); assertEquals(true, exec("short x = (short)2; def y = (int)6; return x <= y")); @@ -313,7 +313,7 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(false, exec("float x = (float)6; def y = (double)2; return x <= y")); assertEquals(false, exec("double x = (double)7; def y = (double)1; return x <= y")); } - + public void testDefLteTypedRHS() { assertEquals(true, exec("def x = (byte)1; int y = (int)7; return x <= y")); assertEquals(true, exec("def x = (short)2; int y = (int)6; return x <= y")); @@ -349,7 +349,7 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(true, exec("def x = (float)6; def y = (double)2; return x > y")); assertEquals(true, exec("def x = (double)7; def y = (double)1; return x > y")); } - + public void testDefGtTypedLHS() { assertEquals(false, exec("byte x = (byte)1; def y = (int)7; return x > y")); assertEquals(false, exec("short x = (short)2; def y = (int)6; return x > y")); @@ -367,7 +367,7 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(true, exec("float x = (float)6; def y = (double)2; return x > y")); assertEquals(true, exec("double x = (double)7; def y = (double)1; return x > y")); } - + public void testDefGtTypedRHS() { assertEquals(false, exec("def x = (byte)1; int y = (int)7; return x > y")); assertEquals(false, exec("def x = (short)2; int y = (int)6; return x > y")); @@ -403,7 +403,7 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(true, exec("def x = (float)6; def y = (double)2; return x >= y")); assertEquals(true, exec("def x = (double)7; def y = (double)1; return x >= y")); } - + public void testDefGteTypedLHS() { assertEquals(false, exec("byte x = (byte)1; def y = (int)7; return x >= y")); assertEquals(false, exec("short x = (short)2; def y = (int)6; return x >= y")); @@ -421,7 +421,7 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(true, exec("float x = (float)6; def y = (double)2; return x >= y")); assertEquals(true, exec("double x = (double)7; def y = (double)1; return x >= y")); } - + public void testDefGteTypedRHS() { assertEquals(false, exec("def x = (byte)1; int y = (int)7; return x >= y")); assertEquals(false, exec("def x = (short)2; int y = (int)6; return x >= y")); @@ -439,7 +439,7 @@ public class ComparisonTests extends ScriptTestCase { assertEquals(true, exec("def x = (float)6; double y = (double)2; return x >= y")); assertEquals(true, exec("def x = (double)7; double y = (double)1; return x >= y")); } - + public void testInstanceOf() { assertEquals(true, exec("int x = 5; return x instanceof int")); assertEquals(true, exec("int x = 5; return x instanceof Number")); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ConditionalTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ConditionalTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/ConditionalTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/ConditionalTests.java index d91f2c3358e..dc3cfd9055c 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ConditionalTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ConditionalTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import java.util.ArrayList; import java.util.Collections; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ConstantFoldingTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ConstantFoldingTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/ConstantFoldingTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/ConstantFoldingTests.java index fe89aec3d5e..de7c1158903 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ConstantFoldingTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ConstantFoldingTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; public class ConstantFoldingTests extends ScriptTestCase { diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ContextExampleTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ContextExampleTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/ContextExampleTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/ContextExampleTests.java index e817bea36cd..49b9020120e 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ContextExampleTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ContextExampleTests.java @@ -19,7 +19,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import java.util.HashMap; import java.util.Map; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DateTimeTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/DateTimeTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/DateTimeTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/DateTimeTests.java index 38ceae74e05..078707b6fb4 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DateTimeTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/DateTimeTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import java.time.ZoneId; import java.time.ZonedDateTime; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DebugTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/DebugTests.java similarity index 95% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/DebugTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/DebugTests.java index b491df5568d..d8fd7203290 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DebugTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/DebugTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.elasticsearch.OpenSearchException; import org.elasticsearch.common.io.stream.BytesStreamOutput; import org.elasticsearch.common.io.stream.StreamInput; -import org.elasticsearch.painless.lookup.PainlessLookup; -import org.elasticsearch.painless.lookup.PainlessLookupBuilder; -import org.elasticsearch.painless.spi.Whitelist; +import org.opensearch.painless.lookup.PainlessLookup; +import org.opensearch.painless.lookup.PainlessLookupBuilder; +import org.opensearch.painless.spi.Whitelist; import org.elasticsearch.script.ScriptException; import java.io.IOException; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/Debugger.java b/modules/lang-painless/src/test/java/org/opensearch/painless/Debugger.java similarity index 89% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/Debugger.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/Debugger.java index a81bd5f97ea..395a61bb260 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/Debugger.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/Debugger.java @@ -17,11 +17,11 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.action.PainlessExecuteAction.PainlessTestScript; -import org.elasticsearch.painless.lookup.PainlessLookupBuilder; -import org.elasticsearch.painless.spi.Whitelist; +import org.opensearch.painless.action.PainlessExecuteAction.PainlessTestScript; +import org.opensearch.painless.lookup.PainlessLookupBuilder; +import org.opensearch.painless.spi.Whitelist; import org.objectweb.asm.util.Textifier; import java.io.PrintWriter; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DefBootstrapTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/DefBootstrapTests.java similarity index 97% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/DefBootstrapTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/DefBootstrapTests.java index a640e2b5c6a..4a4f09f05f8 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DefBootstrapTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/DefBootstrapTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.lookup.PainlessLookup; -import org.elasticsearch.painless.lookup.PainlessLookupBuilder; -import org.elasticsearch.painless.spi.Whitelist; -import org.elasticsearch.painless.symbol.FunctionTable; +import org.opensearch.painless.lookup.PainlessLookup; +import org.opensearch.painless.lookup.PainlessLookupBuilder; +import org.opensearch.painless.spi.Whitelist; +import org.opensearch.painless.symbol.FunctionTable; import org.elasticsearch.test.ESTestCase; import java.lang.invoke.CallSite; @@ -142,7 +142,7 @@ public class DefBootstrapTests extends ESTestCase { assertEquals("dynamic method [java.lang.Object, size/0] not found", iae.getMessage()); assertTrue("Does not fail inside ClassValue.computeValue()", Arrays.stream(iae.getStackTrace()).anyMatch(e -> { return e.getMethodName().equals("computeValue") && - e.getClassName().startsWith("org.elasticsearch.painless.DefBootstrap$PIC$"); + e.getClassName().startsWith("org.opensearch.painless.DefBootstrap$PIC$"); })); } diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DefCastTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/DefCastTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/DefCastTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/DefCastTests.java index 3067e387c9a..26fdf5cd6c8 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DefCastTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/DefCastTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; public class DefCastTests extends ScriptTestCase { diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DefOptimizationTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/DefOptimizationTests.java similarity index 96% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/DefOptimizationTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/DefOptimizationTests.java index 0cee95adef5..7e905b2b883 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DefOptimizationTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/DefOptimizationTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; public class DefOptimizationTests extends ScriptTestCase { @@ -179,290 +179,290 @@ public class DefOptimizationTests extends ScriptTestCase { }); assertTrue(exception.getMessage().contains("Cannot cast java.lang.Double to java.lang.Integer")); } - + public void testMulOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x * y", + assertBytecodeExists("int x = 1; def y = 2; return x * y", "INVOKEDYNAMIC mul(ILjava/lang/Object;)Ljava/lang/Object;"); } - + public void testMulOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x * y", + assertBytecodeExists("def x = 1; int y = 2; return x * y", "INVOKEDYNAMIC mul(Ljava/lang/Object;I)Ljava/lang/Object;"); } - + public void testMulOptRet() { - assertBytecodeExists("def x = 1; def y = 2; double d = x * y", + assertBytecodeExists("def x = 1; def y = 2; double d = x * y", "INVOKEDYNAMIC mul(Ljava/lang/Object;Ljava/lang/Object;)D"); } - + public void testDivOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x / y", + assertBytecodeExists("int x = 1; def y = 2; return x / y", "INVOKEDYNAMIC div(ILjava/lang/Object;)Ljava/lang/Object;"); } - + public void testDivOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x / y", + assertBytecodeExists("def x = 1; int y = 2; return x / y", "INVOKEDYNAMIC div(Ljava/lang/Object;I)Ljava/lang/Object;"); } - + public void testDivOptRet() { - assertBytecodeExists("def x = 1; def y = 2; double d = x / y", + assertBytecodeExists("def x = 1; def y = 2; double d = x / y", "INVOKEDYNAMIC div(Ljava/lang/Object;Ljava/lang/Object;)D"); } - + public void testRemOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x % y", + assertBytecodeExists("int x = 1; def y = 2; return x % y", "INVOKEDYNAMIC rem(ILjava/lang/Object;)Ljava/lang/Object;"); } - + public void testRemOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x % y", + assertBytecodeExists("def x = 1; int y = 2; return x % y", "INVOKEDYNAMIC rem(Ljava/lang/Object;I)Ljava/lang/Object;"); } - + public void testRemOptRet() { - assertBytecodeExists("def x = 1; def y = 2; double d = x % y", + assertBytecodeExists("def x = 1; def y = 2; double d = x % y", "INVOKEDYNAMIC rem(Ljava/lang/Object;Ljava/lang/Object;)D"); } - + public void testAddOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x + y", + assertBytecodeExists("int x = 1; def y = 2; return x + y", "INVOKEDYNAMIC add(ILjava/lang/Object;)Ljava/lang/Object;"); } - + public void testAddOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x + y", + assertBytecodeExists("def x = 1; int y = 2; return x + y", "INVOKEDYNAMIC add(Ljava/lang/Object;I)Ljava/lang/Object;"); } - + public void testAddOptRet() { - assertBytecodeExists("def x = 1; def y = 2; double d = x + y", + assertBytecodeExists("def x = 1; def y = 2; double d = x + y", "INVOKEDYNAMIC add(Ljava/lang/Object;Ljava/lang/Object;)D"); } - + // horrible, sorry public void testAddOptNullGuards() { // needs null guard - assertBytecodeHasPattern("def x = 1; def y = 2; return x + y", + assertBytecodeHasPattern("def x = 1; def y = 2; return x + y", "(?s).*INVOKEDYNAMIC add.*arguments:\\s+" + "\\d+" - + ",\\s+" + DefBootstrap.BINARY_OPERATOR + + ",\\s+" + DefBootstrap.BINARY_OPERATOR + ",\\s+" + DefBootstrap.OPERATOR_ALLOWS_NULL + ".*"); // still needs null guard, NPE is the wrong thing! - assertBytecodeHasPattern("def x = 1; def y = 2; double z = x + y", + assertBytecodeHasPattern("def x = 1; def y = 2; double z = x + y", "(?s).*INVOKEDYNAMIC add.*arguments:\\s+" + "\\d+" + ",\\s+" + DefBootstrap.BINARY_OPERATOR + ",\\s+" + DefBootstrap.OPERATOR_ALLOWS_NULL + ".*"); // a primitive argument is present: no null guard needed - assertBytecodeHasPattern("def x = 1; int y = 2; return x + y", + assertBytecodeHasPattern("def x = 1; int y = 2; return x + y", "(?s).*INVOKEDYNAMIC add.*arguments:\\s+" + "\\d+" + ",\\s+" + DefBootstrap.BINARY_OPERATOR + ",\\s+" + 0 + ".*"); - assertBytecodeHasPattern("int x = 1; def y = 2; return x + y", + assertBytecodeHasPattern("int x = 1; def y = 2; return x + y", "(?s).*INVOKEDYNAMIC add.*arguments:\\s+" + "\\d+" + ",\\s+" + DefBootstrap.BINARY_OPERATOR + ",\\s+" + 0 + ".*"); } - + public void testSubOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x - y", + assertBytecodeExists("int x = 1; def y = 2; return x - y", "INVOKEDYNAMIC sub(ILjava/lang/Object;)Ljava/lang/Object;"); } - + public void testSubOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x - y", + assertBytecodeExists("def x = 1; int y = 2; return x - y", "INVOKEDYNAMIC sub(Ljava/lang/Object;I)Ljava/lang/Object;"); } - + public void testSubOptRet() { - assertBytecodeExists("def x = 1; def y = 2; double d = x - y", + assertBytecodeExists("def x = 1; def y = 2; double d = x - y", "INVOKEDYNAMIC sub(Ljava/lang/Object;Ljava/lang/Object;)D"); } - + public void testLshOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x << y", + assertBytecodeExists("int x = 1; def y = 2; return x << y", "INVOKEDYNAMIC lsh(ILjava/lang/Object;)Ljava/lang/Object;"); } - + public void testLshOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x << y", + assertBytecodeExists("def x = 1; int y = 2; return x << y", "INVOKEDYNAMIC lsh(Ljava/lang/Object;I)Ljava/lang/Object;"); } - + public void testLshOptRet() { - assertBytecodeExists("def x = 1; def y = 2; double d = x << y", + assertBytecodeExists("def x = 1; def y = 2; double d = x << y", "INVOKEDYNAMIC lsh(Ljava/lang/Object;Ljava/lang/Object;)D"); } - + public void testRshOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x >> y", + assertBytecodeExists("int x = 1; def y = 2; return x >> y", "INVOKEDYNAMIC rsh(ILjava/lang/Object;)Ljava/lang/Object;"); } - + public void testRshOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x >> y", + assertBytecodeExists("def x = 1; int y = 2; return x >> y", "INVOKEDYNAMIC rsh(Ljava/lang/Object;I)Ljava/lang/Object;"); } - + public void testRshOptRet() { - assertBytecodeExists("def x = 1; def y = 2; double d = x >> y", + assertBytecodeExists("def x = 1; def y = 2; double d = x >> y", "INVOKEDYNAMIC rsh(Ljava/lang/Object;Ljava/lang/Object;)D"); } - + public void testUshOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x >>> y", + assertBytecodeExists("int x = 1; def y = 2; return x >>> y", "INVOKEDYNAMIC ush(ILjava/lang/Object;)Ljava/lang/Object;"); } - + public void testUshOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x >>> y", + assertBytecodeExists("def x = 1; int y = 2; return x >>> y", "INVOKEDYNAMIC ush(Ljava/lang/Object;I)Ljava/lang/Object;"); } - + public void testUshOptRet() { - assertBytecodeExists("def x = 1; def y = 2; double d = x >>> y", + assertBytecodeExists("def x = 1; def y = 2; double d = x >>> y", "INVOKEDYNAMIC ush(Ljava/lang/Object;Ljava/lang/Object;)D"); } - + public void testAndOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x & y", + assertBytecodeExists("int x = 1; def y = 2; return x & y", "INVOKEDYNAMIC and(ILjava/lang/Object;)Ljava/lang/Object;"); } - + public void testAndOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x & y", + assertBytecodeExists("def x = 1; int y = 2; return x & y", "INVOKEDYNAMIC and(Ljava/lang/Object;I)Ljava/lang/Object;"); } - + public void testAndOptRet() { - assertBytecodeExists("def x = 1; def y = 2; double d = x & y", + assertBytecodeExists("def x = 1; def y = 2; double d = x & y", "INVOKEDYNAMIC and(Ljava/lang/Object;Ljava/lang/Object;)D"); } - + public void testOrOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x | y", + assertBytecodeExists("int x = 1; def y = 2; return x | y", "INVOKEDYNAMIC or(ILjava/lang/Object;)Ljava/lang/Object;"); } - + public void testOrOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x | y", + assertBytecodeExists("def x = 1; int y = 2; return x | y", "INVOKEDYNAMIC or(Ljava/lang/Object;I)Ljava/lang/Object;"); } - + public void testOrOptRet() { - assertBytecodeExists("def x = 1; def y = 2; double d = x | y", + assertBytecodeExists("def x = 1; def y = 2; double d = x | y", "INVOKEDYNAMIC or(Ljava/lang/Object;Ljava/lang/Object;)D"); } - + public void testXorOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x ^ y", + assertBytecodeExists("int x = 1; def y = 2; return x ^ y", "INVOKEDYNAMIC xor(ILjava/lang/Object;)Ljava/lang/Object;"); } - + public void testXorOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x ^ y", + assertBytecodeExists("def x = 1; int y = 2; return x ^ y", "INVOKEDYNAMIC xor(Ljava/lang/Object;I)Ljava/lang/Object;"); } - + public void testXorOptRet() { - assertBytecodeExists("def x = 1; def y = 2; double d = x ^ y", + assertBytecodeExists("def x = 1; def y = 2; double d = x ^ y", "INVOKEDYNAMIC xor(Ljava/lang/Object;Ljava/lang/Object;)D"); } public void testBooleanXorOptLHS() { - assertBytecodeExists("boolean x = true; def y = true; return x ^ y", + assertBytecodeExists("boolean x = true; def y = true; return x ^ y", "INVOKEDYNAMIC xor(ZLjava/lang/Object;)Ljava/lang/Object;"); } public void testBooleanXorOptRHS() { - assertBytecodeExists("def x = true; boolean y = true; return x ^ y", + assertBytecodeExists("def x = true; boolean y = true; return x ^ y", "INVOKEDYNAMIC xor(Ljava/lang/Object;Z)Ljava/lang/Object;"); } - + public void testBooleanXorOptRet() { - assertBytecodeExists("def x = true; def y = true; boolean v = x ^ y", + assertBytecodeExists("def x = true; def y = true; boolean v = x ^ y", "INVOKEDYNAMIC xor(Ljava/lang/Object;Ljava/lang/Object;)Z"); } public void testLtOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x < y", + assertBytecodeExists("int x = 1; def y = 2; return x < y", "INVOKEDYNAMIC lt(ILjava/lang/Object;)Z"); } - + public void testLtOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x < y", + assertBytecodeExists("def x = 1; int y = 2; return x < y", "INVOKEDYNAMIC lt(Ljava/lang/Object;I)Z"); } - + public void testLteOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x <= y", + assertBytecodeExists("int x = 1; def y = 2; return x <= y", "INVOKEDYNAMIC lte(ILjava/lang/Object;)Z"); } - + public void testLteOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x <= y", + assertBytecodeExists("def x = 1; int y = 2; return x <= y", "INVOKEDYNAMIC lte(Ljava/lang/Object;I)Z"); } - + public void testEqOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x == y", + assertBytecodeExists("int x = 1; def y = 2; return x == y", "INVOKEDYNAMIC eq(ILjava/lang/Object;)Z"); } - + public void testEqOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x == y", + assertBytecodeExists("def x = 1; int y = 2; return x == y", "INVOKEDYNAMIC eq(Ljava/lang/Object;I)Z"); } - + public void testNeqOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x != y", + assertBytecodeExists("int x = 1; def y = 2; return x != y", "INVOKEDYNAMIC eq(ILjava/lang/Object;)Z"); } - + public void testNeqOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x != y", + assertBytecodeExists("def x = 1; int y = 2; return x != y", "INVOKEDYNAMIC eq(Ljava/lang/Object;I)Z"); } - + public void testGteOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x >= y", + assertBytecodeExists("int x = 1; def y = 2; return x >= y", "INVOKEDYNAMIC gte(ILjava/lang/Object;)Z"); } - + public void testGteOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x >= y", + assertBytecodeExists("def x = 1; int y = 2; return x >= y", "INVOKEDYNAMIC gte(Ljava/lang/Object;I)Z"); } - + public void testGtOptLHS() { - assertBytecodeExists("int x = 1; def y = 2; return x > y", + assertBytecodeExists("int x = 1; def y = 2; return x > y", "INVOKEDYNAMIC gt(ILjava/lang/Object;)Z"); } - + public void testGtOptRHS() { - assertBytecodeExists("def x = 1; int y = 2; return x > y", + assertBytecodeExists("def x = 1; int y = 2; return x > y", "INVOKEDYNAMIC gt(Ljava/lang/Object;I)Z"); } - + public void testUnaryMinusOptRet() { - assertBytecodeExists("def x = 1; double y = -x; return y", + assertBytecodeExists("def x = 1; double y = -x; return y", "INVOKEDYNAMIC neg(Ljava/lang/Object;)D"); } - + public void testUnaryNotOptRet() { - assertBytecodeExists("def x = 1; double y = ~x; return y", + assertBytecodeExists("def x = 1; double y = ~x; return y", "INVOKEDYNAMIC not(Ljava/lang/Object;)D"); } - + public void testUnaryPlusOptRet() { - assertBytecodeExists("def x = 1; double y = +x; return y", + assertBytecodeExists("def x = 1; double y = +x; return y", "INVOKEDYNAMIC plus(Ljava/lang/Object;)D"); } - + public void testLambdaReturnType() { assertBytecodeExists("List l = new ArrayList(); l.removeIf(x -> x < 10)", "synthetic lambda$synthetic$0(Ljava/lang/Object;)Z"); } - + public void testLambdaArguments() { assertBytecodeExists("List l = new ArrayList(); l.stream().mapToDouble(Double::valueOf).map(x -> x + 1)", "synthetic lambda$synthetic$0(D)D"); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DivisionTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/DivisionTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/DivisionTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/DivisionTests.java index e9880acebbc..cecbb140179 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DivisionTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/DivisionTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** Tests for division operator across all types */ //TODO: NaN/Inf/overflow/... public class DivisionTests extends ScriptTestCase { // TODO: byte,short,char - + public void testBasics() throws Exception { assertEquals(2.25F / 1.5F, exec("return 2.25F / 1.5F;")); assertEquals(0.5, exec("double x = 1; float y = 2; return x / y;")); @@ -137,7 +137,7 @@ public class DivisionTests extends ScriptTestCase { exec("return 1L/0L;"); }); } - + public void testDef() { assertEquals(1, exec("def x = (byte)2; def y = (byte)2; return x / y")); assertEquals(1, exec("def x = (short)2; def y = (byte)2; return x / y")); @@ -203,7 +203,7 @@ public class DivisionTests extends ScriptTestCase { assertEquals(1F, exec("def x = (float)2; def y = (float)2; return x / y")); assertEquals(1D, exec("def x = (double)2; def y = (double)2; return x / y")); } - + public void testDefTypedLHS() { assertEquals(1, exec("byte x = (byte)2; def y = (byte)2; return x / y")); assertEquals(1, exec("short x = (short)2; def y = (byte)2; return x / y")); @@ -269,7 +269,7 @@ public class DivisionTests extends ScriptTestCase { assertEquals(1F, exec("float x = (float)2; def y = (float)2; return x / y")); assertEquals(1D, exec("double x = (double)2; def y = (double)2; return x / y")); } - + public void testDefTypedRHS() { assertEquals(1, exec("def x = (byte)2; byte y = (byte)2; return x / y")); assertEquals(1, exec("def x = (short)2; byte y = (byte)2; return x / y")); @@ -335,7 +335,7 @@ public class DivisionTests extends ScriptTestCase { assertEquals(1F, exec("def x = (float)2; float y = (float)2; return x / y")); assertEquals(1D, exec("def x = (double)2; double y = (double)2; return x / y")); } - + public void testCompoundAssignment() { // byte assertEquals((byte) 15, exec("byte x = 45; x /= 3; return x;")); @@ -358,7 +358,7 @@ public class DivisionTests extends ScriptTestCase { assertEquals(15D, exec("double x = 45.0; x /= 3; return x;")); assertEquals(-5D, exec("double x = 5.0; x /= -1; return x;")); } - + public void testDefCompoundAssignment() { // byte assertEquals((byte) 15, exec("def x = (byte)45; x /= 3; return x;")); @@ -381,7 +381,7 @@ public class DivisionTests extends ScriptTestCase { assertEquals(15D, exec("def x = 45.0; x /= 3; return x;")); assertEquals(-5D, exec("def x = 5.0; x /= -1; return x;")); } - + public void testCompoundAssignmentByZero() { // byte expectScriptThrows(ArithmeticException.class, () -> { @@ -407,7 +407,7 @@ public class DivisionTests extends ScriptTestCase { expectScriptThrows(ArithmeticException.class, () -> { exec("long x = 1; x /= 0; return x;"); }); - + // def expectScriptThrows(ArithmeticException.class, () -> { exec("def x = 1; x /= 0; return x;"); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DocFieldsPhaseTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/DocFieldsPhaseTests.java similarity index 93% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/DocFieldsPhaseTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/DocFieldsPhaseTests.java index 2da5b687f4f..79ccb37c284 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/DocFieldsPhaseTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/DocFieldsPhaseTests.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.Compiler.Loader; -import org.elasticsearch.painless.lookup.PainlessLookup; -import org.elasticsearch.painless.lookup.PainlessLookupBuilder; -import org.elasticsearch.painless.spi.Whitelist; -import org.elasticsearch.painless.symbol.ScriptScope; +import org.opensearch.painless.Compiler.Loader; +import org.opensearch.painless.lookup.PainlessLookup; +import org.opensearch.painless.lookup.PainlessLookupBuilder; +import org.opensearch.painless.spi.Whitelist; +import org.opensearch.painless.symbol.ScriptScope; import org.elasticsearch.script.ScriptContext; import java.security.AccessController; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ElvisTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ElvisTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/ElvisTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/ElvisTests.java index b788cf7f7dd..c57ba7a7e1e 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ElvisTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ElvisTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import static java.util.Collections.singletonMap; import static org.hamcrest.Matchers.greaterThan; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/EqualsTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/EqualsTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/EqualsTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/EqualsTests.java index f8859fc861f..8cd36eaf1f0 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/EqualsTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/EqualsTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.elasticsearch.test.ESTestCase; @@ -132,7 +132,7 @@ public class EqualsTests extends ScriptTestCase { assertEquals(1, exec("def a = 1; Number b = a; Number c = a; if (c === b) return 1; else return 0;")); assertEquals(0, exec("def a = 1; Object b = new HashMap(); if (a === (Object)b) return 1; else return 0;")); } - + public void testEqualsDefAndPrimitive() { /* This test needs an Integer that isn't cached by Integer.valueOf so we draw one randomly. We can't use any fixed integer because * we can never be sure that the JVM hasn't configured itself to cache that Integer. It is sneaky like that. */ diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FactoryTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/FactoryTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/FactoryTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/FactoryTests.java index ce821f78fe6..b2ee616fa27 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FactoryTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/FactoryTests.java @@ -17,9 +17,9 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.spi.Whitelist; +import org.opensearch.painless.spi.Whitelist; import org.elasticsearch.script.ScriptContext; import org.elasticsearch.script.ScriptException; import org.elasticsearch.script.ScriptFactory; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FeatureTestAugmentationObject.java b/modules/lang-painless/src/test/java/org/opensearch/painless/FeatureTestAugmentationObject.java similarity index 98% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/FeatureTestAugmentationObject.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/FeatureTestAugmentationObject.java index b6e1c5b743c..55fcfa6c40b 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FeatureTestAugmentationObject.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/FeatureTestAugmentationObject.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import java.util.function.Function; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FeatureTestObject.java b/modules/lang-painless/src/test/java/org/opensearch/painless/FeatureTestObject.java similarity index 98% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/FeatureTestObject.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/FeatureTestObject.java index 43c0e6808eb..b944f0cb0bf 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FeatureTestObject.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/FeatureTestObject.java @@ -1,8 +1,3 @@ -package org.elasticsearch.painless; - -import java.util.List; -import java.util.function.Function; - /* * Licensed to Elasticsearch under one or more contributor * license agreements. See the NOTICE file distributed with @@ -22,6 +17,11 @@ import java.util.function.Function; * under the License. */ +package org.opensearch.painless; + +import java.util.List; +import java.util.function.Function; + /** Currently just a dummy class for testing a few features not yet exposed by whitelist! */ public class FeatureTestObject { /** static method that returns true */ diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FeatureTestObject2.java b/modules/lang-painless/src/test/java/org/opensearch/painless/FeatureTestObject2.java similarity index 97% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/FeatureTestObject2.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/FeatureTestObject2.java index a1fe4c5fda4..99023054ccf 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FeatureTestObject2.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/FeatureTestObject2.java @@ -1,5 +1,3 @@ -package org.elasticsearch.painless; - /* * Licensed to Elasticsearch under one or more contributor * license agreements. See the NOTICE file distributed with @@ -19,6 +17,8 @@ package org.elasticsearch.painless; * under the License. */ +package org.opensearch.painless; + /** Currently just a dummy class for testing a few features not yet exposed by whitelist! */ public class FeatureTestObject2 { public FeatureTestObject2() {super();} diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FloatOverflowTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/FloatOverflowTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/FloatOverflowTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/FloatOverflowTests.java index 4b3eb8f0e7f..cd497119855 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FloatOverflowTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/FloatOverflowTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** Tests floating point overflow cases */ public class FloatOverflowTests extends ScriptTestCase { diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FunctionRefTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/FunctionRefTests.java similarity index 94% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/FunctionRefTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/FunctionRefTests.java index b6ae2c50ad5..3a6e417327e 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FunctionRefTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/FunctionRefTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import java.lang.invoke.LambdaConversionException; import java.time.Instant; @@ -46,12 +46,12 @@ public class FunctionRefTests extends ScriptTestCase { public void testQualifiedStaticMethodReference() { assertEquals(true, - exec("List l = [true]; l.stream().map(org.elasticsearch.painless.FeatureTestObject::overloadedStatic).findFirst().get()")); + exec("List l = [true]; l.stream().map(org.opensearch.painless.FeatureTestObject::overloadedStatic).findFirst().get()")); } public void testQualifiedStaticMethodReferenceDef() { assertEquals(true, - exec("def l = [true]; l.stream().map(org.elasticsearch.painless.FeatureTestObject::overloadedStatic).findFirst().get()")); + exec("def l = [true]; l.stream().map(org.opensearch.painless.FeatureTestObject::overloadedStatic).findFirst().get()")); } public void testQualifiedVirtualMethodReference() { @@ -133,7 +133,7 @@ public class FunctionRefTests extends ScriptTestCase { assertEquals("testingcdefg", exec( "String x = 'testing';" + "String y = 'abcdefg';" + - "org.elasticsearch.painless.FeatureTestObject test = new org.elasticsearch.painless.FeatureTestObject(2,3);" + + "org.opensearch.painless.FeatureTestObject test = new org.opensearch.painless.FeatureTestObject(2,3);" + "return test.twoFunctionsOfX(x::concat, y::substring);")); } @@ -141,7 +141,7 @@ public class FunctionRefTests extends ScriptTestCase { assertEquals("testingcdefg", exec( "def x = 'testing';" + "def y = 'abcdefg';" + - "org.elasticsearch.painless.FeatureTestObject test = new org.elasticsearch.painless.FeatureTestObject(2,3);" + + "org.opensearch.painless.FeatureTestObject test = new org.opensearch.painless.FeatureTestObject(2,3);" + "return test.twoFunctionsOfX(x::concat, y::substring);")); } @@ -149,7 +149,7 @@ public class FunctionRefTests extends ScriptTestCase { assertEquals("testingcdefg", exec( "String x = 'testing';" + "String y = 'abcdefg';" + - "def test = new org.elasticsearch.painless.FeatureTestObject(2,3);" + + "def test = new org.opensearch.painless.FeatureTestObject(2,3);" + "return test.twoFunctionsOfX(x::concat, y::substring);")); } @@ -157,7 +157,7 @@ public class FunctionRefTests extends ScriptTestCase { assertEquals("testingcdefg", exec( "def x = 'testing';" + "def y = 'abcdefg';" + - "def test = new org.elasticsearch.painless.FeatureTestObject(2,3);" + + "def test = new org.opensearch.painless.FeatureTestObject(2,3);" + "return test.twoFunctionsOfX(x::concat, y::substring);")); } diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FunctionTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/FunctionTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/FunctionTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/FunctionTests.java index e3f75eca7ce..4b4e470a494 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/FunctionTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/FunctionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import static org.hamcrest.Matchers.containsString; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/GeneralCastTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/GeneralCastTests.java similarity index 98% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/GeneralCastTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/GeneralCastTests.java index 93449c231d5..77dad9d2dd9 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/GeneralCastTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/GeneralCastTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** Tests for explicit casts */ public class GeneralCastTests extends ScriptTestCase { @@ -333,15 +333,15 @@ public class GeneralCastTests extends ScriptTestCase { assertEquals(1, exec("def y = 2.0; y.compareTo(1);")); assertEquals(1, exec("int x = 1; def y = 2.0; y.compareTo(x);")); assertEquals(-1, exec("Integer x = Integer.valueOf(3); def y = 2.0; y.compareTo(x);")); - assertEquals(2, exec("def f = new org.elasticsearch.painless.FeatureTestObject(); f.i = (byte)2; f.i")); + assertEquals(2, exec("def f = new org.opensearch.painless.FeatureTestObject(); f.i = (byte)2; f.i")); assertEquals(4.0, exec( - "def x = new org.elasticsearch.painless.FeatureTestObject(); " + + "def x = new org.opensearch.painless.FeatureTestObject(); " + "Byte i = Byte.valueOf(3); " + "byte j = 1;" + "Short s = Short.valueOf(-2);" + "x.mixedAdd(j, i, (char)2, s)" )); - assertNull(exec("def f = new org.elasticsearch.painless.FeatureTestObject(); f.i = null; f.i")); + assertNull(exec("def f = new org.opensearch.painless.FeatureTestObject(); f.i = null; f.i")); expectScriptThrows(ClassCastException.class, () -> exec("def x = 2.0; def y = 1; y.compareTo(x);")); expectScriptThrows(ClassCastException.class, () -> exec("float f = 1.0f; def y = 1; y.compareTo(f);")); } diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/GetByPathAugmentationTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/GetByPathAugmentationTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/GetByPathAugmentationTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/GetByPathAugmentationTests.java index 603ab7fd0e6..89cade3fd7d 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/GetByPathAugmentationTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/GetByPathAugmentationTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import java.util.ArrayList; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/IncrementTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/IncrementTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/IncrementTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/IncrementTests.java index de7fa173202..b02da9f9e56 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/IncrementTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/IncrementTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** Tests for increment/decrement operators across all data types */ public class IncrementTests extends ScriptTestCase { @@ -76,7 +76,7 @@ public class IncrementTests extends ScriptTestCase { assertEquals(1D, exec("double x = 0.0; return ++x;")); assertEquals(-1D, exec("double x = 0.0; return --x;")); } - + /** incrementing def values */ public void testIncrementDef() { assertEquals((byte)0, exec("def x = (byte)0; return x++;")); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/InitializerTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/InitializerTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/InitializerTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/InitializerTests.java index be3db76bac2..b813a655560 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/InitializerTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/InitializerTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import java.util.ArrayList; import java.util.HashMap; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/InjectionTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/InjectionTests.java similarity index 52% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/InjectionTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/InjectionTests.java index e4447a3a9aa..f7f061509e4 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/InjectionTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/InjectionTests.java @@ -17,201 +17,201 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; public class InjectionTests extends ScriptTestCase { public void testInjection() { assertEquals(16, - exec("org.elasticsearch.painless.FeatureTestObject.staticNumberArgument(8);")); + exec("org.opensearch.painless.FeatureTestObject.staticNumberArgument(8);")); } public void testInstanceInjection() { assertEquals(1000, - exec("org.elasticsearch.painless.FeatureTestObject f = new org.elasticsearch.painless.FeatureTestObject(100, 0); " + + exec("org.opensearch.painless.FeatureTestObject f = new org.opensearch.painless.FeatureTestObject(100, 0); " + "f.injectTimesX(5)")); } public void testInstanceInjectWithLambda() { assertEquals(2000, - exec("org.elasticsearch.painless.FeatureTestObject f = new org.elasticsearch.painless.FeatureTestObject(100, 0); " + + exec("org.opensearch.painless.FeatureTestObject f = new org.opensearch.painless.FeatureTestObject(100, 0); " + "f.injectWithLambda(x -> 2*x, 5)")); } public void testInstanceInjectWithDefLambda() { assertEquals(2000, - exec("def f = new org.elasticsearch.painless.FeatureTestObject(100, 0); f.injectWithLambda(x -> 2*x, (short)5)")); + exec("def f = new org.opensearch.painless.FeatureTestObject(100, 0); f.injectWithLambda(x -> 2*x, (short)5)")); } public void testInjectionOnDefNoInject() { assertEquals(1000, - exec("def d = new org.elasticsearch.painless.FeatureTestObject(100, 0); d.injectTimesX((short)5)")); + exec("def d = new org.opensearch.painless.FeatureTestObject(100, 0); d.injectTimesX((short)5)")); } public void testInjectionOnMethodReference() { assertEquals(60, exec( - "def ft0 = new org.elasticsearch.painless.FeatureTestObject(2, 0); " + - "org.elasticsearch.painless.FeatureTestObject ft1 = " + - " new org.elasticsearch.painless.FeatureTestObject(1000, 0); " + + "def ft0 = new org.opensearch.painless.FeatureTestObject(2, 0); " + + "org.opensearch.painless.FeatureTestObject ft1 = " + + " new org.opensearch.painless.FeatureTestObject(1000, 0); " + "ft1.timesSupplier(ft0::injectTimesX, (short)3, 5)")); } public void testInjectionOnMethodReference2() { assertEquals(60, exec( - "org.elasticsearch.painless.FeatureTestObject ft0 = new org.elasticsearch.painless.FeatureTestObject(2, 0); " + - "def ft1 = new org.elasticsearch.painless.FeatureTestObject(1000, 0); " + + "org.opensearch.painless.FeatureTestObject ft0 = new org.opensearch.painless.FeatureTestObject(2, 0); " + + "def ft1 = new org.opensearch.painless.FeatureTestObject(1000, 0); " + "ft1.timesSupplier(ft0::injectTimesX, (short)3, 5)")); } public void testInjectionOnMethodReference3() { assertEquals(60, exec( - "def ft0 = new org.elasticsearch.painless.FeatureTestObject(2, 0); " + - "def ft1 = new org.elasticsearch.painless.FeatureTestObject(1000, 0); " + + "def ft0 = new org.opensearch.painless.FeatureTestObject(2, 0); " + + "def ft1 = new org.opensearch.painless.FeatureTestObject(1000, 0); " + "ft1.timesSupplier(ft0::injectTimesX, (short)3, 5)")); } public void testAugmentedInstanceInjection() { assertEquals(1000, - exec("org.elasticsearch.painless.FeatureTestObject f = new org.elasticsearch.painless.FeatureTestObject(100, 0); " + + exec("org.opensearch.painless.FeatureTestObject f = new org.opensearch.painless.FeatureTestObject(100, 0); " + "f.augmentInjectTimesX(5)")); } public void testAugmentedInstanceInjectWithLambda() { assertEquals(2000, - exec("org.elasticsearch.painless.FeatureTestObject f = new org.elasticsearch.painless.FeatureTestObject(100, 0); " + + exec("org.opensearch.painless.FeatureTestObject f = new org.opensearch.painless.FeatureTestObject(100, 0); " + "f.augmentInjectWithLambda(x -> 2*x, 5)")); } public void testAugmentedInstanceInjectWithDefLambda() { assertEquals(2000, - exec("def f = new org.elasticsearch.painless.FeatureTestObject(100, 0); f.augmentInjectWithLambda(x -> 2*x, (short)5)")); + exec("def f = new org.opensearch.painless.FeatureTestObject(100, 0); f.augmentInjectWithLambda(x -> 2*x, (short)5)")); } public void testAugmentedInjectionOnDefNoInject() { assertEquals(1000, - exec("def d = new org.elasticsearch.painless.FeatureTestObject(100, 0); d.augmentInjectTimesX((short)5)")); + exec("def d = new org.opensearch.painless.FeatureTestObject(100, 0); d.augmentInjectTimesX((short)5)")); } public void testAugmentedInjectionOnMethodReference() { assertEquals(60, exec( - "def ft0 = new org.elasticsearch.painless.FeatureTestObject(2, 0); " + - "org.elasticsearch.painless.FeatureTestObject ft1 = " + - " new org.elasticsearch.painless.FeatureTestObject(1000, 0); " + + "def ft0 = new org.opensearch.painless.FeatureTestObject(2, 0); " + + "org.opensearch.painless.FeatureTestObject ft1 = " + + " new org.opensearch.painless.FeatureTestObject(1000, 0); " + "ft1.augmentTimesSupplier(ft0::augmentInjectTimesX, (short)3, 5)")); } public void testAugmentedInjectionOnMethodReference2() { assertEquals(60, exec( - "org.elasticsearch.painless.FeatureTestObject ft0 = new org.elasticsearch.painless.FeatureTestObject(2, 0); " + - "def ft1 = new org.elasticsearch.painless.FeatureTestObject(1000, 0); " + + "org.opensearch.painless.FeatureTestObject ft0 = new org.opensearch.painless.FeatureTestObject(2, 0); " + + "def ft1 = new org.opensearch.painless.FeatureTestObject(1000, 0); " + "ft1.augmentTimesSupplier(ft0::augmentInjectTimesX, (short)3, 5)")); } public void testAugmentedInjectionOnMethodReference3() { assertEquals(60, exec( - "def ft0 = new org.elasticsearch.painless.FeatureTestObject(2, 0); " + - "def ft1 = new org.elasticsearch.painless.FeatureTestObject(1000, 0); " + + "def ft0 = new org.opensearch.painless.FeatureTestObject(2, 0); " + + "def ft1 = new org.opensearch.painless.FeatureTestObject(1000, 0); " + "ft1.augmentTimesSupplier(ft0::augmentInjectTimesX, (short)3, 5)")); } public void testInstanceMultiInjection() { assertEquals(6000, - exec("org.elasticsearch.painless.FeatureTestObject f = new org.elasticsearch.painless.FeatureTestObject(100, 0); " + + exec("org.opensearch.painless.FeatureTestObject f = new org.opensearch.painless.FeatureTestObject(100, 0); " + "f.injectMultiTimesX(5)")); } public void testInstanceMultiInjectWithLambda() { assertEquals(8000, - exec("org.elasticsearch.painless.FeatureTestObject f = new org.elasticsearch.painless.FeatureTestObject(100, 0); " + + exec("org.opensearch.painless.FeatureTestObject f = new org.opensearch.painless.FeatureTestObject(100, 0); " + "f.injectMultiWithLambda(x -> 2*x, 5)")); } public void testInstanceMultiInjectWithDefLambda() { assertEquals(2000, - exec("def f = new org.elasticsearch.painless.FeatureTestObject(100, 0); f.injectWithLambda(x -> 2*x, (short)5)")); + exec("def f = new org.opensearch.painless.FeatureTestObject(100, 0); f.injectWithLambda(x -> 2*x, (short)5)")); } public void testMultiInjectionOnDefNoMultiInject() { assertEquals(6000, - exec("def d = new org.elasticsearch.painless.FeatureTestObject(100, 0); d.injectMultiTimesX((short)5)")); + exec("def d = new org.opensearch.painless.FeatureTestObject(100, 0); d.injectMultiTimesX((short)5)")); } public void testMultiInjectionOnMethodReference() { assertEquals(60, exec( - "def ft0 = new org.elasticsearch.painless.FeatureTestObject(2, 0); " + - "org.elasticsearch.painless.FeatureTestObject ft1 = " + - " new org.elasticsearch.painless.FeatureTestObject(1000, 0); " + + "def ft0 = new org.opensearch.painless.FeatureTestObject(2, 0); " + + "org.opensearch.painless.FeatureTestObject ft1 = " + + " new org.opensearch.painless.FeatureTestObject(1000, 0); " + "ft1.timesSupplier(ft0::injectTimesX, (short)3, 5)")); } public void testMultiInjectionOnMethodReference2() { assertEquals(60, exec( - "org.elasticsearch.painless.FeatureTestObject ft0 = new org.elasticsearch.painless.FeatureTestObject(2, 0); " + - "def ft1 = new org.elasticsearch.painless.FeatureTestObject(1000, 0); " + + "org.opensearch.painless.FeatureTestObject ft0 = new org.opensearch.painless.FeatureTestObject(2, 0); " + + "def ft1 = new org.opensearch.painless.FeatureTestObject(1000, 0); " + "ft1.timesSupplier(ft0::injectTimesX, (short)3, 5)")); } public void testMultiInjectionOnMethodReference3() { assertEquals(60, exec( - "def ft0 = new org.elasticsearch.painless.FeatureTestObject(2, 0); " + - "def ft1 = new org.elasticsearch.painless.FeatureTestObject(1000, 0); " + + "def ft0 = new org.opensearch.painless.FeatureTestObject(2, 0); " + + "def ft1 = new org.opensearch.painless.FeatureTestObject(1000, 0); " + "ft1.timesSupplier(ft0::injectTimesX, (short)3, 5)")); } public void testAugmentedInstanceMultiInjection() { assertEquals(5000, - exec("org.elasticsearch.painless.FeatureTestObject f = new org.elasticsearch.painless.FeatureTestObject(100, 0); " + + exec("org.opensearch.painless.FeatureTestObject f = new org.opensearch.painless.FeatureTestObject(100, 0); " + "f.augmentInjectMultiTimesX(5)")); } public void testAugmentedInstanceMultiInjectWithLambda() { assertEquals(20000, - exec("org.elasticsearch.painless.FeatureTestObject f = new org.elasticsearch.painless.FeatureTestObject(100, 0); " + + exec("org.opensearch.painless.FeatureTestObject f = new org.opensearch.painless.FeatureTestObject(100, 0); " + "f.augmentInjectMultiWithLambda(x -> 2*x, 5)")); } public void testAugmentedInstanceMultiInjectWithDefLambda() { assertEquals(20000, - exec("def f = new org.elasticsearch.painless.FeatureTestObject(100, 0); " + + exec("def f = new org.opensearch.painless.FeatureTestObject(100, 0); " + "f.augmentInjectMultiWithLambda(x -> 2*x, (short)5)")); } public void testAugmentedMultiInjectionOnDefNoMultiInject() { assertEquals(5000, - exec("def d = new org.elasticsearch.painless.FeatureTestObject(100, 0); d.augmentInjectMultiTimesX((short)5)")); + exec("def d = new org.opensearch.painless.FeatureTestObject(100, 0); d.augmentInjectMultiTimesX((short)5)")); } public void testAugmentedMultiInjectionOnMethodReference() { assertEquals(300, exec( - "def ft0 = new org.elasticsearch.painless.FeatureTestObject(2, 0); " + - "org.elasticsearch.painless.FeatureTestObject ft1 = " + - " new org.elasticsearch.painless.FeatureTestObject(1000, 0); " + + "def ft0 = new org.opensearch.painless.FeatureTestObject(2, 0); " + + "org.opensearch.painless.FeatureTestObject ft1 = " + + " new org.opensearch.painless.FeatureTestObject(1000, 0); " + "ft1.augmentTimesSupplier(ft0::augmentInjectMultiTimesX, (short)3, 5)")); } public void testAugmentedMultiInjectionOnMethodReference2() { assertEquals(300, exec( - "org.elasticsearch.painless.FeatureTestObject ft0 = new org.elasticsearch.painless.FeatureTestObject(2, 0); " + - "def ft1 = new org.elasticsearch.painless.FeatureTestObject(1000, 0); " + + "org.opensearch.painless.FeatureTestObject ft0 = new org.opensearch.painless.FeatureTestObject(2, 0); " + + "def ft1 = new org.opensearch.painless.FeatureTestObject(1000, 0); " + "ft1.augmentTimesSupplier(ft0::augmentInjectMultiTimesX, (short)3, 5)")); } public void testAugmentedMultiInjectionOnMethodReference3() { assertEquals(300, exec( - "def ft0 = new org.elasticsearch.painless.FeatureTestObject(2, 0); " + - "def ft1 = new org.elasticsearch.painless.FeatureTestObject(1000, 0); " + + "def ft0 = new org.opensearch.painless.FeatureTestObject(2, 0); " + + "def ft1 = new org.opensearch.painless.FeatureTestObject(1000, 0); " + "ft1.augmentTimesSupplier(ft0::augmentInjectMultiTimesX, (short)3, 5)")); } } diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/IntegerOverflowTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/IntegerOverflowTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/IntegerOverflowTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/IntegerOverflowTests.java index 1165547bf5a..6afdcbb05f8 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/IntegerOverflowTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/IntegerOverflowTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** Tests integer overflow cases */ public class IntegerOverflowTests extends ScriptTestCase { diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/JsonTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/JsonTests.java similarity index 98% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/JsonTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/JsonTests.java index 8136bbcce6b..8d2f3a8b817 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/JsonTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/JsonTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/LambdaTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/LambdaTests.java similarity index 98% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/LambdaTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/LambdaTests.java index e55edc123c8..0e30c698bb3 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/LambdaTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/LambdaTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import java.util.Arrays; import java.util.HashMap; @@ -112,7 +112,7 @@ public class LambdaTests extends ScriptTestCase { public void testTwoLambdas() { assertEquals("testingcdefg", exec( - "org.elasticsearch.painless.FeatureTestObject test = new org.elasticsearch.painless.FeatureTestObject(2,3);" + + "org.opensearch.painless.FeatureTestObject test = new org.opensearch.painless.FeatureTestObject(2,3);" + "return test.twoFunctionsOfX(x -> 'testing'.concat(x), y -> 'abcdefg'.substring(y))")); } diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ListTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ListTests.java similarity index 98% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/ListTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/ListTests.java index 88e1f7db817..d33de6fa82e 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ListTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ListTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.hamcrest.Matcher; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/MapTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/MapTests.java similarity index 98% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/MapTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/MapTests.java index 034213e74be..feb4b1a152a 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/MapTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/MapTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import static java.util.Collections.singletonMap; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/MultiplicationTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/MultiplicationTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/MultiplicationTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/MultiplicationTests.java index be9a929e5b2..b48a7dcb56e 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/MultiplicationTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/MultiplicationTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** Tests for multiplication operator across all types */ //TODO: NaN/Inf/overflow/... public class MultiplicationTests extends ScriptTestCase { // TODO: short,byte,char - + public void testBasics() throws Exception { assertEquals(8, exec("int x = 4; char y = 2; return x*y;")); } @@ -127,7 +127,7 @@ public class MultiplicationTests extends ScriptTestCase { assertEquals(10.0*0.0, exec("return 10.0*0.0;")); assertEquals(0.0*0.0, exec("return 0.0*0.0;")); } - + public void testDef() { assertEquals(4, exec("def x = (byte)2; def y = (byte)2; return x * y")); assertEquals(4, exec("def x = (short)2; def y = (byte)2; return x * y")); @@ -193,7 +193,7 @@ public class MultiplicationTests extends ScriptTestCase { assertEquals(4F, exec("def x = (float)2; def y = (float)2; return x * y")); assertEquals(4D, exec("def x = (double)2; def y = (double)2; return x * y")); } - + public void testDefTypedLHS() { assertEquals(4, exec("byte x = (byte)2; def y = (byte)2; return x * y")); assertEquals(4, exec("short x = (short)2; def y = (byte)2; return x * y")); @@ -259,7 +259,7 @@ public class MultiplicationTests extends ScriptTestCase { assertEquals(4F, exec("float x = (float)2; def y = (float)2; return x * y")); assertEquals(4D, exec("double x = (double)2; def y = (double)2; return x * y")); } - + public void testDefTypedRHS() { assertEquals(4, exec("def x = (byte)2; byte y = (byte)2; return x * y")); assertEquals(4, exec("def x = (short)2; byte y = (byte)2; return x * y")); @@ -325,7 +325,7 @@ public class MultiplicationTests extends ScriptTestCase { assertEquals(4F, exec("def x = (float)2; float y = (float)2; return x * y")); assertEquals(4D, exec("def x = (double)2; double y = (double)2; return x * y")); } - + public void testCompoundAssignment() { // byte assertEquals((byte) 15, exec("byte x = 5; x *= 3; return x;")); @@ -348,7 +348,7 @@ public class MultiplicationTests extends ScriptTestCase { assertEquals(15D, exec("double x = 5.0; x *= 3; return x;")); assertEquals(-5D, exec("double x = 5.0; x *= -1; return x;")); } - + public void testDefCompoundAssignment() { // byte assertEquals((byte) 15, exec("def x = (byte)5; x *= 3; return x;")); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/NeedsScoreTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/NeedsScoreTests.java similarity index 97% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/NeedsScoreTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/NeedsScoreTests.java index e9a6ca60509..a0d542e559a 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/NeedsScoreTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/NeedsScoreTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.query.QueryShardContext; -import org.elasticsearch.painless.spi.Whitelist; +import org.opensearch.painless.spi.Whitelist; import org.elasticsearch.script.NumberSortScript; import org.elasticsearch.script.ScriptContext; import org.elasticsearch.test.ESSingleNodeTestCase; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/NoSemiColonTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/NoSemiColonTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/NoSemiColonTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/NoSemiColonTests.java index 8fbc82dce35..842ab0610f5 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/NoSemiColonTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/NoSemiColonTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import java.util.Collections; import java.util.HashMap; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/OrTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/OrTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/OrTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/OrTests.java index 72d5af1942a..d32a24ed515 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/OrTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/OrTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** Tests for or operator across all types */ public class OrTests extends ScriptTestCase { diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/OverloadTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/OverloadTests.java similarity index 78% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/OverloadTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/OverloadTests.java index 24abc840868..afc95dbf20d 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/OverloadTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/OverloadTests.java @@ -1,5 +1,3 @@ -package org.elasticsearch.painless; - /* * Licensed to Elasticsearch under one or more contributor * license agreements. See the NOTICE file distributed with @@ -19,6 +17,8 @@ package org.elasticsearch.painless; * under the License. */ +package org.opensearch.painless; + /** Tests method overloading */ public class OverloadTests extends ScriptTestCase { @@ -30,7 +30,7 @@ public class OverloadTests extends ScriptTestCase { }); assertTrue(expected.getMessage().contains("[java.lang.String, indexOf/3]")); } - + public void testMethodDynamic() { assertEquals(2, exec("def x = 'abc123abc'; return x.indexOf('c');")); assertEquals(8, exec("def x = 'abc123abc'; return x.indexOf('c', 3);")); @@ -39,16 +39,16 @@ public class OverloadTests extends ScriptTestCase { }); assertTrue(expected.getMessage().contains("dynamic method [java.lang.String, indexOf/3] not found")); } - + public void testConstructor() { - assertEquals(true, exec("org.elasticsearch.painless.FeatureTestObject f = new org.elasticsearch.painless.FeatureTestObject();" + + assertEquals(true, exec("org.opensearch.painless.FeatureTestObject f = new org.opensearch.painless.FeatureTestObject();" + "return f.x == 0 && f.y == 0;")); - assertEquals(true, exec("org.elasticsearch.painless.FeatureTestObject f = new org.elasticsearch.painless.FeatureTestObject(1, 2);" + + assertEquals(true, exec("org.opensearch.painless.FeatureTestObject f = new org.opensearch.painless.FeatureTestObject(1, 2);" + "return f.x == 1 && f.y == 2;")); } - + public void testStatic() { - assertEquals(true, exec("return org.elasticsearch.painless.FeatureTestObject.overloadedStatic();")); - assertEquals(false, exec("return org.elasticsearch.painless.FeatureTestObject.overloadedStatic(false);")); + assertEquals(true, exec("return org.opensearch.painless.FeatureTestObject.overloadedStatic();")); + assertEquals(false, exec("return org.opensearch.painless.FeatureTestObject.overloadedStatic(false);")); } } diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PostfixTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/PostfixTests.java similarity index 98% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/PostfixTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/PostfixTests.java index 806b885a826..b94b6714025 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PostfixTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/PostfixTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; public class PostfixTests extends ScriptTestCase { public void testConstantPostfixes() { diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PromotionTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/PromotionTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/PromotionTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/PromotionTests.java index 9de618be4a7..0c631ea7c9f 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PromotionTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/PromotionTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; public class PromotionTests extends ScriptTestCase { public void testBinaryPromotion() throws Exception { diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/RegexLimitTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/RegexLimitTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/RegexLimitTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/RegexLimitTests.java index feb21368898..532d6939e9b 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/RegexLimitTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/RegexLimitTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.elasticsearch.common.breaker.CircuitBreakingException; import org.elasticsearch.common.settings.Settings; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/RegexTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/RegexTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/RegexTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/RegexTests.java index 7c3fbc0ce6f..9ea96a9810d 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/RegexTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/RegexTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.script.ScriptException; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/RemainderTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/RemainderTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/RemainderTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/RemainderTests.java index 7380923c746..da4677dee87 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/RemainderTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/RemainderTests.java @@ -17,14 +17,14 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** Tests for division operator across all types */ //TODO: NaN/Inf/overflow/... public class RemainderTests extends ScriptTestCase { // TODO: byte,short,char - + public void testBasics() throws Exception { assertEquals(2.25F % 1.5F, exec("return 2.25F % 1.5F;")); assertEquals(1, exec("int x = 3; int y = 2; return x % y;")); @@ -137,7 +137,7 @@ public class RemainderTests extends ScriptTestCase { exec("return 1L%0L;"); }); } - + public void testDef() { assertEquals(0, exec("def x = (byte)2; def y = (byte)2; return x % y")); assertEquals(0, exec("def x = (short)2; def y = (byte)2; return x % y")); @@ -203,7 +203,7 @@ public class RemainderTests extends ScriptTestCase { assertEquals(0F, exec("def x = (float)2; def y = (float)2; return x % y")); assertEquals(0D, exec("def x = (double)2; def y = (double)2; return x % y")); } - + public void testDefTypedLHS() { assertEquals(0, exec("byte x = (byte)2; def y = (byte)2; return x % y")); assertEquals(0, exec("short x = (short)2; def y = (byte)2; return x % y")); @@ -335,7 +335,7 @@ public class RemainderTests extends ScriptTestCase { assertEquals(0F, exec("def x = (float)2; float y = (float)2; return x % y")); assertEquals(0D, exec("def x = (double)2; double y = (double)2; return x % y")); } - + public void testCompoundAssignment() { // byte assertEquals((byte) 3, exec("byte x = 15; x %= 4; return x;")); @@ -358,7 +358,7 @@ public class RemainderTests extends ScriptTestCase { assertEquals(3D, exec("double x = 15.0; x %= 4; return x;")); assertEquals(-3D, exec("double x = -15.0; x %= 4; return x;")); } - + public void testDefCompoundAssignment() { // byte assertEquals((byte) 3, exec("def x = (byte)15; x %= 4; return x;")); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptEngineTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptEngineTests.java similarity index 98% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptEngineTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/ScriptEngineTests.java index 6594225842e..84ba1d7dca6 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptEngineTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptEngineTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import java.util.Arrays; import java.util.HashMap; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptTestCase.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptTestCase.java similarity index 95% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptTestCase.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/ScriptTestCase.java index b4d4d21e9aa..3c34762f957 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptTestCase.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptTestCase.java @@ -17,13 +17,13 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import junit.framework.AssertionFailedError; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.painless.antlr.Walker; -import org.elasticsearch.painless.spi.Whitelist; -import org.elasticsearch.painless.spi.WhitelistLoader; +import org.opensearch.painless.antlr.Walker; +import org.opensearch.painless.spi.Whitelist; +import org.opensearch.painless.spi.WhitelistLoader; import org.elasticsearch.script.ScriptContext; import org.elasticsearch.script.ScriptException; import org.elasticsearch.test.ESTestCase; @@ -35,7 +35,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.elasticsearch.painless.action.PainlessExecuteAction.PainlessTestScript; +import static org.opensearch.painless.action.PainlessExecuteAction.PainlessTestScript; import static org.hamcrest.Matchers.hasSize; /** @@ -64,7 +64,7 @@ public abstract class ScriptTestCase extends ESTestCase { protected Map, List> scriptContexts() { Map, List> contexts = new HashMap<>(); List whitelists = new ArrayList<>(Whitelist.BASE_WHITELISTS); - whitelists.add(WhitelistLoader.loadFromResourceFiles(Whitelist.class, "org.elasticsearch.painless.test")); + whitelists.add(WhitelistLoader.loadFromResourceFiles(Whitelist.class, "org.opensearch.painless.test")); contexts.put(PainlessTestScript.CONTEXT, whitelists); return contexts; } diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptedMetricAggContextsTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptedMetricAggContextsTests.java similarity index 98% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptedMetricAggContextsTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/ScriptedMetricAggContextsTests.java index 41f56c0285f..c830858ee0d 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptedMetricAggContextsTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ScriptedMetricAggContextsTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.memory.MemoryIndex; import org.apache.lucene.search.Scorable; -import org.elasticsearch.painless.spi.Whitelist; +import org.opensearch.painless.spi.Whitelist; import org.elasticsearch.script.ScriptContext; import org.elasticsearch.script.ScriptedMetricAggContexts; import org.elasticsearch.search.lookup.LeafSearchLookup; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ShiftTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/ShiftTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/ShiftTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/ShiftTests.java index e969802e27c..05be57a0622 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ShiftTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/ShiftTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** Tests for shift operator across all types */ public class ShiftTests extends ScriptTestCase { @@ -39,7 +39,7 @@ public class ShiftTests extends ScriptTestCase { assertEquals(-1L >>> 29, exec("long x = -1L; int y = 29; return x >>> y;")); assertEquals(-1 >>> 29L, exec("int x = -1; long y = 29L; return x >>> y;")); } - + public void testLongShiftsConst() { assertEquals(1L << 2, exec("return 1L << 2;")); assertEquals(1 << 2L, exec("return 1 << 2L;")); @@ -48,7 +48,7 @@ public class ShiftTests extends ScriptTestCase { assertEquals(-1L >>> 29, exec("return -1L >>> 29;")); assertEquals(-1 >>> 29L, exec("return -1 >>> 29L;")); } - + public void testBogusShifts() { expectScriptThrows(ClassCastException.class, ()-> { exec("long x = 1L; float y = 2; return x << y;"); @@ -78,7 +78,7 @@ public class ShiftTests extends ScriptTestCase { exec("return 1D << 2L"); }); } - + public void testLshDef() { assertEquals(2, exec("def x = (byte)1; def y = (byte)1; return x << y")); assertEquals(2, exec("def x = (short)1; def y = (byte)1; return x << y")); @@ -116,7 +116,7 @@ public class ShiftTests extends ScriptTestCase { assertEquals(2, exec("def x = (int)1; def y = (int)1; return x << y")); assertEquals(2L, exec("def x = (long)1; def y = (long)1; return x << y")); } - + public void testLshDefTypedLHS() { assertEquals(2, exec("byte x = (byte)1; def y = (byte)1; return x << y")); assertEquals(2, exec("short x = (short)1; def y = (byte)1; return x << y")); @@ -154,7 +154,7 @@ public class ShiftTests extends ScriptTestCase { assertEquals(2, exec("int x = (int)1; def y = (int)1; return x << y")); assertEquals(2L, exec("long x = (long)1; def y = (long)1; return x << y")); } - + public void testLshDefTypedRHS() { assertEquals(2, exec("def x = (byte)1; byte y = (byte)1; return x << y")); assertEquals(2, exec("def x = (short)1; byte y = (byte)1; return x << y")); @@ -230,7 +230,7 @@ public class ShiftTests extends ScriptTestCase { assertEquals(2, exec("def x = (int)4; def y = (int)1; return x >> y")); assertEquals(2L, exec("def x = (long)4; def y = (long)1; return x >> y")); } - + public void testRshDefTypeLHS() { assertEquals(2, exec("byte x = (byte)4; def y = (byte)1; return x >> y")); assertEquals(2, exec("short x = (short)4; def y = (byte)1; return x >> y")); @@ -268,7 +268,7 @@ public class ShiftTests extends ScriptTestCase { assertEquals(2, exec("int x = (int)4; def y = (int)1; return x >> y")); assertEquals(2L, exec("long x = (long)4; def y = (long)1; return x >> y")); } - + public void testRshDefTypedLHS() { assertEquals(2, exec("def x = (byte)4; byte y = (byte)1; return x >> y")); assertEquals(2, exec("def x = (short)4; byte y = (byte)1; return x >> y")); @@ -344,7 +344,7 @@ public class ShiftTests extends ScriptTestCase { assertEquals(2, exec("def x = (int)4; def y = (int)1; return x >>> y")); assertEquals(2L, exec("def x = (long)4; def y = (long)1; return x >>> y")); } - + public void testUshDefTypedLHS() { assertEquals(2, exec("byte x = (byte)4; def y = (byte)1; return x >>> y")); assertEquals(2, exec("short x = (short)4; def y = (byte)1; return x >>> y")); @@ -382,7 +382,7 @@ public class ShiftTests extends ScriptTestCase { assertEquals(2, exec("int x = (int)4; def y = (int)1; return x >>> y")); assertEquals(2L, exec("long x = (long)4; def y = (long)1; return x >>> y")); } - + public void testUshDefTypedRHS() { assertEquals(2, exec("def x = (byte)4; byte y = (byte)1; return x >>> y")); assertEquals(2, exec("def x = (short)4; byte y = (byte)1; return x >>> y")); @@ -420,7 +420,7 @@ public class ShiftTests extends ScriptTestCase { assertEquals(2, exec("def x = (int)4; int y = (int)1; return x >>> y")); assertEquals(2L, exec("def x = (long)4; long y = (long)1; return x >>> y")); } - + public void testBogusDefShifts() { expectScriptThrows(ClassCastException.class, ()-> { exec("def x = 1L; def y = 2F; return x << y;"); @@ -434,7 +434,7 @@ public class ShiftTests extends ScriptTestCase { expectScriptThrows(ClassCastException.class, ()-> { exec("def x = 1D; def y = 2L; return x << y;"); }); - + expectScriptThrows(ClassCastException.class, ()-> { exec("def x = 1L; def y = 2F; return x >> y;"); }); @@ -447,7 +447,7 @@ public class ShiftTests extends ScriptTestCase { expectScriptThrows(ClassCastException.class, ()-> { exec("def x = 1D; def y = 2L; return x >> y;"); }); - + expectScriptThrows(ClassCastException.class, ()-> { exec("def x = 1L; def y = 2F; return x >>> y;"); }); @@ -461,7 +461,7 @@ public class ShiftTests extends ScriptTestCase { exec("def x = 1D; def y = 2L; return x >>> y;"); }); } - + public void testBogusDefShiftsTypedLHS() { expectScriptThrows(ClassCastException.class, ()-> { exec("long x = 1L; def y = 2F; return x << y;"); @@ -475,7 +475,7 @@ public class ShiftTests extends ScriptTestCase { expectScriptThrows(ClassCastException.class, ()-> { exec("double x = 1D; def y = 2L; return x << y;"); }); - + expectScriptThrows(ClassCastException.class, ()-> { exec("long x = 1L; def y = 2F; return x >> y;"); }); @@ -488,7 +488,7 @@ public class ShiftTests extends ScriptTestCase { expectScriptThrows(ClassCastException.class, ()-> { exec("double x = 1D; def y = 2L; return x >> y;"); }); - + expectScriptThrows(ClassCastException.class, ()-> { exec("long x = 1L; def y = 2F; return x >>> y;"); }); @@ -502,7 +502,7 @@ public class ShiftTests extends ScriptTestCase { exec("double x = 1D; def y = 2L; return x >>> y;"); }); } - + public void testBogusDefShiftsTypedRHS() { expectScriptThrows(ClassCastException.class, ()-> { exec("def x = 1L; float y = 2F; return x << y;"); @@ -516,7 +516,7 @@ public class ShiftTests extends ScriptTestCase { expectScriptThrows(ClassCastException.class, ()-> { exec("def x = 1D; long y = 2L; return x << y;"); }); - + expectScriptThrows(ClassCastException.class, ()-> { exec("def x = 1L; float y = 2F; return x >> y;"); }); @@ -529,7 +529,7 @@ public class ShiftTests extends ScriptTestCase { expectScriptThrows(ClassCastException.class, ()-> { exec("def x = 1D; long y = 2L; return x >> y;"); }); - + expectScriptThrows(ClassCastException.class, ()-> { exec("def x = 1L; float y = 2F; return x >>> y;"); }); @@ -603,7 +603,7 @@ public class ShiftTests extends ScriptTestCase { assertEquals(15, exec("int x = 60; x >>>= 2L; return x;")); assertEquals(-60 >>> 2, exec("int x = -60; x >>>= 2L; return x;")); } - + public void testBogusCompoundAssignment() { expectScriptThrows(ClassCastException.class, ()-> { exec("long x = 1L; float y = 2; x <<= y;"); @@ -633,7 +633,7 @@ public class ShiftTests extends ScriptTestCase { exec("double x = 1D; x <<= 2L;"); }); } - + public void testBogusCompoundAssignmentDef() { expectScriptThrows(ClassCastException.class, ()-> { exec("def x = 1L; float y = 2; x <<= y;"); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/SimilarityScriptTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/SimilarityScriptTests.java similarity index 98% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/SimilarityScriptTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/SimilarityScriptTests.java index 8b9560bbd32..f8b0a723619 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/SimilarityScriptTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/SimilarityScriptTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field.Store; @@ -37,7 +37,7 @@ import org.apache.lucene.search.TopDocs; import org.apache.lucene.store.ByteBuffersDirectory; import org.apache.lucene.store.Directory; import org.elasticsearch.index.similarity.ScriptedSimilarity; -import org.elasticsearch.painless.spi.Whitelist; +import org.opensearch.painless.spi.Whitelist; import org.elasticsearch.script.ScriptContext; import org.elasticsearch.script.SimilarityScript; import org.elasticsearch.script.SimilarityWeightScript; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/StandardCastTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/StandardCastTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/StandardCastTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/StandardCastTests.java index 868adefc649..a3fb6988cd7 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/StandardCastTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/StandardCastTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; public class StandardCastTests extends ScriptTestCase { @@ -210,7 +210,7 @@ public class StandardCastTests extends ScriptTestCase { expectScriptThrows(ClassCastException.class, () -> exec("Object o = Float.valueOf((float)0); Character b = (Character)o;")); expectScriptThrows(ClassCastException.class, () -> exec("Object o = Double.valueOf((double)0); Character b = o;")); expectScriptThrows(ClassCastException.class, () -> exec("Object o = Double.valueOf((double)0); Character b = (Character)o;")); - + expectScriptThrows(ClassCastException.class, () -> exec("Object o = Integer.valueOf(0); Integer b = o;")); expectScriptThrows(ClassCastException.class, () -> exec("Object o = null; Integer b = o;")); exec("Object o = Integer.valueOf(0); Integer b = (Integer)o;"); @@ -1606,7 +1606,7 @@ public class StandardCastTests extends ScriptTestCase { expectScriptThrows(ClassCastException.class, () -> exec("Long o = Long.valueOf((long)0); ArrayList b = o;")); expectScriptThrows(ClassCastException.class, () -> exec("Long o = Long.valueOf((long)0); ArrayList b = (ArrayList)o;")); } - + public void testPrimitiveFloatCasts() { expectScriptThrows(ClassCastException.class, () -> exec("float o = 0; Object n = o;")); expectScriptThrows(ClassCastException.class, () -> exec("float o = 0; Object n = (Object)o;")); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/StaticTestObject.java b/modules/lang-painless/src/test/java/org/opensearch/painless/StaticTestObject.java similarity index 96% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/StaticTestObject.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/StaticTestObject.java index fc805317850..2315361328a 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/StaticTestObject.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/StaticTestObject.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; public class StaticTestObject { public static int staticAddIntsTest(int x, int y) { diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/StringTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/StringTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/StringTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/StringTests.java index 503cdc971a5..128d8ecbe5e 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/StringTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/StringTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import org.apache.lucene.util.Constants; @@ -26,7 +26,7 @@ import java.util.Locale; import java.util.Map; import static java.util.Collections.singletonMap; -import static org.elasticsearch.painless.WriterConstants.MAX_INDY_STRING_CONCAT_ARGS; +import static org.opensearch.painless.WriterConstants.MAX_INDY_STRING_CONCAT_ARGS; public class StringTests extends ScriptTestCase { diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/SubtractionTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/SubtractionTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/SubtractionTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/SubtractionTests.java index e70322af3af..2c7a4744df9 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/SubtractionTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/SubtractionTests.java @@ -17,12 +17,12 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** Tests for subtraction operator across all types */ //TODO: NaN/Inf/overflow/... public class SubtractionTests extends ScriptTestCase { - + public void testBasics() throws Exception { assertEquals(2 - 1, exec("return 2 - 1;")); assertEquals(-1, exec("int x = 1; char y = 2; return x - y;")); @@ -181,7 +181,7 @@ public class SubtractionTests extends ScriptTestCase { assertEquals(10.0-0.0, exec("return 10.0-0.0;")); assertEquals(0.0-0.0, exec("return 0.0-0.0;")); } - + public void testDef() { assertEquals(0, exec("def x = (byte)1; def y = (byte)1; return x - y")); assertEquals(0, exec("def x = (short)1; def y = (byte)1; return x - y")); @@ -239,7 +239,7 @@ public class SubtractionTests extends ScriptTestCase { assertEquals(0D, exec("def x = (float)1; def y = (double)1; return x - y")); assertEquals(0D, exec("def x = (double)1; def y = (double)1; return x - y")); } - + public void testDefTypedLHS() { assertEquals(0, exec("byte x = (byte)1; def y = (byte)1; return x - y")); assertEquals(0, exec("short x = (short)1; def y = (byte)1; return x - y")); @@ -297,7 +297,7 @@ public class SubtractionTests extends ScriptTestCase { assertEquals(0D, exec("float x = (float)1; def y = (double)1; return x - y")); assertEquals(0D, exec("double x = (double)1; def y = (double)1; return x - y")); } - + public void testDefTypedRHS() { assertEquals(0, exec("def x = (byte)1; byte y = (byte)1; return x - y")); assertEquals(0, exec("def x = (short)1; byte y = (byte)1; return x - y")); @@ -355,7 +355,7 @@ public class SubtractionTests extends ScriptTestCase { assertEquals(0D, exec("def x = (float)1; double y = (double)1; return x - y")); assertEquals(0D, exec("def x = (double)1; double y = (double)1; return x - y")); } - + public void testCompoundAssignment() { // byte assertEquals((byte) 15, exec("byte x = 5; x -= -10; return x;")); @@ -379,7 +379,7 @@ public class SubtractionTests extends ScriptTestCase { assertEquals(15D, exec("double x = 5.0; x -= -10; return x;")); assertEquals(-5D, exec("double x = 5.0; x -= 10; return x;")); } - + public void testDefCompoundAssignment() { // byte assertEquals((byte) 15, exec("def x = (byte)5; x -= -10; return x;")); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/TryCatchTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/TryCatchTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/TryCatchTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/TryCatchTests.java index 2b4dd54e015..083f848ae3b 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/TryCatchTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/TryCatchTests.java @@ -1,7 +1,3 @@ -package org.elasticsearch.painless; - -import java.util.Collections; - /* * Licensed to Elasticsearch under one or more contributor * license agreements. See the NOTICE file distributed with @@ -21,6 +17,10 @@ import java.util.Collections; * under the License. */ +package org.opensearch.painless; + +import java.util.Collections; + /** tests for throw/try/catch in painless */ public class TryCatchTests extends ScriptTestCase { diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/UnaryTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/UnaryTests.java similarity index 98% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/UnaryTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/UnaryTests.java index 025bd7f35eb..6927303eca6 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/UnaryTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/UnaryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** Tests for unary operators across different types */ public class UnaryTests extends ScriptTestCase { @@ -42,7 +42,7 @@ public class UnaryTests extends ScriptTestCase { assertEquals(1, exec("return -(-1);")); assertEquals(0, exec("return -0;")); } - + public void testPlus() { assertEquals(-1, exec("byte x = (byte)-1; return +x")); assertEquals(-1, exec("short x = (short)-1; return +x")); @@ -52,7 +52,7 @@ public class UnaryTests extends ScriptTestCase { assertEquals(-1.0F, exec("float x = -1F; return +x")); assertEquals(-1.0, exec("double x = -1.0; return +x")); } - + public void testDefNot() { assertEquals(~1, exec("def x = (byte)1; return ~x")); assertEquals(~1, exec("def x = (short)1; return ~x")); @@ -60,7 +60,7 @@ public class UnaryTests extends ScriptTestCase { assertEquals(~1, exec("def x = 1; return ~x")); assertEquals(~1L, exec("def x = 1L; return ~x")); } - + public void testDefNotTypedRet() { assertEquals((double)~1, exec("def x = (byte)1; double y = ~x; return y;")); assertEquals((float)~1, exec("def x = (short)1; float y = ~x; return y;")); @@ -77,14 +77,14 @@ public class UnaryTests extends ScriptTestCase { assertEquals(-1.0F, exec("def x = 1F; return -x")); assertEquals(-1.0, exec("def x = 1.0; return -x")); } - + public void testDefNegTypedRet() { assertEquals((double)-1, exec("def x = (byte)1; double y = -x; return y;")); assertEquals((float)-1, exec("def x = (short)1; float y = -x; return y;")); assertEquals((long)-1, exec("def x = (char)1; long y = -x; return y;")); assertEquals(-1, exec("def x = 1; int y = -x; return y;")); } - + public void testDefPlus() { assertEquals(-1, exec("def x = (byte)-1; return +x")); assertEquals(-1, exec("def x = (short)-1; return +x")); @@ -94,7 +94,7 @@ public class UnaryTests extends ScriptTestCase { assertEquals(-1.0F, exec("def x = -1F; return +x")); assertEquals(-1.0D, exec("def x = -1.0; return +x")); } - + public void testDefPlusTypedRet() { assertEquals((double)-1, exec("def x = (byte)-1; double y = +x; return y;")); assertEquals((float)-1, exec("def x = (short)-1; float y = +x; return y;")); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/WhenThingsGoWrongTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/WhenThingsGoWrongTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/WhenThingsGoWrongTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/WhenThingsGoWrongTests.java index f5bc2659762..03d8946cf50 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/WhenThingsGoWrongTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/WhenThingsGoWrongTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; import junit.framework.AssertionFailedError; import org.apache.lucene.util.Constants; diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/WhitelistLoaderTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/WhitelistLoaderTests.java similarity index 86% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/WhitelistLoaderTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/WhitelistLoaderTests.java index 59018e60c5d..7bbca63436a 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/WhitelistLoaderTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/WhitelistLoaderTests.java @@ -17,15 +17,15 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; -import org.elasticsearch.painless.spi.Whitelist; -import org.elasticsearch.painless.spi.WhitelistClass; -import org.elasticsearch.painless.spi.WhitelistLoader; -import org.elasticsearch.painless.spi.WhitelistMethod; -import org.elasticsearch.painless.spi.annotation.DeprecatedAnnotation; -import org.elasticsearch.painless.spi.annotation.NoImportAnnotation; -import org.elasticsearch.painless.spi.annotation.WhitelistAnnotationParser; +import org.opensearch.painless.spi.Whitelist; +import org.opensearch.painless.spi.WhitelistClass; +import org.opensearch.painless.spi.WhitelistLoader; +import org.opensearch.painless.spi.WhitelistMethod; +import org.opensearch.painless.spi.annotation.DeprecatedAnnotation; +import org.opensearch.painless.spi.annotation.NoImportAnnotation; +import org.opensearch.painless.spi.annotation.WhitelistAnnotationParser; import java.util.HashMap; import java.util.Map; @@ -35,7 +35,7 @@ public class WhitelistLoaderTests extends ScriptTestCase { Map parsers = new HashMap<>(WhitelistAnnotationParser.BASE_ANNOTATION_PARSERS); RuntimeException expected = expectThrows(RuntimeException.class, () -> { - WhitelistLoader.loadFromResourceFiles(Whitelist.class, parsers, "org.elasticsearch.painless.annotation.unknown"); + WhitelistLoader.loadFromResourceFiles(Whitelist.class, parsers, "org.opensearch.painless.annotation.unknown"); }); assertEquals( "invalid annotation: parser not found for [unknownAnnotation] [@unknownAnnotation]", expected.getCause().getMessage() @@ -43,7 +43,7 @@ public class WhitelistLoaderTests extends ScriptTestCase { assertEquals(IllegalArgumentException.class, expected.getCause().getClass()); expected = expectThrows(RuntimeException.class, () -> { - WhitelistLoader.loadFromResourceFiles(Whitelist.class, parsers, "org.elasticsearch.painless.annotation.unknown_with_options"); + WhitelistLoader.loadFromResourceFiles(Whitelist.class, parsers, "org.opensearch.painless.annotation.unknown_with_options"); }); assertEquals( "invalid annotation: parser not found for [unknownAnootationWithMessage] [@unknownAnootationWithMessage[arg=\"arg value\"]]", @@ -55,7 +55,7 @@ public class WhitelistLoaderTests extends ScriptTestCase { public void testAnnotations() { Map parsers = new HashMap<>(WhitelistAnnotationParser.BASE_ANNOTATION_PARSERS); parsers.put(AnnotationTestObject.TestAnnotation.NAME, AnnotationTestObject.TestAnnotationParser.INSTANCE); - Whitelist whitelist = WhitelistLoader.loadFromResourceFiles(Whitelist.class, parsers, "org.elasticsearch.painless.annotation"); + Whitelist whitelist = WhitelistLoader.loadFromResourceFiles(Whitelist.class, parsers, "org.opensearch.painless.annotation"); assertEquals(1, whitelist.whitelistClasses.size()); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/XorTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/XorTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/XorTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/XorTests.java index bda23aef01f..85614cec641 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/XorTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/XorTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless; +package org.opensearch.painless; /** Tests for xor operator across all types */ public class XorTests extends ScriptTestCase { @@ -66,7 +66,7 @@ public class XorTests extends ScriptTestCase { assertEquals(true, exec("return false ^ true;")); assertEquals(false, exec("return false ^ false;")); } - + public void testIllegal() throws Exception { expectScriptThrows(ClassCastException.class, () -> { exec("float x = (float)4; int y = 1; return x ^ y"); @@ -75,7 +75,7 @@ public class XorTests extends ScriptTestCase { exec("double x = (double)4; int y = 1; return x ^ y"); }); } - + public void testDef() { expectScriptThrows(ClassCastException.class, () -> { exec("def x = (float)4; def y = (byte)1; return x ^ y"); @@ -118,13 +118,13 @@ public class XorTests extends ScriptTestCase { assertEquals(5, exec("def x = (char)4; def y = (char)1; return x ^ y")); assertEquals(5, exec("def x = (int)4; def y = (int)1; return x ^ y")); assertEquals(5L, exec("def x = (long)4; def y = (long)1; return x ^ y")); - + assertEquals(false, exec("def x = true; def y = true; return x ^ y")); assertEquals(true, exec("def x = true; def y = false; return x ^ y")); assertEquals(true, exec("def x = false; def y = true; return x ^ y")); assertEquals(false, exec("def x = false; def y = false; return x ^ y")); } - + public void testDefTypedLHS() { expectScriptThrows(ClassCastException.class, () -> { exec("float x = (float)4; def y = (byte)1; return x ^ y"); @@ -167,13 +167,13 @@ public class XorTests extends ScriptTestCase { assertEquals(5, exec("def x = (char)4; def y = (char)1; return x ^ y")); assertEquals(5, exec("def x = (int)4; def y = (int)1; return x ^ y")); assertEquals(5L, exec("def x = (long)4; def y = (long)1; return x ^ y")); - + assertEquals(false, exec("def x = true; def y = true; return x ^ y")); assertEquals(true, exec("def x = true; def y = false; return x ^ y")); assertEquals(true, exec("def x = false; def y = true; return x ^ y")); assertEquals(false, exec("def x = false; def y = false; return x ^ y")); } - + public void testDefTypedRHS() { expectScriptThrows(ClassCastException.class, () -> { exec("def x = (float)4; byte y = (byte)1; return x ^ y"); @@ -216,13 +216,13 @@ public class XorTests extends ScriptTestCase { assertEquals(5, exec("def x = (char)4; char y = (char)1; return x ^ y")); assertEquals(5, exec("def x = (int)4; int y = (int)1; return x ^ y")); assertEquals(5L, exec("def x = (long)4; long y = (long)1; return x ^ y")); - + assertEquals(false, exec("def x = true; boolean y = true; return x ^ y")); assertEquals(true, exec("def x = true; boolean y = false; return x ^ y")); assertEquals(true, exec("def x = false; boolean y = true; return x ^ y")); assertEquals(false, exec("def x = false; boolean y = false; return x ^ y")); } - + public void testCompoundAssignment() { // boolean assertEquals(false, exec("boolean x = true; x ^= true; return x;")); @@ -245,7 +245,7 @@ public class XorTests extends ScriptTestCase { // long assertEquals((long) (13 ^ 14), exec("long x = 13L; x ^= 14; return x;")); } - + public void testBogusCompoundAssignment() { expectScriptThrows(ClassCastException.class, () -> { exec("float x = 4; int y = 1; x ^= y"); @@ -260,7 +260,7 @@ public class XorTests extends ScriptTestCase { exec("int x = 4; double y = 1; x ^= y"); }); } - + public void testCompoundAssignmentDef() { // boolean assertEquals(false, exec("def x = true; x ^= true; return x;")); @@ -283,7 +283,7 @@ public class XorTests extends ScriptTestCase { // long assertEquals((long) (13 ^ 14), exec("def x = 13L; x ^= 14; return x;")); } - + public void testDefBogusCompoundAssignment() { expectScriptThrows(ClassCastException.class, () -> { exec("def x = 4F; int y = 1; x ^= y"); diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/action/ContextInfoTests.java b/modules/lang-painless/src/test/java/org/opensearch/painless/action/ContextInfoTests.java similarity index 99% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/action/ContextInfoTests.java rename to modules/lang-painless/src/test/java/org/opensearch/painless/action/ContextInfoTests.java index 6b05fd19cd1..4af2b91bf47 100644 --- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/action/ContextInfoTests.java +++ b/modules/lang-painless/src/test/java/org/opensearch/painless/action/ContextInfoTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.painless.action; +package org.opensearch.painless.action; import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.xcontent.XContentParser; @@ -120,7 +120,7 @@ public class ContextInfoTests extends AbstractSerializingTestCase classBindings = new ArrayList<>(classBindingsSize); for (int classBinding = 0; classBinding < classBindingsSize; ++classBinding) { @@ -152,7 +152,7 @@ public class ContextInfoTests extends AbstractSerializingTestCase