-
Notifications
You must be signed in to change notification settings - Fork 25.6k
Support both typed and typeless 'get mapping' requests in the HLRC. #37796
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
acf286f
Support both typed and typeless 'get mapping' requests in the HLRC.
jtibshirani 4e05f79
Fix a typo in IndicesClient.
jtibshirani 28f425d
Add some missing deprecated annotations in IndicesRequestConverters.
jtibshirani 05c870d
Minor clean up in GetMappingsRequest.
jtibshirani 06805cc
Remove equals and hashCode from GetMappingsResponse.
jtibshirani 3b02709
Some clean up in IndicesRequestConvertersTests.
jtibshirani bd476a0
In GetMappingsResponseTests, generate a random server object as oppos…
jtibshirani 811c473
Fix more typos in IndicesClient.
jtibshirani b2a19e4
Merge remote-tracking branch 'upstream/master' into get-mapping-hlrc
jtibshirani 705880d
In GetMappingsResponseTests, switch to comparing client-side objects.
jtibshirani e122a1c
Merge remote-tracking branch 'upstream/master' into get-mapping-hlrc
jtibshirani File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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
74 changes: 74 additions & 0 deletions
74
...nt/rest-high-level/src/main/java/org/elasticsearch/client/indices/GetMappingsRequest.java
This file contains hidden or 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,74 @@ | ||
| /* | ||
| * 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.client.indices; | ||
|
|
||
| import org.elasticsearch.action.support.IndicesOptions; | ||
| import org.elasticsearch.client.TimedRequest; | ||
| import org.elasticsearch.common.Strings; | ||
|
|
||
| public class GetMappingsRequest extends TimedRequest { | ||
|
|
||
| private boolean local = false; | ||
| private boolean includeDefaults = false; | ||
| private String[] indices = Strings.EMPTY_ARRAY; | ||
| private IndicesOptions indicesOptions = IndicesOptions.strictExpandOpen(); | ||
|
|
||
| /** | ||
| * Indicates whether the receiving node should operate based on local index information or | ||
| * forward requests, where needed, to other nodes. If running locally, request will not | ||
| * raise errors if local index information is missing. | ||
| */ | ||
| public GetMappingsRequest local(boolean local) { | ||
| this.local = local; | ||
| return this; | ||
| } | ||
|
|
||
| public boolean local() { | ||
| return local; | ||
| } | ||
|
|
||
| public GetMappingsRequest indices(String... indices) { | ||
| this.indices = indices; | ||
| return this; | ||
| } | ||
|
|
||
| public GetMappingsRequest indicesOptions(IndicesOptions indicesOptions) { | ||
| this.indicesOptions = indicesOptions; | ||
| return this; | ||
| } | ||
|
|
||
| public String[] indices() { | ||
| return indices; | ||
| } | ||
|
|
||
| public IndicesOptions indicesOptions() { | ||
| return indicesOptions; | ||
| } | ||
|
|
||
| public boolean includeDefaults() { | ||
| return includeDefaults; | ||
| } | ||
|
|
||
| /** Indicates whether default mapping settings should be returned */ | ||
| public GetMappingsRequest includeDefaults(boolean includeDefaults) { | ||
| this.includeDefaults = includeDefaults; | ||
| return this; | ||
| } | ||
| } |
71 changes: 71 additions & 0 deletions
71
...t/rest-high-level/src/main/java/org/elasticsearch/client/indices/GetMappingsResponse.java
This file contains hidden or 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,71 @@ | ||
| /* | ||
| * 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.client.indices; | ||
|
|
||
| import org.elasticsearch.cluster.metadata.MappingMetaData; | ||
| import org.elasticsearch.common.ParseField; | ||
| import org.elasticsearch.common.xcontent.XContentParser; | ||
| import org.elasticsearch.common.xcontent.XContentParserUtils; | ||
| import org.elasticsearch.index.mapper.MapperService; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| public class GetMappingsResponse { | ||
|
|
||
| static final ParseField MAPPINGS = new ParseField("mappings"); | ||
|
|
||
| private Map<String, MappingMetaData> mappings; | ||
|
|
||
| public GetMappingsResponse(Map<String, MappingMetaData> mappings) { | ||
| this.mappings = mappings; | ||
| } | ||
|
|
||
| public Map<String, MappingMetaData> mappings() { | ||
| return mappings; | ||
| } | ||
|
|
||
| public static GetMappingsResponse fromXContent(XContentParser parser) throws IOException { | ||
| if (parser.currentToken() == null) { | ||
| parser.nextToken(); | ||
| } | ||
|
|
||
| XContentParserUtils.ensureExpectedToken(parser.currentToken(), | ||
| XContentParser.Token.START_OBJECT, | ||
| parser::getTokenLocation); | ||
|
|
||
| Map<String, Object> parts = parser.map(); | ||
|
|
||
| Map<String, MappingMetaData> mappings = new HashMap<>(); | ||
| for (Map.Entry<String, Object> entry : parts.entrySet()) { | ||
| String indexName = entry.getKey(); | ||
| assert entry.getValue() instanceof Map : "expected a map as type mapping, but got: " + entry.getValue().getClass(); | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| final Map<String, Object> fieldMappings = (Map<String, Object>) ((Map<String, ?>) entry.getValue()) | ||
| .get(MAPPINGS.getPreferredName()); | ||
|
|
||
| mappings.put(indexName, new MappingMetaData(MapperService.SINGLE_MAPPING_NAME, fieldMappings)); | ||
| } | ||
|
|
||
| return new GetMappingsResponse(mappings); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe add @deprecated even if we only use this internally. It makes it more obvious and serves as a grep-able reminder that we can remove this in 8.0.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍