From a042b22d248a74b80f726b61b820d8d536b28f08 Mon Sep 17 00:00:00 2001
From: Jack Conradson <osjdconrad@gmail.com>
Date: Wed, 3 Apr 2019 09:46:33 -0700
Subject: [PATCH] Move PainlessExecuteAction into action package (#40752)

---
 .../java/org/elasticsearch/painless/PainlessPlugin.java  | 1 +
 .../painless/{ => action}/PainlessExecuteAction.java     | 8 ++++----
 .../test/java/org/elasticsearch/painless/Debugger.java   | 2 +-
 .../java/org/elasticsearch/painless/ScriptTestCase.java  | 2 +-
 .../painless/{ => action}/PainlessExecuteApiTests.java   | 9 +++++----
 .../{ => action}/PainlessExecuteRequestTests.java        | 4 ++--
 .../{ => action}/PainlessExecuteResponseTests.java       | 2 +-
 .../elasticsearch/painless/node/NodeToStringTests.java   | 2 +-
 8 files changed, 16 insertions(+), 14 deletions(-)
 rename modules/lang-painless/src/main/java/org/elasticsearch/painless/{ => action}/PainlessExecuteAction.java (99%)
 rename modules/lang-painless/src/test/java/org/elasticsearch/painless/{ => action}/PainlessExecuteApiTests.java (94%)
 rename modules/lang-painless/src/test/java/org/elasticsearch/painless/{ => action}/PainlessExecuteRequestTests.java (97%)
 rename modules/lang-painless/src/test/java/org/elasticsearch/painless/{ => action}/PainlessExecuteResponseTests.java (96%)

diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java
index 2ee524f93b7..96a03fe5914 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessPlugin.java
@@ -32,6 +32,7 @@ import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsFilter;
 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;
diff --git a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessExecuteAction.java b/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessExecuteAction.java
similarity index 99%
rename from modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessExecuteAction.java
rename to modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessExecuteAction.java
index cca285edd44..81e3bdcd5c4 100644
--- a/modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessExecuteAction.java
+++ b/modules/lang-painless/src/main/java/org/elasticsearch/painless/action/PainlessExecuteAction.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.painless;
+package org.elasticsearch.painless.action;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.index.DirectoryReader;
@@ -95,7 +95,7 @@ import static org.elasticsearch.rest.RestRequest.Method.POST;
 
 public class PainlessExecuteAction extends Action<PainlessExecuteAction.Response> {
 
-    static final PainlessExecuteAction INSTANCE = new PainlessExecuteAction();
+    public static final PainlessExecuteAction INSTANCE = new PainlessExecuteAction();
     private static final String NAME = "cluster:admin/scripts/painless/execute";
 
     private PainlessExecuteAction() {
@@ -593,9 +593,9 @@ public class PainlessExecuteAction extends Action<PainlessExecuteAction.Response
         }
     }
 
-    static class RestAction extends BaseRestHandler {
+    public static class RestAction extends BaseRestHandler {
 
-        RestAction(Settings settings, RestController controller) {
+        public RestAction(Settings settings, RestController controller) {
             super(settings);
             controller.registerHandler(GET, "/_scripts/painless/_execute", this);
             controller.registerHandler(POST, "/_scripts/painless/_execute", this);
diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/Debugger.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/Debugger.java
index 38c315b1344..a81bd5f97ea 100644
--- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/Debugger.java
+++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/Debugger.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.painless;
 
-import org.elasticsearch.painless.PainlessExecuteAction.PainlessTestScript;
+import org.elasticsearch.painless.action.PainlessExecuteAction.PainlessTestScript;
 import org.elasticsearch.painless.lookup.PainlessLookupBuilder;
 import org.elasticsearch.painless.spi.Whitelist;
 import org.objectweb.asm.util.Textifier;
diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptTestCase.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptTestCase.java
index 19fece29e42..37b3c3d8cb8 100644
--- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptTestCase.java
+++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptTestCase.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.elasticsearch.painless.PainlessExecuteAction.PainlessTestScript;
+import static org.elasticsearch.painless.action.PainlessExecuteAction.PainlessTestScript;
 import static org.elasticsearch.painless.node.SSource.MainMethodReserved;
 import static org.hamcrest.Matchers.hasSize;
 
diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessExecuteApiTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/action/PainlessExecuteApiTests.java
similarity index 94%
rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessExecuteApiTests.java
rename to modules/lang-painless/src/test/java/org/elasticsearch/painless/action/PainlessExecuteApiTests.java
index 628cc1bc7c5..b58fb7c652f 100644
--- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessExecuteApiTests.java
+++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/action/PainlessExecuteApiTests.java
@@ -16,15 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.painless;
+package org.elasticsearch.painless.action;
 
 import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.IndexService;
 import org.elasticsearch.index.query.MatchQueryBuilder;
-import org.elasticsearch.painless.PainlessExecuteAction.Request;
-import org.elasticsearch.painless.PainlessExecuteAction.Response;
+import org.elasticsearch.painless.PainlessPlugin;
+import org.elasticsearch.painless.action.PainlessExecuteAction.Request;
+import org.elasticsearch.painless.action.PainlessExecuteAction.Response;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptException;
@@ -39,7 +40,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 import static java.util.Collections.singletonMap;
-import static org.elasticsearch.painless.PainlessExecuteAction.TransportAction.innerShardOperation;
+import static org.elasticsearch.painless.action.PainlessExecuteAction.TransportAction.innerShardOperation;
 import static org.hamcrest.Matchers.equalTo;
 
 public class PainlessExecuteApiTests extends ESSingleNodeTestCase {
diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessExecuteRequestTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/action/PainlessExecuteRequestTests.java
similarity index 97%
rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessExecuteRequestTests.java
rename to modules/lang-painless/src/test/java/org/elasticsearch/painless/action/PainlessExecuteRequestTests.java
index 4a7a5c77e1c..51801c29095 100644
--- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessExecuteRequestTests.java
+++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/action/PainlessExecuteRequestTests.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.painless;
+package org.elasticsearch.painless.action;
 
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -30,7 +30,7 @@ import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.query.MatchAllQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.painless.PainlessExecuteAction.Request.ContextSetup;
+import org.elasticsearch.painless.action.PainlessExecuteAction.Request.ContextSetup;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptContext;
 import org.elasticsearch.script.ScriptType;
diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessExecuteResponseTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/action/PainlessExecuteResponseTests.java
similarity index 96%
rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessExecuteResponseTests.java
rename to modules/lang-painless/src/test/java/org/elasticsearch/painless/action/PainlessExecuteResponseTests.java
index 20f3cf08e04..c75497bd630 100644
--- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/PainlessExecuteResponseTests.java
+++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/action/PainlessExecuteResponseTests.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.painless;
+package org.elasticsearch.painless.action;
 
 import org.elasticsearch.test.AbstractStreamableTestCase;
 
diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/node/NodeToStringTests.java b/modules/lang-painless/src/test/java/org/elasticsearch/painless/node/NodeToStringTests.java
index 9a284a26978..08a5d0cb5fd 100644
--- a/modules/lang-painless/src/test/java/org/elasticsearch/painless/node/NodeToStringTests.java
+++ b/modules/lang-painless/src/test/java/org/elasticsearch/painless/node/NodeToStringTests.java
@@ -24,7 +24,7 @@ import org.elasticsearch.painless.FeatureTest;
 import org.elasticsearch.painless.Locals.Variable;
 import org.elasticsearch.painless.Location;
 import org.elasticsearch.painless.Operation;
-import org.elasticsearch.painless.PainlessExecuteAction.PainlessTestScript;
+import org.elasticsearch.painless.action.PainlessExecuteAction.PainlessTestScript;
 import org.elasticsearch.painless.ScriptClassInfo;
 import org.elasticsearch.painless.antlr.Walker;
 import org.elasticsearch.painless.lookup.PainlessCast;