-
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.
Deprecate types in search and multi search templates. (#35669)
This PR adds deprecation warnings to the relevant `Rest*Action` classes, plus tests in `Rest*ActionTests`. No updates to REST tests, the Java HLRC, or documentation were necessary, since they didn't make use of types.
- Loading branch information
1 parent
7e772e3
commit 25c416b
Showing
6 changed files
with
193 additions
and
16 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
87 changes: 87 additions & 0 deletions
87
...e/src/test/java/org/elasticsearch/script/mustache/RestMultiSearchTemplateActionTests.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,87 @@ | ||
| /* | ||
| * 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.script.mustache; | ||
|
|
||
| import org.elasticsearch.client.node.NodeClient; | ||
| import org.elasticsearch.common.bytes.BytesArray; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.util.concurrent.ThreadContext; | ||
| import org.elasticsearch.common.xcontent.XContentType; | ||
| import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; | ||
| import org.elasticsearch.rest.RestChannel; | ||
| import org.elasticsearch.rest.RestController; | ||
| import org.elasticsearch.rest.RestRequest; | ||
| import org.elasticsearch.rest.action.search.RestMultiSearchAction; | ||
| import org.elasticsearch.test.ESTestCase; | ||
| import org.elasticsearch.test.rest.FakeRestChannel; | ||
| import org.elasticsearch.test.rest.FakeRestRequest; | ||
| import org.elasticsearch.usage.UsageService; | ||
|
|
||
| import java.nio.charset.StandardCharsets; | ||
| import java.util.Collections; | ||
|
|
||
| import static org.mockito.Mockito.mock; | ||
|
|
||
| public class RestMultiSearchTemplateActionTests extends ESTestCase { | ||
| private RestController controller; | ||
|
|
||
| public void setUp() throws Exception { | ||
| super.setUp(); | ||
| controller = new RestController(Collections.emptySet(), null, | ||
| mock(NodeClient.class), | ||
| new NoneCircuitBreakerService(), | ||
| new UsageService()); | ||
| new RestMultiSearchTemplateAction(Settings.EMPTY, controller); | ||
| } | ||
|
|
||
| public void testTypeInPath() { | ||
| String content = "{ \"index\": \"some_index\" } \n" + | ||
| "{\"source\": {\"query\" : {\"match_all\" :{}}}} \n"; | ||
| BytesArray bytesContent = new BytesArray(content.getBytes(StandardCharsets.UTF_8)); | ||
|
|
||
| RestRequest request = new FakeRestRequest.Builder(xContentRegistry()) | ||
| .withMethod(RestRequest.Method.GET) | ||
| .withPath("/some_index/some_type/_msearch/template") | ||
| .withContent(bytesContent, XContentType.JSON) | ||
| .build(); | ||
|
|
||
| performRequest(request); | ||
| assertWarnings(RestMultiSearchAction.TYPES_DEPRECATION_MESSAGE); | ||
| } | ||
|
|
||
| public void testTypeInBody() { | ||
| String content = "{ \"index\": \"some_index\", \"type\": \"some_type\" } \n" + | ||
| "{\"source\": {\"query\" : {\"match_all\" :{}}}} \n"; | ||
| BytesArray bytesContent = new BytesArray(content.getBytes(StandardCharsets.UTF_8)); | ||
|
|
||
| RestRequest request = new FakeRestRequest.Builder(xContentRegistry()) | ||
| .withPath("/some_index/_msearch/template") | ||
| .withContent(bytesContent, XContentType.JSON) | ||
| .build(); | ||
|
|
||
| performRequest(request); | ||
| assertWarnings(RestMultiSearchAction.TYPES_DEPRECATION_MESSAGE); | ||
| } | ||
|
|
||
| private void performRequest(RestRequest request) { | ||
| RestChannel channel = new FakeRestChannel(request, false, 1); | ||
| ThreadContext threadContext = new ThreadContext(Settings.EMPTY); | ||
| controller.dispatchRequest(request, channel, threadContext); | ||
| } | ||
| } |
81 changes: 81 additions & 0 deletions
81
...stache/src/test/java/org/elasticsearch/script/mustache/RestSearchTemplateActionTests.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,81 @@ | ||
| /* | ||
| * 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.script.mustache; | ||
|
|
||
| import org.elasticsearch.client.node.NodeClient; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.util.concurrent.ThreadContext; | ||
| import org.elasticsearch.indices.breaker.NoneCircuitBreakerService; | ||
| import org.elasticsearch.rest.RestChannel; | ||
| import org.elasticsearch.rest.RestController; | ||
| import org.elasticsearch.rest.RestRequest; | ||
| import org.elasticsearch.rest.action.search.RestSearchAction; | ||
| import org.elasticsearch.test.ESTestCase; | ||
| import org.elasticsearch.test.rest.FakeRestChannel; | ||
| import org.elasticsearch.test.rest.FakeRestRequest; | ||
| import org.elasticsearch.usage.UsageService; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import static org.mockito.Mockito.mock; | ||
|
|
||
| public class RestSearchTemplateActionTests extends ESTestCase { | ||
| private RestController controller; | ||
|
|
||
| public void setUp() throws Exception { | ||
| super.setUp(); | ||
| controller = new RestController(Collections.emptySet(), null, | ||
| mock(NodeClient.class), | ||
| new NoneCircuitBreakerService(), | ||
| new UsageService()); | ||
| new RestSearchTemplateAction(Settings.EMPTY, controller); | ||
| } | ||
|
|
||
| public void testTypeInPath() { | ||
| RestRequest request = new FakeRestRequest.Builder(xContentRegistry()) | ||
| .withMethod(RestRequest.Method.GET) | ||
| .withPath("/some_index/some_type/_search/template") | ||
| .build(); | ||
|
|
||
| performRequest(request); | ||
| assertWarnings(RestSearchAction.TYPES_DEPRECATION_MESSAGE); | ||
| } | ||
|
|
||
| public void testTypeParameter() { | ||
| Map<String, String> params = new HashMap<>(); | ||
| params.put("type", "some_type"); | ||
|
|
||
| RestRequest request = new FakeRestRequest.Builder(xContentRegistry()) | ||
| .withMethod(RestRequest.Method.GET) | ||
| .withPath("/some_index/_search/template") | ||
| .withParams(params) | ||
| .build(); | ||
|
|
||
| performRequest(request); | ||
| assertWarnings(RestSearchAction.TYPES_DEPRECATION_MESSAGE); | ||
| } | ||
|
|
||
| private void performRequest(RestRequest request) { | ||
| RestChannel channel = new FakeRestChannel(request, false, 1); | ||
| ThreadContext threadContext = new ThreadContext(Settings.EMPTY); | ||
| controller.dispatchRequest(request, channel, threadContext); | ||
| } | ||
| } |
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