Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Rename] modules/lang-painless #210

Merged
merged 8 commits into from
Mar 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
20 changes: 10 additions & 10 deletions modules/lang-painless/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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')
}

Expand Down Expand Up @@ -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()
Expand All @@ -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) {
Expand All @@ -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"
}
Expand All @@ -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',
Expand Down
8 changes: 4 additions & 4 deletions modules/lang-painless/spi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.elasticsearch.painless.spi;
package org.opensearch.painless.spi;

import org.elasticsearch.script.ScriptContext;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -38,7 +38,7 @@
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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.elasticsearch.painless.spi.annotation;
package org.opensearch.painless.spi.annotation;

public class DeprecatedAnnotation {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.elasticsearch.painless.spi.annotation;
package org.opensearch.painless.spi.annotation;

import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.elasticsearch.painless.spi.annotation;
package org.opensearch.painless.spi.annotation;

public class NoImportAnnotation {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.elasticsearch.painless.spi.annotation;
package org.opensearch.painless.spi.annotation;

import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.elasticsearch.painless.spi.annotation;
package org.opensearch.painless.spi.annotation;

public class NonDeterministicAnnotation {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.elasticsearch.painless.spi.annotation;
package org.opensearch.painless.spi.annotation;

import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -488,9 +488,9 @@ private static void printClassBinding(
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;
}
Expand Down Expand Up @@ -572,7 +572,7 @@ private static String getType(Map<String, String> javaNamesToDisplayNames, Strin
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);
Expand Down Expand Up @@ -670,7 +670,7 @@ private static String getLinkType(String javaType) {
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";
}

Expand Down Expand Up @@ -748,7 +748,7 @@ private static List<PainlessContextClassInfo> sortClassInfos(
"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)
);

Expand Down Expand Up @@ -797,8 +797,8 @@ private static Map<String, String> getDisplayNames(List<PainlessContextClassInfo
}

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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading