forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into security_authz_engine
- Loading branch information
Showing
293 changed files
with
7,163 additions
and
1,599 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
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
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
74 changes: 74 additions & 0 deletions
74
...nt/rest-high-level/src/main/java/org/elasticsearch/client/indices/GetMappingsRequest.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,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 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.