Skip to content

refactor CompositeValuesSourceParserHelper for reusage #33945

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

Merged
merged 1 commit into from
Sep 25, 2018
Merged

refactor CompositeValuesSourceParserHelper for reusage #33945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions ...a/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,7 @@ protected XContentBuilder internalXContent(XContentBuilder builder, Params param
builder.field(SIZE_FIELD_NAME.getPreferredName(), size);
builder.startArray(SOURCES_FIELD_NAME.getPreferredName());
for (CompositeValuesSourceBuilder<?> source: sources) {
builder.startObject();
builder.startObject(source.name());
source.toXContent(builder, params);
builder.endObject();
builder.endObject();
CompositeValuesSourceParserHelper.toXContent(source, builder, params);
}
builder.endArray();
if (after != null) {
Expand Down
20 changes: 16 additions & 4 deletions ...elasticsearch/search/aggregations/bucket/composite/CompositeValuesSourceParserHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,17 @@
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.AbstractObjectParser;
import org.elasticsearch.common.xcontent.ObjectParser;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.common.xcontent.ToXContent.Params;
import org.elasticsearch.script.Script;
import org.elasticsearch.search.aggregations.support.ValueType;

import java.io.IOException;

import static org.elasticsearch.common.xcontent.XContentParserUtils.ensureExpectedToken;

class CompositeValuesSourceParserHelper {
public class CompositeValuesSourceParserHelper {
static <VB extends CompositeValuesSourceBuilder<VB>, T> void declareValuesSourceFields(AbstractObjectParser<VB, T> objectParser,
ValueType targetValueType) {
objectParser.declareField(VB::field, XContentParser::text,
Expand All @@ -57,7 +59,7 @@ static <VB extends CompositeValuesSourceBuilder<VB>, T> void declareValuesSource
objectParser.declareField(VB::order, XContentParser::text, new ParseField("order"), ObjectParser.ValueType.STRING);
}

static void writeTo(CompositeValuesSourceBuilder<?> builder, StreamOutput out) throws IOException {
public static void writeTo(CompositeValuesSourceBuilder<?> builder, StreamOutput out) throws IOException {
final byte code;
if (builder.getClass() == TermsValuesSourceBuilder.class) {
code = 0;
Expand All @@ -72,7 +74,7 @@ static void writeTo(CompositeValuesSourceBuilder<?> builder, StreamOutput out) t
builder.writeTo(out);
}

static CompositeValuesSourceBuilder<?> readFrom(StreamInput in) throws IOException {
public static CompositeValuesSourceBuilder<?> readFrom(StreamInput in) throws IOException {
int code = in.readByte();
switch(code) {
case 0:
Expand All @@ -86,7 +88,7 @@ static CompositeValuesSourceBuilder<?> readFrom(StreamInput in) throws IOExcepti
}
}

static CompositeValuesSourceBuilder<?> fromXContent(XContentParser parser) throws IOException {
public static CompositeValuesSourceBuilder<?> fromXContent(XContentParser parser) throws IOException {
XContentParser.Token token = parser.currentToken();
ensureExpectedToken(XContentParser.Token.START_OBJECT, token, parser::getTokenLocation);
token = parser.nextToken();
Expand Down Expand Up @@ -117,4 +119,14 @@ static CompositeValuesSourceBuilder<?> fromXContent(XContentParser parser) throw
parser.nextToken();
return builder;
}

public static XContentBuilder toXContent(CompositeValuesSourceBuilder<?> source, XContentBuilder builder, Params params)
throws IOException {
builder.startObject();
builder.startObject(source.name());
source.toXContent(builder, params);
builder.endObject();
builder.endObject();
return builder;
}
}