honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename MetaData to Metadata in all of the places (#54519) 

This is a simple naming change PR, to fix the fact that "metadata" is a
single English word, and for too long we have not followed general
naming conventions for it. We are also not consistent about it, for
example, METADATA instead of META_DATA if we were trying to be
consistent with MetaData (although METADATA is correct when considered
in the context of "metadata"). This was a simple find and replace across
the code base, only taking a few minutes to fix this naming issue
forever.
This commit is contained in:
Jason Tedor 2020-03-31 16:59:01 -04:00
parent 114894dd76
commit 5fcda57b37
No known key found for this signature in database
GPG Key ID: FA89F05560F16BC5
1773 changed files with 19223 additions and 19223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
benchmarks/src/main/java/org/elasticsearch/benchmark/routing/allocation/AllocationBenchmark.java
View File

@ -21,8 +21,8 @@ package org.elasticsearch.benchmark.routing.allocation;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.node.DiscoveryNodes;
import org.elasticsearch.cluster.routing.RoutingTable; import org.elasticsearch.cluster.routing.RoutingTable;
import org.elasticsearch.cluster.routing.ShardRoutingState; import org.elasticsearch.cluster.routing.ShardRoutingState;
@ -127,19 +127,19 @@ public class AllocationBenchmark {
Settings.builder().put("cluster.routing.allocation.awareness.attributes", "tag").build() Settings.builder().put("cluster.routing.allocation.awareness.attributes", "tag").build()
); );
MetaData.Builder mb = MetaData.builder(); Metadata.Builder mb = Metadata.builder();
for (int i = 1; i <= numIndices; i++) { for (int i = 1; i <= numIndices; i++) {
mb.put( mb.put(
IndexMetaData.builder("test_" + i) IndexMetadata.builder("test_" + i)
.settings(Settings.builder().put("index.version.created", Version.CURRENT)) .settings(Settings.builder().put("index.version.created", Version.CURRENT))
.numberOfShards(numShards) .numberOfShards(numShards)
.numberOfReplicas(numReplicas) .numberOfReplicas(numReplicas)
); );
} }
MetaData metaData = mb.build(); Metadata metadata = mb.build();
RoutingTable.Builder rb = RoutingTable.builder(); RoutingTable.Builder rb = RoutingTable.builder();
for (int i = 1; i <= numIndices; i++) { for (int i = 1; i <= numIndices; i++) {
rb.addAsNew(metaData.index("test_" + i)); rb.addAsNew(metadata.index("test_" + i));
} }
RoutingTable routingTable = rb.build(); RoutingTable routingTable = rb.build();
DiscoveryNodes.Builder nb = DiscoveryNodes.builder(); DiscoveryNodes.Builder nb = DiscoveryNodes.builder();
@ -147,7 +147,7 @@ public class AllocationBenchmark {
nb.add(Allocators.newNode("node" + i, Collections.singletonMap("tag", "tag_" + (i % numTags)))); nb.add(Allocators.newNode("node" + i, Collections.singletonMap("tag", "tag_" + (i % numTags))));
} }
initialClusterState = ClusterState.builder(ClusterName.CLUSTER_NAME_SETTING.getDefault(Settings.EMPTY)) initialClusterState = ClusterState.builder(ClusterName.CLUSTER_NAME_SETTING.getDefault(Settings.EMPTY))
.metaData(metaData) .metadata(metadata)
.routingTable(routingTable) .routingTable(routingTable)
.nodes(nb) .nodes(nb)
.build(); .build();

6
client/benchmark/src/main/java/org/elasticsearch/client/benchmark/rest/RestClientBenchmark.java
View File

@ -63,18 +63,18 @@ public final class RestClientBenchmark extends AbstractBenchmark<RestClient> {
private static final class RestBulkRequestExecutor implements BulkRequestExecutor { private static final class RestBulkRequestExecutor implements BulkRequestExecutor {
private final RestClient client; private final RestClient client;
private final String actionMetaData; private final String actionMetadata;
RestBulkRequestExecutor(RestClient client, String index, String type) { RestBulkRequestExecutor(RestClient client, String index, String type) {
this.client = client; this.client = client;
this.actionMetaData = String.format(Locale.ROOT, "{ \"index\" : { \"_index\" : \"%s\", \"_type\" : \"%s\" } }%n", index, type); this.actionMetadata = String.format(Locale.ROOT, "{ \"index\" : { \"_index\" : \"%s\", \"_type\" : \"%s\" } }%n", index, type);
} }
@Override @Override
public boolean bulkIndex(List<String> bulkData) { public boolean bulkIndex(List<String> bulkData) {
StringBuilder bulkRequestBody = new StringBuilder(); StringBuilder bulkRequestBody = new StringBuilder();
for (String bulkItem : bulkData) { for (String bulkItem : bulkData) {
bulkRequestBody.append(actionMetaData); bulkRequestBody.append(actionMetadata);
bulkRequestBody.append(bulkItem); bulkRequestBody.append(bulkItem);
bulkRequestBody.append("\n"); bulkRequestBody.append("\n");
} }

24
client/rest-high-level/src/main/java/org/elasticsearch/client/GetAliasesResponse.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.client; package org.elasticsearch.client;
import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.cluster.metadata.AliasMetaData; import org.elasticsearch.cluster.metadata.AliasMetadata;
import org.elasticsearch.common.xcontent.StatusToXContentObject; import org.elasticsearch.common.xcontent.StatusToXContentObject;
import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
@ -52,9 +52,9 @@ public class GetAliasesResponse implements StatusToXContentObject {
private final String error; private final String error;
private final ElasticsearchException exception; private final ElasticsearchException exception;
private final Map<String, Set<AliasMetaData>> aliases; private final Map<String, Set<AliasMetadata>> aliases;
GetAliasesResponse(RestStatus status, String error, Map<String, Set<AliasMetaData>> aliases) { GetAliasesResponse(RestStatus status, String error, Map<String, Set<AliasMetadata>> aliases) {
this.status = status; this.status = status;
this.error = error; this.error = error;
this.aliases = aliases; this.aliases = aliases;
@ -90,7 +90,7 @@ public class GetAliasesResponse implements StatusToXContentObject {
/** /**
* Return the requested aliases * Return the requested aliases
*/ */
public Map<String, Set<AliasMetaData>> getAliases() { public Map<String, Set<AliasMetadata>> getAliases() {
return aliases; return aliases;
} }
@ -103,13 +103,13 @@ public class GetAliasesResponse implements StatusToXContentObject {
builder.field("status", status.getStatus()); builder.field("status", status.getStatus());
} }
for (Map.Entry<String, Set<AliasMetaData>> entry : aliases.entrySet()) { for (Map.Entry<String, Set<AliasMetadata>> entry : aliases.entrySet()) {
builder.startObject(entry.getKey()); builder.startObject(entry.getKey());
{ {
builder.startObject("aliases"); builder.startObject("aliases");
{ {
for (final AliasMetaData alias : entry.getValue()) { for (final AliasMetadata alias : entry.getValue()) {
AliasMetaData.Builder.toXContent(alias, builder, ToXContent.EMPTY_PARAMS); AliasMetadata.Builder.toXContent(alias, builder, ToXContent.EMPTY_PARAMS);
} }
} }
builder.endObject(); builder.endObject();
@ -129,7 +129,7 @@ public class GetAliasesResponse implements StatusToXContentObject {
parser.nextToken(); parser.nextToken();
} }
ensureExpectedToken(Token.START_OBJECT, parser.currentToken(), parser::getTokenLocation); ensureExpectedToken(Token.START_OBJECT, parser.currentToken(), parser::getTokenLocation);
Map<String, Set<AliasMetaData>> aliases = new HashMap<>(); Map<String, Set<AliasMetadata>> aliases = new HashMap<>();
String currentFieldName; String currentFieldName;
Token token; Token token;
@ -159,7 +159,7 @@ public class GetAliasesResponse implements StatusToXContentObject {
} else { } else {
String indexName = parser.currentName(); String indexName = parser.currentName();
if (parser.nextToken() == Token.START_OBJECT) { if (parser.nextToken() == Token.START_OBJECT) {
Set<AliasMetaData> parseInside = parseAliases(parser); Set<AliasMetadata> parseInside = parseAliases(parser);
aliases.put(indexName, parseInside); aliases.put(indexName, parseInside);
} }
} }
@ -173,8 +173,8 @@ public class GetAliasesResponse implements StatusToXContentObject {
return new GetAliasesResponse(status, error, aliases); return new GetAliasesResponse(status, error, aliases);
} }
private static Set<AliasMetaData> parseAliases(XContentParser parser) throws IOException { private static Set<AliasMetadata> parseAliases(XContentParser parser) throws IOException {
Set<AliasMetaData> aliases = new HashSet<>(); Set<AliasMetadata> aliases = new HashSet<>();
Token token; Token token;
String currentFieldName = null; String currentFieldName = null;
while ((token = parser.nextToken()) != Token.END_OBJECT) { while ((token = parser.nextToken()) != Token.END_OBJECT) {
@ -183,7 +183,7 @@ public class GetAliasesResponse implements StatusToXContentObject {
} else if (token == Token.START_OBJECT) { } else if (token == Token.START_OBJECT) {
if ("aliases".equals(currentFieldName)) { if ("aliases".equals(currentFieldName)) {
while (parser.nextToken() != Token.END_OBJECT) { while (parser.nextToken() != Token.END_OBJECT) {
AliasMetaData fromXContent = AliasMetaData.Builder.fromXContent(parser); AliasMetadata fromXContent = AliasMetadata.Builder.fromXContent(parser);
aliases.add(fromXContent); aliases.add(fromXContent);
} }
} else { } else {

4
client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesRequestConverters.java
View File

@ -54,7 +54,7 @@ import org.elasticsearch.client.indices.ReloadAnalyzersRequest;
import org.elasticsearch.client.indices.ResizeRequest; import org.elasticsearch.client.indices.ResizeRequest;
import org.elasticsearch.client.indices.UnfreezeIndexRequest; import org.elasticsearch.client.indices.UnfreezeIndexRequest;
import org.elasticsearch.client.indices.rollover.RolloverRequest; import org.elasticsearch.client.indices.rollover.RolloverRequest;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import java.io.IOException; import java.io.IOException;
@ -326,7 +326,7 @@ final class IndicesRequestConverters {
} }
static Request split(ResizeRequest resizeRequest) throws IOException { static Request split(ResizeRequest resizeRequest) throws IOException {
if (IndexMetaData.INDEX_NUMBER_OF_SHARDS_SETTING.exists(resizeRequest.getSettings()) == false) { if (IndexMetadata.INDEX_NUMBER_OF_SHARDS_SETTING.exists(resizeRequest.getSettings()) == false) {
throw new IllegalArgumentException("index.number_of_shards is required for split operations"); throw new IllegalArgumentException("index.number_of_shards is required for split operations");
} }
return resize(resizeRequest, ResizeType.SPLIT); return resize(resizeRequest, ResizeType.SPLIT);

2
client/rest-high-level/src/main/java/org/elasticsearch/client/analytics/StringStatsAggregationBuilder.java
View File

@ -98,7 +98,7 @@ public class StringStatsAggregationBuilder extends ValuesSourceAggregationBuilde
} }
@Override @Override
protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metaData) { protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metadata) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }

2
client/rest-high-level/src/main/java/org/elasticsearch/client/analytics/TopMetricsAggregationBuilder.java
View File

@ -106,7 +106,7 @@ public class TopMetricsAggregationBuilder extends AbstractAggregationBuilder<Top
} }
@Override @Override
protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metaData) { protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metadata) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
} }

38
client/rest-high-level/src/main/java/org/elasticsearch/client/indices/GetFieldMappingsResponse.java
View File

@ -43,7 +43,7 @@ public class GetFieldMappingsResponse {
private static final ParseField MAPPINGS = new ParseField("mappings"); private static final ParseField MAPPINGS = new ParseField("mappings");
private static final ObjectParser<Map<String, FieldMappingMetaData>, String> PARSER = private static final ObjectParser<Map<String, FieldMappingMetadata>, String> PARSER =
new ObjectParser<>(MAPPINGS.getPreferredName(), true, HashMap::new); new ObjectParser<>(MAPPINGS.getPreferredName(), true, HashMap::new);
static { static {
@ -51,16 +51,16 @@ public class GetFieldMappingsResponse {
p.nextToken(); p.nextToken();
while (p.currentToken() == XContentParser.Token.FIELD_NAME) { while (p.currentToken() == XContentParser.Token.FIELD_NAME) {
final String fieldName = p.currentName(); final String fieldName = p.currentName();
final FieldMappingMetaData fieldMappingMetaData = FieldMappingMetaData.fromXContent(p); final FieldMappingMetadata fieldMappingMetadata = FieldMappingMetadata.fromXContent(p);
fieldMappings.put(fieldName, fieldMappingMetaData); fieldMappings.put(fieldName, fieldMappingMetadata);
p.nextToken(); p.nextToken();
} }
}, MAPPINGS, ObjectParser.ValueType.OBJECT); }, MAPPINGS, ObjectParser.ValueType.OBJECT);
} }
private Map<String, Map<String, FieldMappingMetaData>> mappings; private Map<String, Map<String, FieldMappingMetadata>> mappings;
GetFieldMappingsResponse(Map<String, Map<String, FieldMappingMetaData>> mappings) { GetFieldMappingsResponse(Map<String, Map<String, FieldMappingMetadata>> mappings) {
this.mappings = mappings; this.mappings = mappings;
} }
@ -68,7 +68,7 @@ public class GetFieldMappingsResponse {
/** /**
* Returns the fields mapping. The return map keys are indexes and fields (as specified in the request). * Returns the fields mapping. The return map keys are indexes and fields (as specified in the request).
*/ */
public Map<String, Map<String, FieldMappingMetaData>> mappings() { public Map<String, Map<String, FieldMappingMetadata>> mappings() {
return mappings; return mappings;
} }
@ -76,10 +76,10 @@ public class GetFieldMappingsResponse {
* Returns the mappings of a specific index and field. * Returns the mappings of a specific index and field.
* *
* @param field field name as specified in the {@link GetFieldMappingsRequest} * @param field field name as specified in the {@link GetFieldMappingsRequest}
* @return FieldMappingMetaData for the requested field or null if not found. * @return FieldMappingMetadata for the requested field or null if not found.
*/ */
public FieldMappingMetaData fieldMappings(String index, String field) { public FieldMappingMetadata fieldMappings(String index, String field) {
Map<String, FieldMappingMetaData> indexMapping = mappings.get(index); Map<String, FieldMappingMetadata> indexMapping = mappings.get(index);
if (indexMapping == null) { if (indexMapping == null) {
return null; return null;
} }
@ -89,11 +89,11 @@ public class GetFieldMappingsResponse {
public static GetFieldMappingsResponse fromXContent(XContentParser parser) throws IOException { public static GetFieldMappingsResponse fromXContent(XContentParser parser) throws IOException {
ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.nextToken(), parser::getTokenLocation); ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.nextToken(), parser::getTokenLocation);
final Map<String, Map<String, FieldMappingMetaData>> mappings = new HashMap<>(); final Map<String, Map<String, FieldMappingMetadata>> mappings = new HashMap<>();
if (parser.nextToken() == XContentParser.Token.FIELD_NAME) { if (parser.nextToken() == XContentParser.Token.FIELD_NAME) {
while (parser.currentToken() == XContentParser.Token.FIELD_NAME) { while (parser.currentToken() == XContentParser.Token.FIELD_NAME) {
final String index = parser.currentName(); final String index = parser.currentName();
final Map<String, FieldMappingMetaData> fieldMappings = PARSER.parse(parser, index); final Map<String, FieldMappingMetadata> fieldMappings = PARSER.parse(parser, index);
mappings.put(index, fieldMappings); mappings.put(index, fieldMappings);
parser.nextToken(); parser.nextToken();
} }
@ -101,13 +101,13 @@ public class GetFieldMappingsResponse {
return new GetFieldMappingsResponse(mappings); return new GetFieldMappingsResponse(mappings);
} }
public static class FieldMappingMetaData { public static class FieldMappingMetadata {
private static final ParseField FULL_NAME = new ParseField("full_name"); private static final ParseField FULL_NAME = new ParseField("full_name");
private static final ParseField MAPPING = new ParseField("mapping"); private static final ParseField MAPPING = new ParseField("mapping");
private static final ConstructingObjectParser<FieldMappingMetaData, String> PARSER = private static final ConstructingObjectParser<FieldMappingMetadata, String> PARSER =
new ConstructingObjectParser<>("field_mapping_meta_data", true, new ConstructingObjectParser<>("field_mapping_meta_data", true,
a -> new FieldMappingMetaData((String)a[0], (BytesReference)a[1]) a -> new FieldMappingMetadata((String)a[0], (BytesReference)a[1])
); );
static { static {
@ -124,7 +124,7 @@ public class GetFieldMappingsResponse {
private String fullName; private String fullName;
private BytesReference source; private BytesReference source;
public FieldMappingMetaData(String fullName, BytesReference source) { public FieldMappingMetadata(String fullName, BytesReference source) {
this.fullName = fullName; this.fullName = fullName;
this.source = source; this.source = source;
} }
@ -145,20 +145,20 @@ public class GetFieldMappingsResponse {
return source; return source;
} }
public static FieldMappingMetaData fromXContent(XContentParser parser) throws IOException { public static FieldMappingMetadata fromXContent(XContentParser parser) throws IOException {
return PARSER.parse(parser, null); return PARSER.parse(parser, null);
} }
@Override @Override
public String toString() { public String toString() {
return "FieldMappingMetaData{fullName='" + fullName + '\'' + ", source=" + source + '}'; return "FieldMappingMetadata{fullName='" + fullName + '\'' + ", source=" + source + '}';
} }
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
if (!(o instanceof FieldMappingMetaData)) return false; if (!(o instanceof FieldMappingMetadata)) return false;
FieldMappingMetaData that = (FieldMappingMetaData) o; FieldMappingMetadata that = (FieldMappingMetadata) o;
return Objects.equals(fullName, that.fullName) && Objects.equals(source, that.source); return Objects.equals(fullName, that.fullName) && Objects.equals(source, that.source);
} }

42
client/rest-high-level/src/main/java/org/elasticsearch/client/indices/GetIndexResponse.java
View File

@ -20,8 +20,8 @@
package org.elasticsearch.client.indices; package org.elasticsearch.client.indices;
import org.apache.lucene.util.CollectionUtil; import org.apache.lucene.util.CollectionUtil;
import org.elasticsearch.cluster.metadata.AliasMetaData; import org.elasticsearch.cluster.metadata.AliasMetadata;
import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentParser.Token; import org.elasticsearch.common.xcontent.XContentParser.Token;
@ -43,15 +43,15 @@ import static org.elasticsearch.common.xcontent.XContentParserUtils.ensureExpect
*/ */
public class GetIndexResponse { public class GetIndexResponse {
private Map<String, MappingMetaData> mappings; private Map<String, MappingMetadata> mappings;
private Map<String, List<AliasMetaData>> aliases; private Map<String, List<AliasMetadata>> aliases;
private Map<String, Settings> settings; private Map<String, Settings> settings;
private Map<String, Settings> defaultSettings; private Map<String, Settings> defaultSettings;
private String[] indices; private String[] indices;
GetIndexResponse(String[] indices, GetIndexResponse(String[] indices,
Map<String, MappingMetaData> mappings, Map<String, MappingMetadata> mappings,
Map<String, List<AliasMetaData>> aliases, Map<String, List<AliasMetadata>> aliases,
Map<String, Settings> settings, Map<String, Settings> settings,
Map<String, Settings> defaultSettings) { Map<String, Settings> defaultSettings) {
this.indices = indices; this.indices = indices;
@ -75,11 +75,11 @@ public class GetIndexResponse {
return indices; return indices;
} }
public Map<String, MappingMetaData> getMappings() { public Map<String, MappingMetadata> getMappings() {
return mappings; return mappings;
} }
public Map<String, List<AliasMetaData>> getAliases() { public Map<String, List<AliasMetadata>> getAliases() {
return aliases; return aliases;
} }
@ -123,23 +123,23 @@ public class GetIndexResponse {
} }
} }
private static List<AliasMetaData> parseAliases(XContentParser parser) throws IOException { private static List<AliasMetadata> parseAliases(XContentParser parser) throws IOException {
List<AliasMetaData> indexAliases = new ArrayList<>(); List<AliasMetadata> indexAliases = new ArrayList<>();
// We start at START_OBJECT since parseIndexEntry ensures that // We start at START_OBJECT since parseIndexEntry ensures that
while (parser.nextToken() != Token.END_OBJECT) { while (parser.nextToken() != Token.END_OBJECT) {
ensureExpectedToken(Token.FIELD_NAME, parser.currentToken(), parser::getTokenLocation); ensureExpectedToken(Token.FIELD_NAME, parser.currentToken(), parser::getTokenLocation);
indexAliases.add(AliasMetaData.Builder.fromXContent(parser)); indexAliases.add(AliasMetadata.Builder.fromXContent(parser));
} }
return indexAliases; return indexAliases;
} }
private static MappingMetaData parseMappings(XContentParser parser) throws IOException { private static MappingMetadata parseMappings(XContentParser parser) throws IOException {
return new MappingMetaData(MapperService.SINGLE_MAPPING_NAME, parser.map()); return new MappingMetadata(MapperService.SINGLE_MAPPING_NAME, parser.map());
} }
private static IndexEntry parseIndexEntry(XContentParser parser) throws IOException { private static IndexEntry parseIndexEntry(XContentParser parser) throws IOException {
List<AliasMetaData> indexAliases = null; List<AliasMetadata> indexAliases = null;
MappingMetaData indexMappings = null; MappingMetadata indexMappings = null;
Settings indexSettings = null; Settings indexSettings = null;
Settings indexDefaultSettings = null; Settings indexDefaultSettings = null;
// We start at START_OBJECT since fromXContent ensures that // We start at START_OBJECT since fromXContent ensures that
@ -172,11 +172,11 @@ public class GetIndexResponse {
// This is just an internal container to make stuff easier for returning // This is just an internal container to make stuff easier for returning
private static class IndexEntry { private static class IndexEntry {
List<AliasMetaData> indexAliases = new ArrayList<>(); List<AliasMetadata> indexAliases = new ArrayList<>();
MappingMetaData indexMappings; MappingMetadata indexMappings;
Settings indexSettings = Settings.EMPTY; Settings indexSettings = Settings.EMPTY;
Settings indexDefaultSettings = Settings.EMPTY; Settings indexDefaultSettings = Settings.EMPTY;
IndexEntry(List<AliasMetaData> indexAliases, MappingMetaData indexMappings, Settings indexSettings, Settings indexDefaultSettings) { IndexEntry(List<AliasMetadata> indexAliases, MappingMetadata indexMappings, Settings indexSettings, Settings indexDefaultSettings) {
if (indexAliases != null) this.indexAliases = indexAliases; if (indexAliases != null) this.indexAliases = indexAliases;
if (indexMappings != null) this.indexMappings = indexMappings; if (indexMappings != null) this.indexMappings = indexMappings;
if (indexSettings != null) this.indexSettings = indexSettings; if (indexSettings != null) this.indexSettings = indexSettings;
@ -185,8 +185,8 @@ public class GetIndexResponse {
} }
public static GetIndexResponse fromXContent(XContentParser parser) throws IOException { public static GetIndexResponse fromXContent(XContentParser parser) throws IOException {
Map<String, List<AliasMetaData>> aliases = new HashMap<>(); Map<String, List<AliasMetadata>> aliases = new HashMap<>();
Map<String, MappingMetaData> mappings = new HashMap<>(); Map<String, MappingMetadata> mappings = new HashMap<>();
Map<String, Settings> settings = new HashMap<>(); Map<String, Settings> settings = new HashMap<>();
Map<String, Settings> defaultSettings = new HashMap<>(); Map<String, Settings> defaultSettings = new HashMap<>();
List<String> indices = new ArrayList<>(); List<String> indices = new ArrayList<>();
@ -204,7 +204,7 @@ public class GetIndexResponse {
indices.add(indexName); indices.add(indexName);
IndexEntry indexEntry = parseIndexEntry(parser); IndexEntry indexEntry = parseIndexEntry(parser);
// make the order deterministic // make the order deterministic
CollectionUtil.timSort(indexEntry.indexAliases, Comparator.comparing(AliasMetaData::alias)); CollectionUtil.timSort(indexEntry.indexAliases, Comparator.comparing(AliasMetadata::alias));
aliases.put(indexName, Collections.unmodifiableList(indexEntry.indexAliases)); aliases.put(indexName, Collections.unmodifiableList(indexEntry.indexAliases));
mappings.put(indexName, indexEntry.indexMappings); mappings.put(indexName, indexEntry.indexMappings);
settings.put(indexName, indexEntry.indexSettings); settings.put(indexName, indexEntry.indexSettings);

28
client/rest-high-level/src/main/java/org/elasticsearch/client/indices/GetIndexTemplatesResponse.java
View File

@ -31,32 +31,32 @@ public class GetIndexTemplatesResponse {
@Override @Override
public String toString() { public String toString() {
List<IndexTemplateMetaData> thisList = new ArrayList<>(this.indexTemplates); List<IndexTemplateMetadata> thisList = new ArrayList<>(this.indexTemplates);
thisList.sort(Comparator.comparing(IndexTemplateMetaData::name)); thisList.sort(Comparator.comparing(IndexTemplateMetadata::name));
return "GetIndexTemplatesResponse [indexTemplates=" + thisList + "]"; return "GetIndexTemplatesResponse [indexTemplates=" + thisList + "]";
} }
private final List<IndexTemplateMetaData> indexTemplates; private final List<IndexTemplateMetadata> indexTemplates;
GetIndexTemplatesResponse() { GetIndexTemplatesResponse() {
indexTemplates = new ArrayList<>(); indexTemplates = new ArrayList<>();
} }
GetIndexTemplatesResponse(List<IndexTemplateMetaData> indexTemplates) { GetIndexTemplatesResponse(List<IndexTemplateMetadata> indexTemplates) {
this.indexTemplates = indexTemplates; this.indexTemplates = indexTemplates;
} }
public List<IndexTemplateMetaData> getIndexTemplates() { public List<IndexTemplateMetadata> getIndexTemplates() {
return indexTemplates; return indexTemplates;
} }
public static GetIndexTemplatesResponse fromXContent(XContentParser parser) throws IOException { public static GetIndexTemplatesResponse fromXContent(XContentParser parser) throws IOException {
final List<IndexTemplateMetaData> templates = new ArrayList<>(); final List<IndexTemplateMetadata> templates = new ArrayList<>();
for (XContentParser.Token token = parser.nextToken(); token != XContentParser.Token.END_OBJECT; token = parser.nextToken()) { for (XContentParser.Token token = parser.nextToken(); token != XContentParser.Token.END_OBJECT; token = parser.nextToken()) {
if (token == XContentParser.Token.FIELD_NAME) { if (token == XContentParser.Token.FIELD_NAME) {
final IndexTemplateMetaData templateMetaData = IndexTemplateMetaData.Builder.fromXContent(parser, parser.currentName()); final IndexTemplateMetadata templateMetadata = IndexTemplateMetadata.Builder.fromXContent(parser, parser.currentName());
templates.add(templateMetaData); templates.add(templateMetadata);
} }
} }
return new GetIndexTemplatesResponse(templates); return new GetIndexTemplatesResponse(templates);
@ -64,8 +64,8 @@ public class GetIndexTemplatesResponse {
@Override @Override
public int hashCode() { public int hashCode() {
List<IndexTemplateMetaData> sortedList = new ArrayList<>(this.indexTemplates); List<IndexTemplateMetadata> sortedList = new ArrayList<>(this.indexTemplates);
sortedList.sort(Comparator.comparing(IndexTemplateMetaData::name)); sortedList.sort(Comparator.comparing(IndexTemplateMetadata::name));
return Objects.hash(sortedList); return Objects.hash(sortedList);
} }
@ -79,10 +79,10 @@ public class GetIndexTemplatesResponse {
return false; return false;
// To compare results we need to make sure the templates are listed in the same order // To compare results we need to make sure the templates are listed in the same order
GetIndexTemplatesResponse other = (GetIndexTemplatesResponse) obj; GetIndexTemplatesResponse other = (GetIndexTemplatesResponse) obj;
List<IndexTemplateMetaData> thisList = new ArrayList<>(this.indexTemplates); List<IndexTemplateMetadata> thisList = new ArrayList<>(this.indexTemplates);
List<IndexTemplateMetaData> otherList = new ArrayList<>(other.indexTemplates); List<IndexTemplateMetadata> otherList = new ArrayList<>(other.indexTemplates);
thisList.sort(Comparator.comparing(IndexTemplateMetaData::name)); thisList.sort(Comparator.comparing(IndexTemplateMetadata::name));
otherList.sort(Comparator.comparing(IndexTemplateMetaData::name)); otherList.sort(Comparator.comparing(IndexTemplateMetadata::name));
return Objects.equals(thisList, otherList); return Objects.equals(thisList, otherList);
} }

12
client/rest-high-level/src/main/java/org/elasticsearch/client/indices/GetMappingsResponse.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.indices; package org.elasticsearch.client.indices;
import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentParserUtils; import org.elasticsearch.common.xcontent.XContentParserUtils;
@ -33,13 +33,13 @@ public class GetMappingsResponse {
static final ParseField MAPPINGS = new ParseField("mappings"); static final ParseField MAPPINGS = new ParseField("mappings");
private Map<String, MappingMetaData> mappings; private Map<String, MappingMetadata> mappings;
public GetMappingsResponse(Map<String, MappingMetaData> mappings) { public GetMappingsResponse(Map<String, MappingMetadata> mappings) {
this.mappings = mappings; this.mappings = mappings;
} }
public Map<String, MappingMetaData> mappings() { public Map<String, MappingMetadata> mappings() {
return mappings; return mappings;
} }
@ -54,7 +54,7 @@ public class GetMappingsResponse {
Map<String, Object> parts = parser.map(); Map<String, Object> parts = parser.map();
Map<String, MappingMetaData> mappings = new HashMap<>(); Map<String, MappingMetadata> mappings = new HashMap<>();
for (Map.Entry<String, Object> entry : parts.entrySet()) { for (Map.Entry<String, Object> entry : parts.entrySet()) {
String indexName = entry.getKey(); String indexName = entry.getKey();
assert entry.getValue() instanceof Map : "expected a map as type mapping, but got: " + entry.getValue().getClass(); assert entry.getValue() instanceof Map : "expected a map as type mapping, but got: " + entry.getValue().getClass();
@ -63,7 +63,7 @@ public class GetMappingsResponse {
final Map<String, Object> fieldMappings = (Map<String, Object>) ((Map<String, ?>) entry.getValue()) final Map<String, Object> fieldMappings = (Map<String, Object>) ((Map<String, ?>) entry.getValue())
.get(MAPPINGS.getPreferredName()); .get(MAPPINGS.getPreferredName());
mappings.put(indexName, new MappingMetaData(MapperService.SINGLE_MAPPING_NAME, fieldMappings)); mappings.put(indexName, new MappingMetadata(MapperService.SINGLE_MAPPING_NAME, fieldMappings));
} }
return new GetMappingsResponse(mappings); return new GetMappingsResponse(mappings);

80
client/rest-high-level/src/main/java/org/elasticsearch/client/indices/IndexTemplateMetaData.java → client/rest-high-level/src/main/java/org/elasticsearch/client/indices/IndexTemplateMetadata.java
View File

@ -18,9 +18,9 @@
*/ */
package org.elasticsearch.client.indices; package org.elasticsearch.client.indices;
import org.elasticsearch.cluster.metadata.AliasMetaData; import org.elasticsearch.cluster.metadata.AliasMetadata;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.ParseField; import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.collect.ImmutableOpenMap;
@ -38,23 +38,23 @@ import java.util.stream.Collectors;
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg; import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg;
public class IndexTemplateMetaData { public class IndexTemplateMetadata {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private static final ConstructingObjectParser<IndexTemplateMetaData, String> PARSER = new ConstructingObjectParser<>( private static final ConstructingObjectParser<IndexTemplateMetadata, String> PARSER = new ConstructingObjectParser<>(
"IndexTemplateMetaData", true, (a, name) -> { "IndexTemplateMetadata", true, (a, name) -> {
List<Map.Entry<String, AliasMetaData>> alias = (List<Map.Entry<String, AliasMetaData>>) a[5]; List<Map.Entry<String, AliasMetadata>> alias = (List<Map.Entry<String, AliasMetadata>>) a[5];
ImmutableOpenMap<String, AliasMetaData> aliasMap = ImmutableOpenMap<String, AliasMetadata> aliasMap =
new ImmutableOpenMap.Builder<String, AliasMetaData>() new ImmutableOpenMap.Builder<String, AliasMetadata>()
.putAll(alias.stream().collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))) .putAll(alias.stream().collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)))
.build(); .build();
return new IndexTemplateMetaData( return new IndexTemplateMetadata(
name, name,
(Integer) a[0], (Integer) a[0],
(Integer) a[1], (Integer) a[1],
(List<String>) a[2], (List<String>) a[2],
(Settings) a[3], (Settings) a[3],
(MappingMetaData) a[4], (MappingMetadata) a[4],
aliasMap); aliasMap);
}); });
@ -65,7 +65,7 @@ public class IndexTemplateMetaData {
PARSER.declareObject(optionalConstructorArg(), (p, c) -> { PARSER.declareObject(optionalConstructorArg(), (p, c) -> {
Settings.Builder templateSettingsBuilder = Settings.builder(); Settings.Builder templateSettingsBuilder = Settings.builder();
templateSettingsBuilder.put(Settings.fromXContent(p)); templateSettingsBuilder.put(Settings.fromXContent(p));
templateSettingsBuilder.normalizePrefix(IndexMetaData.INDEX_SETTING_PREFIX); templateSettingsBuilder.normalizePrefix(IndexMetadata.INDEX_SETTING_PREFIX);
return templateSettingsBuilder.build(); return templateSettingsBuilder.build();
}, new ParseField("settings")); }, new ParseField("settings"));
PARSER.declareObject(optionalConstructorArg(), (p, c) -> { PARSER.declareObject(optionalConstructorArg(), (p, c) -> {
@ -73,10 +73,10 @@ public class IndexTemplateMetaData {
if (mapping.isEmpty()) { if (mapping.isEmpty()) {
return null; return null;
} }
return new MappingMetaData(MapperService.SINGLE_MAPPING_NAME, mapping); return new MappingMetadata(MapperService.SINGLE_MAPPING_NAME, mapping);
}, new ParseField("mappings")); }, new ParseField("mappings"));
PARSER.declareNamedObjects(optionalConstructorArg(), PARSER.declareNamedObjects(optionalConstructorArg(),
(p, c, name) -> new AbstractMap.SimpleEntry<>(name, AliasMetaData.Builder.fromXContent(p)), new ParseField("aliases")); (p, c, name) -> new AbstractMap.SimpleEntry<>(name, AliasMetadata.Builder.fromXContent(p)), new ParseField("aliases"));
} }
private final String name; private final String name;
@ -107,14 +107,14 @@ public class IndexTemplateMetaData {
private final Settings settings; private final Settings settings;
private final MappingMetaData mappings; private final MappingMetadata mappings;
private final ImmutableOpenMap<String, AliasMetaData> aliases; private final ImmutableOpenMap<String, AliasMetadata> aliases;
public IndexTemplateMetaData(String name, int order, Integer version, public IndexTemplateMetadata(String name, int order, Integer version,
List<String> patterns, Settings settings, List<String> patterns, Settings settings,
MappingMetaData mappings, MappingMetadata mappings,
ImmutableOpenMap<String, AliasMetaData> aliases) { ImmutableOpenMap<String, AliasMetadata> aliases) {
if (patterns == null || patterns.isEmpty()) { if (patterns == null || patterns.isEmpty()) {
throw new IllegalArgumentException("Index patterns must not be null or empty; got " + patterns); throw new IllegalArgumentException("Index patterns must not be null or empty; got " + patterns);
} }
@ -148,11 +148,11 @@ public class IndexTemplateMetaData {
return this.settings; return this.settings;
} }
public MappingMetaData mappings() { public MappingMetadata mappings() {
return this.mappings; return this.mappings;
} }
public ImmutableOpenMap<String, AliasMetaData> aliases() { public ImmutableOpenMap<String, AliasMetadata> aliases() {
return this.aliases; return this.aliases;
} }
@ -164,7 +164,7 @@ public class IndexTemplateMetaData {
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
IndexTemplateMetaData that = (IndexTemplateMetaData) o; IndexTemplateMetadata that = (IndexTemplateMetadata) o;
return order == that.order && return order == that.order &&
Objects.equals(name, that.name) && Objects.equals(name, that.name) &&
Objects.equals(version, that.version) && Objects.equals(version, that.version) &&
@ -191,9 +191,9 @@ public class IndexTemplateMetaData {
private Settings settings = Settings.Builder.EMPTY_SETTINGS; private Settings settings = Settings.Builder.EMPTY_SETTINGS;
private MappingMetaData mappings; private MappingMetadata mappings;
private final ImmutableOpenMap.Builder<String, AliasMetaData> aliases; private final ImmutableOpenMap.Builder<String, AliasMetadata> aliases;
public Builder(String name) { public Builder(String name) {
this.name = name; this.name = name;
@ -201,15 +201,15 @@ public class IndexTemplateMetaData {
aliases = ImmutableOpenMap.builder(); aliases = ImmutableOpenMap.builder();
} }
public Builder(IndexTemplateMetaData indexTemplateMetaData) { public Builder(IndexTemplateMetadata indexTemplateMetadata) {
this.name = indexTemplateMetaData.name(); this.name = indexTemplateMetadata.name();
order(indexTemplateMetaData.order()); order(indexTemplateMetadata.order());
version(indexTemplateMetaData.version()); version(indexTemplateMetadata.version());
patterns(indexTemplateMetaData.patterns()); patterns(indexTemplateMetadata.patterns());
settings(indexTemplateMetaData.settings()); settings(indexTemplateMetadata.settings());
mappings = indexTemplateMetaData.mappings(); mappings = indexTemplateMetadata.mappings();
aliases = ImmutableOpenMap.builder(indexTemplateMetaData.aliases()); aliases = ImmutableOpenMap.builder(indexTemplateMetadata.aliases());
} }
public Builder order(int order) { public Builder order(int order) {
@ -237,27 +237,27 @@ public class IndexTemplateMetaData {
return this; return this;
} }
public Builder mapping(MappingMetaData mappings) { public Builder mapping(MappingMetadata mappings) {
this.mappings = mappings; this.mappings = mappings;
return this; return this;
} }
public Builder putAlias(AliasMetaData aliasMetaData) { public Builder putAlias(AliasMetadata aliasMetadata) {
aliases.put(aliasMetaData.alias(), aliasMetaData); aliases.put(aliasMetadata.alias(), aliasMetadata);
return this; return this;
} }
public Builder putAlias(AliasMetaData.Builder aliasMetaData) { public Builder putAlias(AliasMetadata.Builder aliasMetadata) {
aliases.put(aliasMetaData.alias(), aliasMetaData.build()); aliases.put(aliasMetadata.alias(), aliasMetadata.build());
return this; return this;
} }
public IndexTemplateMetaData build() { public IndexTemplateMetadata build() {
return new IndexTemplateMetaData(name, order, version, indexPatterns, settings, mappings, aliases.build()); return new IndexTemplateMetadata(name, order, version, indexPatterns, settings, mappings, aliases.build());
} }
public static IndexTemplateMetaData fromXContent(XContentParser parser, String templateName) throws IOException { public static IndexTemplateMetadata fromXContent(XContentParser parser, String templateName) throws IOException {
return PARSER.parse(parser, templateName); return PARSER.parse(parser, templateName);
} }
} }

4
client/rest-high-level/src/main/java/org/elasticsearch/client/rollup/GetRollupCapsRequest.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.rollup; package org.elasticsearch.client.rollup;
import org.elasticsearch.client.Validatable; import org.elasticsearch.client.Validatable;
import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.xcontent.ToXContentObject; import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
@ -33,7 +33,7 @@ public class GetRollupCapsRequest implements Validatable, ToXContentObject {
public GetRollupCapsRequest(final String indexPattern) { public GetRollupCapsRequest(final String indexPattern) {
if (Strings.isNullOrEmpty(indexPattern) || indexPattern.equals("*")) { if (Strings.isNullOrEmpty(indexPattern) || indexPattern.equals("*")) {
this.indexPattern = MetaData.ALL; this.indexPattern = Metadata.ALL;
} else { } else {
this.indexPattern = indexPattern; this.indexPattern = indexPattern;
} }

6
client/rest-high-level/src/main/java/org/elasticsearch/client/watcher/WatcherMetaData.java → client/rest-high-level/src/main/java/org/elasticsearch/client/watcher/WatcherMetadata.java
View File

@ -21,11 +21,11 @@ package org.elasticsearch.client.watcher;
import java.util.Objects; import java.util.Objects;
public class WatcherMetaData { public class WatcherMetadata {
private final boolean manuallyStopped; private final boolean manuallyStopped;
public WatcherMetaData(boolean manuallyStopped) { public WatcherMetadata(boolean manuallyStopped) {
this.manuallyStopped = manuallyStopped; this.manuallyStopped = manuallyStopped;
} }
@ -42,7 +42,7 @@ public class WatcherMetaData {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
WatcherMetaData action = (WatcherMetaData) o; WatcherMetadata action = (WatcherMetadata) o;
return manuallyStopped == action.manuallyStopped; return manuallyStopped == action.manuallyStopped;
} }

16
client/rest-high-level/src/main/java/org/elasticsearch/client/watcher/WatcherStatsResponse.java
View File

@ -40,21 +40,21 @@ public class WatcherStatsResponse {
private final NodesResponseHeader header; private final NodesResponseHeader header;
private final String clusterName; private final String clusterName;
private final WatcherMetaData watcherMetaData; private final WatcherMetadata watcherMetadata;
public WatcherStatsResponse(NodesResponseHeader header, String clusterName, WatcherMetaData watcherMetaData, List<Node> nodes) { public WatcherStatsResponse(NodesResponseHeader header, String clusterName, WatcherMetadata watcherMetadata, List<Node> nodes) {
this.nodes = nodes; this.nodes = nodes;
this.header = header; this.header = header;
this.clusterName = clusterName; this.clusterName = clusterName;
this.watcherMetaData = watcherMetaData; this.watcherMetadata = watcherMetadata;
} }
/** /**
* @return the status of the requested watch. If an action was * @return the status of the requested watch. If an action was
* successfully acknowledged, this will be reflected in its status. * successfully acknowledged, this will be reflected in its status.
*/ */
public WatcherMetaData getWatcherMetaData() { public WatcherMetadata getWatcherMetadata() {
return watcherMetaData; return watcherMetadata;
} }
/** /**
@ -84,7 +84,7 @@ public class WatcherStatsResponse {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private static final ConstructingObjectParser<WatcherStatsResponse, Void> PARSER = private static final ConstructingObjectParser<WatcherStatsResponse, Void> PARSER =
new ConstructingObjectParser<>("watcher_stats_response", true, new ConstructingObjectParser<>("watcher_stats_response", true,
a -> new WatcherStatsResponse((NodesResponseHeader) a[0], (String) a[1], new WatcherMetaData((boolean) a[2]), a -> new WatcherStatsResponse((NodesResponseHeader) a[0], (String) a[1], new WatcherMetadata((boolean) a[2]),
(List<Node>) a[3])); (List<Node>) a[3]));
static { static {
@ -107,13 +107,13 @@ public class WatcherStatsResponse {
return Objects.equals(nodes, that.nodes) && return Objects.equals(nodes, that.nodes) &&
Objects.equals(header, that.header) && Objects.equals(header, that.header) &&
Objects.equals(clusterName, that.clusterName) && Objects.equals(clusterName, that.clusterName) &&
Objects.equals(watcherMetaData, that.watcherMetaData); Objects.equals(watcherMetadata, that.watcherMetadata);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(nodes, header, clusterName, watcherMetaData); return Objects.hash(nodes, header, clusterName, watcherMetadata);
} }
public static class Node { public static class Node {

22
client/rest-high-level/src/test/java/org/elasticsearch/client/GetAliasesResponseTests.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.client; package org.elasticsearch.client;
import org.elasticsearch.cluster.metadata.AliasMetaData; import org.elasticsearch.cluster.metadata.AliasMetadata;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.json.JsonXContent; import org.elasticsearch.common.xcontent.json.JsonXContent;
import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.RestStatus;
@ -44,23 +44,23 @@ public class GetAliasesResponseTests extends AbstractXContentTestCase<GetAliases
return new GetAliasesResponse(status, errorMessage, createIndicesAliasesMap(0, 5)); return new GetAliasesResponse(status, errorMessage, createIndicesAliasesMap(0, 5));
} }
private static Map<String, Set<AliasMetaData>> createIndicesAliasesMap(int min, int max) { private static Map<String, Set<AliasMetadata>> createIndicesAliasesMap(int min, int max) {
Map<String, Set<AliasMetaData>> map = new HashMap<>(); Map<String, Set<AliasMetadata>> map = new HashMap<>();
int indicesNum = randomIntBetween(min, max); int indicesNum = randomIntBetween(min, max);
for (int i = 0; i < indicesNum; i++) { for (int i = 0; i < indicesNum; i++) {
String index = randomAlphaOfLength(5); String index = randomAlphaOfLength(5);
Set<AliasMetaData> aliasMetaData = new HashSet<>(); Set<AliasMetadata> aliasMetadata = new HashSet<>();
int aliasesNum = randomIntBetween(0, 3); int aliasesNum = randomIntBetween(0, 3);
for (int alias = 0; alias < aliasesNum; alias++) { for (int alias = 0; alias < aliasesNum; alias++) {
aliasMetaData.add(createAliasMetaData()); aliasMetadata.add(createAliasMetadata());
} }
map.put(index, aliasMetaData); map.put(index, aliasMetadata);
} }
return map; return map;
} }
public static AliasMetaData createAliasMetaData() { public static AliasMetadata createAliasMetadata() {
AliasMetaData.Builder builder = AliasMetaData.builder(randomAlphaOfLengthBetween(3, 10)); AliasMetadata.Builder builder = AliasMetadata.builder(randomAlphaOfLengthBetween(3, 10));
if (randomBoolean()) { if (randomBoolean()) {
builder.routing(randomAlphaOfLengthBetween(3, 10)); builder.routing(randomAlphaOfLengthBetween(3, 10));
} }
@ -85,7 +85,7 @@ public class GetAliasesResponseTests extends AbstractXContentTestCase<GetAliases
protected Predicate<String> getRandomFieldsExcludeFilter() { protected Predicate<String> getRandomFieldsExcludeFilter() {
return p -> p.equals("") // do not add elements at the top-level as any element at this level is parsed as a new index return p -> p.equals("") // do not add elements at the top-level as any element at this level is parsed as a new index
|| p.endsWith(".aliases") // do not add new alias || p.endsWith(".aliases") // do not add new alias
|| p.contains(".filter"); // do not insert random data into AliasMetaData#filter || p.contains(".filter"); // do not insert random data into AliasMetadata#filter
} }
@Override @Override
@ -167,8 +167,8 @@ public class GetAliasesResponseTests extends AbstractXContentTestCase<GetAliases
assertThat(response.getError(), equalTo("alias [something] missing")); assertThat(response.getError(), equalTo("alias [something] missing"));
assertThat(response.getAliases().size(), equalTo(1)); assertThat(response.getAliases().size(), equalTo(1));
assertThat(response.getAliases().get(index).size(), equalTo(1)); assertThat(response.getAliases().get(index).size(), equalTo(1));
AliasMetaData aliasMetaData = response.getAliases().get(index).iterator().next(); AliasMetadata aliasMetadata = response.getAliases().get(index).iterator().next();
assertThat(aliasMetaData.alias(), equalTo("alias")); assertThat(aliasMetadata.alias(), equalTo("alias"));
assertThat(response.getException(), nullValue()); assertThat(response.getException(), nullValue());
} }
} }

162
client/rest-high-level/src/test/java/org/elasticsearch/client/IndicesClientIT.java
View File

@ -71,7 +71,7 @@ import org.elasticsearch.client.indices.GetIndexTemplatesRequest;
import org.elasticsearch.client.indices.GetIndexTemplatesResponse; import org.elasticsearch.client.indices.GetIndexTemplatesResponse;
import org.elasticsearch.client.indices.GetMappingsRequest; import org.elasticsearch.client.indices.GetMappingsRequest;
import org.elasticsearch.client.indices.GetMappingsResponse; import org.elasticsearch.client.indices.GetMappingsResponse;
import org.elasticsearch.client.indices.IndexTemplateMetaData; import org.elasticsearch.client.indices.IndexTemplateMetadata;
import org.elasticsearch.client.indices.IndexTemplatesExistRequest; import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
import org.elasticsearch.client.indices.PutIndexTemplateRequest; import org.elasticsearch.client.indices.PutIndexTemplateRequest;
import org.elasticsearch.client.indices.PutMappingRequest; import org.elasticsearch.client.indices.PutMappingRequest;
@ -80,9 +80,9 @@ import org.elasticsearch.client.indices.ReloadAnalyzersResponse;
import org.elasticsearch.client.indices.UnfreezeIndexRequest; import org.elasticsearch.client.indices.UnfreezeIndexRequest;
import org.elasticsearch.client.indices.rollover.RolloverRequest; import org.elasticsearch.client.indices.rollover.RolloverRequest;
import org.elasticsearch.client.indices.rollover.RolloverResponse; import org.elasticsearch.client.indices.rollover.RolloverResponse;
import org.elasticsearch.cluster.metadata.AliasMetaData; import org.elasticsearch.cluster.metadata.AliasMetadata;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.ValidationException; import org.elasticsearch.common.ValidationException;
import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesArray;
@ -119,8 +119,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_REPLICAS; import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS;
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS;
import static org.elasticsearch.common.xcontent.support.XContentMapValues.extractRawValues; import static org.elasticsearch.common.xcontent.support.XContentMapValues.extractRawValues;
import static org.elasticsearch.common.xcontent.support.XContentMapValues.extractValue; import static org.elasticsearch.common.xcontent.support.XContentMapValues.extractValue;
import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.hasItem;
@ -445,11 +445,11 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
assertEquals("0", getIndexResponse.getSetting(indexName, SETTING_NUMBER_OF_REPLICAS)); assertEquals("0", getIndexResponse.getSetting(indexName, SETTING_NUMBER_OF_REPLICAS));
assertNotNull(getIndexResponse.getMappings().get(indexName)); assertNotNull(getIndexResponse.getMappings().get(indexName));
assertNotNull(getIndexResponse.getMappings().get(indexName)); assertNotNull(getIndexResponse.getMappings().get(indexName));
MappingMetaData mappingMetaData = getIndexResponse.getMappings().get(indexName); MappingMetadata mappingMetadata = getIndexResponse.getMappings().get(indexName);
assertNotNull(mappingMetaData); assertNotNull(mappingMetadata);
assertEquals("_doc", mappingMetaData.type()); assertEquals("_doc", mappingMetadata.type());
assertEquals("{\"properties\":{\"field-1\":{\"type\":\"integer\"}}}", mappingMetaData.source().string()); assertEquals("{\"properties\":{\"field-1\":{\"type\":\"integer\"}}}", mappingMetadata.source().string());
Object o = mappingMetaData.getSourceAsMap().get("properties"); Object o = mappingMetadata.getSourceAsMap().get("properties");
assertThat(o, instanceOf(Map.class)); assertThat(o, instanceOf(Map.class));
//noinspection unchecked //noinspection unchecked
assertThat(((Map<String, Object>) o).get("field-1"), instanceOf(Map.class)); assertThat(((Map<String, Object>) o).get("field-1"), instanceOf(Map.class));
@ -479,10 +479,10 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
assertEquals("1", getIndexResponse.getSetting(indexName, SETTING_NUMBER_OF_SHARDS)); assertEquals("1", getIndexResponse.getSetting(indexName, SETTING_NUMBER_OF_SHARDS));
assertEquals("0", getIndexResponse.getSetting(indexName, SETTING_NUMBER_OF_REPLICAS)); assertEquals("0", getIndexResponse.getSetting(indexName, SETTING_NUMBER_OF_REPLICAS));
assertNotNull(getIndexResponse.getMappings().get(indexName)); assertNotNull(getIndexResponse.getMappings().get(indexName));
MappingMetaData mappingMetaData = getIndexResponse.getMappings().get(indexName).get("_doc"); MappingMetadata mappingMetadata = getIndexResponse.getMappings().get(indexName).get("_doc");
assertNotNull(mappingMetaData); assertNotNull(mappingMetadata);
assertEquals("_doc", mappingMetaData.type()); assertEquals("_doc", mappingMetadata.type());
assertEquals("{\"properties\":{\"field-1\":{\"type\":\"integer\"}}}", mappingMetaData.source().string()); assertEquals("{\"properties\":{\"field-1\":{\"type\":\"integer\"}}}", mappingMetadata.source().string());
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@ -667,13 +667,13 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
highLevelClient().indices()::getFieldMapping, highLevelClient().indices()::getFieldMapping,
highLevelClient().indices()::getFieldMappingAsync); highLevelClient().indices()::getFieldMappingAsync);
final Map<String, GetFieldMappingsResponse.FieldMappingMetaData> fieldMappingMap = final Map<String, GetFieldMappingsResponse.FieldMappingMetadata> fieldMappingMap =
getFieldMappingsResponse.mappings().get(indexName); getFieldMappingsResponse.mappings().get(indexName);
final GetFieldMappingsResponse.FieldMappingMetaData metaData = final GetFieldMappingsResponse.FieldMappingMetadata metadata =
new GetFieldMappingsResponse.FieldMappingMetaData("field", new GetFieldMappingsResponse.FieldMappingMetadata("field",
new BytesArray("{\"field\":{\"type\":\"text\"}}")); new BytesArray("{\"field\":{\"type\":\"text\"}}"));
assertThat(fieldMappingMap, equalTo(Collections.singletonMap("field", metaData))); assertThat(fieldMappingMap, equalTo(Collections.singletonMap("field", metadata)));
} }
public void testGetFieldMappingWithTypes() throws IOException { public void testGetFieldMappingWithTypes() throws IOException {
@ -703,13 +703,13 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
highLevelClient().indices()::getFieldMappingAsync, highLevelClient().indices()::getFieldMappingAsync,
expectWarnings(RestGetFieldMappingAction.TYPES_DEPRECATION_MESSAGE)); expectWarnings(RestGetFieldMappingAction.TYPES_DEPRECATION_MESSAGE));
final Map<String, org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetaData> final Map<String, org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata>
fieldMappingMap = getFieldMappingsResponse.mappings().get(indexName).get("_doc"); fieldMappingMap = getFieldMappingsResponse.mappings().get(indexName).get("_doc");
final org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetaData metaData = final org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata metadata =
new org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetaData("field", new org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse.FieldMappingMetadata("field",
new BytesArray("{\"field\":{\"type\":\"text\"}}")); new BytesArray("{\"field\":{\"type\":\"text\"}}"));
assertThat(fieldMappingMap, equalTo(Collections.singletonMap("field", metaData))); assertThat(fieldMappingMap, equalTo(Collections.singletonMap("field", metadata)));
} }
public void testDeleteIndex() throws IOException { public void testDeleteIndex() throws IOException {
@ -1258,12 +1258,12 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
assertThat(getAliasesResponse.getAliases().size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().size(), equalTo(1));
assertThat(getAliasesResponse.getAliases().get("index1").size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get("index1").size(), equalTo(1));
AliasMetaData aliasMetaData = getAliasesResponse.getAliases().get("index1").iterator().next(); AliasMetadata aliasMetadata = getAliasesResponse.getAliases().get("index1").iterator().next();
assertThat(aliasMetaData, notNullValue()); assertThat(aliasMetadata, notNullValue());
assertThat(aliasMetaData.alias(), equalTo("alias1")); assertThat(aliasMetadata.alias(), equalTo("alias1"));
assertThat(aliasMetaData.getFilter(), nullValue()); assertThat(aliasMetadata.getFilter(), nullValue());
assertThat(aliasMetaData.getIndexRouting(), nullValue()); assertThat(aliasMetadata.getIndexRouting(), nullValue());
assertThat(aliasMetaData.getSearchRouting(), nullValue()); assertThat(aliasMetadata.getSearchRouting(), nullValue());
} }
{ {
GetAliasesRequest getAliasesRequest = new GetAliasesRequest().aliases("alias*"); GetAliasesRequest getAliasesRequest = new GetAliasesRequest().aliases("alias*");
@ -1272,13 +1272,13 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
assertThat(getAliasesResponse.getAliases().size(), equalTo(2)); assertThat(getAliasesResponse.getAliases().size(), equalTo(2));
assertThat(getAliasesResponse.getAliases().get("index1").size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get("index1").size(), equalTo(1));
AliasMetaData aliasMetaData1 = getAliasesResponse.getAliases().get("index1").iterator().next(); AliasMetadata aliasMetadata1 = getAliasesResponse.getAliases().get("index1").iterator().next();
assertThat(aliasMetaData1, notNullValue()); assertThat(aliasMetadata1, notNullValue());
assertThat(aliasMetaData1.alias(), equalTo("alias1")); assertThat(aliasMetadata1.alias(), equalTo("alias1"));
assertThat(getAliasesResponse.getAliases().get("index2").size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get("index2").size(), equalTo(1));
AliasMetaData aliasMetaData2 = getAliasesResponse.getAliases().get("index2").iterator().next(); AliasMetadata aliasMetadata2 = getAliasesResponse.getAliases().get("index2").iterator().next();
assertThat(aliasMetaData2, notNullValue()); assertThat(aliasMetadata2, notNullValue());
assertThat(aliasMetaData2.alias(), equalTo("alias2")); assertThat(aliasMetadata2.alias(), equalTo("alias2"));
} }
{ {
GetAliasesRequest getAliasesRequest = new GetAliasesRequest().aliases("_all"); GetAliasesRequest getAliasesRequest = new GetAliasesRequest().aliases("_all");
@ -1287,13 +1287,13 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
assertThat(getAliasesResponse.getAliases().size(), equalTo(2)); assertThat(getAliasesResponse.getAliases().size(), equalTo(2));
assertThat(getAliasesResponse.getAliases().get("index1").size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get("index1").size(), equalTo(1));
AliasMetaData aliasMetaData1 = getAliasesResponse.getAliases().get("index1").iterator().next(); AliasMetadata aliasMetadata1 = getAliasesResponse.getAliases().get("index1").iterator().next();
assertThat(aliasMetaData1, notNullValue()); assertThat(aliasMetadata1, notNullValue());
assertThat(aliasMetaData1.alias(), equalTo("alias1")); assertThat(aliasMetadata1.alias(), equalTo("alias1"));
assertThat(getAliasesResponse.getAliases().get("index2").size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get("index2").size(), equalTo(1));
AliasMetaData aliasMetaData2 = getAliasesResponse.getAliases().get("index2").iterator().next(); AliasMetadata aliasMetadata2 = getAliasesResponse.getAliases().get("index2").iterator().next();
assertThat(aliasMetaData2, notNullValue()); assertThat(aliasMetadata2, notNullValue());
assertThat(aliasMetaData2.alias(), equalTo("alias2")); assertThat(aliasMetadata2.alias(), equalTo("alias2"));
} }
{ {
GetAliasesRequest getAliasesRequest = new GetAliasesRequest().aliases("*"); GetAliasesRequest getAliasesRequest = new GetAliasesRequest().aliases("*");
@ -1302,13 +1302,13 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
assertThat(getAliasesResponse.getAliases().size(), equalTo(2)); assertThat(getAliasesResponse.getAliases().size(), equalTo(2));
assertThat(getAliasesResponse.getAliases().get("index1").size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get("index1").size(), equalTo(1));
AliasMetaData aliasMetaData1 = getAliasesResponse.getAliases().get("index1").iterator().next(); AliasMetadata aliasMetadata1 = getAliasesResponse.getAliases().get("index1").iterator().next();
assertThat(aliasMetaData1, notNullValue()); assertThat(aliasMetadata1, notNullValue());
assertThat(aliasMetaData1.alias(), equalTo("alias1")); assertThat(aliasMetadata1.alias(), equalTo("alias1"));
assertThat(getAliasesResponse.getAliases().get("index2").size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get("index2").size(), equalTo(1));
AliasMetaData aliasMetaData2 = getAliasesResponse.getAliases().get("index2").iterator().next(); AliasMetadata aliasMetadata2 = getAliasesResponse.getAliases().get("index2").iterator().next();
assertThat(aliasMetaData2, notNullValue()); assertThat(aliasMetadata2, notNullValue());
assertThat(aliasMetaData2.alias(), equalTo("alias2")); assertThat(aliasMetadata2.alias(), equalTo("alias2"));
} }
{ {
GetAliasesRequest getAliasesRequest = new GetAliasesRequest().indices("_all"); GetAliasesRequest getAliasesRequest = new GetAliasesRequest().indices("_all");
@ -1318,13 +1318,13 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
assertThat("Unexpected number of aliases, got: " + getAliasesResponse.getAliases().toString(), assertThat("Unexpected number of aliases, got: " + getAliasesResponse.getAliases().toString(),
getAliasesResponse.getAliases().size(), equalTo(3)); getAliasesResponse.getAliases().size(), equalTo(3));
assertThat(getAliasesResponse.getAliases().get("index1").size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get("index1").size(), equalTo(1));
AliasMetaData aliasMetaData1 = getAliasesResponse.getAliases().get("index1").iterator().next(); AliasMetadata aliasMetadata1 = getAliasesResponse.getAliases().get("index1").iterator().next();
assertThat(aliasMetaData1, notNullValue()); assertThat(aliasMetadata1, notNullValue());
assertThat(aliasMetaData1.alias(), equalTo("alias1")); assertThat(aliasMetadata1.alias(), equalTo("alias1"));
assertThat(getAliasesResponse.getAliases().get("index2").size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get("index2").size(), equalTo(1));
AliasMetaData aliasMetaData2 = getAliasesResponse.getAliases().get("index2").iterator().next(); AliasMetadata aliasMetadata2 = getAliasesResponse.getAliases().get("index2").iterator().next();
assertThat(aliasMetaData2, notNullValue()); assertThat(aliasMetadata2, notNullValue());
assertThat(aliasMetaData2.alias(), equalTo("alias2")); assertThat(aliasMetadata2.alias(), equalTo("alias2"));
assertThat(getAliasesResponse.getAliases().get("index3").size(), equalTo(0)); assertThat(getAliasesResponse.getAliases().get("index3").size(), equalTo(0));
} }
{ {
@ -1334,13 +1334,13 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
assertThat(getAliasesResponse.getAliases().size(), equalTo(3)); assertThat(getAliasesResponse.getAliases().size(), equalTo(3));
assertThat(getAliasesResponse.getAliases().get("index1").size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get("index1").size(), equalTo(1));
AliasMetaData aliasMetaData1 = getAliasesResponse.getAliases().get("index1").iterator().next(); AliasMetadata aliasMetadata1 = getAliasesResponse.getAliases().get("index1").iterator().next();
assertThat(aliasMetaData1, notNullValue()); assertThat(aliasMetadata1, notNullValue());
assertThat(aliasMetaData1.alias(), equalTo("alias1")); assertThat(aliasMetadata1.alias(), equalTo("alias1"));
assertThat(getAliasesResponse.getAliases().get("index2").size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get("index2").size(), equalTo(1));
AliasMetaData aliasMetaData2 = getAliasesResponse.getAliases().get("index2").iterator().next(); AliasMetadata aliasMetadata2 = getAliasesResponse.getAliases().get("index2").iterator().next();
assertThat(aliasMetaData2, notNullValue()); assertThat(aliasMetadata2, notNullValue());
assertThat(aliasMetaData2.alias(), equalTo("alias2")); assertThat(aliasMetadata2.alias(), equalTo("alias2"));
assertThat(getAliasesResponse.getAliases().get("index3").size(), equalTo(0)); assertThat(getAliasesResponse.getAliases().get("index3").size(), equalTo(0));
} }
{ {
@ -1350,13 +1350,13 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
assertThat(getAliasesResponse.getAliases().size(), equalTo(3)); assertThat(getAliasesResponse.getAliases().size(), equalTo(3));
assertThat(getAliasesResponse.getAliases().get("index1").size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get("index1").size(), equalTo(1));
AliasMetaData aliasMetaData1 = getAliasesResponse.getAliases().get("index1").iterator().next(); AliasMetadata aliasMetadata1 = getAliasesResponse.getAliases().get("index1").iterator().next();
assertThat(aliasMetaData1, notNullValue()); assertThat(aliasMetadata1, notNullValue());
assertThat(aliasMetaData1.alias(), equalTo("alias1")); assertThat(aliasMetadata1.alias(), equalTo("alias1"));
assertThat(getAliasesResponse.getAliases().get("index2").size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get("index2").size(), equalTo(1));
AliasMetaData aliasMetaData2 = getAliasesResponse.getAliases().get("index2").iterator().next(); AliasMetadata aliasMetadata2 = getAliasesResponse.getAliases().get("index2").iterator().next();
assertThat(aliasMetaData2, notNullValue()); assertThat(aliasMetadata2, notNullValue());
assertThat(aliasMetaData2.alias(), equalTo("alias2")); assertThat(aliasMetadata2.alias(), equalTo("alias2"));
assertThat(getAliasesResponse.getAliases().get("index3").size(), equalTo(0)); assertThat(getAliasesResponse.getAliases().get("index3").size(), equalTo(0));
} }
} }
@ -1423,9 +1423,9 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
assertThat(getAliasesResponse.getAliases().size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().size(), equalTo(1));
assertThat(getAliasesResponse.getAliases().get(index).size(), equalTo(1)); assertThat(getAliasesResponse.getAliases().get(index).size(), equalTo(1));
AliasMetaData aliasMetaData = getAliasesResponse.getAliases().get(index).iterator().next(); AliasMetadata aliasMetadata = getAliasesResponse.getAliases().get(index).iterator().next();
assertThat(aliasMetaData, notNullValue()); assertThat(aliasMetadata, notNullValue());
assertThat(aliasMetaData.alias(), equalTo(alias)); assertThat(aliasMetadata.alias(), equalTo(alias));
/* /*
This is the above response in json format: This is the above response in json format:
{ {
@ -1450,16 +1450,16 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
public void testIndexPutSettings() throws IOException { public void testIndexPutSettings() throws IOException {
final Setting<Integer> dynamicSetting = IndexMetaData.INDEX_NUMBER_OF_REPLICAS_SETTING; final Setting<Integer> dynamicSetting = IndexMetadata.INDEX_NUMBER_OF_REPLICAS_SETTING;
final String dynamicSettingKey = IndexMetaData.SETTING_NUMBER_OF_REPLICAS; final String dynamicSettingKey = IndexMetadata.SETTING_NUMBER_OF_REPLICAS;
final int dynamicSettingValue = 0; final int dynamicSettingValue = 0;
final Setting<String> staticSetting = IndexSettings.INDEX_CHECK_ON_STARTUP; final Setting<String> staticSetting = IndexSettings.INDEX_CHECK_ON_STARTUP;
final String staticSettingKey = IndexSettings.INDEX_CHECK_ON_STARTUP.getKey(); final String staticSettingKey = IndexSettings.INDEX_CHECK_ON_STARTUP.getKey();
final String staticSettingValue = "true"; final String staticSettingValue = "true";
final Setting<Integer> unmodifiableSetting = IndexMetaData.INDEX_NUMBER_OF_SHARDS_SETTING; final Setting<Integer> unmodifiableSetting = IndexMetadata.INDEX_NUMBER_OF_SHARDS_SETTING;
final String unmodifiableSettingKey = IndexMetaData.SETTING_NUMBER_OF_SHARDS; final String unmodifiableSettingKey = IndexMetadata.SETTING_NUMBER_OF_SHARDS;
final int unmodifiableSettingValue = 3; final int unmodifiableSettingValue = 3;
String index = "index"; String index = "index";
@ -1783,7 +1783,7 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
client.indices()::getTemplate, client.indices()::getTemplateAsync, client.indices()::getTemplate, client.indices()::getTemplateAsync,
expectWarnings(RestGetIndexTemplateAction.TYPES_DEPRECATION_MESSAGE)); expectWarnings(RestGetIndexTemplateAction.TYPES_DEPRECATION_MESSAGE));
assertThat(getTemplate1.getIndexTemplates(), hasSize(1)); assertThat(getTemplate1.getIndexTemplates(), hasSize(1));
org.elasticsearch.cluster.metadata.IndexTemplateMetaData template1 = getTemplate1.getIndexTemplates().get(0); org.elasticsearch.cluster.metadata.IndexTemplateMetadata template1 = getTemplate1.getIndexTemplates().get(0);
assertThat(template1.name(), equalTo("template-1")); assertThat(template1.name(), equalTo("template-1"));
assertThat(template1.patterns(), contains("pattern-1", "name-1")); assertThat(template1.patterns(), contains("pattern-1", "name-1"));
assertTrue(template1.aliases().containsKey("alias-1")); assertTrue(template1.aliases().containsKey("alias-1"));
@ -1794,7 +1794,7 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
client.indices()::getTemplate, client.indices()::getTemplateAsync, client.indices()::getTemplate, client.indices()::getTemplateAsync,
expectWarnings(RestGetIndexTemplateAction.TYPES_DEPRECATION_MESSAGE)); expectWarnings(RestGetIndexTemplateAction.TYPES_DEPRECATION_MESSAGE));
assertThat(getTemplate2.getIndexTemplates(), hasSize(1)); assertThat(getTemplate2.getIndexTemplates(), hasSize(1));
org.elasticsearch.cluster.metadata.IndexTemplateMetaData template2 = getTemplate2.getIndexTemplates().get(0); org.elasticsearch.cluster.metadata.IndexTemplateMetadata template2 = getTemplate2.getIndexTemplates().get(0);
assertThat(template2.name(), equalTo("template-2")); assertThat(template2.name(), equalTo("template-2"));
assertThat(template2.patterns(), contains("pattern-2", "name-2")); assertThat(template2.patterns(), contains("pattern-2", "name-2"));
assertTrue(template2.aliases().isEmpty()); assertTrue(template2.aliases().isEmpty());
@ -1811,7 +1811,7 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
getBothRequest, client.indices()::getTemplate, client.indices()::getTemplateAsync, getBothRequest, client.indices()::getTemplate, client.indices()::getTemplateAsync,
expectWarnings(RestGetIndexTemplateAction.TYPES_DEPRECATION_MESSAGE)); expectWarnings(RestGetIndexTemplateAction.TYPES_DEPRECATION_MESSAGE));
assertThat(getBoth.getIndexTemplates(), hasSize(2)); assertThat(getBoth.getIndexTemplates(), hasSize(2));
assertThat(getBoth.getIndexTemplates().stream().map(org.elasticsearch.cluster.metadata.IndexTemplateMetaData::getName).toArray(), assertThat(getBoth.getIndexTemplates().stream().map(org.elasticsearch.cluster.metadata.IndexTemplateMetadata::getName).toArray(),
arrayContainingInAnyOrder("template-1", "template-2")); arrayContainingInAnyOrder("template-1", "template-2"));
GetIndexTemplatesRequest getAllRequest = new GetIndexTemplatesRequest(); GetIndexTemplatesRequest getAllRequest = new GetIndexTemplatesRequest();
@ -1819,7 +1819,7 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
getAllRequest, client.indices()::getTemplate, client.indices()::getTemplateAsync, getAllRequest, client.indices()::getTemplate, client.indices()::getTemplateAsync,
expectWarnings(RestGetIndexTemplateAction.TYPES_DEPRECATION_MESSAGE)); expectWarnings(RestGetIndexTemplateAction.TYPES_DEPRECATION_MESSAGE));
assertThat(getAll.getIndexTemplates().size(), greaterThanOrEqualTo(2)); assertThat(getAll.getIndexTemplates().size(), greaterThanOrEqualTo(2));
assertThat(getAll.getIndexTemplates().stream().map(org.elasticsearch.cluster.metadata.IndexTemplateMetaData::getName) assertThat(getAll.getIndexTemplates().stream().map(org.elasticsearch.cluster.metadata.IndexTemplateMetadata::getName)
.collect(Collectors.toList()), .collect(Collectors.toList()),
hasItems("template-1", "template-2")); hasItems("template-1", "template-2"));
@ -1864,7 +1864,7 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
new GetIndexTemplatesRequest("template-1"), new GetIndexTemplatesRequest("template-1"),
client.indices()::getIndexTemplate, client.indices()::getIndexTemplateAsync); client.indices()::getIndexTemplate, client.indices()::getIndexTemplateAsync);
assertThat(getTemplate1.getIndexTemplates(), hasSize(1)); assertThat(getTemplate1.getIndexTemplates(), hasSize(1));
IndexTemplateMetaData template1 = getTemplate1.getIndexTemplates().get(0); IndexTemplateMetadata template1 = getTemplate1.getIndexTemplates().get(0);
assertThat(template1.name(), equalTo("template-1")); assertThat(template1.name(), equalTo("template-1"));
assertThat(template1.patterns(), contains("pattern-1", "name-1")); assertThat(template1.patterns(), contains("pattern-1", "name-1"));
assertTrue(template1.aliases().containsKey("alias-1")); assertTrue(template1.aliases().containsKey("alias-1"));
@ -1872,13 +1872,13 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
GetIndexTemplatesResponse getTemplate2 = execute(new GetIndexTemplatesRequest("template-2"), GetIndexTemplatesResponse getTemplate2 = execute(new GetIndexTemplatesRequest("template-2"),
client.indices()::getIndexTemplate, client.indices()::getIndexTemplateAsync); client.indices()::getIndexTemplate, client.indices()::getIndexTemplateAsync);
assertThat(getTemplate2.getIndexTemplates(), hasSize(1)); assertThat(getTemplate2.getIndexTemplates(), hasSize(1));
IndexTemplateMetaData template2 = getTemplate2.getIndexTemplates().get(0); IndexTemplateMetadata template2 = getTemplate2.getIndexTemplates().get(0);
assertThat(template2.name(), equalTo("template-2")); assertThat(template2.name(), equalTo("template-2"));
assertThat(template2.patterns(), contains("pattern-2", "name-2")); assertThat(template2.patterns(), contains("pattern-2", "name-2"));
assertTrue(template2.aliases().isEmpty()); assertTrue(template2.aliases().isEmpty());
assertThat(template2.settings().get("index.number_of_shards"), equalTo("2")); assertThat(template2.settings().get("index.number_of_shards"), equalTo("2"));
assertThat(template2.settings().get("index.number_of_replicas"), equalTo("0")); assertThat(template2.settings().get("index.number_of_replicas"), equalTo("0"));
// New API returns a MappingMetaData class rather than CompressedXContent for the mapping // New API returns a MappingMetadata class rather than CompressedXContent for the mapping
assertTrue(template2.mappings().sourceAsMap().containsKey("properties")); assertTrue(template2.mappings().sourceAsMap().containsKey("properties"));
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
Map<String, Object> props = (Map<String, Object>) template2.mappings().sourceAsMap().get("properties"); Map<String, Object> props = (Map<String, Object>) template2.mappings().sourceAsMap().get("properties");
@ -1893,14 +1893,14 @@ public class IndicesClientIT extends ESRestHighLevelClientTestCase {
GetIndexTemplatesResponse getBoth = execute( GetIndexTemplatesResponse getBoth = execute(
getBothRequest, client.indices()::getIndexTemplate, client.indices()::getIndexTemplateAsync); getBothRequest, client.indices()::getIndexTemplate, client.indices()::getIndexTemplateAsync);
assertThat(getBoth.getIndexTemplates(), hasSize(2)); assertThat(getBoth.getIndexTemplates(), hasSize(2));
assertThat(getBoth.getIndexTemplates().stream().map(IndexTemplateMetaData::name).toArray(), assertThat(getBoth.getIndexTemplates().stream().map(IndexTemplateMetadata::name).toArray(),
arrayContainingInAnyOrder("template-1", "template-2")); arrayContainingInAnyOrder("template-1", "template-2"));
GetIndexTemplatesRequest getAllRequest = new GetIndexTemplatesRequest(); GetIndexTemplatesRequest getAllRequest = new GetIndexTemplatesRequest();
GetIndexTemplatesResponse getAll = execute( GetIndexTemplatesResponse getAll = execute(
getAllRequest, client.indices()::getIndexTemplate, client.indices()::getIndexTemplateAsync); getAllRequest, client.indices()::getIndexTemplate, client.indices()::getIndexTemplateAsync);
assertThat(getAll.getIndexTemplates().size(), greaterThanOrEqualTo(2)); assertThat(getAll.getIndexTemplates().size(), greaterThanOrEqualTo(2));
assertThat(getAll.getIndexTemplates().stream().map(IndexTemplateMetaData::name) assertThat(getAll.getIndexTemplates().stream().map(IndexTemplateMetadata::name)
.collect(Collectors.toList()), .collect(Collectors.toList()),
hasItems("template-1", "template-2")); hasItems("template-1", "template-2"));

4
client/rest-high-level/src/test/java/org/elasticsearch/client/WatcherIT.java
View File

@ -61,7 +61,7 @@ public class WatcherIT extends ESRestHighLevelClientTestCase {
assertTrue(response.isAcknowledged()); assertTrue(response.isAcknowledged());
WatcherStatsResponse stats = highLevelClient().watcher().watcherStats(new WatcherStatsRequest(), RequestOptions.DEFAULT); WatcherStatsResponse stats = highLevelClient().watcher().watcherStats(new WatcherStatsRequest(), RequestOptions.DEFAULT);
assertFalse(stats.getWatcherMetaData().manuallyStopped()); assertFalse(stats.getWatcherMetadata().manuallyStopped());
assertThat(stats.getNodes(), not(empty())); assertThat(stats.getNodes(), not(empty()));
for(WatcherStatsResponse.Node node : stats.getNodes()) { for(WatcherStatsResponse.Node node : stats.getNodes()) {
assertEquals(WatcherState.STARTED, node.getWatcherState()); assertEquals(WatcherState.STARTED, node.getWatcherState());
@ -74,7 +74,7 @@ public class WatcherIT extends ESRestHighLevelClientTestCase {
assertTrue(response.isAcknowledged()); assertTrue(response.isAcknowledged());
WatcherStatsResponse stats = highLevelClient().watcher().watcherStats(new WatcherStatsRequest(), RequestOptions.DEFAULT); WatcherStatsResponse stats = highLevelClient().watcher().watcherStats(new WatcherStatsRequest(), RequestOptions.DEFAULT);
assertTrue(stats.getWatcherMetaData().manuallyStopped()); assertTrue(stats.getWatcherMetadata().manuallyStopped());
} }
public void testPutWatch() throws Exception { public void testPutWatch() throws Exception {

4
client/rest-high-level/src/test/java/org/elasticsearch/client/core/CountResponseTests.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.client.core; package org.elasticsearch.client.core;
import org.elasticsearch.action.search.ShardSearchFailure; import org.elasticsearch.action.search.ShardSearchFailure;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
@ -91,7 +91,7 @@ public class CountResponseTests extends ESTestCase {
String nodeId = randomAlphaOfLengthBetween(5, 10); String nodeId = randomAlphaOfLengthBetween(5, 10);
String indexName = randomAlphaOfLengthBetween(5, 10); String indexName = randomAlphaOfLengthBetween(5, 10);
searchShardTarget = new SearchShardTarget(nodeId, searchShardTarget = new SearchShardTarget(nodeId,
new ShardId(new Index(indexName, IndexMetaData.INDEX_UUID_NA_VALUE), randomInt()), null, null); new ShardId(new Index(indexName, IndexMetadata.INDEX_UUID_NA_VALUE), randomInt()), null, null);
} }
return new ShardSearchFailure(ex, searchShardTarget); return new ShardSearchFailure(ex, searchShardTarget);
} }

10
client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ILMDocumentationIT.java
View File

@ -69,7 +69,7 @@ import org.elasticsearch.client.slm.SnapshotLifecycleStats;
import org.elasticsearch.client.slm.SnapshotRetentionConfiguration; import org.elasticsearch.client.slm.SnapshotRetentionConfiguration;
import org.elasticsearch.client.slm.StartSLMRequest; import org.elasticsearch.client.slm.StartSLMRequest;
import org.elasticsearch.client.slm.StopSLMRequest; import org.elasticsearch.client.slm.StopSLMRequest;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -361,7 +361,7 @@ public class ILMDocumentationIT extends ESRestHighLevelClientTestCase {
CreateIndexRequest createIndexRequest = new CreateIndexRequest("my_index-1") CreateIndexRequest createIndexRequest = new CreateIndexRequest("my_index-1")
.settings(Settings.builder() .settings(Settings.builder()
.put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1) .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
.put("index.lifecycle.name", "my_policy") .put("index.lifecycle.name", "my_policy")
.put("index.lifecycle.rollover_alias", "my_alias") .put("index.lifecycle.rollover_alias", "my_alias")
.build()); .build());
@ -369,7 +369,7 @@ public class ILMDocumentationIT extends ESRestHighLevelClientTestCase {
client.indices().create(createIndexRequest, RequestOptions.DEFAULT); client.indices().create(createIndexRequest, RequestOptions.DEFAULT);
CreateIndexRequest createOtherIndexRequest = new CreateIndexRequest("other_index") CreateIndexRequest createOtherIndexRequest = new CreateIndexRequest("other_index")
.settings(Settings.builder() .settings(Settings.builder()
.put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1) .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
.build()); .build());
client.indices().create(createOtherIndexRequest, RequestOptions.DEFAULT); client.indices().create(createOtherIndexRequest, RequestOptions.DEFAULT);
@ -623,7 +623,7 @@ public class ILMDocumentationIT extends ESRestHighLevelClientTestCase {
CreateIndexRequest createIndexRequest = new CreateIndexRequest("my_index") CreateIndexRequest createIndexRequest = new CreateIndexRequest("my_index")
.settings(Settings.builder() .settings(Settings.builder()
.put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 2) .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 2)
.put("index.lifecycle.name", "my_policy") .put("index.lifecycle.name", "my_policy")
.build()); .build());
client.indices().create(createIndexRequest, RequestOptions.DEFAULT); client.indices().create(createIndexRequest, RequestOptions.DEFAULT);
@ -688,7 +688,7 @@ public class ILMDocumentationIT extends ESRestHighLevelClientTestCase {
client.indexLifecycle().putLifecyclePolicy(putRequest, RequestOptions.DEFAULT); client.indexLifecycle().putLifecyclePolicy(putRequest, RequestOptions.DEFAULT);
CreateIndexRequest createIndexRequest = new CreateIndexRequest("my_index") CreateIndexRequest createIndexRequest = new CreateIndexRequest("my_index")
.settings(Settings.builder() .settings(Settings.builder()
.put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1) .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
.put("index.lifecycle.name", "my_policy") .put("index.lifecycle.name", "my_policy")
.build()); .build());
client.indices().create(createIndexRequest, RequestOptions.DEFAULT); client.indices().create(createIndexRequest, RequestOptions.DEFAULT);

42
client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/IndicesClientDocumentationIT.java
View File

@ -76,7 +76,7 @@ import org.elasticsearch.client.indices.GetIndexTemplatesRequest;
import org.elasticsearch.client.indices.GetIndexTemplatesResponse; import org.elasticsearch.client.indices.GetIndexTemplatesResponse;
import org.elasticsearch.client.indices.GetMappingsRequest; import org.elasticsearch.client.indices.GetMappingsRequest;
import org.elasticsearch.client.indices.GetMappingsResponse; import org.elasticsearch.client.indices.GetMappingsResponse;
import org.elasticsearch.client.indices.IndexTemplateMetaData; import org.elasticsearch.client.indices.IndexTemplateMetadata;
import org.elasticsearch.client.indices.IndexTemplatesExistRequest; import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
import org.elasticsearch.client.indices.PutIndexTemplateRequest; import org.elasticsearch.client.indices.PutIndexTemplateRequest;
import org.elasticsearch.client.indices.PutMappingRequest; import org.elasticsearch.client.indices.PutMappingRequest;
@ -86,8 +86,8 @@ import org.elasticsearch.client.indices.ReloadAnalyzersResponse.ReloadDetails;
import org.elasticsearch.client.indices.UnfreezeIndexRequest; import org.elasticsearch.client.indices.UnfreezeIndexRequest;
import org.elasticsearch.client.indices.rollover.RolloverRequest; import org.elasticsearch.client.indices.rollover.RolloverRequest;
import org.elasticsearch.client.indices.rollover.RolloverResponse; import org.elasticsearch.client.indices.rollover.RolloverResponse;
import org.elasticsearch.cluster.metadata.AliasMetaData; import org.elasticsearch.cluster.metadata.AliasMetadata;
import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.unit.ByteSizeValue;
@ -593,8 +593,8 @@ public class IndicesClientDocumentationIT extends ESRestHighLevelClientTestCase
// end::get-mappings-execute // end::get-mappings-execute
// tag::get-mappings-response // tag::get-mappings-response
Map<String, MappingMetaData> allMappings = getMappingResponse.mappings(); // <1> Map<String, MappingMetadata> allMappings = getMappingResponse.mappings(); // <1>
MappingMetaData indexMapping = allMappings.get("twitter"); // <2> MappingMetadata indexMapping = allMappings.get("twitter"); // <2>
Map<String, Object> mapping = indexMapping.sourceAsMap(); // <3> Map<String, Object> mapping = indexMapping.sourceAsMap(); // <3>
// end::get-mappings-response // end::get-mappings-response
@ -645,8 +645,8 @@ public class IndicesClientDocumentationIT extends ESRestHighLevelClientTestCase
final CountDownLatch latch = new CountDownLatch(1); final CountDownLatch latch = new CountDownLatch(1);
final ActionListener<GetMappingsResponse> latchListener = new LatchedActionListener<>(listener, latch); final ActionListener<GetMappingsResponse> latchListener = new LatchedActionListener<>(listener, latch);
listener = ActionListener.wrap(r -> { listener = ActionListener.wrap(r -> {
Map<String, MappingMetaData> allMappings = r.mappings(); Map<String, MappingMetadata> allMappings = r.mappings();
MappingMetaData indexMapping = allMappings.get("twitter"); MappingMetadata indexMapping = allMappings.get("twitter");
Map<String, Object> mapping = indexMapping.sourceAsMap(); Map<String, Object> mapping = indexMapping.sourceAsMap();
Map<String, String> type = new HashMap<>(); Map<String, String> type = new HashMap<>();
@ -716,15 +716,15 @@ public class IndicesClientDocumentationIT extends ESRestHighLevelClientTestCase
// end::get-field-mappings-execute // end::get-field-mappings-execute
// tag::get-field-mappings-response // tag::get-field-mappings-response
final Map<String, Map<String, GetFieldMappingsResponse.FieldMappingMetaData>> mappings = final Map<String, Map<String, GetFieldMappingsResponse.FieldMappingMetadata>> mappings =
response.mappings();// <1> response.mappings();// <1>
final Map<String, GetFieldMappingsResponse.FieldMappingMetaData> fieldMappings = final Map<String, GetFieldMappingsResponse.FieldMappingMetadata> fieldMappings =
mappings.get("twitter"); // <2> mappings.get("twitter"); // <2>
final GetFieldMappingsResponse.FieldMappingMetaData metaData = final GetFieldMappingsResponse.FieldMappingMetadata metadata =
fieldMappings.get("message");// <3> fieldMappings.get("message");// <3>
final String fullName = metaData.fullName();// <4> final String fullName = metadata.fullName();// <4>
final Map<String, Object> source = metaData.sourceAsMap(); // <5> final Map<String, Object> source = metadata.sourceAsMap(); // <5>
// end::get-field-mappings-response // end::get-field-mappings-response
} }
@ -748,14 +748,14 @@ public class IndicesClientDocumentationIT extends ESRestHighLevelClientTestCase
final CountDownLatch latch = new CountDownLatch(1); final CountDownLatch latch = new CountDownLatch(1);
final ActionListener<GetFieldMappingsResponse> latchListener = new LatchedActionListener<>(listener, latch); final ActionListener<GetFieldMappingsResponse> latchListener = new LatchedActionListener<>(listener, latch);
listener = ActionListener.wrap(r -> { listener = ActionListener.wrap(r -> {
final Map<String, Map<String, GetFieldMappingsResponse.FieldMappingMetaData>> mappings = final Map<String, Map<String, GetFieldMappingsResponse.FieldMappingMetadata>> mappings =
r.mappings(); r.mappings();
final Map<String, GetFieldMappingsResponse.FieldMappingMetaData> fieldMappings = final Map<String, GetFieldMappingsResponse.FieldMappingMetadata> fieldMappings =
mappings.get("twitter"); mappings.get("twitter");
final GetFieldMappingsResponse.FieldMappingMetaData metaData1 = fieldMappings.get("message"); final GetFieldMappingsResponse.FieldMappingMetadata metadata1 = fieldMappings.get("message");
final String fullName = metaData1.fullName(); final String fullName = metadata1.fullName();
final Map<String, Object> source = metaData1.sourceAsMap(); final Map<String, Object> source = metadata1.sourceAsMap();
latchListener.onResponse(r); latchListener.onResponse(r);
}, e -> { }, e -> {
latchListener.onFailure(e); latchListener.onFailure(e);
@ -1234,9 +1234,9 @@ public class IndicesClientDocumentationIT extends ESRestHighLevelClientTestCase
// end::get-index-execute // end::get-index-execute
// tag::get-index-response // tag::get-index-response
MappingMetaData indexMappings = getIndexResponse.getMappings().get("index"); // <1> MappingMetadata indexMappings = getIndexResponse.getMappings().get("index"); // <1>
Map<String, Object> indexTypeMappings = indexMappings.getSourceAsMap(); // <2> Map<String, Object> indexTypeMappings = indexMappings.getSourceAsMap(); // <2>
List<AliasMetaData> indexAliases = getIndexResponse.getAliases().get("index"); // <3> List<AliasMetadata> indexAliases = getIndexResponse.getAliases().get("index"); // <3>
String numberOfShardsString = getIndexResponse.getSetting("index", "index.number_of_shards"); // <4> String numberOfShardsString = getIndexResponse.getSetting("index", "index.number_of_shards"); // <4>
Settings indexSettings = getIndexResponse.getSettings().get("index"); // <5> Settings indexSettings = getIndexResponse.getSettings().get("index"); // <5>
Integer numberOfShards = indexSettings.getAsInt("index.number_of_shards", null); // <6> Integer numberOfShards = indexSettings.getAsInt("index.number_of_shards", null); // <6>
@ -1998,7 +1998,7 @@ public class IndicesClientDocumentationIT extends ESRestHighLevelClientTestCase
// end::get-alias-execute // end::get-alias-execute
// tag::get-alias-response // tag::get-alias-response
Map<String, Set<AliasMetaData>> aliases = response.getAliases(); // <1> Map<String, Set<AliasMetadata>> aliases = response.getAliases(); // <1>
// end::get-alias-response // end::get-alias-response
// tag::get-alias-response-error // tag::get-alias-response-error
@ -2320,7 +2320,7 @@ public class IndicesClientDocumentationIT extends ESRestHighLevelClientTestCase
// end::get-templates-execute // end::get-templates-execute
// tag::get-templates-response // tag::get-templates-response
List<IndexTemplateMetaData> templates = getTemplatesResponse.getIndexTemplates(); // <1> List<IndexTemplateMetadata> templates = getTemplatesResponse.getIndexTemplates(); // <1>
// end::get-templates-response // end::get-templates-response
assertThat(templates, hasSize(1)); assertThat(templates, hasSize(1));

16
client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/SnapshotClientDocumentationIT.java
View File

@ -47,7 +47,7 @@ import org.elasticsearch.client.Response;
import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.client.indices.CreateIndexRequest; import org.elasticsearch.client.indices.CreateIndexRequest;
import org.elasticsearch.cluster.SnapshotsInProgress; import org.elasticsearch.cluster.SnapshotsInProgress;
import org.elasticsearch.cluster.metadata.RepositoryMetaData; import org.elasticsearch.cluster.metadata.RepositoryMetadata;
import org.elasticsearch.common.Booleans; import org.elasticsearch.common.Booleans;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.unit.TimeValue;
@ -234,10 +234,10 @@ public class SnapshotClientDocumentationIT extends ESRestHighLevelClientTestCase
// end::get-repository-execute // end::get-repository-execute
// tag::get-repository-response // tag::get-repository-response
List<RepositoryMetaData> repositoryMetaDataResponse = response.repositories(); List<RepositoryMetadata> repositoryMetadataResponse = response.repositories();
// end::get-repository-response // end::get-repository-response
assertThat(1, equalTo(repositoryMetaDataResponse.size())); assertThat(1, equalTo(repositoryMetadataResponse.size()));
assertThat(repositoryName, equalTo(repositoryMetaDataResponse.get(0).name())); assertThat(repositoryName, equalTo(repositoryMetadataResponse.get(0).name()));
} }
public void testSnapshotGetRepositoryAsync() throws InterruptedException { public void testSnapshotGetRepositoryAsync() throws InterruptedException {
@ -455,14 +455,14 @@ public class SnapshotClientDocumentationIT extends ESRestHighLevelClientTestCase
// end::verify-repository-execute // end::verify-repository-execute
// tag::verify-repository-response // tag::verify-repository-response
List<VerifyRepositoryResponse.NodeView> repositoryMetaDataResponse = response.getNodes(); List<VerifyRepositoryResponse.NodeView> repositoryMetadataResponse = response.getNodes();
// end::verify-repository-response // end::verify-repository-response
assertThat(1, equalTo(repositoryMetaDataResponse.size())); assertThat(1, equalTo(repositoryMetadataResponse.size()));
final boolean async = Booleans.parseBoolean(System.getProperty("tests.rest.async", "false")); final boolean async = Booleans.parseBoolean(System.getProperty("tests.rest.async", "false"));
if (async) { if (async) {
assertThat("asyncIntegTest-0", equalTo(repositoryMetaDataResponse.get(0).getName())); assertThat("asyncIntegTest-0", equalTo(repositoryMetadataResponse.get(0).getName()));
} else { } else {
assertThat("integTest-0", equalTo(repositoryMetaDataResponse.get(0).getName())); assertThat("integTest-0", equalTo(repositoryMetadataResponse.get(0).getName()));
} }
} }

14
client/rest-high-level/src/test/java/org/elasticsearch/client/indices/GetFieldMappingsResponseTests.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.indices; package org.elasticsearch.client.indices;
import org.elasticsearch.client.indices.GetFieldMappingsResponse.FieldMappingMetaData; import org.elasticsearch.client.indices.GetFieldMappingsResponse.FieldMappingMetadata;
import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
@ -52,18 +52,18 @@ public class GetFieldMappingsResponseTests extends ESTestCase {
} }
private static GetFieldMappingsResponse createTestInstance() { private static GetFieldMappingsResponse createTestInstance() {
Map<String, Map<String, FieldMappingMetaData>> mappings = new HashMap<>(); Map<String, Map<String, FieldMappingMetadata>> mappings = new HashMap<>();
// if mappings is empty, means that fields are not found // if mappings is empty, means that fields are not found
if (randomBoolean()) { if (randomBoolean()) {
int indices = randomInt(10); int indices = randomInt(10);
for (int i = 0; i < indices; i++) { for (int i = 0; i < indices; i++) {
Map<String, FieldMappingMetaData> fieldMappings = new HashMap<>(); Map<String, FieldMappingMetadata> fieldMappings = new HashMap<>();
int fields = randomInt(10); int fields = randomInt(10);
for (int k = 0; k < fields; k++) { for (int k = 0; k < fields; k++) {
final String mapping = randomBoolean() ? "{\"type\":\"string\"}" : "{\"type\":\"keyword\"}"; final String mapping = randomBoolean() ? "{\"type\":\"string\"}" : "{\"type\":\"keyword\"}";
final String fieldName = randomAlphaOfLength(8); final String fieldName = randomAlphaOfLength(8);
FieldMappingMetaData metaData = new FieldMappingMetaData(fieldName, new BytesArray(mapping)); FieldMappingMetadata metadata = new FieldMappingMetadata(fieldName, new BytesArray(mapping));
fieldMappings.put(fieldName, metaData); fieldMappings.put(fieldName, metadata);
} }
mappings.put(randomAlphaOfLength(8), fieldMappings); mappings.put(randomAlphaOfLength(8), fieldMappings);
} }
@ -74,10 +74,10 @@ public class GetFieldMappingsResponseTests extends ESTestCase {
// As the client class GetFieldMappingsResponse doesn't have toXContent method, adding this method here only for the test // As the client class GetFieldMappingsResponse doesn't have toXContent method, adding this method here only for the test
private static void toXContent(GetFieldMappingsResponse response, XContentBuilder builder) throws IOException { private static void toXContent(GetFieldMappingsResponse response, XContentBuilder builder) throws IOException {
builder.startObject(); builder.startObject();
for (Map.Entry<String, Map<String, FieldMappingMetaData>> indexEntry : response.mappings().entrySet()) { for (Map.Entry<String, Map<String, FieldMappingMetadata>> indexEntry : response.mappings().entrySet()) {
builder.startObject(indexEntry.getKey()); builder.startObject(indexEntry.getKey());
builder.startObject("mappings"); builder.startObject("mappings");
for (Map.Entry<String, FieldMappingMetaData> fieldEntry : indexEntry.getValue().entrySet()) { for (Map.Entry<String, FieldMappingMetadata> fieldEntry : indexEntry.getValue().entrySet()) {
builder.startObject(fieldEntry.getKey()); builder.startObject(fieldEntry.getKey());
builder.field("full_name", fieldEntry.getValue().fullName()); builder.field("full_name", fieldEntry.getValue().fullName());
builder.field("mapping", fieldEntry.getValue().sourceAsMap()); builder.field("mapping", fieldEntry.getValue().sourceAsMap());

34
client/rest-high-level/src/test/java/org/elasticsearch/client/indices/GetIndexResponseTests.java
View File

@ -21,8 +21,8 @@ package org.elasticsearch.client.indices;
import org.apache.lucene.util.CollectionUtil; import org.apache.lucene.util.CollectionUtil;
import org.elasticsearch.client.GetAliasesResponseTests; import org.elasticsearch.client.GetAliasesResponseTests;
import org.elasticsearch.cluster.metadata.AliasMetaData; import org.elasticsearch.cluster.metadata.AliasMetadata;
import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.settings.IndexScopedSettings; import org.elasticsearch.common.settings.IndexScopedSettings;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -72,8 +72,8 @@ public class GetIndexResponseTests extends ESTestCase {
private static GetIndexResponse createTestInstance() { private static GetIndexResponse createTestInstance() {
String[] indices = generateRandomStringArray(5, 5, false, false); String[] indices = generateRandomStringArray(5, 5, false, false);
Map<String, MappingMetaData> mappings = new HashMap<>(); Map<String, MappingMetadata> mappings = new HashMap<>();
Map<String, List<AliasMetaData>> aliases = new HashMap<>(); Map<String, List<AliasMetadata>> aliases = new HashMap<>();
Map<String, Settings> settings = new HashMap<>(); Map<String, Settings> settings = new HashMap<>();
Map<String, Settings> defaultSettings = new HashMap<>(); Map<String, Settings> defaultSettings = new HashMap<>();
IndexScopedSettings indexScopedSettings = IndexScopedSettings.DEFAULT_SCOPED_SETTINGS; IndexScopedSettings indexScopedSettings = IndexScopedSettings.DEFAULT_SCOPED_SETTINGS;
@ -81,13 +81,13 @@ public class GetIndexResponseTests extends ESTestCase {
for (String index: indices) { for (String index: indices) {
mappings.put(index, createMappingsForIndex()); mappings.put(index, createMappingsForIndex());
List<AliasMetaData> aliasMetaDataList = new ArrayList<>(); List<AliasMetadata> aliasMetadataList = new ArrayList<>();
int aliasesNum = randomIntBetween(0, 3); int aliasesNum = randomIntBetween(0, 3);
for (int i=0; i<aliasesNum; i++) { for (int i=0; i<aliasesNum; i++) {
aliasMetaDataList.add(GetAliasesResponseTests.createAliasMetaData()); aliasMetadataList.add(GetAliasesResponseTests.createAliasMetadata());
} }
CollectionUtil.timSort(aliasMetaDataList, Comparator.comparing(AliasMetaData::alias)); CollectionUtil.timSort(aliasMetadataList, Comparator.comparing(AliasMetadata::alias));
aliases.put(index, Collections.unmodifiableList(aliasMetaDataList)); aliases.put(index, Collections.unmodifiableList(aliasMetadataList));
Settings.Builder builder = Settings.builder(); Settings.Builder builder = Settings.builder();
builder.put(RandomCreateIndexGenerator.randomIndexSettings()); builder.put(RandomCreateIndexGenerator.randomIndexSettings());
@ -100,11 +100,11 @@ public class GetIndexResponseTests extends ESTestCase {
return new GetIndexResponse(indices, mappings, aliases, settings, defaultSettings); return new GetIndexResponse(indices, mappings, aliases, settings, defaultSettings);
} }
private static MappingMetaData createMappingsForIndex() { private static MappingMetadata createMappingsForIndex() {
int typeCount = rarely() ? 0 : 1; int typeCount = rarely() ? 0 : 1;
MappingMetaData mmd; MappingMetadata mmd;
try { try {
mmd = new MappingMetaData(MapperService.SINGLE_MAPPING_NAME, Collections.emptyMap()); mmd = new MappingMetadata(MapperService.SINGLE_MAPPING_NAME, Collections.emptyMap());
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -118,7 +118,7 @@ public class GetIndexResponseTests extends ESTestCase {
try { try {
String typeName = MapperService.SINGLE_MAPPING_NAME; String typeName = MapperService.SINGLE_MAPPING_NAME;
mmd = new MappingMetaData(typeName, mappings); mmd = new MappingMetadata(typeName, mappings);
} catch (IOException e) { } catch (IOException e) {
fail("shouldn't have failed " + e); fail("shouldn't have failed " + e);
} }
@ -162,15 +162,15 @@ public class GetIndexResponseTests extends ESTestCase {
private static void toXContent(GetIndexResponse response, XContentBuilder builder) throws IOException { private static void toXContent(GetIndexResponse response, XContentBuilder builder) throws IOException {
// first we need to repackage from GetIndexResponse to org.elasticsearch.action.admin.indices.get.GetIndexResponse // first we need to repackage from GetIndexResponse to org.elasticsearch.action.admin.indices.get.GetIndexResponse
ImmutableOpenMap.Builder<String, ImmutableOpenMap<String, MappingMetaData>> allMappings = ImmutableOpenMap.builder(); ImmutableOpenMap.Builder<String, ImmutableOpenMap<String, MappingMetadata>> allMappings = ImmutableOpenMap.builder();
ImmutableOpenMap.Builder<String, List<AliasMetaData>> aliases = ImmutableOpenMap.builder(); ImmutableOpenMap.Builder<String, List<AliasMetadata>> aliases = ImmutableOpenMap.builder();
ImmutableOpenMap.Builder<String, Settings> settings = ImmutableOpenMap.builder(); ImmutableOpenMap.Builder<String, Settings> settings = ImmutableOpenMap.builder();
ImmutableOpenMap.Builder<String, Settings> defaultSettings = ImmutableOpenMap.builder(); ImmutableOpenMap.Builder<String, Settings> defaultSettings = ImmutableOpenMap.builder();
Map<String, MappingMetaData> indexMappings = response.getMappings(); Map<String, MappingMetadata> indexMappings = response.getMappings();
for (String index : response.getIndices()) { for (String index : response.getIndices()) {
MappingMetaData mmd = indexMappings.get(index); MappingMetadata mmd = indexMappings.get(index);
ImmutableOpenMap.Builder<String, MappingMetaData> typedMappings = ImmutableOpenMap.builder(); ImmutableOpenMap.Builder<String, MappingMetadata> typedMappings = ImmutableOpenMap.builder();
if (mmd != null) { if (mmd != null) {
typedMappings.put(MapperService.SINGLE_MAPPING_NAME, mmd); typedMappings.put(MapperService.SINGLE_MAPPING_NAME, mmd);
} }

52
client/rest-high-level/src/test/java/org/elasticsearch/client/indices/GetIndexTemplatesResponseTests.java
View File

@ -19,8 +19,8 @@
package org.elasticsearch.client.indices; package org.elasticsearch.client.indices;
import org.elasticsearch.cluster.metadata.AliasMetaData; import org.elasticsearch.cluster.metadata.AliasMetadata;
import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.compress.CompressedXContent;
@ -78,15 +78,15 @@ public class GetIndexTemplatesResponseTests extends ESTestCase {
XContentType xContentType = randomFrom(XContentType.values()); XContentType xContentType = randomFrom(XContentType.values());
int numTemplates = randomIntBetween(0, 32); int numTemplates = randomIntBetween(0, 32);
for (int i = 0; i < numTemplates; i++) { for (int i = 0; i < numTemplates; i++) {
org.elasticsearch.cluster.metadata.IndexTemplateMetaData.Builder esIMD = org.elasticsearch.cluster.metadata.IndexTemplateMetadata.Builder esIMD =
new org.elasticsearch.cluster.metadata.IndexTemplateMetaData.Builder(String.format(Locale.ROOT, "%02d ", i) + new org.elasticsearch.cluster.metadata.IndexTemplateMetadata.Builder(String.format(Locale.ROOT, "%02d ", i) +
randomAlphaOfLength(4)); randomAlphaOfLength(4));
esIMD.patterns(Arrays.asList(generateRandomStringArray(32, 4, false, false))); esIMD.patterns(Arrays.asList(generateRandomStringArray(32, 4, false, false)));
esIMD.settings(randomIndexSettings()); esIMD.settings(randomIndexSettings());
esIMD.putMapping("_doc", new CompressedXContent(BytesReference.bytes(randomMapping("_doc", xContentType)))); esIMD.putMapping("_doc", new CompressedXContent(BytesReference.bytes(randomMapping("_doc", xContentType))));
int numAliases = randomIntBetween(0, 8); int numAliases = randomIntBetween(0, 8);
for (int j = 0; j < numAliases; j++) { for (int j = 0; j < numAliases; j++) {
esIMD.putAlias(randomAliasMetaData(String.format(Locale.ROOT, "%02d ", j) + randomAlphaOfLength(4))); esIMD.putAlias(randomAliasMetadata(String.format(Locale.ROOT, "%02d ", j) + randomAlphaOfLength(4)));
} }
esIMD.order(randomIntBetween(0, Integer.MAX_VALUE)); esIMD.order(randomIntBetween(0, Integer.MAX_VALUE));
esIMD.version(randomIntBetween(0, Integer.MAX_VALUE)); esIMD.version(randomIntBetween(0, Integer.MAX_VALUE));
@ -101,10 +101,10 @@ public class GetIndexTemplatesResponseTests extends ESTestCase {
GetIndexTemplatesResponse response = GetIndexTemplatesResponse.fromXContent(parser); GetIndexTemplatesResponse response = GetIndexTemplatesResponse.fromXContent(parser);
assertThat(response.getIndexTemplates().size(), equalTo(numTemplates)); assertThat(response.getIndexTemplates().size(), equalTo(numTemplates));
response.getIndexTemplates().sort(Comparator.comparing(IndexTemplateMetaData::name)); response.getIndexTemplates().sort(Comparator.comparing(IndexTemplateMetadata::name));
for (int i = 0; i < numTemplates; i++) { for (int i = 0; i < numTemplates; i++) {
org.elasticsearch.cluster.metadata.IndexTemplateMetaData esIMD = esResponse.getIndexTemplates().get(i); org.elasticsearch.cluster.metadata.IndexTemplateMetadata esIMD = esResponse.getIndexTemplates().get(i);
IndexTemplateMetaData result = response.getIndexTemplates().get(i); IndexTemplateMetadata result = response.getIndexTemplates().get(i);
assertThat(result.patterns(), equalTo(esIMD.patterns())); assertThat(result.patterns(), equalTo(esIMD.patterns()));
assertThat(result.settings(), equalTo(esIMD.settings())); assertThat(result.settings(), equalTo(esIMD.settings()));
@ -118,11 +118,11 @@ public class GetIndexTemplatesResponseTests extends ESTestCase {
assertThat(result.mappings().sourceAsMap(), equalTo(expectedMapping.get("_doc"))); assertThat(result.mappings().sourceAsMap(), equalTo(expectedMapping.get("_doc")));
assertThat(result.aliases().size(), equalTo(esIMD.aliases().size())); assertThat(result.aliases().size(), equalTo(esIMD.aliases().size()));
List<AliasMetaData> expectedAliases = Arrays.stream(esIMD.aliases().values().toArray(AliasMetaData.class)) List<AliasMetadata> expectedAliases = Arrays.stream(esIMD.aliases().values().toArray(AliasMetadata.class))
.sorted(Comparator.comparing(AliasMetaData::alias)) .sorted(Comparator.comparing(AliasMetadata::alias))
.collect(Collectors.toList()); .collect(Collectors.toList());
List<AliasMetaData> actualAliases = Arrays.stream(result.aliases().values().toArray(AliasMetaData.class)) List<AliasMetadata> actualAliases = Arrays.stream(result.aliases().values().toArray(AliasMetadata.class))
.sorted(Comparator.comparing(AliasMetaData::alias)) .sorted(Comparator.comparing(AliasMetadata::alias))
.collect(Collectors.toList()); .collect(Collectors.toList());
for (int j = 0; j < result.aliases().size(); j++) { for (int j = 0; j < result.aliases().size(); j++) {
assertThat(actualAliases.get(j), equalTo(expectedAliases.get(j))); assertThat(actualAliases.get(j), equalTo(expectedAliases.get(j)));
@ -148,8 +148,8 @@ public class GetIndexTemplatesResponseTests extends ESTestCase {
// Check there's no doc types at the root of the mapping // Check there's no doc types at the root of the mapping
Map<String, Object> expectedMap = XContentHelper.convertToMap( Map<String, Object> expectedMap = XContentHelper.convertToMap(
new BytesArray(mappingString), true, XContentType.JSON).v2(); new BytesArray(mappingString), true, XContentType.JSON).v2();
for (IndexTemplateMetaData template : newInstance.getIndexTemplates()) { for (IndexTemplateMetadata template : newInstance.getIndexTemplates()) {
MappingMetaData mappingMD = template.mappings(); MappingMetadata mappingMD = template.mappings();
if(mappingMD != null) { if(mappingMD != null) {
Map<String, Object> mappingAsMap = mappingMD.sourceAsMap(); Map<String, Object> mappingAsMap = mappingMD.sourceAsMap();
assertEquals(expectedMap, mappingAsMap); assertEquals(expectedMap, mappingAsMap);
@ -158,14 +158,14 @@ public class GetIndexTemplatesResponseTests extends ESTestCase {
} }
static GetIndexTemplatesResponse createTestInstance() { static GetIndexTemplatesResponse createTestInstance() {
List<IndexTemplateMetaData> templates = new ArrayList<>(); List<IndexTemplateMetadata> templates = new ArrayList<>();
int numTemplates = between(0, 10); int numTemplates = between(0, 10);
for (int t = 0; t < numTemplates; t++) { for (int t = 0; t < numTemplates; t++) {
IndexTemplateMetaData.Builder templateBuilder = IndexTemplateMetaData.builder("template-" + t); IndexTemplateMetadata.Builder templateBuilder = IndexTemplateMetadata.builder("template-" + t);
templateBuilder.patterns(IntStream.range(0, between(1, 5)).mapToObj(i -> "pattern-" + i).collect(Collectors.toList())); templateBuilder.patterns(IntStream.range(0, between(1, 5)).mapToObj(i -> "pattern-" + i).collect(Collectors.toList()));
int numAlias = between(0, 5); int numAlias = between(0, 5);
for (int i = 0; i < numAlias; i++) { for (int i = 0; i < numAlias; i++) {
templateBuilder.putAlias(AliasMetaData.builder(randomAlphaOfLengthBetween(1, 10))); templateBuilder.putAlias(AliasMetadata.builder(randomAlphaOfLengthBetween(1, 10)));
} }
if (randomBoolean()) { if (randomBoolean()) {
templateBuilder.settings(Settings.builder().put("index.setting-1", randomLong())); templateBuilder.settings(Settings.builder().put("index.setting-1", randomLong()));
@ -179,7 +179,7 @@ public class GetIndexTemplatesResponseTests extends ESTestCase {
if (randomBoolean()) { if (randomBoolean()) {
try { try {
Map<String, Object> map = XContentHelper.convertToMap(new BytesArray(mappingString), true, XContentType.JSON).v2(); Map<String, Object> map = XContentHelper.convertToMap(new BytesArray(mappingString), true, XContentType.JSON).v2();
MappingMetaData mapping = new MappingMetaData(MapperService.SINGLE_MAPPING_NAME, map); MappingMetadata mapping = new MappingMetadata(MapperService.SINGLE_MAPPING_NAME, map);
templateBuilder.mapping(mapping); templateBuilder.mapping(mapping);
} catch (IOException ex) { } catch (IOException ex) {
throw new UncheckedIOException(ex); throw new UncheckedIOException(ex);
@ -195,15 +195,15 @@ public class GetIndexTemplatesResponseTests extends ESTestCase {
//Create a server-side counterpart for the client-side class and call toXContent on it //Create a server-side counterpart for the client-side class and call toXContent on it
List<org.elasticsearch.cluster.metadata.IndexTemplateMetaData> serverIndexTemplates = new ArrayList<>(); List<org.elasticsearch.cluster.metadata.IndexTemplateMetadata> serverIndexTemplates = new ArrayList<>();
List<IndexTemplateMetaData> clientIndexTemplates = response.getIndexTemplates(); List<IndexTemplateMetadata> clientIndexTemplates = response.getIndexTemplates();
for (IndexTemplateMetaData clientITMD : clientIndexTemplates) { for (IndexTemplateMetadata clientITMD : clientIndexTemplates) {
org.elasticsearch.cluster.metadata.IndexTemplateMetaData.Builder serverTemplateBuilder = org.elasticsearch.cluster.metadata.IndexTemplateMetadata.Builder serverTemplateBuilder =
org.elasticsearch.cluster.metadata.IndexTemplateMetaData.builder(clientITMD.name()); org.elasticsearch.cluster.metadata.IndexTemplateMetadata.builder(clientITMD.name());
serverTemplateBuilder.patterns(clientITMD.patterns()); serverTemplateBuilder.patterns(clientITMD.patterns());
Iterator<AliasMetaData> aliases = clientITMD.aliases().valuesIt(); Iterator<AliasMetadata> aliases = clientITMD.aliases().valuesIt();
aliases.forEachRemaining((a)->serverTemplateBuilder.putAlias(a)); aliases.forEachRemaining((a)->serverTemplateBuilder.putAlias(a));
serverTemplateBuilder.settings(clientITMD.settings()); serverTemplateBuilder.settings(clientITMD.settings());
@ -220,8 +220,8 @@ public class GetIndexTemplatesResponseTests extends ESTestCase {
serverResponse.toXContent(builder, ToXContent.EMPTY_PARAMS); serverResponse.toXContent(builder, ToXContent.EMPTY_PARAMS);
} }
private static AliasMetaData randomAliasMetaData(String name) { private static AliasMetadata randomAliasMetadata(String name) {
AliasMetaData.Builder alias = AliasMetaData.builder(name); AliasMetadata.Builder alias = AliasMetadata.builder(name);
if (randomBoolean()) { if (randomBoolean()) {
if (randomBoolean()) { if (randomBoolean()) {
alias.routing(randomAlphaOfLength(5)); alias.routing(randomAlphaOfLength(5));

16
client/rest-high-level/src/test/java/org/elasticsearch/client/indices/GetMappingsResponseTests.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.client.indices; package org.elasticsearch.client.indices;
import org.elasticsearch.cluster.metadata.MappingMetaData; import org.elasticsearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.collect.ImmutableOpenMap;
import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.ToXContent.Params; import org.elasticsearch.common.xcontent.ToXContent.Params;
@ -56,8 +56,8 @@ public class GetMappingsResponseTests extends ESTestCase {
} }
private static GetMappingsResponse createTestInstance() { private static GetMappingsResponse createTestInstance() {
Map<String, MappingMetaData> mappings = Collections.singletonMap( Map<String, MappingMetadata> mappings = Collections.singletonMap(
"index-" + randomAlphaOfLength(5), randomMappingMetaData()); "index-" + randomAlphaOfLength(5), randomMappingMetadata());
return new GetMappingsResponse(mappings); return new GetMappingsResponse(mappings);
} }
@ -69,7 +69,7 @@ public class GetMappingsResponseTests extends ESTestCase {
return field -> !field.equals(MAPPINGS.getPreferredName()); return field -> !field.equals(MAPPINGS.getPreferredName());
} }
public static MappingMetaData randomMappingMetaData() { public static MappingMetadata randomMappingMetadata() {
Map<String, Object> mappings = new HashMap<>(); Map<String, Object> mappings = new HashMap<>();
if (frequently()) { // rarely have no fields if (frequently()) { // rarely have no fields
@ -80,7 +80,7 @@ public class GetMappingsResponseTests extends ESTestCase {
} }
try { try {
return new MappingMetaData(MapperService.SINGLE_MAPPING_NAME, mappings); return new MappingMetadata(MapperService.SINGLE_MAPPING_NAME, mappings);
} catch (IOException e) { } catch (IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
@ -102,10 +102,10 @@ public class GetMappingsResponseTests extends ESTestCase {
private static void toXContent(GetMappingsResponse response, XContentBuilder builder) throws IOException { private static void toXContent(GetMappingsResponse response, XContentBuilder builder) throws IOException {
Params params = new ToXContent.MapParams( Params params = new ToXContent.MapParams(
Collections.singletonMap(BaseRestHandler.INCLUDE_TYPE_NAME_PARAMETER, "false")); Collections.singletonMap(BaseRestHandler.INCLUDE_TYPE_NAME_PARAMETER, "false"));
ImmutableOpenMap.Builder<String, ImmutableOpenMap<String, MappingMetaData>> allMappings = ImmutableOpenMap.builder(); ImmutableOpenMap.Builder<String, ImmutableOpenMap<String, MappingMetadata>> allMappings = ImmutableOpenMap.builder();
for (Map.Entry<String, MappingMetaData> indexEntry : response.mappings().entrySet()) { for (Map.Entry<String, MappingMetadata> indexEntry : response.mappings().entrySet()) {
ImmutableOpenMap.Builder<String, MappingMetaData> mappings = ImmutableOpenMap.builder(); ImmutableOpenMap.Builder<String, MappingMetadata> mappings = ImmutableOpenMap.builder();
mappings.put(MapperService.SINGLE_MAPPING_NAME, indexEntry.getValue()); mappings.put(MapperService.SINGLE_MAPPING_NAME, indexEntry.getValue());
allMappings.put(indexEntry.getKey(), mappings.build()); allMappings.put(indexEntry.getKey(), mappings.build());
} }

6
client/rest-high-level/src/test/java/org/elasticsearch/client/rollup/GetRollupCapsRequestTests.java
View File

@ -18,7 +18,7 @@
*/ */
package org.elasticsearch.client.rollup; package org.elasticsearch.client.rollup;
import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
@ -26,8 +26,8 @@ import static org.hamcrest.Matchers.equalTo;
public class GetRollupCapsRequestTests extends ESTestCase { public class GetRollupCapsRequestTests extends ESTestCase {
public void testImplicitIndexPattern() { public void testImplicitIndexPattern() {
String pattern = randomFrom("", "*", MetaData.ALL, null); String pattern = randomFrom("", "*", Metadata.ALL, null);
GetRollupCapsRequest request = new GetRollupCapsRequest(pattern); GetRollupCapsRequest request = new GetRollupCapsRequest(pattern);
assertThat(request.getIndexPattern(), equalTo(MetaData.ALL)); assertThat(request.getIndexPattern(), equalTo(Metadata.ALL));
} }
} }

10
client/rest-high-level/src/test/java/org/elasticsearch/client/watcher/WatcherStatsResponseTests.java
View File

@ -52,7 +52,7 @@ public class WatcherStatsResponseTests extends ESTestCase {
private void toXContent(WatcherStatsResponse response, XContentBuilder builder) throws IOException { private void toXContent(WatcherStatsResponse response, XContentBuilder builder) throws IOException {
builder.startObject(); builder.startObject();
NodesResponseHeaderTestUtils.toXContent(response.getHeader(), response.getClusterName(), builder); NodesResponseHeaderTestUtils.toXContent(response.getHeader(), response.getClusterName(), builder);
toXContent(response.getWatcherMetaData(), builder); toXContent(response.getWatcherMetadata(), builder);
builder.startArray("stats"); builder.startArray("stats");
for (WatcherStatsResponse.Node node : response.getNodes()) { for (WatcherStatsResponse.Node node : response.getNodes()) {
toXContent(node, builder); toXContent(node, builder);
@ -61,8 +61,8 @@ public class WatcherStatsResponseTests extends ESTestCase {
builder.endObject(); builder.endObject();
} }
private void toXContent(WatcherMetaData metaData, XContentBuilder builder) throws IOException { private void toXContent(WatcherMetadata metadata, XContentBuilder builder) throws IOException {
builder.field("manually_stopped", metaData.manuallyStopped()); builder.field("manually_stopped", metadata.manuallyStopped());
} }
private void toXContent(WatcherStatsResponse.Node node, XContentBuilder builder) throws IOException { private void toXContent(WatcherStatsResponse.Node node, XContentBuilder builder) throws IOException {
@ -182,7 +182,7 @@ public class WatcherStatsResponseTests extends ESTestCase {
} }
NodesResponseHeader nodesResponseHeader = new NodesResponseHeader(randomInt(10), randomInt(10), NodesResponseHeader nodesResponseHeader = new NodesResponseHeader(randomInt(10), randomInt(10),
randomInt(10), Collections.emptyList()); randomInt(10), Collections.emptyList());
WatcherMetaData watcherMetaData = new WatcherMetaData(randomBoolean()); WatcherMetadata watcherMetadata = new WatcherMetadata(randomBoolean());
return new WatcherStatsResponse(nodesResponseHeader, randomAlphaOfLength(10), watcherMetaData, nodes); return new WatcherStatsResponse(nodesResponseHeader, randomAlphaOfLength(10), watcherMetadata, nodes);
} }
} }

2
docs/reference/ml/anomaly-detection/apis/find-file-structure.asciidoc
View File

@ -1766,7 +1766,7 @@ this:
"count" : 26 "count" : 26
}, },
{ {
"value" : "o.e.c.m.MetaDataIndexTemplateService", "value" : "o.e.c.m.MetadataIndexTemplateService",
"count" : 8 "count" : 8
}, },
{ {

4
docs/reference/release-notes/7.0.0-alpha2.asciidoc
View File

@ -185,7 +185,7 @@ CRUD::
Distributed:: Distributed::
* [Close Index API] Mark shard copy as stale if needed during shard verification {pull}36755[#36755] * [Close Index API] Mark shard copy as stale if needed during shard verification {pull}36755[#36755]
* [Close Index API] Refactor MetaDataIndexStateService {pull}36354[#36354] (issue: {issue}36249[#36249]) * [Close Index API] Refactor MetadataIndexStateService {pull}36354[#36354] (issue: {issue}36249[#36249])
* [Close Index API] Add TransportShardCloseAction for pre-closing verifications {pull}36249[#36249] * [Close Index API] Add TransportShardCloseAction for pre-closing verifications {pull}36249[#36249]
* TransportResyncReplicationAction should not honour blocks {pull}35795[#35795] (issues: {issue}35332[#35332], {issue}35597[#35597]) * TransportResyncReplicationAction should not honour blocks {pull}35795[#35795] (issues: {issue}35332[#35332], {issue}35597[#35597])
* Expose all permits acquisition in IndexShard and TransportReplicationAction {pull}35540[#35540] (issue: {issue}33888[#33888]) * Expose all permits acquisition in IndexShard and TransportReplicationAction {pull}35540[#35540] (issue: {issue}33888[#33888])
@ -399,7 +399,7 @@ ZenDiscovery::
* [Zen2] PersistedState interface implementation {pull}35819[#35819] * [Zen2] PersistedState interface implementation {pull}35819[#35819]
* [Zen2] Support rolling upgrades from Zen1 {pull}35737[#35737] * [Zen2] Support rolling upgrades from Zen1 {pull}35737[#35737]
* [Zen2] Add lag detector {pull}35685[#35685] * [Zen2] Add lag detector {pull}35685[#35685]
* [Zen2] Move ClusterState fields to be persisted to ClusterState.MetaData {pull}35625[#35625] * [Zen2] Move ClusterState fields to be persisted to ClusterState.Metadata {pull}35625[#35625]
* [Zen2] Introduce ClusterBootstrapService {pull}35488[#35488] * [Zen2] Introduce ClusterBootstrapService {pull}35488[#35488]
* [Zen2] Introduce vote withdrawal {pull}35446[#35446] * [Zen2] Introduce vote withdrawal {pull}35446[#35446]
* Zen2: Add basic Zen1 transport-level BWC {pull}35443[#35443] * Zen2: Add basic Zen1 transport-level BWC {pull}35443[#35443]

2
docs/reference/release-notes/7.0.0-beta1.asciidoc
View File

@ -514,7 +514,7 @@ Features/Ingest::
* ingest: support default pipelines + bulk upserts {pull}36618[#36618] (issue: {issue}36219[#36219]) * ingest: support default pipelines + bulk upserts {pull}36618[#36618] (issue: {issue}36219[#36219])
Features/Java High Level REST Client:: Features/Java High Level REST Client::
* Update IndexTemplateMetaData to allow unknown fields {pull}38448[#38448] (issue: {issue}36938[#36938]) * Update IndexTemplateMetadata to allow unknown fields {pull}38448[#38448] (issue: {issue}36938[#36938])
* `if_seq_no` and `if_primary_term` parameters aren't wired correctly in REST Client's CRUD API {pull}38411[#38411] * `if_seq_no` and `if_primary_term` parameters aren't wired correctly in REST Client's CRUD API {pull}38411[#38411]
* Update Rollup Caps to allow unknown fields {pull}38339[#38339] (issue: {issue}36938[#36938]) * Update Rollup Caps to allow unknown fields {pull}38339[#38339] (issue: {issue}36938[#36938])
* Fix ILM explain response to allow unknown fields {pull}38054[#38054] (issue: {issue}36938[#36938]) * Fix ILM explain response to allow unknown fields {pull}38054[#38054] (issue: {issue}36938[#36938])

6
docs/reference/release-notes/7.0.asciidoc
View File

@ -571,7 +571,7 @@ Discovery-Plugins::
Distributed:: Distributed::
* [Close Index API] Mark shard copy as stale if needed during shard verification {pull}36755[#36755] * [Close Index API] Mark shard copy as stale if needed during shard verification {pull}36755[#36755]
* [Close Index API] Refactor MetaDataIndexStateService {pull}36354[#36354] (issue: {issue}36249[#36249]) * [Close Index API] Refactor MetadataIndexStateService {pull}36354[#36354] (issue: {issue}36249[#36249])
* [Close Index API] Add TransportShardCloseAction for pre-closing verifications {pull}36249[#36249] * [Close Index API] Add TransportShardCloseAction for pre-closing verifications {pull}36249[#36249]
* TransportResyncReplicationAction should not honour blocks {pull}35795[#35795] (issues: {issue}35332[#35332], {issue}35597[#35597]) * TransportResyncReplicationAction should not honour blocks {pull}35795[#35795] (issues: {issue}35332[#35332], {issue}35597[#35597])
* Expose all permits acquisition in IndexShard and TransportReplicationAction {pull}35540[#35540] (issue: {issue}33888[#33888]) * Expose all permits acquisition in IndexShard and TransportReplicationAction {pull}35540[#35540] (issue: {issue}33888[#33888])
@ -1076,7 +1076,7 @@ ZenDiscovery::
* PersistedState interface implementation {pull}35819[#35819] * PersistedState interface implementation {pull}35819[#35819]
* Support rolling upgrades from Zen1 {pull}35737[#35737] * Support rolling upgrades from Zen1 {pull}35737[#35737]
* Add lag detector {pull}35685[#35685] * Add lag detector {pull}35685[#35685]
* Move ClusterState fields to be persisted to ClusterState.MetaData {pull}35625[#35625] * Move ClusterState fields to be persisted to ClusterState.Metadata {pull}35625[#35625]
* Introduce ClusterBootstrapService {pull}35488[#35488] * Introduce ClusterBootstrapService {pull}35488[#35488]
* Introduce vote withdrawal {pull}35446[#35446] * Introduce vote withdrawal {pull}35446[#35446]
* Add basic Zen1 transport-level BWC {pull}35443[#35443] * Add basic Zen1 transport-level BWC {pull}35443[#35443]
@ -1251,7 +1251,7 @@ Features/Ingest::
Features/Java High Level REST Client:: Features/Java High Level REST Client::
* Drop extra level from user parser {pull}34932[#34932] * Drop extra level from user parser {pull}34932[#34932]
* Update IndexTemplateMetaData to allow unknown fields {pull}38448[#38448] (issue: {issue}36938[#36938]) * Update IndexTemplateMetadata to allow unknown fields {pull}38448[#38448] (issue: {issue}36938[#36938])
* `if_seq_no` and `if_primary_term` parameters aren't wired correctly in REST Client's CRUD API {pull}38411[#38411] * `if_seq_no` and `if_primary_term` parameters aren't wired correctly in REST Client's CRUD API {pull}38411[#38411]
* Update Rollup Caps to allow unknown fields {pull}38339[#38339] (issue: {issue}36938[#36938]) * Update Rollup Caps to allow unknown fields {pull}38339[#38339] (issue: {issue}36938[#36938])
* Fix ILM explain response to allow unknown fields {pull}38054[#38054] (issue: {issue}36938[#36938]) * Fix ILM explain response to allow unknown fields {pull}38054[#38054] (issue: {issue}36938[#36938])

2
docs/reference/release-notes/7.3.asciidoc
View File

@ -285,7 +285,7 @@ Engine::
* Add a merge policy that prunes ID postings for soft-deleted but retained documents {pull}40741[#40741] * Add a merge policy that prunes ID postings for soft-deleted but retained documents {pull}40741[#40741]
Features/Indices APIs:: Features/Indices APIs::
* Remove "template" field in IndexTemplateMetaData {pull}42099[#42099] (issue: {issue}38502[#38502]) * Remove "template" field in IndexTemplateMetadata {pull}42099[#42099] (issue: {issue}38502[#38502])
Features/Ingest:: Features/Ingest::
* Avoid HashMap construction on Grok non-match {pull}42444[#42444] * Avoid HashMap construction on Grok non-match {pull}42444[#42444]

10
modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/InternalMatrixStats.java
View File

@ -43,8 +43,8 @@ public class InternalMatrixStats extends InternalAggregation implements MatrixSt
/** per shard ctor */ /** per shard ctor */
InternalMatrixStats(String name, long count, RunningStats multiFieldStatsResults, MatrixStatsResults results, InternalMatrixStats(String name, long count, RunningStats multiFieldStatsResults, MatrixStatsResults results,
List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) { List<PipelineAggregator> pipelineAggregators, Map<String, Object> metadata) {
super(name, pipelineAggregators, metaData); super(name, pipelineAggregators, metadata);
assert count >= 0; assert count >= 0;
this.stats = multiFieldStatsResults; this.stats = multiFieldStatsResults;
this.results = results; this.results = results;
@ -240,7 +240,7 @@ public class InternalMatrixStats extends InternalAggregation implements MatrixSt
// return empty result iff all stats are null // return empty result iff all stats are null
if (aggs.isEmpty()) { if (aggs.isEmpty()) {
return new InternalMatrixStats(name, 0, null, new MatrixStatsResults(), pipelineAggregators(), getMetaData()); return new InternalMatrixStats(name, 0, null, new MatrixStatsResults(), pipelineAggregators(), getMetadata());
} }
RunningStats runningStats = new RunningStats(); RunningStats runningStats = new RunningStats();
@ -250,9 +250,9 @@ public class InternalMatrixStats extends InternalAggregation implements MatrixSt
if (reduceContext.isFinalReduce()) { if (reduceContext.isFinalReduce()) {
MatrixStatsResults results = new MatrixStatsResults(runningStats); MatrixStatsResults results = new MatrixStatsResults(runningStats);
return new InternalMatrixStats(name, results.getDocCount(), runningStats, results, pipelineAggregators(), getMetaData()); return new InternalMatrixStats(name, results.getDocCount(), runningStats, results, pipelineAggregators(), getMetadata());
} }
return new InternalMatrixStats(name, runningStats.docCount, runningStats, null, pipelineAggregators(), getMetaData()); return new InternalMatrixStats(name, runningStats.docCount, runningStats, null, pipelineAggregators(), getMetadata());
} }
@Override @Override

10
modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregationBuilder.java
View File

@ -48,14 +48,14 @@ public class MatrixStatsAggregationBuilder
} }
protected MatrixStatsAggregationBuilder(MatrixStatsAggregationBuilder clone, protected MatrixStatsAggregationBuilder(MatrixStatsAggregationBuilder clone,
AggregatorFactories.Builder factoriesBuilder, Map<String, Object> metaData) { AggregatorFactories.Builder factoriesBuilder, Map<String, Object> metadata) {
super(clone, factoriesBuilder, metaData); super(clone, factoriesBuilder, metadata);
this.multiValueMode = clone.multiValueMode; this.multiValueMode = clone.multiValueMode;
} }
@Override @Override
protected AggregationBuilder shallowCopy(AggregatorFactories.Builder factoriesBuilder, Map<String, Object> metaData) { protected AggregationBuilder shallowCopy(AggregatorFactories.Builder factoriesBuilder, Map<String, Object> metadata) {
return new MatrixStatsAggregationBuilder(this, factoriesBuilder, metaData); return new MatrixStatsAggregationBuilder(this, factoriesBuilder, metadata);
} }
/** /**
@ -84,7 +84,7 @@ public class MatrixStatsAggregationBuilder
Map<String, ValuesSourceConfig<Numeric>> configs, Map<String, ValuesSourceConfig<Numeric>> configs,
AggregatorFactory parent, AggregatorFactory parent,
AggregatorFactories.Builder subFactoriesBuilder) throws IOException { AggregatorFactories.Builder subFactoriesBuilder) throws IOException {
return new MatrixStatsAggregatorFactory(name, configs, multiValueMode, queryShardContext, parent, subFactoriesBuilder, metaData); return new MatrixStatsAggregatorFactory(name, configs, multiValueMode, queryShardContext, parent, subFactoriesBuilder, metadata);
} }
@Override @Override

8
modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregator.java
View File

@ -51,8 +51,8 @@ final class MatrixStatsAggregator extends MetricsAggregator {
MatrixStatsAggregator(String name, Map<String, ValuesSource.Numeric> valuesSources, SearchContext context, MatrixStatsAggregator(String name, Map<String, ValuesSource.Numeric> valuesSources, SearchContext context,
Aggregator parent, MultiValueMode multiValueMode, List<PipelineAggregator> pipelineAggregators, Aggregator parent, MultiValueMode multiValueMode, List<PipelineAggregator> pipelineAggregators,
Map<String,Object> metaData) throws IOException { Map<String,Object> metadata) throws IOException {
super(name, context, parent, pipelineAggregators, metaData); super(name, context, parent, pipelineAggregators, metadata);
if (valuesSources != null && !valuesSources.isEmpty()) { if (valuesSources != null && !valuesSources.isEmpty()) {
this.valuesSources = new NumericArrayValuesSource(valuesSources, multiValueMode); this.valuesSources = new NumericArrayValuesSource(valuesSources, multiValueMode);
stats = context.bigArrays().newObjectArray(1); stats = context.bigArrays().newObjectArray(1);
@ -126,12 +126,12 @@ final class MatrixStatsAggregator extends MetricsAggregator {
if (valuesSources == null || bucket >= stats.size()) { if (valuesSources == null || bucket >= stats.size()) {
return buildEmptyAggregation(); return buildEmptyAggregation();
} }
return new InternalMatrixStats(name, stats.size(), stats.get(bucket), null, pipelineAggregators(), metaData()); return new InternalMatrixStats(name, stats.size(), stats.get(bucket), null, pipelineAggregators(), metadata());
} }
@Override @Override
public InternalAggregation buildEmptyAggregation() { public InternalAggregation buildEmptyAggregation() {
return new InternalMatrixStats(name, 0, null, null, pipelineAggregators(), metaData()); return new InternalMatrixStats(name, 0, null, null, pipelineAggregators(), metadata());
} }
@Override @Override

12
modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/matrix/stats/MatrixStatsAggregatorFactory.java
View File

@ -43,8 +43,8 @@ final class MatrixStatsAggregatorFactory extends ArrayValuesSourceAggregatorFact
QueryShardContext queryShardContext, QueryShardContext queryShardContext,
AggregatorFactory parent, AggregatorFactory parent,
AggregatorFactories.Builder subFactoriesBuilder, AggregatorFactories.Builder subFactoriesBuilder,
Map<String, Object> metaData) throws IOException { Map<String, Object> metadata) throws IOException {
super(name, configs, queryShardContext, parent, subFactoriesBuilder, metaData); super(name, configs, queryShardContext, parent, subFactoriesBuilder, metadata);
this.multiValueMode = multiValueMode; this.multiValueMode = multiValueMode;
} }
@ -52,9 +52,9 @@ final class MatrixStatsAggregatorFactory extends ArrayValuesSourceAggregatorFact
protected Aggregator createUnmapped(SearchContext searchContext, protected Aggregator createUnmapped(SearchContext searchContext,
Aggregator parent, Aggregator parent,
List<PipelineAggregator> pipelineAggregators, List<PipelineAggregator> pipelineAggregators,
Map<String, Object> metaData) Map<String, Object> metadata)
throws IOException { throws IOException {
return new MatrixStatsAggregator(name, null, searchContext, parent, multiValueMode, pipelineAggregators, metaData); return new MatrixStatsAggregator(name, null, searchContext, parent, multiValueMode, pipelineAggregators, metadata);
} }
@Override @Override
@ -63,7 +63,7 @@ final class MatrixStatsAggregatorFactory extends ArrayValuesSourceAggregatorFact
Aggregator parent, Aggregator parent,
boolean collectsFromSingleBucket, boolean collectsFromSingleBucket,
List<PipelineAggregator> pipelineAggregators, List<PipelineAggregator> pipelineAggregators,
Map<String, Object> metaData) throws IOException { Map<String, Object> metadata) throws IOException {
return new MatrixStatsAggregator(name, valuesSources, searchContext, parent, multiValueMode, pipelineAggregators, metaData); return new MatrixStatsAggregator(name, valuesSources, searchContext, parent, multiValueMode, pipelineAggregators, metadata);
} }
} }

8
modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSourceAggregationBuilder.java
View File

@ -56,8 +56,8 @@ public abstract class ArrayValuesSourceAggregationBuilder<VS extends ValuesSourc
super(name, valuesSourceType, targetValueType); super(name, valuesSourceType, targetValueType);
} }
protected LeafOnly(LeafOnly<VS, AB> clone, Builder factoriesBuilder, Map<String, Object> metaData) { protected LeafOnly(LeafOnly<VS, AB> clone, Builder factoriesBuilder, Map<String, Object> metadata) {
super(clone, factoriesBuilder, metaData); super(clone, factoriesBuilder, metadata);
if (factoriesBuilder.count() > 0) { if (factoriesBuilder.count() > 0) {
throw new AggregationInitializationException("Aggregator [" + name + "] of type [" throw new AggregationInitializationException("Aggregator [" + name + "] of type ["
+ getType() + "] cannot accept sub-aggregations"); + getType() + "] cannot accept sub-aggregations");
@ -109,8 +109,8 @@ public abstract class ArrayValuesSourceAggregationBuilder<VS extends ValuesSourc
} }
protected ArrayValuesSourceAggregationBuilder(ArrayValuesSourceAggregationBuilder<VS, AB> clone, protected ArrayValuesSourceAggregationBuilder(ArrayValuesSourceAggregationBuilder<VS, AB> clone,
Builder factoriesBuilder, Map<String, Object> metaData) { Builder factoriesBuilder, Map<String, Object> metadata) {
super(clone, factoriesBuilder, metaData); super(clone, factoriesBuilder, metadata);
this.valuesSourceType = clone.valuesSourceType; this.valuesSourceType = clone.valuesSourceType;
this.targetValueType = clone.targetValueType; this.targetValueType = clone.targetValueType;
this.fields = new ArrayList<>(clone.fields); this.fields = new ArrayList<>(clone.fields);

14
modules/aggs-matrix-stats/src/main/java/org/elasticsearch/search/aggregations/support/ArrayValuesSourceAggregatorFactory.java
View File

@ -39,8 +39,8 @@ public abstract class ArrayValuesSourceAggregatorFactory<VS extends ValuesSource
public ArrayValuesSourceAggregatorFactory(String name, Map<String, ValuesSourceConfig<VS>> configs, public ArrayValuesSourceAggregatorFactory(String name, Map<String, ValuesSourceConfig<VS>> configs,
QueryShardContext queryShardContext, AggregatorFactory parent, QueryShardContext queryShardContext, AggregatorFactory parent,
AggregatorFactories.Builder subFactoriesBuilder, AggregatorFactories.Builder subFactoriesBuilder,
Map<String, Object> metaData) throws IOException { Map<String, Object> metadata) throws IOException {
super(name, queryShardContext, parent, subFactoriesBuilder, metaData); super(name, queryShardContext, parent, subFactoriesBuilder, metadata);
this.configs = configs; this.configs = configs;
} }
@ -49,7 +49,7 @@ public abstract class ArrayValuesSourceAggregatorFactory<VS extends ValuesSource
Aggregator parent, Aggregator parent,
boolean collectsFromSingleBucket, boolean collectsFromSingleBucket,
List<PipelineAggregator> pipelineAggregators, List<PipelineAggregator> pipelineAggregators,
Map<String, Object> metaData) throws IOException { Map<String, Object> metadata) throws IOException {
HashMap<String, VS> valuesSources = new HashMap<>(); HashMap<String, VS> valuesSources = new HashMap<>();
for (Map.Entry<String, ValuesSourceConfig<VS>> config : configs.entrySet()) { for (Map.Entry<String, ValuesSourceConfig<VS>> config : configs.entrySet()) {
@ -59,22 +59,22 @@ public abstract class ArrayValuesSourceAggregatorFactory<VS extends ValuesSource
} }
} }
if (valuesSources.isEmpty()) { if (valuesSources.isEmpty()) {
return createUnmapped(searchContext, parent, pipelineAggregators, metaData); return createUnmapped(searchContext, parent, pipelineAggregators, metadata);
} }
return doCreateInternal(valuesSources, searchContext, parent, return doCreateInternal(valuesSources, searchContext, parent,
collectsFromSingleBucket, pipelineAggregators, metaData); collectsFromSingleBucket, pipelineAggregators, metadata);
} }
protected abstract Aggregator createUnmapped(SearchContext searchContext, protected abstract Aggregator createUnmapped(SearchContext searchContext,
Aggregator parent, Aggregator parent,
List<PipelineAggregator> pipelineAggregators, List<PipelineAggregator> pipelineAggregators,
Map<String, Object> metaData) throws IOException; Map<String, Object> metadata) throws IOException;
protected abstract Aggregator doCreateInternal(Map<String, VS> valuesSources, protected abstract Aggregator doCreateInternal(Map<String, VS> valuesSources,
SearchContext searchContext, SearchContext searchContext,
Aggregator parent, Aggregator parent,
boolean collectsFromSingleBucket, boolean collectsFromSingleBucket,
List<PipelineAggregator> pipelineAggregators, List<PipelineAggregator> pipelineAggregators,
Map<String, Object> metaData) throws IOException; Map<String, Object> metadata) throws IOException;
} }

16
modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/stats/InternalMatrixStatsTests.java
View File

@ -70,7 +70,7 @@ public class InternalMatrixStatsTests extends InternalAggregationTestCase<Intern
@Override @Override
protected InternalMatrixStats createTestInstance(String name, List<PipelineAggregator> pipelineAggregators, protected InternalMatrixStats createTestInstance(String name, List<PipelineAggregator> pipelineAggregators,
Map<String, Object> metaData) { Map<String, Object> metadata) {
double[] values = new double[fields.length]; double[] values = new double[fields.length];
for (int i = 0; i < fields.length; i++) { for (int i = 0; i < fields.length; i++) {
values[i] = randomDouble(); values[i] = randomDouble();
@ -79,7 +79,7 @@ public class InternalMatrixStatsTests extends InternalAggregationTestCase<Intern
RunningStats runningStats = new RunningStats(); RunningStats runningStats = new RunningStats();
runningStats.add(fields, values); runningStats.add(fields, values);
MatrixStatsResults matrixStatsResults = hasMatrixStatsResults ? new MatrixStatsResults(runningStats) : null; MatrixStatsResults matrixStatsResults = hasMatrixStatsResults ? new MatrixStatsResults(runningStats) : null;
return new InternalMatrixStats(name, 1L, runningStats, matrixStatsResults, Collections.emptyList(), metaData); return new InternalMatrixStats(name, 1L, runningStats, matrixStatsResults, Collections.emptyList(), metadata);
} }
@Override @Override
@ -93,7 +93,7 @@ public class InternalMatrixStatsTests extends InternalAggregationTestCase<Intern
long docCount = instance.getDocCount(); long docCount = instance.getDocCount();
RunningStats runningStats = instance.getStats(); RunningStats runningStats = instance.getStats();
MatrixStatsResults matrixStatsResults = instance.getResults(); MatrixStatsResults matrixStatsResults = instance.getResults();
Map<String, Object> metaData = instance.getMetaData(); Map<String, Object> metadata = instance.getMetadata();
switch (between(0, 3)) { switch (between(0, 3)) {
case 0: case 0:
name += randomAlphaOfLength(5); name += randomAlphaOfLength(5);
@ -117,15 +117,15 @@ public class InternalMatrixStatsTests extends InternalAggregationTestCase<Intern
break; break;
case 3: case 3:
default: default:
if (metaData == null) { if (metadata == null) {
metaData = new HashMap<>(1); metadata = new HashMap<>(1);
} else { } else {
metaData = new HashMap<>(instance.getMetaData()); metadata = new HashMap<>(instance.getMetadata());
} }
metaData.put(randomAlphaOfLength(15), randomInt()); metadata.put(randomAlphaOfLength(15), randomInt());
break; break;
} }
return new InternalMatrixStats(name, docCount, runningStats, matrixStatsResults, Collections.emptyList(), metaData); return new InternalMatrixStats(name, docCount, runningStats, matrixStatsResults, Collections.emptyList(), metadata);
} }
@Override @Override

22
modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisPluginTests.java
View File

@ -22,7 +22,7 @@ package org.elasticsearch.analysis.common;
import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.Tokenizer;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.IndexSettings;
@ -43,7 +43,7 @@ public class CommonAnalysisPluginTests extends ESTestCase {
*/ */
public void testNGramDeprecationWarning() throws IOException { public void testNGramDeprecationWarning() throws IOException {
Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir()) Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
.put(IndexMetaData.SETTING_VERSION_CREATED, .put(IndexMetadata.SETTING_VERSION_CREATED,
VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, VersionUtils.getPreviousVersion(Version.V_7_0_0))) VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, VersionUtils.getPreviousVersion(Version.V_7_0_0)))
.put("index.analysis.analyzer.custom_analyzer.type", "custom") .put("index.analysis.analyzer.custom_analyzer.type", "custom")
.put("index.analysis.analyzer.custom_analyzer.tokenizer", "standard") .put("index.analysis.analyzer.custom_analyzer.tokenizer", "standard")
@ -63,7 +63,7 @@ public class CommonAnalysisPluginTests extends ESTestCase {
*/ */
public void testNGramDeprecationError() throws IOException { public void testNGramDeprecationError() throws IOException {
Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir()) Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
.put(IndexMetaData.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, null)) .put(IndexMetadata.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, null))
.put("index.analysis.analyzer.custom_analyzer.type", "custom") .put("index.analysis.analyzer.custom_analyzer.type", "custom")
.put("index.analysis.analyzer.custom_analyzer.tokenizer", "standard") .put("index.analysis.analyzer.custom_analyzer.tokenizer", "standard")
.putList("index.analysis.analyzer.custom_analyzer.filter", "nGram") .putList("index.analysis.analyzer.custom_analyzer.filter", "nGram")
@ -82,7 +82,7 @@ public class CommonAnalysisPluginTests extends ESTestCase {
*/ */
public void testEdgeNGramDeprecationWarning() throws IOException { public void testEdgeNGramDeprecationWarning() throws IOException {
Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir()) Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
.put(IndexMetaData.SETTING_VERSION_CREATED, .put(IndexMetadata.SETTING_VERSION_CREATED,
VersionUtils.randomVersionBetween(random(), Version.V_6_4_0, VersionUtils.getPreviousVersion(Version.V_7_0_0))) VersionUtils.randomVersionBetween(random(), Version.V_6_4_0, VersionUtils.getPreviousVersion(Version.V_7_0_0)))
.put("index.analysis.analyzer.custom_analyzer.type", "custom") .put("index.analysis.analyzer.custom_analyzer.type", "custom")
.put("index.analysis.analyzer.custom_analyzer.tokenizer", "standard") .put("index.analysis.analyzer.custom_analyzer.tokenizer", "standard")
@ -101,7 +101,7 @@ public class CommonAnalysisPluginTests extends ESTestCase {
*/ */
public void testEdgeNGramDeprecationError() throws IOException { public void testEdgeNGramDeprecationError() throws IOException {
Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir()) Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
.put(IndexMetaData.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, null)) .put(IndexMetadata.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, null))
.put("index.analysis.analyzer.custom_analyzer.type", "custom") .put("index.analysis.analyzer.custom_analyzer.type", "custom")
.put("index.analysis.analyzer.custom_analyzer.tokenizer", "standard") .put("index.analysis.analyzer.custom_analyzer.tokenizer", "standard")
.putList("index.analysis.analyzer.custom_analyzer.filter", "edgeNGram") .putList("index.analysis.analyzer.custom_analyzer.filter", "edgeNGram")
@ -120,7 +120,7 @@ public class CommonAnalysisPluginTests extends ESTestCase {
*/ */
public void testStandardHtmlStripAnalyzerDeprecationError() throws IOException { public void testStandardHtmlStripAnalyzerDeprecationError() throws IOException {
Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir()) Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
.put(IndexMetaData.SETTING_VERSION_CREATED, .put(IndexMetadata.SETTING_VERSION_CREATED,
VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT)) VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT))
.put("index.analysis.analyzer.custom_analyzer.type", "standard_html_strip") .put("index.analysis.analyzer.custom_analyzer.type", "standard_html_strip")
.putList("index.analysis.analyzer.custom_analyzer.stopwords", "a", "b") .putList("index.analysis.analyzer.custom_analyzer.stopwords", "a", "b")
@ -139,7 +139,7 @@ public class CommonAnalysisPluginTests extends ESTestCase {
*/ */
public void testStandardHtmlStripAnalyzerDeprecationWarning() throws IOException { public void testStandardHtmlStripAnalyzerDeprecationWarning() throws IOException {
Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir()) Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
.put(IndexMetaData.SETTING_VERSION_CREATED, .put(IndexMetadata.SETTING_VERSION_CREATED,
VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, VersionUtils.randomVersionBetween(random(), Version.V_6_0_0,
VersionUtils.getPreviousVersion(Version.V_7_0_0))) VersionUtils.getPreviousVersion(Version.V_7_0_0)))
.put("index.analysis.analyzer.custom_analyzer.type", "standard_html_strip") .put("index.analysis.analyzer.custom_analyzer.type", "standard_html_strip")
@ -162,7 +162,7 @@ public class CommonAnalysisPluginTests extends ESTestCase {
*/ */
public void testnGramFilterInCustomAnalyzerDeprecationError() throws IOException { public void testnGramFilterInCustomAnalyzerDeprecationError() throws IOException {
final Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir()) final Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
.put(IndexMetaData.SETTING_VERSION_CREATED, .put(IndexMetadata.SETTING_VERSION_CREATED,
VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT)) VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT))
.put("index.analysis.analyzer.custom_analyzer.type", "custom") .put("index.analysis.analyzer.custom_analyzer.type", "custom")
.put("index.analysis.analyzer.custom_analyzer.tokenizer", "standard") .put("index.analysis.analyzer.custom_analyzer.tokenizer", "standard")
@ -182,7 +182,7 @@ public class CommonAnalysisPluginTests extends ESTestCase {
*/ */
public void testEdgeNGramFilterInCustomAnalyzerDeprecationError() throws IOException { public void testEdgeNGramFilterInCustomAnalyzerDeprecationError() throws IOException {
final Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir()) final Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
.put(IndexMetaData.SETTING_VERSION_CREATED, .put(IndexMetadata.SETTING_VERSION_CREATED,
VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT)) VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT))
.put("index.analysis.analyzer.custom_analyzer.type", "custom") .put("index.analysis.analyzer.custom_analyzer.type", "custom")
.put("index.analysis.analyzer.custom_analyzer.tokenizer", "standard") .put("index.analysis.analyzer.custom_analyzer.tokenizer", "standard")
@ -221,7 +221,7 @@ public class CommonAnalysisPluginTests extends ESTestCase {
public void doTestPrebuiltTokenizerDeprecation(String deprecatedName, String replacement, Version version, boolean expectWarning) public void doTestPrebuiltTokenizerDeprecation(String deprecatedName, String replacement, Version version, boolean expectWarning)
throws IOException { throws IOException {
final Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir()) final Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
.put(IndexMetaData.SETTING_VERSION_CREATED, version).build(); .put(IndexMetadata.SETTING_VERSION_CREATED, version).build();
try (CommonAnalysisPlugin commonAnalysisPlugin = new CommonAnalysisPlugin()) { try (CommonAnalysisPlugin commonAnalysisPlugin = new CommonAnalysisPlugin()) {
Map<String, TokenizerFactory> tokenizers = createTestAnalysis( Map<String, TokenizerFactory> tokenizers = createTestAnalysis(
@ -240,7 +240,7 @@ public class CommonAnalysisPluginTests extends ESTestCase {
public void doTestCustomTokenizerDeprecation(String deprecatedName, String replacement, Version version, boolean expectWarning) public void doTestCustomTokenizerDeprecation(String deprecatedName, String replacement, Version version, boolean expectWarning)
throws IOException { throws IOException {
final Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir()) final Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
.put(IndexMetaData.SETTING_VERSION_CREATED, version) .put(IndexMetadata.SETTING_VERSION_CREATED, version)
.put("index.analysis.analyzer.custom_analyzer.type", "custom") .put("index.analysis.analyzer.custom_analyzer.type", "custom")
.put("index.analysis.analyzer.custom_analyzer.tokenizer", "my_tokenizer") .put("index.analysis.analyzer.custom_analyzer.tokenizer", "my_tokenizer")
.put("index.analysis.tokenizer.my_tokenizer.type", deprecatedName) .put("index.analysis.tokenizer.my_tokenizer.type", deprecatedName)

6
modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CompoundAnalysisTests.java
View File

@ -23,7 +23,7 @@ import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.env.TestEnvironment; import org.elasticsearch.env.TestEnvironment;
@ -100,7 +100,7 @@ public class CompoundAnalysisTests extends ESTestCase {
String json = "/org/elasticsearch/analysis/common/test1.json"; String json = "/org/elasticsearch/analysis/common/test1.json";
return Settings.builder() return Settings.builder()
.loadFromStream(json, getClass().getResourceAsStream(json), false) .loadFromStream(json, getClass().getResourceAsStream(json), false)
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
.build(); .build();
} }
@ -109,7 +109,7 @@ public class CompoundAnalysisTests extends ESTestCase {
String yaml = "/org/elasticsearch/analysis/common/test1.yml"; String yaml = "/org/elasticsearch/analysis/common/test1.yml";
return Settings.builder() return Settings.builder()
.loadFromStream(yaml, getClass().getResourceAsStream(yaml), false) .loadFromStream(yaml, getClass().getResourceAsStream(yaml), false)
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
.build(); .build();
} }

4
modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/EdgeNGramTokenizerTests.java
View File

@ -21,7 +21,7 @@ package org.elasticsearch.analysis.common;
import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.Tokenizer;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.env.TestEnvironment; import org.elasticsearch.env.TestEnvironment;
@ -45,7 +45,7 @@ public class EdgeNGramTokenizerTests extends ESTokenStreamTestCase {
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
.build(); .build();
Settings indexSettings = Settings.builder() Settings indexSettings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, version) .put(IndexMetadata.SETTING_VERSION_CREATED, version)
.put("index.analysis.analyzer.my_analyzer.tokenizer", tokenizer) .put("index.analysis.analyzer.my_analyzer.tokenizer", tokenizer)
.build(); .build();
IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", indexSettings); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", indexSettings);

6
modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/HtmlStripCharFilterFactoryTests.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.IndexSettings;
@ -41,7 +41,7 @@ public class HtmlStripCharFilterFactoryTests extends ESTestCase {
*/ */
public void testDeprecationWarning() throws IOException { public void testDeprecationWarning() throws IOException {
Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir()) Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
.put(IndexMetaData.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_6_3_0, Version.CURRENT)) .put(IndexMetadata.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_6_3_0, Version.CURRENT))
.build(); .build();
IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings);
@ -59,7 +59,7 @@ public class HtmlStripCharFilterFactoryTests extends ESTestCase {
*/ */
public void testNoDeprecationWarningPre6_3() throws IOException { public void testNoDeprecationWarningPre6_3() throws IOException {
Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir()) Settings settings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
.put(IndexMetaData.SETTING_VERSION_CREATED, .put(IndexMetadata.SETTING_VERSION_CREATED,
VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, Version.V_6_2_4)) VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, Version.V_6_2_4))
.build(); .build();

6
modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/MultiplexerTokenFilterTests.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.env.TestEnvironment; import org.elasticsearch.env.TestEnvironment;
@ -41,7 +41,7 @@ public class MultiplexerTokenFilterTests extends ESTokenStreamTestCase {
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
.build(); .build();
Settings indexSettings = Settings.builder() Settings indexSettings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put("index.analysis.filter.t.type", "truncate") .put("index.analysis.filter.t.type", "truncate")
.put("index.analysis.filter.t.length", "2") .put("index.analysis.filter.t.length", "2")
.put("index.analysis.filter.multiplexFilter.type", "multiplexer") .put("index.analysis.filter.multiplexFilter.type", "multiplexer")
@ -77,7 +77,7 @@ public class MultiplexerTokenFilterTests extends ESTokenStreamTestCase {
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
.build(); .build();
Settings indexSettings = Settings.builder() Settings indexSettings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put("index.analysis.filter.t.type", "truncate") .put("index.analysis.filter.t.type", "truncate")
.put("index.analysis.filter.t.length", "2") .put("index.analysis.filter.t.length", "2")
.put("index.analysis.filter.multiplexFilter.type", "multiplexer") .put("index.analysis.filter.multiplexFilter.type", "multiplexer")

4
modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/NGramTokenizerFactoryTests.java
View File

@ -25,7 +25,7 @@ import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter; import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter;
import org.apache.lucene.analysis.reverse.ReverseStringFilter; import org.apache.lucene.analysis.reverse.ReverseStringFilter;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.settings.Settings.Builder; import org.elasticsearch.common.settings.Settings.Builder;
import org.elasticsearch.index.Index; import org.elasticsearch.index.Index;
@ -154,7 +154,7 @@ public class NGramTokenizerFactoryTests extends ESTokenStreamTestCase {
builder.put("side", "back"); builder.put("side", "back");
} }
Settings settings = builder.build(); Settings settings = builder.build();
Settings indexSettings = newAnalysisSettingsBuilder().put(IndexMetaData.SETTING_VERSION_CREATED, v.id).build(); Settings indexSettings = newAnalysisSettingsBuilder().put(IndexMetadata.SETTING_VERSION_CREATED, v.id).build();
Tokenizer tokenizer = new MockTokenizer(); Tokenizer tokenizer = new MockTokenizer();
tokenizer.setReader(new StringReader("foo bar")); tokenizer.setReader(new StringReader("foo bar"));
TokenStream edgeNGramTokenFilter = TokenStream edgeNGramTokenFilter =

4
modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/PatternCaptureTokenFilterTests.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.IndexSettings;
@ -38,7 +38,7 @@ public class PatternCaptureTokenFilterTests extends ESTokenStreamTestCase {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir())
.loadFromStream(json, getClass().getResourceAsStream(json), false) .loadFromStream(json, getClass().getResourceAsStream(json), false)
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.build(); .build();
IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings);

4
modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/PredicateTokenScriptFilterTests.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.env.TestEnvironment; import org.elasticsearch.env.TestEnvironment;
@ -44,7 +44,7 @@ public class PredicateTokenScriptFilterTests extends ESTokenStreamTestCase {
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
.build(); .build();
Settings indexSettings = Settings.builder() Settings indexSettings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put("index.analysis.filter.f.type", "predicate_token_filter") .put("index.analysis.filter.f.type", "predicate_token_filter")
.put("index.analysis.filter.f.script.source", "my_script") .put("index.analysis.filter.f.script.source", "my_script")
.put("index.analysis.analyzer.myAnalyzer.type", "custom") .put("index.analysis.analyzer.myAnalyzer.type", "custom")

4
modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/ScriptedConditionTokenFilterTests.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.analysis.common; package org.elasticsearch.analysis.common;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.env.TestEnvironment; import org.elasticsearch.env.TestEnvironment;
@ -43,7 +43,7 @@ public class ScriptedConditionTokenFilterTests extends ESTokenStreamTestCase {
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
.build(); .build();
Settings indexSettings = Settings.builder() Settings indexSettings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put("index.analysis.filter.cond.type", "condition") .put("index.analysis.filter.cond.type", "condition")
.put("index.analysis.filter.cond.script.source", "token.getPosition() > 1") .put("index.analysis.filter.cond.script.source", "token.getPosition() > 1")
.putList("index.analysis.filter.cond.filter", "uppercase") .putList("index.analysis.filter.cond.filter", "uppercase")

2
modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/StemmerTokenFilterFactoryTests.java
View File

@ -38,7 +38,7 @@ import java.io.IOException;
import java.io.StringReader; import java.io.StringReader;
import static com.carrotsearch.randomizedtesting.RandomizedTest.scaledRandomIntBetween; import static com.carrotsearch.randomizedtesting.RandomizedTest.scaledRandomIntBetween;
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_VERSION_CREATED; import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_VERSION_CREATED;
import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.instanceOf;
public class StemmerTokenFilterFactoryTests extends ESTokenStreamTestCase { public class StemmerTokenFilterFactoryTests extends ESTokenStreamTestCase {

30
modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java
View File

@ -25,7 +25,7 @@ import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.core.KeywordTokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.IndexSettings;
@ -69,7 +69,7 @@ public class SynonymsAnalysisTests extends ESTestCase {
Settings settings = Settings.builder(). Settings settings = Settings.builder().
loadFromStream(json, getClass().getResourceAsStream(json), false) loadFromStream(json, getClass().getResourceAsStream(json), false)
.put(Environment.PATH_HOME_SETTING.getKey(), home) .put(Environment.PATH_HOME_SETTING.getKey(), home)
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT).build(); .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).build();
IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings);
indexAnalyzers = createTestAnalysis(idxSettings, settings, new CommonAnalysisPlugin()).indexAnalyzers; indexAnalyzers = createTestAnalysis(idxSettings, settings, new CommonAnalysisPlugin()).indexAnalyzers;
@ -89,7 +89,7 @@ public class SynonymsAnalysisTests extends ESTestCase {
public void testSynonymWordDeleteByAnalyzer() throws IOException { public void testSynonymWordDeleteByAnalyzer() throws IOException {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put("path.home", createTempDir().toString()) .put("path.home", createTempDir().toString())
.put("index.analysis.filter.synonym.type", "synonym") .put("index.analysis.filter.synonym.type", "synonym")
.putList("index.analysis.filter.synonym.synonyms", "kimchy => shay", "dude => elasticsearch", "abides => man!") .putList("index.analysis.filter.synonym.synonyms", "kimchy => shay", "dude => elasticsearch", "abides => man!")
@ -110,7 +110,7 @@ public class SynonymsAnalysisTests extends ESTestCase {
public void testExpandSynonymWordDeleteByAnalyzer() throws IOException { public void testExpandSynonymWordDeleteByAnalyzer() throws IOException {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put("path.home", createTempDir().toString()) .put("path.home", createTempDir().toString())
.put("index.analysis.filter.synonym_expand.type", "synonym") .put("index.analysis.filter.synonym_expand.type", "synonym")
.putList("index.analysis.filter.synonym_expand.synonyms", "kimchy, shay", "dude, elasticsearch", "abides, man!") .putList("index.analysis.filter.synonym_expand.synonyms", "kimchy, shay", "dude, elasticsearch", "abides, man!")
@ -131,7 +131,7 @@ public class SynonymsAnalysisTests extends ESTestCase {
public void testSynonymsWrappedByMultiplexer() throws IOException { public void testSynonymsWrappedByMultiplexer() throws IOException {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put("path.home", createTempDir().toString()) .put("path.home", createTempDir().toString())
.put("index.analysis.filter.synonyms.type", "synonym") .put("index.analysis.filter.synonyms.type", "synonym")
.putList("index.analysis.filter.synonyms.synonyms", "programmer, developer") .putList("index.analysis.filter.synonyms.synonyms", "programmer, developer")
@ -152,7 +152,7 @@ public class SynonymsAnalysisTests extends ESTestCase {
public void testAsciiFoldingFilterForSynonyms() throws IOException { public void testAsciiFoldingFilterForSynonyms() throws IOException {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put("path.home", createTempDir().toString()) .put("path.home", createTempDir().toString())
.put("index.analysis.filter.synonyms.type", "synonym") .put("index.analysis.filter.synonyms.type", "synonym")
.putList("index.analysis.filter.synonyms.synonyms", "hoj, height") .putList("index.analysis.filter.synonyms.synonyms", "hoj, height")
@ -169,7 +169,7 @@ public class SynonymsAnalysisTests extends ESTestCase {
public void testPreconfigured() throws IOException { public void testPreconfigured() throws IOException {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put("path.home", createTempDir().toString()) .put("path.home", createTempDir().toString())
.put("index.analysis.filter.synonyms.type", "synonym") .put("index.analysis.filter.synonyms.type", "synonym")
.putList("index.analysis.filter.synonyms.synonyms", "würst, sausage") .putList("index.analysis.filter.synonyms.synonyms", "würst, sausage")
@ -186,7 +186,7 @@ public class SynonymsAnalysisTests extends ESTestCase {
public void testChainedSynonymFilters() throws IOException { public void testChainedSynonymFilters() throws IOException {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put("path.home", createTempDir().toString()) .put("path.home", createTempDir().toString())
.put("index.analysis.filter.synonyms1.type", "synonym") .put("index.analysis.filter.synonyms1.type", "synonym")
.putList("index.analysis.filter.synonyms1.synonyms", "term1, term2") .putList("index.analysis.filter.synonyms1.synonyms", "term1, term2")
@ -205,7 +205,7 @@ public class SynonymsAnalysisTests extends ESTestCase {
public void testShingleFilters() { public void testShingleFilters() {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, .put(IndexMetadata.SETTING_VERSION_CREATED,
VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT)) VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT))
.put("path.home", createTempDir().toString()) .put("path.home", createTempDir().toString())
.put("index.analysis.filter.synonyms.type", "synonym") .put("index.analysis.filter.synonyms.type", "synonym")
@ -225,7 +225,7 @@ public class SynonymsAnalysisTests extends ESTestCase {
public void testTokenFiltersBypassSynonymAnalysis() throws IOException { public void testTokenFiltersBypassSynonymAnalysis() throws IOException {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put("path.home", createTempDir().toString()) .put("path.home", createTempDir().toString())
.putList("word_list", "a") .putList("word_list", "a")
.put("hyphenation_patterns_path", "foo") .put("hyphenation_patterns_path", "foo")
@ -257,7 +257,7 @@ public class SynonymsAnalysisTests extends ESTestCase {
)); ));
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, .put(IndexMetadata.SETTING_VERSION_CREATED,
VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT)) VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT))
.put("path.home", createTempDir().toString()) .put("path.home", createTempDir().toString())
.build(); .build();
@ -281,7 +281,7 @@ public class SynonymsAnalysisTests extends ESTestCase {
} }
Settings settings2 = Settings.builder() Settings settings2 = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, .put(IndexMetadata.SETTING_VERSION_CREATED,
VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, VersionUtils.getPreviousVersion(Version.V_7_0_0))) VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, VersionUtils.getPreviousVersion(Version.V_7_0_0)))
.put("path.home", createTempDir().toString()) .put("path.home", createTempDir().toString())
.putList("common_words", "a", "b") .putList("common_words", "a", "b")
@ -305,7 +305,7 @@ public class SynonymsAnalysisTests extends ESTestCase {
public void testDisallowedTokenFilters() throws IOException { public void testDisallowedTokenFilters() throws IOException {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, .put(IndexMetadata.SETTING_VERSION_CREATED,
VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT)) VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT))
.put("path.home", createTempDir().toString()) .put("path.home", createTempDir().toString())
.putList("common_words", "a", "b") .putList("common_words", "a", "b")
@ -334,7 +334,7 @@ public class SynonymsAnalysisTests extends ESTestCase {
} }
settings = Settings.builder() settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, .put(IndexMetadata.SETTING_VERSION_CREATED,
VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, VersionUtils.getPreviousVersion(Version.V_7_0_0))) VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, VersionUtils.getPreviousVersion(Version.V_7_0_0)))
.put("path.home", createTempDir().toString()) .put("path.home", createTempDir().toString())
.putList("common_words", "a", "b") .putList("common_words", "a", "b")
@ -356,7 +356,7 @@ public class SynonymsAnalysisTests extends ESTestCase {
assertWarnings(expectedWarnings.toArray(new String[0])); assertWarnings(expectedWarnings.toArray(new String[0]));
settings = Settings.builder() settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, .put(IndexMetadata.SETTING_VERSION_CREATED,
VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, VersionUtils.getPreviousVersion(Version.V_7_0_0))) VersionUtils.randomVersionBetween(random(), Version.V_6_0_0, VersionUtils.getPreviousVersion(Version.V_7_0_0)))
.put("path.home", createTempDir().toString()) .put("path.home", createTempDir().toString())
.put("preserve_original", "false") .put("preserve_original", "false")

6
modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/WhitespaceTokenizerFactoryTests.java
View File

@ -23,7 +23,7 @@ import com.carrotsearch.randomizedtesting.generators.RandomStrings;
import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.Index; import org.elasticsearch.index.Index;
import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.IndexSettings;
@ -39,7 +39,7 @@ import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStre
public class WhitespaceTokenizerFactoryTests extends ESTestCase { public class WhitespaceTokenizerFactoryTests extends ESTestCase {
public void testSimpleWhiteSpaceTokenizer() throws IOException { public void testSimpleWhiteSpaceTokenizer() throws IOException {
final Settings indexSettings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT).build(); final Settings indexSettings = Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).build();
IndexSettings indexProperties = IndexSettingsModule.newIndexSettings(new Index("test", "_na_"), indexSettings); IndexSettings indexProperties = IndexSettingsModule.newIndexSettings(new Index("test", "_na_"), indexSettings);
WhitespaceTokenizer tokenizer = (WhitespaceTokenizer) new WhitespaceTokenizerFactory(indexProperties, null, "whitespace_maxlen", WhitespaceTokenizer tokenizer = (WhitespaceTokenizer) new WhitespaceTokenizerFactory(indexProperties, null, "whitespace_maxlen",
Settings.EMPTY).create(); Settings.EMPTY).create();
@ -51,7 +51,7 @@ public class WhitespaceTokenizerFactoryTests extends ESTestCase {
} }
public void testMaxTokenLength() throws IOException { public void testMaxTokenLength() throws IOException {
final Settings indexSettings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT).build(); final Settings indexSettings = Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).build();
IndexSettings indexProperties = IndexSettingsModule.newIndexSettings(new Index("test", "_na_"), indexSettings); IndexSettings indexProperties = IndexSettingsModule.newIndexSettings(new Index("test", "_na_"), indexSettings);
final Settings settings = Settings.builder().put(WhitespaceTokenizerFactory.MAX_TOKEN_LENGTH, 2).build(); final Settings settings = Settings.builder().put(WhitespaceTokenizerFactory.MAX_TOKEN_LENGTH, 2).build();
WhitespaceTokenizer tokenizer = (WhitespaceTokenizer) new WhitespaceTokenizerFactory(indexProperties, null, "whitespace_maxlen", WhitespaceTokenizer tokenizer = (WhitespaceTokenizer) new WhitespaceTokenizerFactory(indexProperties, null, "whitespace_maxlen",

6
modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/WordDelimiterGraphTokenFilterFactoryTests.java
View File

@ -21,7 +21,7 @@ package org.elasticsearch.analysis.common;
import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.env.TestEnvironment; import org.elasticsearch.env.TestEnvironment;
@ -125,7 +125,7 @@ public class WordDelimiterGraphTokenFilterFactoryTests
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
.build(); .build();
Settings indexSettings = Settings.builder() Settings indexSettings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, .put(IndexMetadata.SETTING_VERSION_CREATED,
VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, VersionUtils.getPreviousVersion(Version.V_7_3_0))) VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, VersionUtils.getPreviousVersion(Version.V_7_3_0)))
.put("index.analysis.analyzer.my_analyzer.tokenizer", "standard") .put("index.analysis.analyzer.my_analyzer.tokenizer", "standard")
.putList("index.analysis.analyzer.my_analyzer.filter", "word_delimiter_graph") .putList("index.analysis.analyzer.my_analyzer.filter", "word_delimiter_graph")
@ -148,7 +148,7 @@ public class WordDelimiterGraphTokenFilterFactoryTests
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
.build(); .build();
Settings indexSettings = Settings.builder() Settings indexSettings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put("index.analysis.analyzer.my_analyzer.tokenizer", "standard") .put("index.analysis.analyzer.my_analyzer.tokenizer", "standard")
.putList("index.analysis.analyzer.my_analyzer.filter", "word_delimiter_graph") .putList("index.analysis.analyzer.my_analyzer.filter", "word_delimiter_graph")
.build(); .build();

2
modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/DateIndexNameProcessor.java
View File

@ -102,7 +102,7 @@ public final class DateIndexNameProcessor extends AbstractProcessor {
.append('}') .append('}')
.append('>'); .append('>');
String dynamicIndexName = builder.toString(); String dynamicIndexName = builder.toString();
ingestDocument.setFieldValue(IngestDocument.MetaData.INDEX.getFieldName(), dynamicIndexName); ingestDocument.setFieldValue(IngestDocument.Metadata.INDEX.getFieldName(), dynamicIndexName);
return ingestDocument; return ingestDocument;
} }

12
modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/AppendProcessorTests.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.ingest.common; package org.elasticsearch.ingest.common;
import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.IngestDocument;
import org.elasticsearch.ingest.IngestDocument.MetaData; import org.elasticsearch.ingest.IngestDocument.Metadata;
import org.elasticsearch.ingest.Processor; import org.elasticsearch.ingest.Processor;
import org.elasticsearch.ingest.RandomDocumentPicks; import org.elasticsearch.ingest.RandomDocumentPicks;
import org.elasticsearch.ingest.TestTemplateService; import org.elasticsearch.ingest.TestTemplateService;
@ -126,25 +126,25 @@ public class AppendProcessorTests extends ESTestCase {
public void testAppendMetadataExceptVersion() throws Exception { public void testAppendMetadataExceptVersion() throws Exception {
// here any metadata field value becomes a list, which won't make sense in most of the cases, // here any metadata field value becomes a list, which won't make sense in most of the cases,
// but support for append is streamlined like for set so we test it // but support for append is streamlined like for set so we test it
MetaData randomMetaData = randomFrom(MetaData.INDEX, MetaData.TYPE, MetaData.ID, MetaData.ROUTING); Metadata randomMetadata = randomFrom(Metadata.INDEX, Metadata.TYPE, Metadata.ID, Metadata.ROUTING);
List<String> values = new ArrayList<>(); List<String> values = new ArrayList<>();
Processor appendProcessor; Processor appendProcessor;
if (randomBoolean()) { if (randomBoolean()) {
String value = randomAlphaOfLengthBetween(1, 10); String value = randomAlphaOfLengthBetween(1, 10);
values.add(value); values.add(value);
appendProcessor = createAppendProcessor(randomMetaData.getFieldName(), value); appendProcessor = createAppendProcessor(randomMetadata.getFieldName(), value);
} else { } else {
int valuesSize = randomIntBetween(0, 10); int valuesSize = randomIntBetween(0, 10);
for (int i = 0; i < valuesSize; i++) { for (int i = 0; i < valuesSize; i++) {
values.add(randomAlphaOfLengthBetween(1, 10)); values.add(randomAlphaOfLengthBetween(1, 10));
} }
appendProcessor = createAppendProcessor(randomMetaData.getFieldName(), values); appendProcessor = createAppendProcessor(randomMetadata.getFieldName(), values);
} }
IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random()); IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random());
Object initialValue = ingestDocument.getSourceAndMetadata().get(randomMetaData.getFieldName()); Object initialValue = ingestDocument.getSourceAndMetadata().get(randomMetadata.getFieldName());
appendProcessor.execute(ingestDocument); appendProcessor.execute(ingestDocument);
List<?> list = ingestDocument.getFieldValue(randomMetaData.getFieldName(), List.class); List<?> list = ingestDocument.getFieldValue(randomMetadata.getFieldName(), List.class);
if (initialValue == null) { if (initialValue == null) {
assertThat(list, equalTo(values)); assertThat(list, equalTo(values));
} else { } else {

2
modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/ForEachProcessorTests.java
View File

@ -102,7 +102,7 @@ public class ForEachProcessorTests extends ESTestCase {
assertThat(ingestDocument.getFieldValue("values", List.class), equalTo(Arrays.asList("A", "B", "c"))); assertThat(ingestDocument.getFieldValue("values", List.class), equalTo(Arrays.asList("A", "B", "c")));
} }
public void testMetaDataAvailable() throws Exception { public void testMetadataAvailable() throws Exception {
List<Map<String, Object>> values = new ArrayList<>(); List<Map<String, Object>> values = new ArrayList<>();
values.add(new HashMap<>()); values.add(new HashMap<>());
values.add(new HashMap<>()); values.add(new HashMap<>());

16
modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/SetProcessorTests.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.ingest.common; package org.elasticsearch.ingest.common;
import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.IngestDocument;
import org.elasticsearch.ingest.IngestDocument.MetaData; import org.elasticsearch.ingest.IngestDocument.Metadata;
import org.elasticsearch.ingest.Processor; import org.elasticsearch.ingest.Processor;
import org.elasticsearch.ingest.RandomDocumentPicks; import org.elasticsearch.ingest.RandomDocumentPicks;
import org.elasticsearch.ingest.TestTemplateService; import org.elasticsearch.ingest.TestTemplateService;
@ -101,27 +101,27 @@ public class SetProcessorTests extends ESTestCase {
} }
public void testSetMetadataExceptVersion() throws Exception { public void testSetMetadataExceptVersion() throws Exception {
MetaData randomMetaData = randomFrom(MetaData.INDEX, MetaData.TYPE, MetaData.ID, MetaData.ROUTING); Metadata randomMetadata = randomFrom(Metadata.INDEX, Metadata.TYPE, Metadata.ID, Metadata.ROUTING);
Processor processor = createSetProcessor(randomMetaData.getFieldName(), "_value", true); Processor processor = createSetProcessor(randomMetadata.getFieldName(), "_value", true);
IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random()); IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random());
processor.execute(ingestDocument); processor.execute(ingestDocument);
assertThat(ingestDocument.getFieldValue(randomMetaData.getFieldName(), String.class), Matchers.equalTo("_value")); assertThat(ingestDocument.getFieldValue(randomMetadata.getFieldName(), String.class), Matchers.equalTo("_value"));
} }
public void testSetMetadataVersion() throws Exception { public void testSetMetadataVersion() throws Exception {
long version = randomNonNegativeLong(); long version = randomNonNegativeLong();
Processor processor = createSetProcessor(MetaData.VERSION.getFieldName(), version, true); Processor processor = createSetProcessor(Metadata.VERSION.getFieldName(), version, true);
IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random()); IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random());
processor.execute(ingestDocument); processor.execute(ingestDocument);
assertThat(ingestDocument.getFieldValue(MetaData.VERSION.getFieldName(), Long.class), Matchers.equalTo(version)); assertThat(ingestDocument.getFieldValue(Metadata.VERSION.getFieldName(), Long.class), Matchers.equalTo(version));
} }
public void testSetMetadataVersionType() throws Exception { public void testSetMetadataVersionType() throws Exception {
String versionType = randomFrom("internal", "external", "external_gte"); String versionType = randomFrom("internal", "external", "external_gte");
Processor processor = createSetProcessor(MetaData.VERSION_TYPE.getFieldName(), versionType, true); Processor processor = createSetProcessor(Metadata.VERSION_TYPE.getFieldName(), versionType, true);
IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random()); IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random());
processor.execute(ingestDocument); processor.execute(ingestDocument);
assertThat(ingestDocument.getFieldValue(MetaData.VERSION_TYPE.getFieldName(), String.class), Matchers.equalTo(versionType)); assertThat(ingestDocument.getFieldValue(Metadata.VERSION_TYPE.getFieldName(), String.class), Matchers.equalTo(versionType));
} }
private static Processor createSetProcessor(String fieldName, Object fieldValue, boolean overrideEnabled) { private static Processor createSetProcessor(String fieldName, Object fieldValue, boolean overrideEnabled) {

4
modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldTypeTests.java
View File

@ -31,7 +31,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
import org.elasticsearch.core.internal.io.IOUtils; import org.elasticsearch.core.internal.io.IOUtils;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.fielddata.LeafNumericFieldData; import org.elasticsearch.index.fielddata.LeafNumericFieldData;
@ -181,7 +181,7 @@ public class ScaledFloatFieldTypeTests extends FieldTypeTestCase {
doc.add(new SortedNumericDocValuesField("scaled_float2", 12)); doc.add(new SortedNumericDocValuesField("scaled_float2", 12));
w.addDocument(doc); w.addDocument(doc);
try (DirectoryReader reader = DirectoryReader.open(w)) { try (DirectoryReader reader = DirectoryReader.open(w)) {
IndexMetaData indexMetadata = new IndexMetaData.Builder("index").settings( IndexMetadata indexMetadata = new IndexMetadata.Builder("index").settings(
Settings.builder() Settings.builder()
.put("index.version.created", Version.CURRENT) .put("index.version.created", Version.CURRENT)
.put("index.number_of_shards", 1) .put("index.number_of_shards", 1)

10
modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ChildrenAggregationBuilder.java
View File

@ -69,16 +69,16 @@ public class ChildrenAggregationBuilder
} }
protected ChildrenAggregationBuilder(ChildrenAggregationBuilder clone, protected ChildrenAggregationBuilder(ChildrenAggregationBuilder clone,
Builder factoriesBuilder, Map<String, Object> metaData) { Builder factoriesBuilder, Map<String, Object> metadata) {
super(clone, factoriesBuilder, metaData); super(clone, factoriesBuilder, metadata);
this.childType = clone.childType; this.childType = clone.childType;
this.childFilter = clone.childFilter; this.childFilter = clone.childFilter;
this.parentFilter = clone.parentFilter; this.parentFilter = clone.parentFilter;
} }
@Override @Override
protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metaData) { protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metadata) {
return new ChildrenAggregationBuilder(this, factoriesBuilder, metaData); return new ChildrenAggregationBuilder(this, factoriesBuilder, metadata);
} }
/** /**
@ -105,7 +105,7 @@ public class ChildrenAggregationBuilder
AggregatorFactory parent, AggregatorFactory parent,
Builder subFactoriesBuilder) throws IOException { Builder subFactoriesBuilder) throws IOException {
return new ChildrenAggregatorFactory(name, config, childFilter, parentFilter, queryShardContext, parent, return new ChildrenAggregatorFactory(name, config, childFilter, parentFilter, queryShardContext, parent,
subFactoriesBuilder, metaData); subFactoriesBuilder, metadata);
} }
@Override @Override

14
modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ChildrenAggregatorFactory.java
View File

@ -48,8 +48,8 @@ public class ChildrenAggregatorFactory extends ValuesSourceAggregatorFactory<Wit
QueryShardContext context, QueryShardContext context,
AggregatorFactory parent, AggregatorFactory parent,
AggregatorFactories.Builder subFactoriesBuilder, AggregatorFactories.Builder subFactoriesBuilder,
Map<String, Object> metaData) throws IOException { Map<String, Object> metadata) throws IOException {
super(name, config, context, parent, subFactoriesBuilder, metaData); super(name, config, context, parent, subFactoriesBuilder, metadata);
this.childFilter = childFilter; this.childFilter = childFilter;
this.parentFilter = parentFilter; this.parentFilter = parentFilter;
@ -57,11 +57,11 @@ public class ChildrenAggregatorFactory extends ValuesSourceAggregatorFactory<Wit
@Override @Override
protected Aggregator createUnmapped(SearchContext searchContext, Aggregator parent, protected Aggregator createUnmapped(SearchContext searchContext, Aggregator parent,
List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) throws IOException { List<PipelineAggregator> pipelineAggregators, Map<String, Object> metadata) throws IOException {
return new NonCollectingAggregator(name, searchContext, parent, pipelineAggregators, metaData) { return new NonCollectingAggregator(name, searchContext, parent, pipelineAggregators, metadata) {
@Override @Override
public InternalAggregation buildEmptyAggregation() { public InternalAggregation buildEmptyAggregation() {
return new InternalChildren(name, 0, buildEmptySubAggregations(), pipelineAggregators(), metaData()); return new InternalChildren(name, 0, buildEmptySubAggregations(), pipelineAggregators(), metadata());
} }
}; };
} }
@ -71,12 +71,12 @@ public class ChildrenAggregatorFactory extends ValuesSourceAggregatorFactory<Wit
SearchContext searchContext, Aggregator parent, SearchContext searchContext, Aggregator parent,
boolean collectsFromSingleBucket, boolean collectsFromSingleBucket,
List<PipelineAggregator> pipelineAggregators, List<PipelineAggregator> pipelineAggregators,
Map<String, Object> metaData) throws IOException { Map<String, Object> metadata) throws IOException {
long maxOrd = valuesSource.globalMaxOrd(searchContext.searcher()); long maxOrd = valuesSource.globalMaxOrd(searchContext.searcher());
if (collectsFromSingleBucket) { if (collectsFromSingleBucket) {
return new ParentToChildrenAggregator(name, factories, searchContext, parent, childFilter, return new ParentToChildrenAggregator(name, factories, searchContext, parent, childFilter,
parentFilter, valuesSource, maxOrd, pipelineAggregators, metaData); parentFilter, valuesSource, maxOrd, pipelineAggregators, metadata);
} else { } else {
return asMultiBucketAggregator(this, searchContext, parent); return asMultiBucketAggregator(this, searchContext, parent);
} }

8
modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ChildrenToParentAggregator.java
View File

@ -42,19 +42,19 @@ public class ChildrenToParentAggregator extends ParentJoinAggregator {
public ChildrenToParentAggregator(String name, AggregatorFactories factories, public ChildrenToParentAggregator(String name, AggregatorFactories factories,
SearchContext context, Aggregator parent, Query childFilter, SearchContext context, Aggregator parent, Query childFilter,
Query parentFilter, ValuesSource.Bytes.WithOrdinals valuesSource, Query parentFilter, ValuesSource.Bytes.WithOrdinals valuesSource,
long maxOrd, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) throws IOException { long maxOrd, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metadata) throws IOException {
super(name, factories, context, parent, childFilter, parentFilter, valuesSource, maxOrd, pipelineAggregators, metaData); super(name, factories, context, parent, childFilter, parentFilter, valuesSource, maxOrd, pipelineAggregators, metadata);
} }
@Override @Override
public InternalAggregation buildAggregation(long owningBucketOrdinal) throws IOException { public InternalAggregation buildAggregation(long owningBucketOrdinal) throws IOException {
return new InternalParent(name, bucketDocCount(owningBucketOrdinal), return new InternalParent(name, bucketDocCount(owningBucketOrdinal),
bucketAggregations(owningBucketOrdinal), pipelineAggregators(), metaData()); bucketAggregations(owningBucketOrdinal), pipelineAggregators(), metadata());
} }
@Override @Override
public InternalAggregation buildEmptyAggregation() { public InternalAggregation buildEmptyAggregation() {
return new InternalParent(name, 0, buildEmptySubAggregations(), pipelineAggregators(), return new InternalParent(name, 0, buildEmptySubAggregations(), pipelineAggregators(),
metaData()); metadata());
} }
} }

6
modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/InternalChildren.java
View File

@ -33,8 +33,8 @@ import java.util.Map;
*/ */
public class InternalChildren extends InternalSingleBucketAggregation implements Children { public class InternalChildren extends InternalSingleBucketAggregation implements Children {
public InternalChildren(String name, long docCount, InternalAggregations aggregations, List<PipelineAggregator> pipelineAggregators, public InternalChildren(String name, long docCount, InternalAggregations aggregations, List<PipelineAggregator> pipelineAggregators,
Map<String, Object> metaData) { Map<String, Object> metadata) {
super(name, docCount, aggregations, pipelineAggregators, metaData); super(name, docCount, aggregations, pipelineAggregators, metadata);
} }
/** /**
@ -51,6 +51,6 @@ public class InternalChildren extends InternalSingleBucketAggregation implements
@Override @Override
protected InternalSingleBucketAggregation newAggregation(String name, long docCount, InternalAggregations subAggregations) { protected InternalSingleBucketAggregation newAggregation(String name, long docCount, InternalAggregations subAggregations) {
return new InternalChildren(name, docCount, subAggregations, pipelineAggregators(), getMetaData()); return new InternalChildren(name, docCount, subAggregations, pipelineAggregators(), getMetadata());
} }
} }

6
modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/InternalParent.java
View File

@ -33,8 +33,8 @@ import java.util.Map;
*/ */
public class InternalParent extends InternalSingleBucketAggregation implements Parent { public class InternalParent extends InternalSingleBucketAggregation implements Parent {
public InternalParent(String name, long docCount, InternalAggregations aggregations, List<PipelineAggregator> pipelineAggregators, public InternalParent(String name, long docCount, InternalAggregations aggregations, List<PipelineAggregator> pipelineAggregators,
Map<String, Object> metaData) { Map<String, Object> metadata) {
super(name, docCount, aggregations, pipelineAggregators, metaData); super(name, docCount, aggregations, pipelineAggregators, metadata);
} }
/** /**
@ -51,6 +51,6 @@ public class InternalParent extends InternalSingleBucketAggregation implements P
@Override @Override
protected InternalSingleBucketAggregation newAggregation(String name, long docCount, InternalAggregations subAggregations) { protected InternalSingleBucketAggregation newAggregation(String name, long docCount, InternalAggregations subAggregations) {
return new InternalParent(name, docCount, subAggregations, pipelineAggregators(), getMetaData()); return new InternalParent(name, docCount, subAggregations, pipelineAggregators(), getMetadata());
} }
} }

10
modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ParentAggregationBuilder.java
View File

@ -69,16 +69,16 @@ public class ParentAggregationBuilder
} }
protected ParentAggregationBuilder(ParentAggregationBuilder clone, protected ParentAggregationBuilder(ParentAggregationBuilder clone,
Builder factoriesBuilder, Map<String, Object> metaData) { Builder factoriesBuilder, Map<String, Object> metadata) {
super(clone, factoriesBuilder, metaData); super(clone, factoriesBuilder, metadata);
this.childType = clone.childType; this.childType = clone.childType;
this.childFilter = clone.childFilter; this.childFilter = clone.childFilter;
this.parentFilter = clone.parentFilter; this.parentFilter = clone.parentFilter;
} }
@Override @Override
protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metaData) { protected AggregationBuilder shallowCopy(Builder factoriesBuilder, Map<String, Object> metadata) {
return new ParentAggregationBuilder(this, factoriesBuilder, metaData); return new ParentAggregationBuilder(this, factoriesBuilder, metadata);
} }
/** /**
@ -105,7 +105,7 @@ public class ParentAggregationBuilder
AggregatorFactory parent, AggregatorFactory parent,
Builder subFactoriesBuilder) throws IOException { Builder subFactoriesBuilder) throws IOException {
return new ParentAggregatorFactory(name, config, childFilter, parentFilter, queryShardContext, parent, return new ParentAggregatorFactory(name, config, childFilter, parentFilter, queryShardContext, parent,
subFactoriesBuilder, metaData); subFactoriesBuilder, metadata);
} }
@Override @Override

14
modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ParentAggregatorFactory.java
View File

@ -48,8 +48,8 @@ public class ParentAggregatorFactory extends ValuesSourceAggregatorFactory<WithO
QueryShardContext queryShardContext, QueryShardContext queryShardContext,
AggregatorFactory parent, AggregatorFactory parent,
AggregatorFactories.Builder subFactoriesBuilder, AggregatorFactories.Builder subFactoriesBuilder,
Map<String, Object> metaData) throws IOException { Map<String, Object> metadata) throws IOException {
super(name, config, queryShardContext, parent, subFactoriesBuilder, metaData); super(name, config, queryShardContext, parent, subFactoriesBuilder, metadata);
this.childFilter = childFilter; this.childFilter = childFilter;
this.parentFilter = parentFilter; this.parentFilter = parentFilter;
@ -57,11 +57,11 @@ public class ParentAggregatorFactory extends ValuesSourceAggregatorFactory<WithO
@Override @Override
protected Aggregator createUnmapped(SearchContext searchContext, Aggregator parent, protected Aggregator createUnmapped(SearchContext searchContext, Aggregator parent,
List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) throws IOException { List<PipelineAggregator> pipelineAggregators, Map<String, Object> metadata) throws IOException {
return new NonCollectingAggregator(name, searchContext, parent, pipelineAggregators, metaData) { return new NonCollectingAggregator(name, searchContext, parent, pipelineAggregators, metadata) {
@Override @Override
public InternalAggregation buildEmptyAggregation() { public InternalAggregation buildEmptyAggregation() {
return new InternalParent(name, 0, buildEmptySubAggregations(), pipelineAggregators(), metaData()); return new InternalParent(name, 0, buildEmptySubAggregations(), pipelineAggregators(), metadata());
} }
}; };
} }
@ -71,12 +71,12 @@ public class ParentAggregatorFactory extends ValuesSourceAggregatorFactory<WithO
SearchContext searchContext, Aggregator children, SearchContext searchContext, Aggregator children,
boolean collectsFromSingleBucket, boolean collectsFromSingleBucket,
List<PipelineAggregator> pipelineAggregators, List<PipelineAggregator> pipelineAggregators,
Map<String, Object> metaData) throws IOException { Map<String, Object> metadata) throws IOException {
long maxOrd = valuesSource.globalMaxOrd(searchContext.searcher()); long maxOrd = valuesSource.globalMaxOrd(searchContext.searcher());
if (collectsFromSingleBucket) { if (collectsFromSingleBucket) {
return new ChildrenToParentAggregator(name, factories, searchContext, children, childFilter, return new ChildrenToParentAggregator(name, factories, searchContext, children, childFilter,
parentFilter, valuesSource, maxOrd, pipelineAggregators, metaData); parentFilter, valuesSource, maxOrd, pipelineAggregators, metadata);
} else { } else {
return asMultiBucketAggregator(this, searchContext, children); return asMultiBucketAggregator(this, searchContext, children);
} }

4
modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ParentJoinAggregator.java
View File

@ -74,8 +74,8 @@ public abstract class ParentJoinAggregator extends BucketsAggregator implements
ValuesSource.Bytes.WithOrdinals valuesSource, ValuesSource.Bytes.WithOrdinals valuesSource,
long maxOrd, long maxOrd,
List<PipelineAggregator> pipelineAggregators, List<PipelineAggregator> pipelineAggregators,
Map<String, Object> metaData) throws IOException { Map<String, Object> metadata) throws IOException {
super(name, factories, context, parent, pipelineAggregators, metaData); super(name, factories, context, parent, pipelineAggregators, metadata);
if (maxOrd > Integer.MAX_VALUE) { if (maxOrd > Integer.MAX_VALUE) {
throw new IllegalStateException("the number of parent [" + maxOrd + "] + is greater than the allowed limit " + throw new IllegalStateException("the number of parent [" + maxOrd + "] + is greater than the allowed limit " +

8
modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregator.java
View File

@ -38,19 +38,19 @@ public class ParentToChildrenAggregator extends ParentJoinAggregator {
public ParentToChildrenAggregator(String name, AggregatorFactories factories, public ParentToChildrenAggregator(String name, AggregatorFactories factories,
SearchContext context, Aggregator parent, Query childFilter, SearchContext context, Aggregator parent, Query childFilter,
Query parentFilter, ValuesSource.Bytes.WithOrdinals valuesSource, Query parentFilter, ValuesSource.Bytes.WithOrdinals valuesSource,
long maxOrd, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) throws IOException { long maxOrd, List<PipelineAggregator> pipelineAggregators, Map<String, Object> metadata) throws IOException {
super(name, factories, context, parent, parentFilter, childFilter, valuesSource, maxOrd, pipelineAggregators, metaData); super(name, factories, context, parent, parentFilter, childFilter, valuesSource, maxOrd, pipelineAggregators, metadata);
} }
@Override @Override
public InternalAggregation buildAggregation(long owningBucketOrdinal) throws IOException { public InternalAggregation buildAggregation(long owningBucketOrdinal) throws IOException {
return new InternalChildren(name, bucketDocCount(owningBucketOrdinal), return new InternalChildren(name, bucketDocCount(owningBucketOrdinal),
bucketAggregations(owningBucketOrdinal), pipelineAggregators(), metaData()); bucketAggregations(owningBucketOrdinal), pipelineAggregators(), metadata());
} }
@Override @Override
public InternalAggregation buildEmptyAggregation() { public InternalAggregation buildEmptyAggregation() {
return new InternalChildren(name, 0, buildEmptySubAggregations(), pipelineAggregators(), return new InternalChildren(name, 0, buildEmptySubAggregations(), pipelineAggregators(),
metaData()); metadata());
} }
} }

2
modules/parent-join/src/main/java/org/elasticsearch/join/mapper/ParentJoinFieldMapper.java
View File

@ -94,7 +94,7 @@ public final class ParentJoinFieldMapper extends FieldMapper {
} }
private static void checkIndexCompatibility(IndexSettings settings, String name) { private static void checkIndexCompatibility(IndexSettings settings, String name) {
if (settings.getIndexMetaData().isRoutingPartitionedIndex()) { if (settings.getIndexMetadata().isRoutingPartitionedIndex()) {
throw new IllegalStateException("cannot create join field [" + name + "] " + throw new IllegalStateException("cannot create join field [" + name + "] " +
"for the partitioned index " + "[" + settings.getIndex().getName() + "]"); "for the partitioned index " + "[" + settings.getIndex().getName() + "]");
} }

6
modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenIT.java
View File

@ -23,7 +23,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.action.update.UpdateResponse;
import org.elasticsearch.client.Requests; import org.elasticsearch.client.Requests;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.AggregationBuilders;
@ -220,8 +220,8 @@ public class ChildrenIT extends AbstractParentChildTestCase {
String childType = "variantsku"; String childType = "variantsku";
assertAcked( assertAcked(
prepareCreate(indexName) prepareCreate(indexName)
.setSettings(Settings.builder().put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1) .setSettings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
.put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0)) .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0))
.addMapping("doc", .addMapping("doc",
addFieldMappings(buildParentJoinFieldMappingFromSimplifiedDef("join_field", true, addFieldMappings(buildParentJoinFieldMappingFromSimplifiedDef("join_field", true,
masterType, childType), masterType, childType),

4
modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenToParentAggregatorTests.java
View File

@ -33,7 +33,7 @@ import org.apache.lucene.search.TermInSetQuery;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.lucene.index.ElasticsearchDirectoryReader; import org.elasticsearch.common.lucene.index.ElasticsearchDirectoryReader;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -282,7 +282,7 @@ public class ChildrenToParentAggregatorTests extends AggregatorTestCase {
} }
private static ParentJoinFieldMapper createJoinFieldMapper() { private static ParentJoinFieldMapper createJoinFieldMapper() {
Settings settings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT).build(); Settings settings = Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).build();
return new ParentJoinFieldMapper.Builder("join_field") return new ParentJoinFieldMapper.Builder("join_field")
.addParent(PARENT_TYPE, Collections.singleton(CHILD_TYPE)) .addParent(PARENT_TYPE, Collections.singleton(CHILD_TYPE))
.build(new Mapper.BuilderContext(settings, new ContentPath(0))); .build(new Mapper.BuilderContext(settings, new ContentPath(0)));

4
modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/InternalChildrenTests.java
View File

@ -45,8 +45,8 @@ public class InternalChildrenTests extends InternalSingleBucketAggregationTestCa
@Override @Override
protected InternalChildren createTestInstance(String name, long docCount, InternalAggregations aggregations, protected InternalChildren createTestInstance(String name, long docCount, InternalAggregations aggregations,
List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) { List<PipelineAggregator> pipelineAggregators, Map<String, Object> metadata) {
return new InternalChildren(name, docCount, aggregations, pipelineAggregators, metaData); return new InternalChildren(name, docCount, aggregations, pipelineAggregators, metadata);
} }
@Override @Override

4
modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/InternalParentTests.java
View File

@ -44,8 +44,8 @@ public class InternalParentTests extends InternalSingleBucketAggregationTestCase
@Override @Override
protected InternalParent createTestInstance(String name, long docCount, InternalAggregations aggregations, protected InternalParent createTestInstance(String name, long docCount, InternalAggregations aggregations,
List<PipelineAggregator> pipelineAggregators, Map<String, Object> metaData) { List<PipelineAggregator> pipelineAggregators, Map<String, Object> metadata) {
return new InternalParent(name, docCount, aggregations, pipelineAggregators, metaData); return new InternalParent(name, docCount, aggregations, pipelineAggregators, metadata);
} }
@Override @Override

4
modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ParentToChildrenAggregatorTests.java
View File

@ -33,7 +33,7 @@ import org.apache.lucene.search.TermInSetQuery;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.lucene.index.ElasticsearchDirectoryReader; import org.elasticsearch.common.lucene.index.ElasticsearchDirectoryReader;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -170,7 +170,7 @@ public class ParentToChildrenAggregatorTests extends AggregatorTestCase {
} }
private static ParentJoinFieldMapper createJoinFieldMapper() { private static ParentJoinFieldMapper createJoinFieldMapper() {
Settings settings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT).build(); Settings settings = Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).build();
return new ParentJoinFieldMapper.Builder("join_field") return new ParentJoinFieldMapper.Builder("join_field")
.addParent(PARENT_TYPE, Collections.singleton(CHILD_TYPE)) .addParent(PARENT_TYPE, Collections.singleton(CHILD_TYPE))
.build(new Mapper.BuilderContext(settings, new ContentPath(0))); .build(new Mapper.BuilderContext(settings, new ContentPath(0)));

4
modules/parent-join/src/test/java/org/elasticsearch/join/query/HasChildQueryBuilderTests.java
View File

@ -33,7 +33,7 @@ import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper;
import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.search.similarities.Similarity;
import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -92,7 +92,7 @@ public class HasChildQueryBuilderTests extends AbstractQueryTestCase<HasChildQue
protected Settings createTestIndexSettings() { protected Settings createTestIndexSettings() {
return Settings.builder() return Settings.builder()
.put(super.createTestIndexSettings()) .put(super.createTestIndexSettings())
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.build(); .build();
} }

4
modules/parent-join/src/test/java/org/elasticsearch/join/query/HasParentQueryBuilderTests.java
View File

@ -24,7 +24,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.join.ScoreMode; import org.apache.lucene.search.join.ScoreMode;
import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -77,7 +77,7 @@ public class HasParentQueryBuilderTests extends AbstractQueryTestCase<HasParentQ
protected Settings createTestIndexSettings() { protected Settings createTestIndexSettings() {
return Settings.builder() return Settings.builder()
.put(super.createTestIndexSettings()) .put(super.createTestIndexSettings())
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.build(); .build();
} }

4
modules/parent-join/src/test/java/org/elasticsearch/join/query/ParentIdQueryBuilderTests.java
View File

@ -27,7 +27,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TermQuery;
import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -68,7 +68,7 @@ public class ParentIdQueryBuilderTests extends AbstractQueryTestCase<ParentIdQue
protected Settings createTestIndexSettings() { protected Settings createTestIndexSettings() {
return Settings.builder() return Settings.builder()
.put(super.createTestIndexSettings()) .put(super.createTestIndexSettings())
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.build(); .build();
} }

10
modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java
View File

@ -151,11 +151,11 @@ public class PercolatorFieldMapper extends FieldMapper {
} }
static KeywordFieldMapper createExtractQueryFieldBuilder(String name, BuilderContext context) { static KeywordFieldMapper createExtractQueryFieldBuilder(String name, BuilderContext context) {
KeywordFieldMapper.Builder queryMetaDataFieldBuilder = new KeywordFieldMapper.Builder(name); KeywordFieldMapper.Builder queryMetadataFieldBuilder = new KeywordFieldMapper.Builder(name);
queryMetaDataFieldBuilder.docValues(false); queryMetadataFieldBuilder.docValues(false);
queryMetaDataFieldBuilder.store(false); queryMetadataFieldBuilder.store(false);
queryMetaDataFieldBuilder.indexOptions(IndexOptions.DOCS); queryMetadataFieldBuilder.indexOptions(IndexOptions.DOCS);
return queryMetaDataFieldBuilder.build(context); return queryMetadataFieldBuilder.build(context);
} }
static BinaryFieldMapper createQueryBuilderFieldBuilder(BuilderContext context) { static BinaryFieldMapper createQueryBuilderFieldBuilder(BuilderContext context) {

6
modules/percolator/src/test/java/org/elasticsearch/percolator/CandidateQueryTests.java
View File

@ -78,7 +78,7 @@ import org.apache.lucene.store.ByteBuffersDirectory;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.CheckedFunction; import org.elasticsearch.common.CheckedFunction;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesArray;
@ -1115,8 +1115,8 @@ public class CandidateQueryTests extends ESSingleNodeTestCase {
} }
private void addQuery(Query query, List<ParseContext.Document> docs) { private void addQuery(Query query, List<ParseContext.Document> docs) {
IndexMetaData build = IndexMetaData.builder("") IndexMetadata build = IndexMetadata.builder("")
.settings(Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)) .settings(Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT))
.numberOfShards(1).numberOfReplicas(0).build(); .numberOfShards(1).numberOfReplicas(0).build();
IndexSettings settings = new IndexSettings(build, Settings.EMPTY); IndexSettings settings = new IndexSettings(build, Settings.EMPTY);
ParseContext.InternalParseContext parseContext = new ParseContext.InternalParseContext(settings, ParseContext.InternalParseContext parseContext = new ParseContext.InternalParseContext(settings,

18
modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorFieldMapperTests.java
View File

@ -42,7 +42,7 @@ import org.apache.lucene.search.join.ScoreMode;
import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRef;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.action.support.PlainActionFuture; import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.BytesReference;
@ -183,8 +183,8 @@ public class PercolatorFieldMapperTests extends ESSingleNodeTestCase {
DocumentMapper documentMapper = mapperService.documentMapper("doc"); DocumentMapper documentMapper = mapperService.documentMapper("doc");
PercolatorFieldMapper fieldMapper = (PercolatorFieldMapper) documentMapper.mappers().getMapper(fieldName); PercolatorFieldMapper fieldMapper = (PercolatorFieldMapper) documentMapper.mappers().getMapper(fieldName);
IndexMetaData build = IndexMetaData.builder("") IndexMetadata build = IndexMetadata.builder("")
.settings(Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)) .settings(Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT))
.numberOfShards(1).numberOfReplicas(0).build(); .numberOfShards(1).numberOfReplicas(0).build();
IndexSettings settings = new IndexSettings(build, Settings.EMPTY); IndexSettings settings = new IndexSettings(build, Settings.EMPTY);
ParseContext.InternalParseContext parseContext = new ParseContext.InternalParseContext(settings, ParseContext.InternalParseContext parseContext = new ParseContext.InternalParseContext(settings,
@ -237,8 +237,8 @@ public class PercolatorFieldMapperTests extends ESSingleNodeTestCase {
bq.add(rangeQuery2, Occur.MUST); bq.add(rangeQuery2, Occur.MUST);
DocumentMapper documentMapper = mapperService.documentMapper("doc"); DocumentMapper documentMapper = mapperService.documentMapper("doc");
IndexMetaData build = IndexMetaData.builder("") IndexMetadata build = IndexMetadata.builder("")
.settings(Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)) .settings(Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT))
.numberOfShards(1).numberOfReplicas(0).build(); .numberOfShards(1).numberOfReplicas(0).build();
IndexSettings settings = new IndexSettings(build, Settings.EMPTY); IndexSettings settings = new IndexSettings(build, Settings.EMPTY);
PercolatorFieldMapper fieldMapper = (PercolatorFieldMapper) documentMapper.mappers().getMapper(fieldName); PercolatorFieldMapper fieldMapper = (PercolatorFieldMapper) documentMapper.mappers().getMapper(fieldName);
@ -292,8 +292,8 @@ public class PercolatorFieldMapperTests extends ESSingleNodeTestCase {
TermRangeQuery query = new TermRangeQuery("field1", new BytesRef("a"), new BytesRef("z"), true, true); TermRangeQuery query = new TermRangeQuery("field1", new BytesRef("a"), new BytesRef("z"), true, true);
DocumentMapper documentMapper = mapperService.documentMapper("doc"); DocumentMapper documentMapper = mapperService.documentMapper("doc");
PercolatorFieldMapper fieldMapper = (PercolatorFieldMapper) documentMapper.mappers().getMapper(fieldName); PercolatorFieldMapper fieldMapper = (PercolatorFieldMapper) documentMapper.mappers().getMapper(fieldName);
IndexMetaData build = IndexMetaData.builder("") IndexMetadata build = IndexMetadata.builder("")
.settings(Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)) .settings(Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT))
.numberOfShards(1).numberOfReplicas(0).build(); .numberOfShards(1).numberOfReplicas(0).build();
IndexSettings settings = new IndexSettings(build, Settings.EMPTY); IndexSettings settings = new IndexSettings(build, Settings.EMPTY);
ParseContext.InternalParseContext parseContext = new ParseContext.InternalParseContext(settings, ParseContext.InternalParseContext parseContext = new ParseContext.InternalParseContext(settings,
@ -311,8 +311,8 @@ public class PercolatorFieldMapperTests extends ESSingleNodeTestCase {
PhraseQuery phraseQuery = new PhraseQuery("field", "term"); PhraseQuery phraseQuery = new PhraseQuery("field", "term");
DocumentMapper documentMapper = mapperService.documentMapper("doc"); DocumentMapper documentMapper = mapperService.documentMapper("doc");
PercolatorFieldMapper fieldMapper = (PercolatorFieldMapper) documentMapper.mappers().getMapper(fieldName); PercolatorFieldMapper fieldMapper = (PercolatorFieldMapper) documentMapper.mappers().getMapper(fieldName);
IndexMetaData build = IndexMetaData.builder("") IndexMetadata build = IndexMetadata.builder("")
.settings(Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)) .settings(Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT))
.numberOfShards(1).numberOfReplicas(0).build(); .numberOfShards(1).numberOfReplicas(0).build();
IndexSettings settings = new IndexSettings(build, Settings.EMPTY); IndexSettings settings = new IndexSettings(build, Settings.EMPTY);
ParseContext.InternalParseContext parseContext = new ParseContext.InternalParseContext(settings, ParseContext.InternalParseContext parseContext = new ParseContext.InternalParseContext(settings,

4
modules/percolator/src/test/java/org/elasticsearch/percolator/QueryBuilderStoreTests.java
View File

@ -29,7 +29,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.CheckedFunction; import org.elasticsearch.common.CheckedFunction;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry; import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -72,7 +72,7 @@ public class QueryBuilderStoreTests extends ESTestCase {
TermQueryBuilder[] queryBuilders = new TermQueryBuilder[randomIntBetween(1, 16)]; TermQueryBuilder[] queryBuilders = new TermQueryBuilder[randomIntBetween(1, 16)];
IndexWriterConfig config = new IndexWriterConfig(new WhitespaceAnalyzer()); IndexWriterConfig config = new IndexWriterConfig(new WhitespaceAnalyzer());
config.setMergePolicy(NoMergePolicy.INSTANCE); config.setMergePolicy(NoMergePolicy.INSTANCE);
Settings settings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT).build(); Settings settings = Settings.builder().put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT).build();
BinaryFieldMapper fieldMapper = PercolatorFieldMapper.Builder.createQueryBuilderFieldBuilder( BinaryFieldMapper fieldMapper = PercolatorFieldMapper.Builder.createQueryBuilderFieldBuilder(
new Mapper.BuilderContext(settings, new ContentPath(0))); new Mapper.BuilderContext(settings, new ContentPath(0)));

4
modules/reindex/src/test/java/org/elasticsearch/index/reindex/DeleteByQueryBasicTests.java
View File

@ -41,8 +41,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_READ_ONLY; import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_READ_ONLY;
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_READ_ONLY_ALLOW_DELETE; import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE;
import static org.elasticsearch.index.query.QueryBuilders.matchQuery; import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
import static org.elasticsearch.index.query.QueryBuilders.rangeQuery; import static org.elasticsearch.index.query.QueryBuilders.rangeQuery;
import static org.elasticsearch.index.query.QueryBuilders.termQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery;

16
modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexSourceTargetValidationTests.java
View File

@ -26,10 +26,10 @@ import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.support.AutoCreateIndex; import org.elasticsearch.action.support.AutoCreateIndex;
import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.AliasMetaData; import org.elasticsearch.cluster.metadata.AliasMetadata;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver; import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.MetaData; import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.BytesReference;
@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.containsString;
* cluster.... * cluster....
*/ */
public class ReindexSourceTargetValidationTests extends ESTestCase { public class ReindexSourceTargetValidationTests extends ESTestCase {
private static final ClusterState STATE = ClusterState.builder(new ClusterName("test")).metaData(MetaData.builder() private static final ClusterState STATE = ClusterState.builder(new ClusterName("test")).metadata(Metadata.builder()
.put(index("target", "target_alias", "target_multi"), true) .put(index("target", "target_alias", "target_multi"), true)
.put(index("target2", "target_multi"), true) .put(index("target2", "target_multi"), true)
.put(index("target_with_write_index", true, "target_multi_with_write_index"), true) .put(index("target_with_write_index", true, "target_multi_with_write_index"), true)
@ -130,17 +130,17 @@ public class ReindexSourceTargetValidationTests extends ESTestCase {
INDEX_NAME_EXPRESSION_RESOLVER, AUTO_CREATE_INDEX, STATE); INDEX_NAME_EXPRESSION_RESOLVER, AUTO_CREATE_INDEX, STATE);
} }
private static IndexMetaData index(String name, String... aliases) { private static IndexMetadata index(String name, String... aliases) {
return index(name, null, aliases); return index(name, null, aliases);
} }
private static IndexMetaData index(String name, @Nullable Boolean writeIndex, String... aliases) { private static IndexMetadata index(String name, @Nullable Boolean writeIndex, String... aliases) {
IndexMetaData.Builder builder = IndexMetaData.builder(name).settings(Settings.builder() IndexMetadata.Builder builder = IndexMetadata.builder(name).settings(Settings.builder()
.put("index.version.created", Version.CURRENT.id) .put("index.version.created", Version.CURRENT.id)
.put("index.number_of_shards", 1) .put("index.number_of_shards", 1)
.put("index.number_of_replicas", 1)); .put("index.number_of_replicas", 1));
for (String alias: aliases) { for (String alias: aliases) {
builder.putAlias(AliasMetaData.builder(alias).writeIndex(writeIndex).build()); builder.putAlias(AliasMetadata.builder(alias).writeIndex(writeIndex).build());
} }
return builder.build(); return builder.build();
} }

6
modules/repository-url/src/main/java/org/elasticsearch/common/blobstore/url/URLBlobContainer.java
View File

@ -21,7 +21,7 @@ package org.elasticsearch.common.blobstore.url;
import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.SuppressForbidden;
import org.elasticsearch.common.blobstore.BlobContainer; import org.elasticsearch.common.blobstore.BlobContainer;
import org.elasticsearch.common.blobstore.BlobMetaData; import org.elasticsearch.common.blobstore.BlobMetadata;
import org.elasticsearch.common.blobstore.BlobPath; import org.elasticsearch.common.blobstore.BlobPath;
import org.elasticsearch.common.blobstore.DeleteResult; import org.elasticsearch.common.blobstore.DeleteResult;
import org.elasticsearch.common.blobstore.support.AbstractBlobContainer; import org.elasticsearch.common.blobstore.support.AbstractBlobContainer;
@ -73,7 +73,7 @@ public class URLBlobContainer extends AbstractBlobContainer {
* This operation is not supported by URLBlobContainer * This operation is not supported by URLBlobContainer
*/ */
@Override @Override
public Map<String, BlobMetaData> listBlobs() throws IOException { public Map<String, BlobMetadata> listBlobs() throws IOException {
throw new UnsupportedOperationException("URL repository doesn't support this operation"); throw new UnsupportedOperationException("URL repository doesn't support this operation");
} }
@ -86,7 +86,7 @@ public class URLBlobContainer extends AbstractBlobContainer {
* This operation is not supported by URLBlobContainer * This operation is not supported by URLBlobContainer
*/ */
@Override @Override
public Map<String, BlobMetaData> listBlobsByPrefix(String blobNamePrefix) throws IOException { public Map<String, BlobMetadata> listBlobsByPrefix(String blobNamePrefix) throws IOException {
throw new UnsupportedOperationException("URL repository doesn't support this operation"); throw new UnsupportedOperationException("URL repository doesn't support this operation");
} }

4
modules/repository-url/src/main/java/org/elasticsearch/repositories/url/URLRepository.java
View File

@ -21,7 +21,7 @@ package org.elasticsearch.repositories.url;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.elasticsearch.cluster.metadata.RepositoryMetaData; import org.elasticsearch.cluster.metadata.RepositoryMetadata;
import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.blobstore.BlobContainer; import org.elasticsearch.common.blobstore.BlobContainer;
import org.elasticsearch.common.blobstore.BlobPath; import org.elasticsearch.common.blobstore.BlobPath;
@ -82,7 +82,7 @@ public class URLRepository extends BlobStoreRepository {
/** /**
* Constructs a read-only URL-based repository * Constructs a read-only URL-based repository
*/ */
public URLRepository(RepositoryMetaData metadata, Environment environment, public URLRepository(RepositoryMetadata metadata, Environment environment,
NamedXContentRegistry namedXContentRegistry, ClusterService clusterService) { NamedXContentRegistry namedXContentRegistry, ClusterService clusterService) {
super(metadata, false, namedXContentRegistry, clusterService); super(metadata, false, namedXContentRegistry, clusterService);

22
modules/repository-url/src/test/java/org/elasticsearch/repositories/url/URLRepositoryTests.java
View File

@ -19,7 +19,7 @@
package org.elasticsearch.repositories.url; package org.elasticsearch.repositories.url;
import org.elasticsearch.cluster.metadata.RepositoryMetaData; import org.elasticsearch.cluster.metadata.RepositoryMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
@ -38,8 +38,8 @@ import static org.hamcrest.CoreMatchers.nullValue;
public class URLRepositoryTests extends ESTestCase { public class URLRepositoryTests extends ESTestCase {
private URLRepository createRepository(Settings baseSettings, RepositoryMetaData repositoryMetaData) { private URLRepository createRepository(Settings baseSettings, RepositoryMetadata repositoryMetadata) {
return new URLRepository(repositoryMetaData, TestEnvironment.newEnvironment(baseSettings), return new URLRepository(repositoryMetadata, TestEnvironment.newEnvironment(baseSettings),
new NamedXContentRegistry(Collections.emptyList()), BlobStoreTestUtil.mockClusterService()) { new NamedXContentRegistry(Collections.emptyList()), BlobStoreTestUtil.mockClusterService()) {
@Override @Override
protected void assertSnapshotOrGenericThread() { protected void assertSnapshotOrGenericThread() {
@ -55,8 +55,8 @@ public class URLRepositoryTests extends ESTestCase {
.put(URLRepository.ALLOWED_URLS_SETTING.getKey(), repoPath) .put(URLRepository.ALLOWED_URLS_SETTING.getKey(), repoPath)
.put(URLRepository.REPOSITORIES_URL_SETTING.getKey(), repoPath) .put(URLRepository.REPOSITORIES_URL_SETTING.getKey(), repoPath)
.build(); .build();
RepositoryMetaData repositoryMetaData = new RepositoryMetaData("url", URLRepository.TYPE, baseSettings); RepositoryMetadata repositoryMetadata = new RepositoryMetadata("url", URLRepository.TYPE, baseSettings);
final URLRepository repository = createRepository(baseSettings, repositoryMetaData); final URLRepository repository = createRepository(baseSettings, repositoryMetadata);
repository.start(); repository.start();
assertThat("blob store has to be lazy initialized", repository.getBlobStore(), is(nullValue())); assertThat("blob store has to be lazy initialized", repository.getBlobStore(), is(nullValue()));
@ -70,8 +70,8 @@ public class URLRepositoryTests extends ESTestCase {
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
.put(URLRepository.REPOSITORIES_URL_SETTING.getKey(), repoPath) .put(URLRepository.REPOSITORIES_URL_SETTING.getKey(), repoPath)
.build(); .build();
RepositoryMetaData repositoryMetaData = new RepositoryMetaData("url", URLRepository.TYPE, baseSettings); RepositoryMetadata repositoryMetadata = new RepositoryMetadata("url", URLRepository.TYPE, baseSettings);
final URLRepository repository = createRepository(baseSettings, repositoryMetaData); final URLRepository repository = createRepository(baseSettings, repositoryMetadata);
repository.start(); repository.start();
try { try {
repository.blobContainer(); repository.blobContainer();
@ -92,8 +92,8 @@ public class URLRepositoryTests extends ESTestCase {
.put(URLRepository.REPOSITORIES_URL_SETTING.getKey(), repoPath) .put(URLRepository.REPOSITORIES_URL_SETTING.getKey(), repoPath)
.put(URLRepository.SUPPORTED_PROTOCOLS_SETTING.getKey(), "http,https") .put(URLRepository.SUPPORTED_PROTOCOLS_SETTING.getKey(), "http,https")
.build(); .build();
RepositoryMetaData repositoryMetaData = new RepositoryMetaData("url", URLRepository.TYPE, baseSettings); RepositoryMetadata repositoryMetadata = new RepositoryMetadata("url", URLRepository.TYPE, baseSettings);
final URLRepository repository = createRepository(baseSettings, repositoryMetaData); final URLRepository repository = createRepository(baseSettings, repositoryMetadata);
repository.start(); repository.start();
try { try {
repository.blobContainer(); repository.blobContainer();
@ -109,8 +109,8 @@ public class URLRepositoryTests extends ESTestCase {
.put(URLRepository.ALLOWED_URLS_SETTING.getKey(), "file:/tmp/") .put(URLRepository.ALLOWED_URLS_SETTING.getKey(), "file:/tmp/")
.put(URLRepository.REPOSITORIES_URL_SETTING.getKey(), "file:/var/" ) .put(URLRepository.REPOSITORIES_URL_SETTING.getKey(), "file:/var/" )
.build(); .build();
RepositoryMetaData repositoryMetaData = new RepositoryMetaData("url", URLRepository.TYPE, baseSettings); RepositoryMetadata repositoryMetadata = new RepositoryMetadata("url", URLRepository.TYPE, baseSettings);
final URLRepository repository = createRepository(baseSettings, repositoryMetaData); final URLRepository repository = createRepository(baseSettings, repositoryMetadata);
repository.start(); repository.start();
try { try {
repository.blobContainer(); repository.blobContainer();

6
modules/transport-netty4/src/test/java/org/elasticsearch/rest/discovery/Zen2RestApiIT.java
View File

@ -28,7 +28,7 @@ import org.elasticsearch.client.Request;
import org.elasticsearch.client.Response; import org.elasticsearch.client.Response;
import org.elasticsearch.client.ResponseException; import org.elasticsearch.client.ResponseException;
import org.elasticsearch.client.RestClient; import org.elasticsearch.client.RestClient;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.cluster.routing.UnassignedInfo; import org.elasticsearch.cluster.routing.UnassignedInfo;
import org.elasticsearch.common.Priority; import org.elasticsearch.common.Priority;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -61,8 +61,8 @@ public class Zen2RestApiIT extends ESNetty4IntegTestCase {
createIndex("test", createIndex("test",
Settings.builder() Settings.builder()
.put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.ZERO) // assign shards .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.ZERO) // assign shards
.put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 2) // causes rebalancing .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 2) // causes rebalancing
.put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 1) .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1)
.build()); .build());
ensureGreen("test"); ensureGreen("test");

10
plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/IcuAnalyzerTests.java
View File

@ -22,7 +22,7 @@ package org.elasticsearch.index.analysis;
import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.plugin.analysis.icu.AnalysisICUPlugin; import org.elasticsearch.plugin.analysis.icu.AnalysisICUPlugin;
@ -37,7 +37,7 @@ public class IcuAnalyzerTests extends BaseTokenStreamTestCase {
public void testMixedAlphabetTokenization() throws IOException { public void testMixedAlphabetTokenization() throws IOException {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.build(); .build();
IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings);
@ -52,7 +52,7 @@ public class IcuAnalyzerTests extends BaseTokenStreamTestCase {
public void testMiddleDots() throws IOException { public void testMiddleDots() throws IOException {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.build(); .build();
IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings);
@ -66,7 +66,7 @@ public class IcuAnalyzerTests extends BaseTokenStreamTestCase {
public void testUnicodeNumericCharacters() throws IOException { public void testUnicodeNumericCharacters() throws IOException {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.build(); .build();
IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings);
@ -80,7 +80,7 @@ public class IcuAnalyzerTests extends BaseTokenStreamTestCase {
public void testBadSettings() { public void testBadSettings() {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put("mode", "wrong") .put("mode", "wrong")
.build(); .build();
IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings);

4
plugins/analysis-icu/src/test/java/org/elasticsearch/index/analysis/IcuTokenizerFactoryTests.java
View File

@ -21,7 +21,7 @@ package org.elasticsearch.index.analysis;
import org.apache.lucene.analysis.icu.segmentation.ICUTokenizer; import org.apache.lucene.analysis.icu.segmentation.ICUTokenizer;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.index.Index; import org.elasticsearch.index.Index;
@ -96,7 +96,7 @@ public class IcuTokenizerFactoryTests extends ESTestCase {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.loadFromStream(json, IcuTokenizerFactoryTests.class.getResourceAsStream(json), false) .loadFromStream(json, IcuTokenizerFactoryTests.class.getResourceAsStream(json), false)
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.build(); .build();
Settings nodeSettings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), home).build(); Settings nodeSettings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), home).build();

6
plugins/analysis-kuromoji/src/test/java/org/elasticsearch/index/analysis/KuromojiAnalysisTests.java
View File

@ -26,7 +26,7 @@ import org.apache.lucene.analysis.ja.JapaneseAnalyzer;
import org.apache.lucene.analysis.ja.JapaneseTokenizer; import org.apache.lucene.analysis.ja.JapaneseTokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.index.Index; import org.elasticsearch.index.Index;
@ -214,7 +214,7 @@ public class KuromojiAnalysisTests extends ESTestCase {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.loadFromStream(json, KuromojiAnalysisTests.class.getResourceAsStream(json), false) .loadFromStream(json, KuromojiAnalysisTests.class.getResourceAsStream(json), false)
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.build(); .build();
Settings nodeSettings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), home).build(); Settings nodeSettings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), home).build();
return createTestAnalysis(new Index("test", "_na_"), nodeSettings, settings, new AnalysisKuromojiPlugin()); return createTestAnalysis(new Index("test", "_na_"), nodeSettings, settings, new AnalysisKuromojiPlugin());
@ -355,7 +355,7 @@ public class KuromojiAnalysisTests extends ESTestCase {
Files.createDirectory(config); Files.createDirectory(config);
Files.copy(dict, config.resolve("user_dict.txt")); Files.copy(dict, config.resolve("user_dict.txt"));
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put(Environment.PATH_HOME_SETTING.getKey(), home) .put(Environment.PATH_HOME_SETTING.getKey(), home)
.put(analysisSettings) .put(analysisSettings)
.build(); .build();

8
plugins/analysis-nori/src/test/java/org/elasticsearch/index/analysis/NoriAnalysisTests.java
View File

@ -25,7 +25,7 @@ import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.ko.KoreanAnalyzer; import org.apache.lucene.analysis.ko.KoreanAnalyzer;
import org.apache.lucene.analysis.ko.KoreanTokenizer; import org.apache.lucene.analysis.ko.KoreanTokenizer;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
import org.elasticsearch.plugin.analysis.nori.AnalysisNoriPlugin; import org.elasticsearch.plugin.analysis.nori.AnalysisNoriPlugin;
@ -177,7 +177,7 @@ public class NoriAnalysisTests extends ESTokenStreamTestCase {
public void testNoriReadingForm() throws IOException { public void testNoriReadingForm() throws IOException {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
.put("index.analysis.filter.my_filter.type", "nori_readingform") .put("index.analysis.filter.my_filter.type", "nori_readingform")
.build(); .build();
@ -191,7 +191,7 @@ public class NoriAnalysisTests extends ESTokenStreamTestCase {
public void testNoriNumber() throws IOException { public void testNoriNumber() throws IOException {
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
.put("index.analysis.filter.my_filter.type", "nori_number") .put("index.analysis.filter.my_filter.type", "nori_number")
.build(); .build();
@ -217,7 +217,7 @@ public class NoriAnalysisTests extends ESTokenStreamTestCase {
Files.createDirectory(config); Files.createDirectory(config);
Files.copy(dict, config.resolve("user_dict.txt")); Files.copy(dict, config.resolve("user_dict.txt"));
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put(Environment.PATH_HOME_SETTING.getKey(), home) .put(Environment.PATH_HOME_SETTING.getKey(), home)
.put(analysisSettings) .put(analysisSettings)
.build(); .build();

6
plugins/analysis-phonetic/src/test/java/org/elasticsearch/index/analysis/AnalysisPhoneticFactoryTests.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.index.analysis; package org.elasticsearch.index.analysis;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.IndexSettings; import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.indices.analysis.AnalysisFactoryTestCase; import org.elasticsearch.indices.analysis.AnalysisFactoryTestCase;
@ -51,7 +51,7 @@ public class AnalysisPhoneticFactoryTests extends AnalysisFactoryTestCase {
AnalysisPhoneticPlugin plugin = new AnalysisPhoneticPlugin(); AnalysisPhoneticPlugin plugin = new AnalysisPhoneticPlugin();
Settings settings = Settings.builder() Settings settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT)) .put(IndexMetadata.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT))
.put("path.home", createTempDir().toString()) .put("path.home", createTempDir().toString())
.build(); .build();
IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings); IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings);
@ -62,7 +62,7 @@ public class AnalysisPhoneticFactoryTests extends AnalysisFactoryTestCase {
assertEquals("Token filter [phonetic] cannot be used to parse synonyms", e.getMessage()); assertEquals("Token filter [phonetic] cannot be used to parse synonyms", e.getMessage());
settings = Settings.builder() settings = Settings.builder()
.put(IndexMetaData.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(), .put(IndexMetadata.SETTING_VERSION_CREATED, VersionUtils.randomVersionBetween(random(),
Version.V_6_0_0, VersionUtils.getPreviousVersion(Version.V_7_0_0))) Version.V_6_0_0, VersionUtils.getPreviousVersion(Version.V_7_0_0)))
.put("path.home", createTempDir().toString()) .put("path.home", createTempDir().toString())
.build(); .build();

4
plugins/analysis-phonetic/src/test/java/org/elasticsearch/index/analysis/SimplePhoneticAnalysisTests.java
View File

@ -24,7 +24,7 @@ import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.WhitespaceTokenizer; import org.apache.lucene.analysis.core.WhitespaceTokenizer;
import org.apache.lucene.analysis.phonetic.DaitchMokotoffSoundexFilter; import org.apache.lucene.analysis.phonetic.DaitchMokotoffSoundexFilter;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.Index; import org.elasticsearch.index.Index;
import org.elasticsearch.plugin.analysis.AnalysisPhoneticPlugin; import org.elasticsearch.plugin.analysis.AnalysisPhoneticPlugin;
@ -45,7 +45,7 @@ public class SimplePhoneticAnalysisTests extends ESTestCase {
public void setup() throws IOException { public void setup() throws IOException {
String yaml = "/org/elasticsearch/index/analysis/phonetic-1.yml"; String yaml = "/org/elasticsearch/index/analysis/phonetic-1.yml";
Settings settings = Settings.builder().loadFromStream(yaml, getClass().getResourceAsStream(yaml), false) Settings settings = Settings.builder().loadFromStream(yaml, getClass().getResourceAsStream(yaml), false)
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.build(); .build();
this.analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisPhoneticPlugin()); this.analysis = createTestAnalysis(new Index("test", "_na_"), settings, new AnalysisPhoneticPlugin());
} }

14
plugins/analysis-stempel/src/test/java/org/elasticsearch/index/analysis/AnalysisPolishFactoryTests.java
View File

@ -24,7 +24,7 @@ import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.Tokenizer;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.UUIDs; import org.elasticsearch.common.UUIDs;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment; import org.elasticsearch.env.Environment;
@ -54,15 +54,15 @@ public class AnalysisPolishFactoryTests extends AnalysisFactoryTestCase {
// TODO: is this the right boilerplate? I forked this out of TransportAnalyzeAction.java: // TODO: is this the right boilerplate? I forked this out of TransportAnalyzeAction.java:
Settings settings = Settings.builder() Settings settings = Settings.builder()
// for _na_ // for _na_
.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
.put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0) .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
.put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1) .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
.put(IndexMetaData.SETTING_INDEX_UUID, UUIDs.randomBase64UUID()) .put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID())
.put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString()) .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
.build(); .build();
Environment environment = TestEnvironment.newEnvironment(settings); Environment environment = TestEnvironment.newEnvironment(settings);
IndexMetaData metaData = IndexMetaData.builder(IndexMetaData.INDEX_UUID_NA_VALUE).settings(settings).build(); IndexMetadata metadata = IndexMetadata.builder(IndexMetadata.INDEX_UUID_NA_VALUE).settings(settings).build();
IndexSettings indexSettings = new IndexSettings(metaData, Settings.EMPTY); IndexSettings indexSettings = new IndexSettings(metadata, Settings.EMPTY);
testThreadSafety(new PolishStemTokenFilterFactory(indexSettings, environment, "stempelpolishstem", settings)); testThreadSafety(new PolishStemTokenFilterFactory(indexSettings, environment, "stempelpolishstem", settings));
} }

4
plugins/examples/security-authorization-engine/src/test/java/org/elasticsearch/example/CustomAuthorizationEngineTests.java
View File

@ -24,7 +24,7 @@ import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.support.PlainActionFuture; import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.cluster.metadata.IndexAbstraction; import org.elasticsearch.cluster.metadata.IndexAbstraction;
import org.elasticsearch.cluster.metadata.IndexAbstraction.Index; import org.elasticsearch.cluster.metadata.IndexAbstraction.Index;
import org.elasticsearch.cluster.metadata.IndexMetaData; import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.transport.TransportRequest; import org.elasticsearch.transport.TransportRequest;
@ -131,7 +131,7 @@ public class CustomAuthorizationEngineTests extends ESTestCase {
public void testAuthorizeIndexAction() { public void testAuthorizeIndexAction() {
CustomAuthorizationEngine engine = new CustomAuthorizationEngine(); CustomAuthorizationEngine engine = new CustomAuthorizationEngine();
Map<String, IndexAbstraction> indicesMap = new HashMap<>(); Map<String, IndexAbstraction> indicesMap = new HashMap<>();
indicesMap.put("index", new Index(IndexMetaData.builder("index") indicesMap.put("index", new Index(IndexMetadata.builder("index")
.settings(Settings.builder().put("index.version.created", Version.CURRENT)) .settings(Settings.builder().put("index.version.created", Version.CURRENT))
.numberOfShards(1) .numberOfShards(1)
.numberOfReplicas(0) .numberOfReplicas(0)

6
plugins/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureBlobContainer.java
View File

@ -29,7 +29,7 @@ import org.elasticsearch.action.support.GroupedActionListener;
import org.elasticsearch.action.support.PlainActionFuture; import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.blobstore.BlobContainer; import org.elasticsearch.common.blobstore.BlobContainer;
import org.elasticsearch.common.blobstore.BlobMetaData; import org.elasticsearch.common.blobstore.BlobMetadata;
import org.elasticsearch.common.blobstore.BlobPath; import org.elasticsearch.common.blobstore.BlobPath;
import org.elasticsearch.common.blobstore.DeleteResult; import org.elasticsearch.common.blobstore.DeleteResult;
import org.elasticsearch.common.blobstore.support.AbstractBlobContainer; import org.elasticsearch.common.blobstore.support.AbstractBlobContainer;
@ -152,7 +152,7 @@ public class AzureBlobContainer extends AbstractBlobContainer {
} }
@Override @Override
public Map<String, BlobMetaData> listBlobsByPrefix(@Nullable String prefix) throws IOException { public Map<String, BlobMetadata> listBlobsByPrefix(@Nullable String prefix) throws IOException {
logger.trace("listBlobsByPrefix({})", prefix); logger.trace("listBlobsByPrefix({})", prefix);
try { try {
@ -164,7 +164,7 @@ public class AzureBlobContainer extends AbstractBlobContainer {
} }
@Override @Override
public Map<String, BlobMetaData> listBlobs() throws IOException { public Map<String, BlobMetadata> listBlobs() throws IOException {
logger.trace("listBlobs()"); logger.trace("listBlobs()");
return listBlobsByPrefix(null); return listBlobsByPrefix(null);
} }

8
plugins/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureBlobStore.java
View File

@ -21,9 +21,9 @@ package org.elasticsearch.repositories.azure;
import com.microsoft.azure.storage.LocationMode; import com.microsoft.azure.storage.LocationMode;
import com.microsoft.azure.storage.StorageException; import com.microsoft.azure.storage.StorageException;
import org.elasticsearch.cluster.metadata.RepositoryMetaData; import org.elasticsearch.cluster.metadata.RepositoryMetadata;
import org.elasticsearch.common.blobstore.BlobContainer; import org.elasticsearch.common.blobstore.BlobContainer;
import org.elasticsearch.common.blobstore.BlobMetaData; import org.elasticsearch.common.blobstore.BlobMetadata;
import org.elasticsearch.common.blobstore.BlobPath; import org.elasticsearch.common.blobstore.BlobPath;
import org.elasticsearch.common.blobstore.BlobStore; import org.elasticsearch.common.blobstore.BlobStore;
import org.elasticsearch.common.blobstore.DeleteResult; import org.elasticsearch.common.blobstore.DeleteResult;
@ -50,7 +50,7 @@ public class AzureBlobStore implements BlobStore {
private final String container; private final String container;
private final LocationMode locationMode; private final LocationMode locationMode;
public AzureBlobStore(RepositoryMetaData metadata, AzureStorageService service, ThreadPool threadPool) { public AzureBlobStore(RepositoryMetadata metadata, AzureStorageService service, ThreadPool threadPool) {
this.container = Repository.CONTAINER_SETTING.get(metadata.settings()); this.container = Repository.CONTAINER_SETTING.get(metadata.settings());
this.clientName = Repository.CLIENT_NAME.get(metadata.settings()); this.clientName = Repository.CLIENT_NAME.get(metadata.settings());
this.service = service; this.service = service;
@ -104,7 +104,7 @@ public class AzureBlobStore implements BlobStore {
return service.getInputStream(clientName, container, blob); return service.getInputStream(clientName, container, blob);
} }
public Map<String, BlobMetaData> listBlobsByPrefix(String keyPath, String prefix) public Map<String, BlobMetadata> listBlobsByPrefix(String keyPath, String prefix)
throws URISyntaxException, StorageException, IOException { throws URISyntaxException, StorageException, IOException {
return service.listBlobsByPrefix(clientName, container, keyPath, prefix); return service.listBlobsByPrefix(clientName, container, keyPath, prefix);
} }

4
plugins/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureRepository.java
View File

@ -23,7 +23,7 @@ import com.microsoft.azure.storage.LocationMode;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.message.ParameterizedMessage;
import org.elasticsearch.cluster.metadata.RepositoryMetaData; import org.elasticsearch.cluster.metadata.RepositoryMetadata;
import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.blobstore.BlobPath; import org.elasticsearch.common.blobstore.BlobPath;
@ -78,7 +78,7 @@ public class AzureRepository extends BlobStoreRepository {
private final boolean readonly; private final boolean readonly;
public AzureRepository( public AzureRepository(
final RepositoryMetaData metadata, final RepositoryMetadata metadata,
final NamedXContentRegistry namedXContentRegistry, final NamedXContentRegistry namedXContentRegistry,
final AzureStorageService storageService, final AzureStorageService storageService,
final ClusterService clusterService) { final ClusterService clusterService) {

10
plugins/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureStorageService.java
View File

@ -43,10 +43,10 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage; import org.apache.logging.log4j.message.ParameterizedMessage;
import org.elasticsearch.action.support.PlainActionFuture; import org.elasticsearch.action.support.PlainActionFuture;
import org.elasticsearch.common.blobstore.BlobMetaData; import org.elasticsearch.common.blobstore.BlobMetadata;
import org.elasticsearch.common.blobstore.BlobPath; import org.elasticsearch.common.blobstore.BlobPath;
import org.elasticsearch.common.blobstore.DeleteResult; import org.elasticsearch.common.blobstore.DeleteResult;
import org.elasticsearch.common.blobstore.support.PlainBlobMetaData; import org.elasticsearch.common.blobstore.support.PlainBlobMetadata;
import org.elasticsearch.common.collect.MapBuilder; import org.elasticsearch.common.collect.MapBuilder;
import org.elasticsearch.common.collect.Tuple; import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -267,12 +267,12 @@ public class AzureStorageService {
return giveSocketPermissionsToStream(is); return giveSocketPermissionsToStream(is);
} }
public Map<String, BlobMetaData> listBlobsByPrefix(String account, String container, String keyPath, String prefix) public Map<String, BlobMetadata> listBlobsByPrefix(String account, String container, String keyPath, String prefix)
throws URISyntaxException, StorageException, IOException { throws URISyntaxException, StorageException, IOException {
// NOTE: this should be here: if (prefix == null) prefix = ""; // NOTE: this should be here: if (prefix == null) prefix = "";
// however, this is really inefficient since deleteBlobsByPrefix enumerates everything and // however, this is really inefficient since deleteBlobsByPrefix enumerates everything and
// then does a prefix match on the result; it should just call listBlobsByPrefix with the prefix! // then does a prefix match on the result; it should just call listBlobsByPrefix with the prefix!
final MapBuilder<String, BlobMetaData> blobsBuilder = MapBuilder.newMapBuilder(); final MapBuilder<String, BlobMetadata> blobsBuilder = MapBuilder.newMapBuilder();
final EnumSet<BlobListingDetails> enumBlobListingDetails = EnumSet.of(BlobListingDetails.METADATA); final EnumSet<BlobListingDetails> enumBlobListingDetails = EnumSet.of(BlobListingDetails.METADATA);
final Tuple<CloudBlobClient, Supplier<OperationContext>> client = client(account); final Tuple<CloudBlobClient, Supplier<OperationContext>> client = client(account);
final CloudBlobContainer blobContainer = client.v1().getContainerReference(container); final CloudBlobContainer blobContainer = client.v1().getContainerReference(container);
@ -289,7 +289,7 @@ public class AzureStorageService {
final BlobProperties properties = ((CloudBlob) blobItem).getProperties(); final BlobProperties properties = ((CloudBlob) blobItem).getProperties();
final String name = blobPath.substring(keyPath.length()); final String name = blobPath.substring(keyPath.length());
logger.trace(() -> new ParameterizedMessage("blob url [{}], name [{}], size [{}]", uri, name, properties.getLength())); logger.trace(() -> new ParameterizedMessage("blob url [{}], name [{}], size [{}]", uri, name, properties.getLength()));
blobsBuilder.put(name, new PlainBlobMetaData(name, properties.getLength())); blobsBuilder.put(name, new PlainBlobMetadata(name, properties.getLength()));
} }
} }
}); });

6
plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureBlobContainerRetriesTests.java
View File

@ -25,7 +25,7 @@ import com.microsoft.azure.storage.blob.BlobRequestOptions;
import com.sun.net.httpserver.HttpExchange; import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpServer; import com.sun.net.httpserver.HttpServer;
import fixture.azure.AzureHttpHandler; import fixture.azure.AzureHttpHandler;
import org.elasticsearch.cluster.metadata.RepositoryMetaData; import org.elasticsearch.cluster.metadata.RepositoryMetadata;
import org.elasticsearch.common.Strings; import org.elasticsearch.common.Strings;
import org.elasticsearch.common.SuppressForbidden; import org.elasticsearch.common.SuppressForbidden;
import org.elasticsearch.common.blobstore.BlobContainer; import org.elasticsearch.common.blobstore.BlobContainer;
@ -139,13 +139,13 @@ public class AzureBlobContainerRetriesTests extends ESTestCase {
} }
}; };
final RepositoryMetaData repositoryMetaData = new RepositoryMetaData("repository", AzureRepository.TYPE, final RepositoryMetadata repositoryMetadata = new RepositoryMetadata("repository", AzureRepository.TYPE,
Settings.builder() Settings.builder()
.put(CONTAINER_SETTING.getKey(), "container") .put(CONTAINER_SETTING.getKey(), "container")
.put(ACCOUNT_SETTING.getKey(), clientName) .put(ACCOUNT_SETTING.getKey(), clientName)
.build()); .build());
return new AzureBlobContainer(BlobPath.cleanPath(), new AzureBlobStore(repositoryMetaData, service, threadPool), threadPool); return new AzureBlobContainer(BlobPath.cleanPath(), new AzureBlobStore(repositoryMetadata, service, threadPool), threadPool);
} }
public void testReadNonexistentBlobThrowsNoSuchFileException() { public void testReadNonexistentBlobThrowsNoSuchFileException() {

4
plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureRepositorySettingsTests.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.repositories.azure; package org.elasticsearch.repositories.azure;
import com.microsoft.azure.storage.LocationMode; import com.microsoft.azure.storage.LocationMode;
import org.elasticsearch.cluster.metadata.RepositoryMetaData; import org.elasticsearch.cluster.metadata.RepositoryMetadata;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue; import org.elasticsearch.common.unit.ByteSizeValue;
@ -41,7 +41,7 @@ public class AzureRepositorySettingsTests extends ESTestCase {
.putList(Environment.PATH_DATA_SETTING.getKey(), tmpPaths()) .putList(Environment.PATH_DATA_SETTING.getKey(), tmpPaths())
.put(settings) .put(settings)
.build(); .build();
final AzureRepository azureRepository = new AzureRepository(new RepositoryMetaData("foo", "azure", internalSettings), final AzureRepository azureRepository = new AzureRepository(new RepositoryMetadata("foo", "azure", internalSettings),
NamedXContentRegistry.EMPTY, mock(AzureStorageService.class), BlobStoreTestUtil.mockClusterService()); NamedXContentRegistry.EMPTY, mock(AzureStorageService.class), BlobStoreTestUtil.mockClusterService());
assertThat(azureRepository.getBlobStore(), is(nullValue())); assertThat(azureRepository.getBlobStore(), is(nullValue()));
return azureRepository; return azureRepository;

6
plugins/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobContainer.java
View File

@ -20,7 +20,7 @@
package org.elasticsearch.repositories.gcs; package org.elasticsearch.repositories.gcs;
import org.elasticsearch.common.blobstore.BlobContainer; import org.elasticsearch.common.blobstore.BlobContainer;
import org.elasticsearch.common.blobstore.BlobMetaData; import org.elasticsearch.common.blobstore.BlobMetadata;
import org.elasticsearch.common.blobstore.BlobPath; import org.elasticsearch.common.blobstore.BlobPath;
import org.elasticsearch.common.blobstore.DeleteResult; import org.elasticsearch.common.blobstore.DeleteResult;
import org.elasticsearch.common.blobstore.support.AbstractBlobContainer; import org.elasticsearch.common.blobstore.support.AbstractBlobContainer;
@ -43,7 +43,7 @@ class GoogleCloudStorageBlobContainer extends AbstractBlobContainer {
} }
@Override @Override
public Map<String, BlobMetaData> listBlobs() throws IOException { public Map<String, BlobMetadata> listBlobs() throws IOException {
return blobStore.listBlobs(path); return blobStore.listBlobs(path);
} }
@ -53,7 +53,7 @@ class GoogleCloudStorageBlobContainer extends AbstractBlobContainer {
} }
@Override @Override
public Map<String, BlobMetaData> listBlobsByPrefix(String prefix) throws IOException { public Map<String, BlobMetadata> listBlobsByPrefix(String prefix) throws IOException {
return blobStore.listBlobsByPrefix(path, prefix); return blobStore.listBlobsByPrefix(path, prefix);
} }

Some files were not shown because too many files have changed in this diff Show More