Skip to content

Commit de96724

Browse files
committed
simplify DeleteLicenseResponse fromXContent parsing
1 parent 0ac7816 commit de96724

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

server/src/main/java/org/elasticsearch/action/support/master/AcknowledgedResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
*/
4040
public abstract class AcknowledgedResponse extends ActionResponse implements ToXContentObject {
4141

42-
protected static final ParseField ACKNOWLEDGED = new ParseField("acknowledged");
42+
private static final ParseField ACKNOWLEDGED = new ParseField("acknowledged");
4343

4444
protected static <T extends AcknowledgedResponse> void declareAcknowledgedField(ConstructingObjectParser<T, Void> objectParser) {
4545
objectParser.declareField(constructorArg(), (parser, context) -> parser.booleanValue(), ACKNOWLEDGED,

x-pack/protocol/src/main/java/org/elasticsearch/protocol/xpack/license/DeleteLicenseResponse.java

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,18 @@
1919
package org.elasticsearch.protocol.xpack.license;
2020

2121
import org.elasticsearch.action.support.master.AcknowledgedResponse;
22-
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
2322
import org.elasticsearch.common.xcontent.XContentParser;
2423

25-
import java.io.IOException;
26-
27-
import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;
28-
2924
public class DeleteLicenseResponse extends AcknowledgedResponse {
3025

31-
private static final ConstructingObjectParser<DeleteLicenseResponse, Void> PARSER = new ConstructingObjectParser<>(
32-
"delete_license_response", true, (a, v) -> new DeleteLicenseResponse((Boolean) a[0]));
33-
34-
static {
35-
PARSER.declareBoolean(constructorArg(), AcknowledgedResponse.ACKNOWLEDGED);
36-
}
37-
3826
public DeleteLicenseResponse() {
3927
}
4028

4129
public DeleteLicenseResponse(boolean acknowledged) {
4230
super(acknowledged);
4331
}
4432

45-
public static DeleteLicenseResponse fromXContent(XContentParser parser) throws IOException {
46-
return PARSER.parse(parser, null);
33+
public static DeleteLicenseResponse fromXContent(XContentParser parser) {
34+
return new DeleteLicenseResponse(parseAcknowledged(parser));
4735
}
4836
}

0 commit comments

Comments
 (0)