Skip to content

Commit cb5ec67

Browse files
authored
Move PainlessExecuteAction into action package (#40752)
1 parent ce9ca34 commit cb5ec67

File tree

8 files changed

+16
-14
lines changed

8 files changed

+16
-14
lines changed

modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.elasticsearch.common.settings.Settings;
3333
import org.elasticsearch.common.settings.SettingsFilter;
3434
import org.elasticsearch.painless.action.PainlessContextAction;
35+
import org.elasticsearch.painless.action.PainlessExecuteAction;
3536
import org.elasticsearch.painless.spi.PainlessExtension;
3637
import org.elasticsearch.painless.spi.Whitelist;
3738
import org.elasticsearch.painless.spi.WhitelistLoader;

modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessExecuteAction.java renamed to modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessExecuteAction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.elasticsearch.painless;
19+
package org.elasticsearch.painless.action;
2020

2121
import org.apache.lucene.analysis.Analyzer;
2222
import org.apache.lucene.index.DirectoryReader;
@@ -95,7 +95,7 @@
9595

9696
public class PainlessExecuteAction extends Action<PainlessExecuteAction.Response> {
9797

98-
static final PainlessExecuteAction INSTANCE = new PainlessExecuteAction();
98+
public static final PainlessExecuteAction INSTANCE = new PainlessExecuteAction();
9999
private static final String NAME = "cluster:admin/scripts/painless/execute";
100100

101101
private PainlessExecuteAction() {
@@ -593,9 +593,9 @@ private static Response prepareRamIndex(Request request,
593593
}
594594
}
595595

596-
static class RestAction extends BaseRestHandler {
596+
public static class RestAction extends BaseRestHandler {
597597

598-
RestAction(Settings settings, RestController controller) {
598+
public RestAction(Settings settings, RestController controller) {
599599
super(settings);
600600
controller.registerHandler(GET, "/_scripts/painless/_execute", this);
601601
controller.registerHandler(POST, "/_scripts/painless/_execute", this);

modules/lang-painless/src/test/java/org/elasticsearch/painless/Debugger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.elasticsearch.painless;
2121

22-
import org.elasticsearch.painless.PainlessExecuteAction.PainlessTestScript;
22+
import org.elasticsearch.painless.action.PainlessExecuteAction.PainlessTestScript;
2323
import org.elasticsearch.painless.lookup.PainlessLookupBuilder;
2424
import org.elasticsearch.painless.spi.Whitelist;
2525
import org.objectweb.asm.util.Textifier;

modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import java.util.List;
3636
import java.util.Map;
3737

38-
import static org.elasticsearch.painless.PainlessExecuteAction.PainlessTestScript;
38+
import static org.elasticsearch.painless.action.PainlessExecuteAction.PainlessTestScript;
3939
import static org.elasticsearch.painless.node.SSource.MainMethodReserved;
4040
import static org.hamcrest.Matchers.hasSize;
4141

modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessExecuteApiTests.java renamed to modules/lang-painless/src/test/java/org/elasticsearch/painless/action/PainlessExecuteApiTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.elasticsearch.painless;
19+
package org.elasticsearch.painless.action;
2020

2121
import org.elasticsearch.common.bytes.BytesArray;
2222
import org.elasticsearch.common.settings.Settings;
2323
import org.elasticsearch.common.xcontent.XContentType;
2424
import org.elasticsearch.index.IndexService;
2525
import org.elasticsearch.index.query.MatchQueryBuilder;
26-
import org.elasticsearch.painless.PainlessExecuteAction.Request;
27-
import org.elasticsearch.painless.PainlessExecuteAction.Response;
26+
import org.elasticsearch.painless.PainlessPlugin;
27+
import org.elasticsearch.painless.action.PainlessExecuteAction.Request;
28+
import org.elasticsearch.painless.action.PainlessExecuteAction.Response;
2829
import org.elasticsearch.plugins.Plugin;
2930
import org.elasticsearch.script.Script;
3031
import org.elasticsearch.script.ScriptException;
@@ -39,7 +40,7 @@
3940
import java.util.Map;
4041

4142
import static java.util.Collections.singletonMap;
42-
import static org.elasticsearch.painless.PainlessExecuteAction.TransportAction.innerShardOperation;
43+
import static org.elasticsearch.painless.action.PainlessExecuteAction.TransportAction.innerShardOperation;
4344
import static org.hamcrest.Matchers.equalTo;
4445

4546
public class PainlessExecuteApiTests extends ESSingleNodeTestCase {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.elasticsearch.painless;
19+
package org.elasticsearch.painless.action;
2020

2121
import org.elasticsearch.common.bytes.BytesReference;
2222
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -30,7 +30,7 @@
3030
import org.elasticsearch.common.xcontent.XContentType;
3131
import org.elasticsearch.index.query.MatchAllQueryBuilder;
3232
import org.elasticsearch.index.query.QueryBuilder;
33-
import org.elasticsearch.painless.PainlessExecuteAction.Request.ContextSetup;
33+
import org.elasticsearch.painless.action.PainlessExecuteAction.Request.ContextSetup;
3434
import org.elasticsearch.script.Script;
3535
import org.elasticsearch.script.ScriptContext;
3636
import org.elasticsearch.script.ScriptType;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
19-
package org.elasticsearch.painless;
19+
package org.elasticsearch.painless.action;
2020

2121
import org.elasticsearch.test.AbstractStreamableTestCase;
2222

modules/lang-painless/src/test/java/org/elasticsearch/painless/node/NodeToStringTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.elasticsearch.painless.Locals.Variable;
2525
import org.elasticsearch.painless.Location;
2626
import org.elasticsearch.painless.Operation;
27-
import org.elasticsearch.painless.PainlessExecuteAction.PainlessTestScript;
27+
import org.elasticsearch.painless.action.PainlessExecuteAction.PainlessTestScript;
2828
import org.elasticsearch.painless.ScriptClassInfo;
2929
import org.elasticsearch.painless.antlr.Walker;
3030
import org.elasticsearch.painless.lookup.PainlessCast;

0 commit comments

Comments
 (0)