Projects >> elasticsearch >>99147228d721acfad158a6b0166783e3ab930ebb

Chunk
Conflicting content 
/**
 * {@link AbstractQueryBuilder} that builds a GeoShape Filter
 */
<<<<<<< HEAD
public class GeoShapeQueryBuilder extends AbstractQueryBuilder {

    public static final String NAME = "geo_shape";
=======
public class GeoShapeQueryBuilder extends QueryBuilder implements BoostableQueryBuilder {
>>>>>>> b78211ddaaf719b71dff9fd31ee83414904de6c6

    private final String name;
Solution content 
/**
 * {@link QueryBuilder} that builds a GeoShape Filter
 */
public class GeoShapeQueryBuilder extends AbstractQueryBuilder implements BoostableQueryBuilder {

    public static final String NAME = "geo_shape";

    static final GeoShapeQueryBuilder PROTOTYPE = new GeoShapeQueryBuilder(null, null);

    private final String name;
File
GeoShapeQueryBuilder.java
Developer's decision
Manual
Kind of conflict
Attribute
Class signature
Chunk
Conflicting content 
=======

    private ShapeRelation relation = null;

<<<<<<< HEAD
    static final GeoShapeQueryBuilder PROTOTYPE = new GeoShapeQueryBuilder(null, null);

    private float boost = -1;
    
>>>>>>> b78211ddaaf719b71dff9fd31ee83414904de6c6
    /**
     * Creates a new GeoShapeQueryBuilder whose Filter will be against the
     * given field name using the given Shape
Solution content 
    private ShapeRelation relation = null;

    private float boost = -1;
    
    /**
     * Creates a new GeoShapeQueryBuilder whose Filter will be against the
     * given field name using the given Shape
File
GeoShapeQueryBuilder.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
/**
 * A filter for a field based on several terms matching on any of them.
 */
<<<<<<< HEAD
public class TermsQueryBuilder extends AbstractQueryBuilder {

    public static final String NAME = "terms";
=======
public class TermsQueryBuilder extends QueryBuilder implements BoostableQueryBuilder {
>>>>>>> b78211ddaaf719b71dff9fd31ee83414904de6c6

    private final String name;
Solution content 
/**
 * A filter for a field based on several terms matching on any of them.
 */
public class TermsQueryBuilder extends AbstractQueryBuilder implements BoostableQueryBuilder {

    public static final String NAME = "terms";

    static final TermsQueryBuilder PROTOTYPE = new TermsQueryBuilder(null, (Object) null);

    private final String name;
File
TermsQueryBuilder.java
Developer's decision
Manual
Kind of conflict
Attribute
Class signature
Chunk
Conflicting content 
    private String execution;

<<<<<<< HEAD
    private String lookupIndex;
    private String lookupType;
    private String lookupId;
    private String lookupRouting;
    private String lookupPath;
    private Boolean lookupCache;

    static final TermsQueryBuilder PROTOTYPE = new TermsQueryBuilder(null, (Object) null);
=======
    private float boost = -1;
>>>>>>> b78211ddaaf719b71dff9fd31ee83414904de6c6

    /**
     * A filter for a field based on several terms matching on any of them.
Solution content 

    private String execution;

    private String lookupIndex;
    private String lookupType;
    private String lookupId;
    private String lookupRouting;
    private String lookupPath;
    private Boolean lookupCache;
    private float boost = -1;

    /**
     * A filter for a field based on several terms matching on any of them.
File
TermsQueryBuilder.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        if (execution != null) {
            builder.field("execution", execution);
        }
<<<<<<< HEAD
=======

        if (boost != -1) {
            builder.field("boost", boost);
        }

>>>>>>> b78211ddaaf719b71dff9fd31ee83414904de6c6
        if (queryName != null) {
            builder.field("_name", queryName);
        }
Solution content 
        if (execution != null) {
            builder.field("execution", execution);
        }

        if (boost != -1) {
            builder.field("boost", boost);
        }

        if (queryName != null) {
            builder.field("_name", queryName);
        }
File
TermsQueryBuilder.java
Developer's decision
Version 2
Kind of conflict
If statement