Skip to content

Commit

Permalink
More clean-up in CreateIndexRequest.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jtibshirani
jtibshirani committed Jan 18, 2019
1 parent 8519ca2 commit 457a69e
Show file tree
Hide file tree
Showing 3 changed files with 69 additions and 55 deletions.
97 changes: 57 additions & 40 deletions ...nt/rest-high-level/src/main/java/org/elasticsearch/client/indices/CreateIndexRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.action.IndicesRequest;
import org.elasticsearch.action.admin.indices.alias.Alias;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
import org.elasticsearch.action.support.ActiveShardCount;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.client.TimedRequest;
Expand All @@ -34,20 +33,16 @@
import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.DeprecationHandler;
import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentHelper;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.index.mapper.MapperService;

import java.io.IOException;
import java.io.InputStream;
import java.io.UncheckedIOException;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Objects;
Expand All @@ -65,7 +60,10 @@ public class CreateIndexRequest extends TimedRequest implements Validatable, Ind

private final String index;
private Settings settings = EMPTY_SETTINGS;
private final Map<String, String> mappings = new HashMap<>();

private BytesReference mappings;
private XContentType mappingsXContentType;

private final Set<Alias> aliases = new HashSet<>();

private ActiveShardCount waitForActiveShards = ActiveShardCount.DEFAULT;
Expand Down Expand Up @@ -153,6 +151,8 @@ public CreateIndexRequest settings(Map<String, ?> source) {
/**
* Adds mapping that will be added when the index gets created.
*
* Note that the definition should *not* be nested under a type name.
*
* @param source The mapping source
* @param xContentType The content type of the source
*/
Expand All @@ -163,22 +163,7 @@ public CreateIndexRequest mapping(String source, XContentType xContentType) {
/**
* Adds mapping that will be added when the index gets created.
*
* @param source The mapping source
* @param xContentType the content type of the mapping source
*/
private CreateIndexRequest mapping(BytesReference source, XContentType xContentType) {
Objects.requireNonNull(xContentType);
try {
mappings.put(MapperService.SINGLE_MAPPING_NAME,
XContentHelper.convertToJson(source, false, false, xContentType));
return this;
} catch (IOException e) {
throw new UncheckedIOException("failed to convert to json", e);
}
}

/**
* Adds mapping that will be added when the index gets created.
* Note that the definition should *not* be nested under a type name.
*
* @param source The mapping source
*/
Expand All @@ -189,26 +174,43 @@ public CreateIndexRequest mapping(XContentBuilder source) {
/**
* Adds mapping that will be added when the index gets created.
*
* Note that the definition should *not* be nested under a type name.
*
* @param source The mapping source
*/
public CreateIndexRequest mapping(Map<String, ?> source) {
try {
XContentBuilder builder = XContentFactory.contentBuilder(XContentType.JSON);
builder.map(source);
return mapping(builder);
return mapping(BytesReference.bytes(builder), builder.contentType());
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + source + "]", e);
}
}


/**
* Adds mapping that will be added when the index gets created.
*
* Note that the definition should *not* be nested under a type name.
*
* @param source The mapping source
* @param xContentType the content type of the mapping source
*/
private CreateIndexRequest mapping(BytesReference source, XContentType xContentType) {
Objects.requireNonNull(xContentType);
mappings = source;
mappingsXContentType = xContentType;
return this;
}

/**
* Sets the aliases that will be associated with the index when it gets created
*/
public CreateIndexRequest aliases(Map<String, ?> source) {
try {
XContentBuilder builder = XContentFactory.jsonBuilder();
builder.map(source);
return aliases(BytesReference.bytes(builder));
return aliases(BytesReference.bytes(builder), builder.contentType());
} catch (IOException e) {
throw new ElasticsearchGenerationException("Failed to generate [" + source + "]", e);
}
Expand All @@ -218,23 +220,23 @@ public CreateIndexRequest aliases(Map<String, ?> source) {
* Sets the aliases that will be associated with the index when it gets created
*/
public CreateIndexRequest aliases(XContentBuilder source) {
return aliases(BytesReference.bytes(source));
return aliases(BytesReference.bytes(source), source.contentType());
}

/**
* Sets the aliases that will be associated with the index when it gets created
*/
public CreateIndexRequest aliases(String source) {
return aliases(new BytesArray(source));
public CreateIndexRequest aliases(String source, XContentType contentType) {
return aliases(new BytesArray(source), contentType);
}

/**
* Sets the aliases that will be associated with the index when it gets created
*/
public CreateIndexRequest aliases(BytesReference source) {
public CreateIndexRequest aliases(BytesReference source, XContentType contentType) {
// EMPTY is safe here because we never call namedObject
try (XContentParser parser = XContentHelper
.createParser(NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, source)) {
try (XContentParser parser = XContentHelper.createParser(NamedXContentRegistry.EMPTY,
DeprecationHandler.THROW_UNSUPPORTED_OPERATION, source, contentType)) {
//move to the first alias
parser.nextToken();
while ((parser.nextToken()) != XContentParser.Token.END_OBJECT) {
Expand All @@ -256,43 +258,56 @@ public CreateIndexRequest alias(Alias alias) {

/**
* Sets the settings and mappings as a single source.
*
* Note that the mapping definition should *not* be nested under a type name.
*/
public CreateIndexRequest source(String source, XContentType xContentType) {
return source(new BytesArray(source), xContentType);
}

/**
* Sets the settings and mappings as a single source.
*
* Note that the mapping definition should *not* be nested under a type name.
*/
public CreateIndexRequest source(XContentBuilder source) {
return source(BytesReference.bytes(source), source.contentType());
}

/**
* Sets the settings and mappings as a single source.
*
* Note that the mapping definition should *not* be nested under a type name.
*/
public CreateIndexRequest source(byte[] source, XContentType xContentType) {
return source(source, 0, source.length, xContentType);
}

/**
* Sets the settings and mappings as a single source.
*
* Note that the mapping definition should *not* be nested under a type name.
*/
public CreateIndexRequest source(byte[] source, int offset, int length, XContentType xContentType) {
return source(new BytesArray(source, offset, length), xContentType);
}

/**
* Sets the settings and mappings as a single source.
*
* Note that the mapping definition should *not* be nested under a type name.
*/
public CreateIndexRequest source(BytesReference source, XContentType xContentType) {
Objects.requireNonNull(xContentType);
source(XContentHelper.convertToMap(source, false, xContentType).v2(), LoggingDeprecationHandler.INSTANCE);
source(XContentHelper.convertToMap(source, false, xContentType).v2(),
DeprecationHandler.THROW_UNSUPPORTED_OPERATION);
return this;
}

/**
* Sets the settings and mappings as a single source.
*
* Note that the mapping definition should *not* be nested under a type name.
*/
@SuppressWarnings("unchecked")
public CreateIndexRequest source(Map<String, ?> source, DeprecationHandler deprecationHandler) {
Expand All @@ -301,17 +316,20 @@ public CreateIndexRequest source(Map<String, ?> source, DeprecationHandler depre
if (SETTINGS.match(name, deprecationHandler)) {
settings((Map<String, Object>) entry.getValue());
} else if (MAPPINGS.match(name, deprecationHandler)) {
Map<String, Object> mappings = (Map<String, Object>) entry.getValue();
mapping(mappings);
mapping((Map<String, Object>) entry.getValue());
} else if (ALIASES.match(name, deprecationHandler)) {
aliases((Map<String, Object>) entry.getValue());
}
}
return this;
}

public Map<String, String> mappings() {
return this.mappings;
public BytesReference mappings() {
return mappings;
}

public XContentType mappingsXContentType() {
return mappingsXContentType;
}

public Set<Alias> aliases() {
Expand Down Expand Up @@ -358,10 +376,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
settings.toXContent(builder, params);
builder.endObject();

if (!mappings.isEmpty()) {
String mapping = mappings.get(MapperService.SINGLE_MAPPING_NAME);
try (InputStream stream = new BytesArray(mapping).streamInput()) {
builder.rawField(MAPPINGS.getPreferredName(), stream, XContentType.JSON);
if (mappings != null) {
try (InputStream stream = mappings.streamInput()) {
builder.rawField(MAPPINGS.getPreferredName(), stream, mappingsXContentType);
}
}

Expand Down
25 changes: 11 additions & 14 deletions ...st-high-level/src/test/java/org/elasticsearch/client/indices/CreateIndexRequestTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@
import org.elasticsearch.action.admin.indices.alias.Alias;
import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.json.JsonXContent;
import org.elasticsearch.test.AbstractXContentTestCase;

import java.io.IOException;
import java.util.Map;
import java.util.Set;
import java.util.function.Predicate;

Expand All @@ -49,20 +47,19 @@ protected CreateIndexRequest doParseInstance(XContentParser parser) throws IOExc
}

@Override
protected void assertEqualInstances(CreateIndexRequest expectedInstance, CreateIndexRequest newInstance) {
assertEquals(expectedInstance.settings(), newInstance.settings());
assertAliasesEqual(expectedInstance.aliases(), newInstance.aliases());
assertMappingsEqual(expectedInstance.mappings(), newInstance.mappings());
protected void assertEqualInstances(CreateIndexRequest expected, CreateIndexRequest actual) {
assertEquals(expected.settings(), actual.settings());
assertAliasesEqual(expected.aliases(), actual.aliases());
assertMappingsEqual(expected, actual);
}

private void assertMappingsEqual(Map<String, String> expected, Map<String, String> actual) {
assertEquals(expected.keySet(), actual.keySet());

for (Map.Entry<String, String> expectedEntry : expected.entrySet()) {
String expectedValue = expectedEntry.getValue();
String actualValue = actual.get(expectedEntry.getKey());
try (XContentParser expectedJson = createParser(JsonXContent.jsonXContent, expectedValue);
XContentParser actualJson = createParser(JsonXContent.jsonXContent, actualValue)) {
private void assertMappingsEqual(CreateIndexRequest expected, CreateIndexRequest actual) {
if (expected.mappings() == null) {
assertNull(actual.mappings());
} else {
assertNotNull(actual.mappings());
try (XContentParser expectedJson = createParser(expected.mappingsXContentType().xContent(), expected.mappings());
XContentParser actualJson = createParser(actual.mappingsXContentType().xContent(), actual.mappings())) {
assertEquals(expectedJson.map(), actualJson.map());
} catch (IOException e) {
throw new RuntimeException(e);
Expand Down
2 changes: 1 addition & 1 deletion test/framework/src/main/java/org/elasticsearch/test/AbstractXContentTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.elasticsearch.test;

import org.elasticsearch.common.CheckedBiFunction;
import org.elasticsearch.common.CheckedBiConsumer;
import org.elasticsearch.common.CheckedBiFunction;
import org.elasticsearch.common.CheckedFunction;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.bytes.BytesReference;
Expand Down

0 comments on commit 457a69e

Please sign in to comment.