-
Notifications
You must be signed in to change notification settings - Fork 24.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Painless] Add instance bindings (#34410)
This change adds instance bindings to Painless. This binding allows a whitelisted method to be called on an instance instantiated prior to script compilation. Whitelisting must be done in code as there is no practical way to instantiate a useful instance from a text file (see the tests for an example). Since an instance can be shared by multiple scripts, each method called must be thread-safe.
- Loading branch information
Showing
16 changed files
with
537 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
...g-painless/spi/src/main/java/org/elasticsearch/painless/spi/WhitelistInstanceBinding.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
/* | ||
* 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. | ||
*/ | ||
|
||
package org.elasticsearch.painless.spi; | ||
|
||
import java.util.List; | ||
import java.util.Objects; | ||
|
||
/** | ||
* An instance binding represents a method call that stores state. Each instance binding must provide | ||
* exactly one public method name. The canonical type name parameters provided must match those of the | ||
* method. The method for an instance binding will target the specified Java instance. | ||
*/ | ||
public class WhitelistInstanceBinding { | ||
|
||
/** Information about where this constructor was whitelisted from. */ | ||
public final String origin; | ||
|
||
/** The Java instance this instance binding targets. */ | ||
public final Object targetInstance; | ||
|
||
/** The method name for this class binding. */ | ||
public final String methodName; | ||
|
||
/** The canonical type name for the return type. */ | ||
public final String returnCanonicalTypeName; | ||
|
||
/** | ||
* A {@link List} of {@link String}s that are the Painless type names for the parameters of the | ||
* constructor which can be used to look up the Java constructor through reflection. | ||
*/ | ||
public final List<String> canonicalTypeNameParameters; | ||
|
||
/** Standard constructor. All values must be not {@code null}. */ | ||
public WhitelistInstanceBinding(String origin, Object targetInstance, | ||
String methodName, String returnCanonicalTypeName, List<String> canonicalTypeNameParameters) { | ||
|
||
this.origin = Objects.requireNonNull(origin); | ||
this.targetInstance = Objects.requireNonNull(targetInstance); | ||
|
||
this.methodName = Objects.requireNonNull(methodName); | ||
this.returnCanonicalTypeName = Objects.requireNonNull(returnCanonicalTypeName); | ||
this.canonicalTypeNameParameters = Objects.requireNonNull(canonicalTypeNameParameters); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
...ang-painless/src/main/java/org/elasticsearch/painless/lookup/PainlessInstanceBinding.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
/* | ||
* 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. | ||
*/ | ||
|
||
package org.elasticsearch.painless.lookup; | ||
|
||
import java.lang.reflect.Method; | ||
import java.util.List; | ||
import java.util.Objects; | ||
|
||
public class PainlessInstanceBinding { | ||
|
||
public final Object targetInstance; | ||
public final Method javaMethod; | ||
|
||
public final Class<?> returnType; | ||
public final List<Class<?>> typeParameters; | ||
|
||
PainlessInstanceBinding(Object targetInstance, Method javaMethod, Class<?> returnType, List<Class<?>> typeParameters) { | ||
this.targetInstance = targetInstance; | ||
this.javaMethod = javaMethod; | ||
|
||
this.returnType = returnType; | ||
this.typeParameters = typeParameters; | ||
} | ||
|
||
@Override | ||
public boolean equals(Object object) { | ||
if (this == object) { | ||
return true; | ||
} | ||
|
||
if (object == null || getClass() != object.getClass()) { | ||
return false; | ||
} | ||
|
||
PainlessInstanceBinding that = (PainlessInstanceBinding)object; | ||
|
||
return targetInstance == that.targetInstance && | ||
Objects.equals(javaMethod, that.javaMethod) && | ||
Objects.equals(returnType, that.returnType) && | ||
Objects.equals(typeParameters, that.typeParameters); | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
return Objects.hash(targetInstance, javaMethod, returnType, typeParameters); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.