Prepare for es 7.x.x (not compiling due to elastic/elasticsearch#38944)

Author: dweiss

build.gradle

@@ -1,12 +1,12 @@
 
 // This plugin's version (typically must match that of ES).
-version = '6.6.2'
+version = '7.0.0-beta1'
 group = 'org.carrot2'
 
 buildscript {
     ext {
         // ES version we depend upon/ compile against.
-        version_es = '6.6.2'
+        version_es = '7.0.0-beta1'
     }
 
     repositories {

src/main/java/org/carrot2/elasticsearch/ClusteringAction.java

@@ -79,6 +79,7 @@
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightField;
 import org.elasticsearch.search.internal.InternalSearchResponse;
 import org.elasticsearch.search.profile.SearchProfileShardResults;
+import org.elasticsearch.tasks.Task;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportChannel;
 import org.elasticsearch.transport.TransportRequestHandler;
@@ -88,9 +89,7 @@
  * Perform clustering of search results.
  */
 public class ClusteringAction
-        extends Action<ClusteringAction.ClusteringActionRequest,
-        ClusteringAction.ClusteringActionResponse,
-        ClusteringAction.ClusteringActionRequestBuilder> {
+        extends Action<ClusteringAction.ClusteringActionResponse> {
     /* Action name. */
     public static final String NAME = "indices:data/read/cluster";
 
@@ -106,11 +105,6 @@ public ClusteringActionResponse newResponse() {
         return new ClusteringActionResponse();
     }
 
-    @Override
-    public ClusteringActionRequestBuilder newRequestBuilder(ElasticsearchClient client) {
-        return new ClusteringActionRequestBuilder(client);
-    }
-
     /**
      * An {@link ActionRequest} for {@link ClusteringAction}.
      */
@@ -500,9 +494,7 @@ public IndicesOptions indicesOptions() {
      * An {@link ActionRequestBuilder} for {@link ClusteringAction}.
      */
     public static class ClusteringActionRequestBuilder
-            extends ActionRequestBuilder<ClusteringActionRequest,
-            ClusteringActionResponse,
-            ClusteringActionRequestBuilder> {
+            extends ActionRequestBuilder<ClusteringActionRequest, ClusteringActionResponse> {
 
         public ClusteringActionRequestBuilder(ElasticsearchClient client) {
             super(client, ClusteringAction.INSTANCE, new ClusteringActionRequest());
@@ -746,27 +738,20 @@ public String toString() {
      * A {@link TransportAction} for {@link ClusteringAction}.
      */
     public static class TransportClusteringAction
-            extends TransportAction<ClusteringAction.ClusteringActionRequest,
-            ClusteringAction.ClusteringActionResponse> {
+            extends TransportAction<ClusteringAction.ClusteringActionRequest, ClusteringAction.ClusteringActionResponse> {
         private final Set<String> langCodeWarnings = new CopyOnWriteArraySet<>();
 
         private final TransportSearchAction searchAction;
         private final ControllerSingleton controllerSingleton;
 
         @Inject
-        public TransportClusteringAction(Settings settings,
-                                         ThreadPool threadPool,
-                                         TransportService transportService,
+        public TransportClusteringAction(TransportService transportService,
                                          TransportSearchAction searchAction,
                                          ControllerSingleton controllerSingleton,
                                          ActionFilters actionFilters,
-                                         IndexNameExpressionResolver indexNameExpressionResolver,
-                                         NamedXContentRegistry xContentRegistry) {
-            super(settings,
-                  ClusteringAction.NAME,
-                  threadPool,
+                                         IndexNameExpressionResolver indexNameExpressionResolver) {
+            super(ClusteringAction.NAME,
                   actionFilters,
-                  indexNameExpressionResolver,
                   transportService.getTaskManager());
 
             this.searchAction = searchAction;
@@ -779,7 +764,8 @@ public TransportClusteringAction(Settings settings,
         }
 
         @Override
-        protected void doExecute(final ClusteringActionRequest clusteringRequest,
+        protected void doExecute(Task task,
+                                 final ClusteringActionRequest clusteringRequest,
                                  final ActionListener<ClusteringActionResponse> listener) {
             final long tsSearchStart = System.nanoTime();
             searchAction.execute(clusteringRequest.getSearchRequest(), new ActionListener<SearchResponse>() {
@@ -1142,7 +1128,7 @@ static String join(List<?> list) {
 
         private final class TransportHandler implements TransportRequestHandler<ClusteringActionRequest> {
             @Override
-            public void messageReceived(final ClusteringActionRequest request, final TransportChannel channel) throws Exception {
+            public void messageReceived(final ClusteringActionRequest request, final TransportChannel channel, Task task) throws Exception {
                 execute(request, new ActionListener<ClusteringActionResponse>() {
                     @Override
                     public void onResponse(ClusteringActionResponse response) {

src/main/java/org/carrot2/elasticsearch/ControllerSingleton.java

@@ -51,8 +51,7 @@ public class ControllerSingleton extends AbstractLifecycleComponent {
     private Logger logger;
 
     @Inject
-    public ControllerSingleton(Settings settings, Environment environment) {
-        super(settings);
+    public ControllerSingleton(Environment environment) {
         this.environment = environment;
         this.logger = LogManager.getLogger("plugin.carrot2");
     }

src/main/java/org/carrot2/elasticsearch/ListAlgorithmsAction.java

@@ -10,7 +10,6 @@
 import org.elasticsearch.action.support.TransportAction;
 import org.elasticsearch.client.ElasticsearchClient;
 import org.elasticsearch.client.node.NodeClient;
-import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
@@ -23,6 +22,7 @@
 import org.elasticsearch.rest.RestRequest;
 import org.elasticsearch.rest.RestRequest.Method;
 import org.elasticsearch.rest.RestStatus;
+import org.elasticsearch.tasks.Task;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.TransportChannel;
 import org.elasticsearch.transport.TransportRequestHandler;
@@ -38,9 +38,7 @@
 /**
  * List all available clustering algorithms.
  */
-public class ListAlgorithmsAction extends Action<ListAlgorithmsAction.ListAlgorithmsActionRequest,
-        ListAlgorithmsAction.ListAlgorithmsActionResponse,
-        ListAlgorithmsAction.ListAlgorithmsActionRequestBuilder> {
+public class ListAlgorithmsAction extends Action<ListAlgorithmsAction.ListAlgorithmsActionResponse> {
     /* Action name. */
     public static final String NAME = "cluster:monitor/carrot2/algorithms";
 
@@ -56,11 +54,6 @@ public ListAlgorithmsActionResponse newResponse() {
         return new ListAlgorithmsActionResponse();
     }
 
-    @Override
-    public ListAlgorithmsActionRequestBuilder newRequestBuilder(ElasticsearchClient client) {
-        return new ListAlgorithmsActionRequestBuilder(client);
-    }
-
     /**
      * An {@link ActionRequest} for {@link ListAlgorithmsAction}.
      */
@@ -77,8 +70,7 @@ public ActionRequestValidationException validate() {
      */
     public static class ListAlgorithmsActionRequestBuilder
             extends ActionRequestBuilder<ListAlgorithmsActionRequest,
-            ListAlgorithmsActionResponse,
-            ListAlgorithmsActionRequestBuilder> {
+            ListAlgorithmsActionResponse> {
         public ListAlgorithmsActionRequestBuilder(ElasticsearchClient client) {
             super(client, ListAlgorithmsAction.INSTANCE, new ListAlgorithmsActionRequest());
         }
@@ -144,22 +136,16 @@ public String toString() {
      * {@link ListAlgorithmsActionResponse}.
      */
     public static class TransportListAlgorithmsAction
-            extends TransportAction<ListAlgorithmsActionRequest,
-            ListAlgorithmsActionResponse> {
+            extends TransportAction<ListAlgorithmsActionRequest, ListAlgorithmsActionResponse> {
 
         private final ControllerSingleton controllerSingleton;
 
         @Inject
-        public TransportListAlgorithmsAction(Settings settings, ThreadPool threadPool,
-                                             TransportService transportService,
+        public TransportListAlgorithmsAction(TransportService transportService,
                                              ControllerSingleton controllerSingleton,
-                                             ActionFilters actionFilters,
-                                             IndexNameExpressionResolver indexNameExpressionResolver) {
-            super(settings,
-                  ListAlgorithmsAction.NAME,
-                  threadPool,
+                                             ActionFilters actionFilters) {
+            super(ListAlgorithmsAction.NAME,
                   actionFilters,
-                  indexNameExpressionResolver,
                   transportService.getTaskManager());
             this.controllerSingleton = controllerSingleton;
             transportService.registerRequestHandler(
@@ -170,15 +156,17 @@ public TransportListAlgorithmsAction(Settings settings, ThreadPool threadPool,
         }
 
         @Override
-        protected void doExecute(ListAlgorithmsActionRequest request,
+        protected void doExecute(Task task,
+                                 ListAlgorithmsActionRequest request,
                                  ActionListener<ListAlgorithmsActionResponse> listener) {
             listener.onResponse(new ListAlgorithmsActionResponse(controllerSingleton.getAlgorithms()));
         }
 
         private final class TransportHandler implements TransportRequestHandler<ListAlgorithmsActionRequest> {
             @Override
             public void messageReceived(final ListAlgorithmsActionRequest request,
-                                        final TransportChannel channel) throws Exception {
+                                        final TransportChannel channel,
+                                        Task task) throws Exception {
                 execute(request, new ActionListener<ListAlgorithmsActionResponse>() {
                     @Override
                     public void onResponse(ListAlgorithmsActionResponse response) {

src/test/java/org/carrot2/elasticsearch/SampleIndexTestCase.java

@@ -55,10 +55,14 @@ public abstract class SampleIndexTestCase extends ESIntegTestCase {
     protected Settings nodeSettings(int nodeOrdinal) {
         return Settings.builder()
                 .put(super.nodeSettings(nodeOrdinal))
-                .put(NetworkModule.HTTP_ENABLED.getKey(), true)
                 .build();
     }
-    
+
+    @Override
+    protected boolean addMockHttpTransport() {
+        return false;
+    }
+
     @Override
     protected Collection<Class<? extends Plugin>> nodePlugins() {
       return Collections.singletonList(ClusteringPlugin.class);