Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add start rollup job support to HL REST Client #34623

Merged
merged 11 commits into from
Oct 29, 2018
Merged

Add start rollup job support to HL REST Client #34623

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
453be79
Add start rollup job support to HL REST Client
Oct 18, 2018
11b6a03
Merge branch 'master' into HLClient-addStartJob
Oct 18, 2018
0d32c63
fix compile issue
Oct 18, 2018
48ca811
iter
Oct 19, 2018
de4b2a9
iter
Oct 19, 2018
b9f8817
Merge branch 'master' into HLClient-addStartJob
Oct 22, 2018
a716b4e
Merge branch 'master' into HLClient-addStartJob
Oct 23, 2018
c6b4930
Merge branch 'master' into HLClient-addStartJob
Oct 25, 2018
2a94112
Adressing review comments
Oct 25, 2018
d727958
Merge branch 'master' into HLClient-addStartJob
Oct 26, 2018
4b2712a
iter
Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion ...t/rest-high-level/src/main/java/org/elasticsearch/client/rollup/AcknowledgedResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,21 @@

package org.elasticsearch.client.rollup;

import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder;

import java.io.IOException;
import java.util.Objects;
import java.util.function.Function;

import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;

public abstract class AcknowledgedResponse implements ToXContentObject {

protected static final String PARSE_FIELD_NAME = "acknowledged";
private final boolean acknowledged;

public AcknowledgedResponse(final boolean acknowledged) {
Expand All @@ -37,6 +44,12 @@ public boolean isAcknowledged() {
return acknowledged;
}

protected static <T> ConstructingObjectParser<T, Void> generateParser(String name, Function<Boolean, T> ctor, String parseField) {
ConstructingObjectParser<T, Void> p = new ConstructingObjectParser<>(name, true, args -> ctor.apply((boolean) args[0]));
p.declareBoolean(constructorArg(), new ParseField(parseField));
return p;
}

@Override
public boolean equals(Object o) {
if (this == o) {
Expand Down Expand Up @@ -67,5 +80,7 @@ public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params par
/**
* @return the field name this response uses to output the acknowledged flag
*/
protected abstract String getFieldName();
protected String getFieldName() {
return PARSE_FIELD_NAME;
}
}
20 changes: 3 additions & 17 deletions ...est-high-level/src/main/java/org/elasticsearch/client/rollup/DeleteRollupJobResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,35 +19,21 @@

package org.elasticsearch.client.rollup;

import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser;

import java.io.IOException;

import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;

public class DeleteRollupJobResponse extends AcknowledgedResponse {

private static final String PARSE_FIELD_NAME = "acknowledged";

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

private static final ConstructingObjectParser<DeleteRollupJobResponse, Void> PARSER = AcknowledgedResponse
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

super bueno!

.generateParser("delete_rollup_job_response", DeleteRollupJobResponse::new, AcknowledgedResponse.PARSE_FIELD_NAME);

public static DeleteRollupJobResponse fromXContent(final XContentParser parser) throws IOException {
return PARSER.parse(parser, null);
}

private static final ConstructingObjectParser<DeleteRollupJobResponse, Void> PARSER
= new ConstructingObjectParser<>("delete_rollup_job_response", true,
args -> new DeleteRollupJobResponse((boolean) args[0]));
static {
PARSER.declareBoolean(constructorArg(), new ParseField(PARSE_FIELD_NAME));
}

@Override
protected String getFieldName() {
return PARSE_FIELD_NAME;
}
}
19 changes: 3 additions & 16 deletions ...t/rest-high-level/src/main/java/org/elasticsearch/client/rollup/PutRollupJobResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,21 @@
*/
package org.elasticsearch.client.rollup;

import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser;

import java.io.IOException;

import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;

public class PutRollupJobResponse extends AcknowledgedResponse {

private static final String PARSE_FIELD_NAME = "acknowledged";

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

private static final ConstructingObjectParser<PutRollupJobResponse, Void> PARSER = AcknowledgedResponse
.generateParser("delete_rollup_job_response", PutRollupJobResponse::new, AcknowledgedResponse.PARSE_FIELD_NAME);

public static PutRollupJobResponse fromXContent(final XContentParser parser) throws IOException {
return PARSER.parse(parser, null);
}

private static final ConstructingObjectParser<PutRollupJobResponse, Void> PARSER
= new ConstructingObjectParser<>("put_rollup_job_response", true, args -> new PutRollupJobResponse((boolean) args[0]));
static {
PARSER.declareBoolean(constructorArg(), new ParseField(PARSE_FIELD_NAME));
}

@Override
protected String getFieldName() {
return PARSE_FIELD_NAME;
}
}
13 changes: 3 additions & 10 deletions ...rest-high-level/src/main/java/org/elasticsearch/client/rollup/StartRollupJobResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@

package org.elasticsearch.client.rollup;

import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
import org.elasticsearch.common.xcontent.XContentParser;

import java.io.IOException;

import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;

public class StartRollupJobResponse extends AcknowledgedResponse {

private static final String PARSE_FIELD_NAME = "started";

private static final ConstructingObjectParser<StartRollupJobResponse, Void> PARSER = AcknowledgedResponse
.generateParser("delete_rollup_job_response", StartRollupJobResponse::new, PARSE_FIELD_NAME);

public StartRollupJobResponse(boolean acknowledged) {
super(acknowledged);
}
Expand All @@ -39,13 +39,6 @@ public static StartRollupJobResponse fromXContent(final XContentParser parser) t
return PARSER.parse(parser, null);
}

private static final ConstructingObjectParser<StartRollupJobResponse, Void> PARSER
= new ConstructingObjectParser<>("start_rollup_job_response", true,
args -> new StartRollupJobResponse((boolean) args[0]));
static {
PARSER.declareBoolean(constructorArg(), new ParseField(PARSE_FIELD_NAME));
}

@Override
protected String getFieldName() {
return PARSE_FIELD_NAME;
Expand Down