| Chunk |
|---|
| Conflicting content |
|---|
* A filter for a field based on several terms matching on any of them.
* @deprecated use {@link TermsQueryBuilder} instead.
*/
<<<<<<< HEAD
@Deprecated
public class TermsLookupQueryBuilder extends TermsQueryBuilder {
public TermsLookupQueryBuilder(String name) {
super(name, (Object[]) null);
}
@Override
public String getWriteableName() {
return TermsQueryBuilder.NAME;
=======
public class TermsLookupQueryBuilder extends QueryBuilder {
private final String name;
private String lookupIndex;
private String lookupType;
private String lookupId;
private String lookupRouting;
private String lookupPath;
private String queryName;
public TermsLookupQueryBuilder(String name) {
this.name = name;
}
/**
* Sets the filter name for the filter that can be used when searching for matched_filters per hit.
*/
public TermsLookupQueryBuilder queryName(String queryName) {
this.queryName = queryName;
return this;
}
/**
* Sets the index name to lookup the terms from.
*/
public TermsLookupQueryBuilder lookupIndex(String lookupIndex) {
this.lookupIndex = lookupIndex;
return this;
}
/**
* Sets the index type to lookup the terms from.
*/
public TermsLookupQueryBuilder lookupType(String lookupType) {
this.lookupType = lookupType;
return this;
}
/**
* Sets the doc id to lookup the terms from.
*/
public TermsLookupQueryBuilder lookupId(String lookupId) {
this.lookupId = lookupId;
return this;
}
/**
* Sets the path within the document to lookup the terms from.
*/
public TermsLookupQueryBuilder lookupPath(String lookupPath) {
this.lookupPath = lookupPath;
return this;
}
public TermsLookupQueryBuilder lookupRouting(String lookupRouting) {
this.lookupRouting = lookupRouting;
return this;
}
@Override
public void doXContent(XContentBuilder builder, Params params) throws IOException {
builder.startObject(TermsQueryParser.NAME);
builder.startObject(name);
if (lookupIndex != null) {
builder.field("index", lookupIndex);
}
builder.field("type", lookupType);
builder.field("id", lookupId);
if (lookupRouting != null) {
builder.field("routing", lookupRouting);
}
builder.field("path", lookupPath);
builder.endObject();
if (queryName != null) {
builder.field("_name", queryName);
}
builder.endObject();
>>>>>>> 4010e7e9a7148d66d5fb3699c5a042053efea1f4
}
} |
| Solution content |
|---|
* A filter for a field based on several terms matching on any of them.
* @deprecated use {@link TermsQueryBuilder} instead.
*/
@Deprecated
public class TermsLookupQueryBuilder extends TermsQueryBuilder {
public TermsLookupQueryBuilder(String name) {
super(name, (Object[]) null);
}
@Override
public String getWriteableName() {
return TermsQueryBuilder.NAME;
}
} |
| File |
|---|
| TermsLookupQueryBuilder.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Annotation |
| Attribute |
| Comment |
| If statement |
| Method declaration |
| Method invocation |
| Method signature |
| Return statement |
| Chunk |
|---|
| Conflicting content |
|---|
private final Object values;
<<<<<<< HEAD
=======
private String minimumShouldMatch;
private Boolean disableCoord;
private String queryName;
>>>>>>> 4010e7e9a7148d66d5fb3699c5a042053efea1f4
private String execution;
private String lookupIndex; |
| Solution content |
|---|
private final Object values;
private String minimumShouldMatch;
private Boolean disableCoord;
private String execution;
private String lookupIndex; |
| File |
|---|
| TermsQueryBuilder.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
}
/**
<<<<<<< HEAD
* Sets the index name to lookup the terms from.
=======
* Sets the minimum number of matches across the provided terms. Defaults to 1.
* @deprecated use [bool] query instead
*/
@Deprecated
public TermsQueryBuilder minimumShouldMatch(String minimumShouldMatch) {
this.minimumShouldMatch = minimumShouldMatch;
return this;
}
/**
* Disables Similarity#coord(int,int) in scoring. Defaults to false.
* @deprecated use [bool] query instead
*/
@Deprecated
public TermsQueryBuilder disableCoord(boolean disableCoord) {
this.disableCoord = disableCoord;
return this;
}
/**
* Sets the filter name for the filter that can be used when searching for matched_filters per hit.
>>>>>>> 4010e7e9a7148d66d5fb3699c5a042053efea1f4
*/
public TermsQueryBuilder lookupIndex(String lookupIndex) {
this.lookupIndex = lookupIndex; |
| Solution content |
|---|
}
/**
<<<<<<< HEAD
* Sets the index name to lookup the terms from.
=======
* Sets the minimum number of matches across the provided terms. Defaults to 1.
* @deprecated use [bool] query instead
*/
@Deprecated
public TermsQueryBuilder minimumShouldMatch(String minimumShouldMatch) {
this.minimumShouldMatch = minimumShouldMatch;
return this;
}
/**
* Disables Similarity#coord(int,int) in scoring. Defaults to false.
* @deprecated use [bool] query instead
*/
@Deprecated
public TermsQueryBuilder disableCoord(boolean disableCoord) {
this.disableCoord = disableCoord;
return this;
}
/**
* Sets the filter name for the filter that can be used when searching for matched_filters per hit.
>>>>>>> master
*/
public TermsQueryBuilder lookupIndex(String lookupIndex) {
this.lookupIndex = lookupIndex; |
| File |
|---|
| TermsQueryBuilder.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Annotation |
| Comment |
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
builder.field("execution", execution);
}
<<<<<<< HEAD
printBoostAndQueryName(builder);
=======
if (minimumShouldMatch != null) {
builder.field("minimum_should_match", minimumShouldMatch);
}
if (disableCoord != null) {
builder.field("disable_coord", disableCoord);
}
if (boost != -1) {
builder.field("boost", boost);
}
if (queryName != null) {
builder.field("_name", queryName);
}
>>>>>>> 4010e7e9a7148d66d5fb3699c5a042053efea1f4
builder.endObject();
}
|
| Solution content |
|---|
builder.field("execution", execution);
}
if (minimumShouldMatch != null) {
builder.field("minimum_should_match", minimumShouldMatch);
}
if (disableCoord != null) {
builder.field("disable_coord", disableCoord);
}
printBoostAndQueryName(builder);
builder.endObject();
}
|
| File |
|---|
| TermsQueryBuilder.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| If statement |
| Method invocation |