Compatible logic for Removes typed endpoint from search and related APIs

client/rest-high-level/src/test/java/org/elasticsearch/client/RequestConvertersTests.java

@@ -1223,7 +1223,7 @@ public void testMultiSearch() throws IOException {
         };
         MultiSearchRequest.readMultiLineFormat(new BytesArray(EntityUtils.toByteArray(request.getEntity())),
                 REQUEST_BODY_CONTENT_TYPE.xContent(), consumer, null, multiSearchRequest.indicesOptions(), null, null, null,
-                xContentRegistry(), true);
+                xContentRegistry(), true, key -> false);
         assertEquals(requests, multiSearchRequest.requests());
     }
 

modules/lang-mustache/src/main/java/org/elasticsearch/script/mustache/RestMultiSearchTemplateAction.java

@@ -32,6 +32,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.function.Function;
 
 import static java.util.Arrays.asList;
 import static org.elasticsearch.rest.RestRequest.Method.GET;
@@ -49,7 +50,7 @@ public class RestMultiSearchTemplateAction extends BaseRestHandler {
     }
 
 
-    private final boolean allowExplicitIndex;
+    protected final boolean allowExplicitIndex;
 
     public RestMultiSearchTemplateAction(Settings settings) {
         this.allowExplicitIndex = MULTI_ALLOW_EXPLICIT_INDEX.get(settings);
@@ -79,6 +80,18 @@ public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client
      * Parses a {@link RestRequest} body and returns a {@link MultiSearchTemplateRequest}
      */
     public static MultiSearchTemplateRequest parseRequest(RestRequest restRequest, boolean allowExplicitIndex) throws IOException {
+        return parseRequest(restRequest,allowExplicitIndex, k->false);
+    }
+
+    /**
+     * Parses a {@link RestRequest} body and returns a {@link MultiSearchTemplateRequest}
+     * @param typeConsumer - is a function used when parsing a request body. if it contains a types field it will consume it,
+     *                     allowing the same parsing logic to work in v7 and v8.
+     *                     It takes a string - field name, returns a boolean - if the field was "type or types"
+     */
+    public static MultiSearchTemplateRequest parseRequest(RestRequest restRequest,
+                                                          boolean allowExplicitIndex,
+                                                          Function<String,Boolean> typeConsumer) throws IOException {
         MultiSearchTemplateRequest multiRequest = new MultiSearchTemplateRequest();
         if (restRequest.hasParam("max_concurrent_searches")) {
             multiRequest.maxConcurrentSearchRequests(restRequest.paramAsInt("max_concurrent_searches", 0));
@@ -94,7 +107,7 @@ public static MultiSearchTemplateRequest parseRequest(RestRequest restRequest, b
                         throw new IllegalArgumentException("Malformed search template");
                     }
                     RestSearchAction.checkRestTotalHits(restRequest, searchRequest);
-                });
+                }, typeConsumer);
         return multiRequest;
     }
 

modules/rest-compatibility/build.gradle

@@ -19,7 +19,12 @@
 
 esplugin {
   description 'Adds a compatiblity layer for the prior major versions REST API'
-  classname 'org.elasticsearch.rest.compat.RestCompatPlugin'
+  classname 'org.elasticsearch.compat.RestCompatPlugin'
+}
+
+dependencies {
+  compile project(':modules:lang-mustache')
+  compile project(':modules:reindex')
 }
 
 integTest.enabled = false

modules/rest-compatibility/src/main/java/org/elasticsearch/rest/compat/RestCompatPlugin.java → modules/rest-compatibility/src/main/java/org/elasticsearch/compat/RestCompatPlugin.java

@@ -7,7 +7,7 @@
  * 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
+ *     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
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.rest.compat;
+package org.elasticsearch.compat;
 
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
@@ -26,12 +26,21 @@
 import org.elasticsearch.common.settings.IndexScopedSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsFilter;
+import org.elasticsearch.index.reindex.RestDeleteByQueryActionV7;
+import org.elasticsearch.index.reindex.RestUpdateByQueryActionV7;
 import org.elasticsearch.plugins.ActionPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.rest.RestController;
 import org.elasticsearch.rest.RestHandler;
-import org.elasticsearch.rest.compat.version7.RestGetActionV7;
-import org.elasticsearch.rest.compat.version7.RestIndexActionV7;
+import org.elasticsearch.rest.action.admin.indices.RestCreateIndexActionV7;
+import org.elasticsearch.rest.action.document.RestGetActionV7;
+import org.elasticsearch.rest.action.document.RestIndexActionV7;
+import org.elasticsearch.rest.action.document.RestMultiTermVectorsActionV7;
+import org.elasticsearch.rest.action.document.RestTermVectorsActionV7;
+import org.elasticsearch.rest.action.search.RestMultiSearchActionV7;
+import org.elasticsearch.rest.action.search.RestSearchActionV7;
+import org.elasticsearch.script.mustache.RestMultiSearchTemplateActionV7;
+import org.elasticsearch.script.mustache.RestSearchTemplateActionV7;
 
 import java.util.Collections;
 import java.util.List;
@@ -51,10 +60,19 @@ public List<RestHandler> getRestHandlers(
     ) {
         if (Version.CURRENT.major == 8) {
             return List.of(
+                new RestDeleteByQueryActionV7(),
+                new RestUpdateByQueryActionV7(),
+                new RestCreateIndexActionV7(),
                 new RestGetActionV7(),
                 new RestIndexActionV7.CompatibleRestIndexAction(),
                 new RestIndexActionV7.CompatibleCreateHandler(),
-                new RestIndexActionV7.CompatibleAutoIdHandler(nodesInCluster)
+                new RestIndexActionV7.CompatibleAutoIdHandler(nodesInCluster),
+                new RestTermVectorsActionV7(),
+                new RestMultiTermVectorsActionV7(),
+                new RestSearchActionV7(),
+                new RestMultiSearchActionV7(settings),
+                new RestSearchTemplateActionV7(),
+                new RestMultiSearchTemplateActionV7(settings)
             );
         }
         return Collections.emptyList();

modules/rest-compatibility/src/main/java/org/elasticsearch/compat/TypeConsumer.java

@@ -0,0 +1,53 @@
+/*
+ * 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.compat;
+
+import org.elasticsearch.common.Strings;
+import org.elasticsearch.rest.RestRequest;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Function;
+
+public class TypeConsumer implements Function<String, Boolean> {
+    private final RestRequest request;
+    private final Set<String> fieldNames;
+    private boolean foundTypeInBody = false;
+
+    public TypeConsumer(RestRequest request, String ... fieldNames) {
+        this.request = request;
+        this.fieldNames = Set.of(fieldNames);
+    }
+
+    @Override
+    public Boolean apply(String fieldName) {
+        if (fieldNames.contains(fieldName)) {
+            foundTypeInBody = true;
+            return true;
+        }
+        return false;
+    }
+
+    public boolean hasTypes() {
+        //TODO can params be types too? or _types?
+        String[] types = Strings.splitStringByCommaToArray(request.param("type"));
+        return types.length > 0 || foundTypeInBody;
+    }
+}

modules/rest-compatibility/src/main/java/org/elasticsearch/index/reindex/RestDeleteByQueryActionV7.java

@@ -0,0 +1,47 @@
+/*
+ * 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.index.reindex;
+
+import org.elasticsearch.Version;
+import org.elasticsearch.client.node.NodeClient;
+import org.elasticsearch.rest.RestRequest;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.elasticsearch.rest.RestRequest.Method.POST;
+
+public class RestDeleteByQueryActionV7 extends RestDeleteByQueryAction {
+    @Override
+    public List<Route> routes() {
+        return List.of(new Route(POST, "/{index}/{type}/_delete_by_query"));
+    }
+
+    @Override
+    public String compatibleWithVersion() {
+        return String.valueOf(Version.V_7_0_0.major);
+    }
+
+    @Override
+    public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
+        request.param("type");
+        return super.prepareRequest(request, client);
+    }
+}

modules/rest-compatibility/src/main/java/org/elasticsearch/index/reindex/RestUpdateByQueryActionV7.java

@@ -0,0 +1,47 @@
+/*
+ * 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.index.reindex;
+
+import org.elasticsearch.Version;
+import org.elasticsearch.client.node.NodeClient;
+import org.elasticsearch.rest.RestRequest;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.elasticsearch.rest.RestRequest.Method.POST;
+
+public class RestUpdateByQueryActionV7 extends RestUpdateByQueryAction {
+    @Override
+    public List<Route> routes() {
+        return List.of(new Route(POST, "/{index}/{type}/_update_by_query"));
+    }
+
+    @Override
+    public String compatibleWithVersion() {
+        return String.valueOf(Version.V_7_0_0.major);
+    }
+
+    @Override
+    public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
+        request.param("type");
+        return super.prepareRequest(request, client);
+    }
+}

modules/rest-compatibility/src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateIndexActionV7.java

@@ -0,0 +1,109 @@
+/*
+ * 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.rest.action.admin.indices;
+
+import org.elasticsearch.Version;
+import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
+import org.elasticsearch.action.support.ActiveShardCount;
+import org.elasticsearch.client.node.NodeClient;
+import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
+import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.index.mapper.MapperService;
+import org.elasticsearch.rest.RestRequest;
+import org.elasticsearch.rest.action.RestToXContentListener;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import static java.util.Collections.singletonMap;
+
+public class RestCreateIndexActionV7 extends RestCreateIndexAction {
+
+    /**
+     * Parameter that controls whether certain REST apis should include type names in their requests or responses.
+     * Note: Support for this parameter will be removed after the transition period to typeless APIs.
+     */
+    public static final String INCLUDE_TYPE_NAME_PARAMETER = "include_type_name";
+    public static final boolean DEFAULT_INCLUDE_TYPE_NAME_POLICY = false;
+
+    @Override
+    public String compatibleWithVersion() {
+        return String.valueOf(Version.V_7_0_0.major);
+    }
+
+    @Override
+    public RestChannelConsumer prepareRequest(final RestRequest request, final NodeClient client) throws IOException {
+        CreateIndexRequest createIndexRequest = new CreateIndexRequest(request.param("index"));
+
+        if (request.hasContent()) {
+            Map<String, Object> sourceAsMap = XContentHelper.convertToMap(request.requiredContent(), false, request.getXContentType()).v2();
+
+            request.param(INCLUDE_TYPE_NAME_PARAMETER);// just consume, it is not replaced with _doc
+            sourceAsMap = prepareMappingsV7(sourceAsMap, request);
+
+            createIndexRequest.source(sourceAsMap, LoggingDeprecationHandler.INSTANCE);
+        }
+
+        createIndexRequest.timeout(request.paramAsTime("timeout", createIndexRequest.timeout()));
+        createIndexRequest.masterNodeTimeout(request.paramAsTime("master_timeout", createIndexRequest.masterNodeTimeout()));
+        createIndexRequest.waitForActiveShards(ActiveShardCount.parseString(request.param("wait_for_active_shards")));
+        return channel -> client.admin().indices().create(createIndexRequest, new RestToXContentListener<>(channel));
+    }
+
+    static Map<String, Object> prepareMappingsV7(Map<String, Object> source, RestRequest request) {
+        final boolean includeTypeName = request.paramAsBoolean(INCLUDE_TYPE_NAME_PARAMETER, DEFAULT_INCLUDE_TYPE_NAME_POLICY);
+
+        @SuppressWarnings("unchecked")
+        Map<String, Object> mappings = (Map<String, Object>) source.get("mappings");
+
+        if (includeTypeName && mappings.size() == 1) {
+            // no matter what the type was, replace it with _doc
+            Map<String, Object> newSource = new HashMap<>();
+
+            String typeName = mappings.keySet().iterator().next();
+            @SuppressWarnings("unchecked")
+            Map<String, Object> typedMappings = (Map<String, Object>) mappings.get(typeName);
+
+            newSource.put("mappings", Collections.singletonMap(MapperService.SINGLE_MAPPING_NAME, typedMappings));
+            return newSource;
+        } else {
+            return prepareMappings(source);
+        }
+    }
+
+    static Map<String, Object> prepareMappings(Map<String, Object> source) {
+        if (source.containsKey("mappings") == false || (source.get("mappings") instanceof Map) == false) {
+            return source;
+        }
+
+        Map<String, Object> newSource = new HashMap<>(source);
+
+        @SuppressWarnings("unchecked")
+        Map<String, Object> mappings = (Map<String, Object>) source.get("mappings");
+        if (MapperService.isMappingSourceTyped(MapperService.SINGLE_MAPPING_NAME, mappings)) {
+            throw new IllegalArgumentException("The mapping definition cannot be nested under a type");
+        }
+
+        newSource.put("mappings", singletonMap(MapperService.SINGLE_MAPPING_NAME, mappings));
+        return newSource;
+    }
+}