Skip to content

Commit

Permalink
Share common parser in some AcknowledgedResponses (#31169)
Browse files Browse the repository at this point in the history
Several AcknowledgedResponse implementations only parse the boolean acknowledged
flag and then create an instance of their class using that flag. This can be
simplified by adding this basic parser to the superclass, provide a common
helper method and call the appropriate ctor in the fromXContent methods.
  • Loading branch information
Christoph Büscher committed Jun 7, 2018
1 parent 1b64979 commit 9fd9e1c
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 75 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,13 @@
package org.elasticsearch.action.admin.cluster.repositories.delete;

import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser;

/**
* Unregister repository response
*/
public class DeleteRepositoryResponse extends AcknowledgedResponse {

private static final ConstructingObjectParser<DeleteRepositoryResponse, Void> PARSER =
new ConstructingObjectParser<>("delete_repository", true, args -> new DeleteRepositoryResponse((boolean) args[0]));

static {
declareAcknowledgedField(PARSER);
}

DeleteRepositoryResponse() {
}

Expand All @@ -43,6 +35,6 @@ public class DeleteRepositoryResponse extends AcknowledgedResponse {
}

public static DeleteRepositoryResponse fromXContent(XContentParser parser) {
return PARSER.apply(parser, null);
return new DeleteRepositoryResponse(parseAcknowledged(parser));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,13 @@
package org.elasticsearch.action.admin.cluster.repositories.put;

import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser;

/**
* Register repository response
*/
public class PutRepositoryResponse extends AcknowledgedResponse {

private static final ConstructingObjectParser<PutRepositoryResponse, Void> PARSER = new ConstructingObjectParser<>("put_repository",
true, args -> new PutRepositoryResponse((boolean) args[0]));

static {
declareAcknowledgedField(PARSER);
}

PutRepositoryResponse() {
}

Expand All @@ -43,6 +35,6 @@ public class PutRepositoryResponse extends AcknowledgedResponse {
}

public static PutRepositoryResponse fromXContent(XContentParser parser) {
return PARSER.apply(parser, null);
return new PutRepositoryResponse(parseAcknowledged(parser));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ public class IndicesAliasesResponse extends AcknowledgedResponse {
}

public static IndicesAliasesResponse fromXContent(XContentParser parser) {
return PARSER.apply(parser, null);
return new IndicesAliasesResponse(parseAcknowledged(parser));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,12 @@
package org.elasticsearch.action.admin.indices.close;

import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser;

/**
* A response for a close index action.
*/
public class CloseIndexResponse extends AcknowledgedResponse {
private static final ConstructingObjectParser<CloseIndexResponse, Void> PARSER = new ConstructingObjectParser<>("close_index", true,
args -> new CloseIndexResponse((boolean) args[0]));

static {
declareAcknowledgedField(PARSER);
}

CloseIndexResponse() {
}

Expand All @@ -42,6 +34,6 @@ public class CloseIndexResponse extends AcknowledgedResponse {
}

public static CloseIndexResponse fromXContent(XContentParser parser) {
return PARSER.apply(parser, null);
return new CloseIndexResponse(parseAcknowledged(parser));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,13 @@
package org.elasticsearch.action.admin.indices.delete;

import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser;

/**
* A response for a delete index action.
*/
public class DeleteIndexResponse extends AcknowledgedResponse {

private static final ConstructingObjectParser<DeleteIndexResponse, Void> PARSER = new ConstructingObjectParser<>("delete_index",
true, args -> new DeleteIndexResponse((boolean) args[0]));

static {
declareAcknowledgedField(PARSER);
}

DeleteIndexResponse() {
}

Expand All @@ -43,6 +35,6 @@ public class DeleteIndexResponse extends AcknowledgedResponse {
}

public static DeleteIndexResponse fromXContent(XContentParser parser) {
return PARSER.apply(parser, null);
return new DeleteIndexResponse(parseAcknowledged(parser));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,21 @@
package org.elasticsearch.action.admin.indices.mapping.put;

import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser;

/**
* The response of put mapping operation.
*/
public class PutMappingResponse extends AcknowledgedResponse {

private static final ConstructingObjectParser<PutMappingResponse, Void> PARSER = new ConstructingObjectParser<>("put_mapping",
true, args -> new PutMappingResponse((boolean) args[0]));

static {
declareAcknowledgedField(PARSER);
}

protected PutMappingResponse() {

}

protected PutMappingResponse(boolean acknowledged) {
super(acknowledged);
}

public static PutMappingResponse fromXContent(XContentParser parser) {
return PARSER.apply(parser, null);
return new PutMappingResponse(parseAcknowledged(parser));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,13 @@
package org.elasticsearch.action.admin.indices.settings.put;

import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser;

/**
* A response for an update index settings action
*/
public class UpdateSettingsResponse extends AcknowledgedResponse {

private static final ConstructingObjectParser<UpdateSettingsResponse, Void> PARSER = new ConstructingObjectParser<>(
"update_index_settings", true, args -> new UpdateSettingsResponse((boolean) args[0]));

static {
declareAcknowledgedField(PARSER);
}

UpdateSettingsResponse() {
}

Expand All @@ -43,7 +35,6 @@ public class UpdateSettingsResponse extends AcknowledgedResponse {
}

public static UpdateSettingsResponse fromXContent(XContentParser parser) {
return PARSER.apply(parser, null);
return new UpdateSettingsResponse(parseAcknowledged(parser));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
package org.elasticsearch.action.admin.indices.template.put;

import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser;

/**
Expand All @@ -34,13 +33,7 @@ protected PutIndexTemplateResponse(boolean acknowledged) {
super(acknowledged);
}

private static final ConstructingObjectParser<PutIndexTemplateResponse, Void> PARSER;
static {
PARSER = new ConstructingObjectParser<>("put_index_template", true, args -> new PutIndexTemplateResponse((boolean) args[0]));
declareAcknowledgedField(PARSER);
}

public static PutIndexTemplateResponse fromXContent(XContentParser parser) {
return PARSER.apply(parser, null);
return new PutIndexTemplateResponse(parseAcknowledged(parser));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,19 @@
package org.elasticsearch.action.ingest;

import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentParser;

public class WritePipelineResponse extends AcknowledgedResponse implements ToXContentObject {

private static final ConstructingObjectParser<WritePipelineResponse, Void> PARSER = new ConstructingObjectParser<>(
"write_pipeline_response", true, args -> new WritePipelineResponse((boolean) args[0]));

static {
declareAcknowledgedField(PARSER);
}

WritePipelineResponse() {

}

public WritePipelineResponse(boolean acknowledged) {
super(acknowledged);
}

public static WritePipelineResponse fromXContent(XContentParser parser) {
return PARSER.apply(parser, null);
return new WritePipelineResponse(parseAcknowledged(parser));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.elasticsearch.common.xcontent.ObjectParser;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;

import java.io.IOException;
import java.util.Objects;
Expand Down Expand Up @@ -88,6 +89,21 @@ protected void addCustomFields(XContentBuilder builder, Params params) throws IO

}

/**
* A generic parser that simply parses the acknowledged flag
*/
private static final ConstructingObjectParser<Boolean, Void> ACKNOWLEDGED_FLAG_PARSER = new ConstructingObjectParser<>(
"acknowledged_flag", true, args -> (Boolean) args[0]);

static {
ACKNOWLEDGED_FLAG_PARSER.declareField(constructorArg(), (parser, context) -> parser.booleanValue(), ACKNOWLEDGED,
ObjectParser.ValueType.BOOLEAN);
}

protected static boolean parseAcknowledged(XContentParser parser) {
return ACKNOWLEDGED_FLAG_PARSER.apply(parser, null);
}

@Override
public boolean equals(Object o) {
if (this == o) {
Expand Down

0 comments on commit 9fd9e1c

Please sign in to comment.