Projects >> atlas-model >>863375449410ef259b1ec2f8bb93603a8318606c

Chunk
Conflicting content 
        private float title = 0;
        private float broadcast = 0;
        private float catchup = 0;
<<<<<<< HEAD
        private Maybe priorityChannelWeighting = Maybe.nothing();
        private Maybe firstBroadcastWeighting = Maybe.nothing();
=======
        private String type;
        private Boolean topLevel;
>>>>>>> f6026654b140560036642d210da33e4dabc5f7ed

        public Builder(String query) {
            this.query = query;
Solution content 
        private float title = 0;
        private float broadcast = 0;
        private float catchup = 0;
        private Maybe priorityChannelWeighting = Maybe.nothing();
        private Maybe firstBroadcastWeighting = Maybe.nothing();
        private String type;
        private Boolean topLevel;

        public Builder(String query) {
            this.query = query;
File
SearchQuery.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
            return this;
        }
        
<<<<<<< HEAD
        public Builder withPriorityChannelWeighting(Float priorityChannelWeighting) {
            this.priorityChannelWeighting  = Maybe.fromPossibleNullValue(priorityChannelWeighting);
            return this;
        }

        public Builder withFirstBroadcastWeighting(Float firstBroadcastWeighting) {
            this.firstBroadcastWeighting  = Maybe.fromPossibleNullValue(firstBroadcastWeighting);
=======
        public Builder withType(String type) {
            this.type = type;
>>>>>>> f6026654b140560036642d210da33e4dabc5f7ed
            return this;
        }
Solution content 
        
        }
            return this;
        }
        
        public Builder withPriorityChannelWeighting(Float priorityChannelWeighting) {
            this.priorityChannelWeighting  = Maybe.fromPossibleNullValue(priorityChannelWeighting);
            return this;
        }

        public Builder withFirstBroadcastWeighting(Float firstBroadcastWeighting) {
            this.firstBroadcastWeighting  = Maybe.fromPossibleNullValue(firstBroadcastWeighting);
            return this;
        }

        public Builder withType(String type) {
            this.type = type;
            return this;
File
SearchQuery.java
Developer's decision
Manual
Kind of conflict
Attribute
Method declaration
Method invocation
Method signature
Chunk
Conflicting content 
        
        public SearchQuery build() {
            return new SearchQuery(query, selection, specializations, 
<<<<<<< HEAD
                publishers, title, broadcast, catchup, priorityChannelWeighting, firstBroadcastWeighting);
=======
                publishers, title, broadcast, catchup, type, topLevel);
        }

        public Builder isTopLevel(Boolean topLevel) {
            this.topLevel = topLevel;
            return this;
>>>>>>> f6026654b140560036642d210da33e4dabc5f7ed
        }
    }
Solution content 
        
        public Builder isTopLevel(Boolean topLevel) {
            this.topLevel = topLevel;
            return this;
        }
        
        public SearchQuery build() {
            return new SearchQuery(query, selection, specializations, 
                    publishers, title, broadcast, catchup, 
                    priorityChannelWeighting, firstBroadcastWeighting, 
                    type, topLevel);
        }
    }
File
SearchQuery.java
Developer's decision
Manual
Kind of conflict
Attribute
Method signature
Return statement
Chunk
Conflicting content 
    private final float titleWeighting;
    private final float broadcastWeighting;
    private final float catchupWeighting;
<<<<<<< HEAD
	private final Maybe priorityChannelWeighting;
	private final Maybe firstBroadcastWeighting;
=======
    private final String type;
    private Boolean topLevelOnly;
>>>>>>> f6026654b140560036642d210da33e4dabc5f7ed

    /**
     * Use a Builder
Solution content 
    private final float titleWeighting;
    private final float broadcastWeighting;
    private final float catchupWeighting;
	private final Maybe priorityChannelWeighting;
	private final Maybe firstBroadcastWeighting;
    private final String type;
    private Boolean topLevelOnly;

    /**
     * Use a Builder
File
SearchQuery.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
     */
    @Deprecated
    public SearchQuery(String term, Selection selection, float titleWeighting, float broadcastWeighting, float availabilityWeighting) {
<<<<<<< HEAD
		this(term, selection, Sets.newHashSet(), Sets.newHashSet(), titleWeighting, broadcastWeighting, availabilityWeighting, Maybe.nothing(), Maybe.nothing());
=======
		this(term, selection, Sets.newHashSet(), Sets.newHashSet(), titleWeighting, broadcastWeighting, availabilityWeighting, null, null);
>>>>>>> f6026654b140560036642d210da33e4dabc5f7ed
	}
    
    /**
Solution content 
     */
    @Deprecated
    public SearchQuery(String term, Selection selection, float titleWeighting, float broadcastWeighting, float availabilityWeighting) {
		this(term, selection, Sets.newHashSet(), Sets.newHashSet(), titleWeighting, broadcastWeighting, availabilityWeighting, Maybe.nothing(), Maybe.nothing(), null, null);
	}
    
    /**
     * Use a Builder 
     */
    @Deprecated
    public SearchQuery(String term, Selection selection, Iterable includedSpecializations, Iterable includedPublishers, float titleWeighting, float broadcastWeighting, float availabilityWeighting) {
		this(term, selection, includedSpecializations, includedPublishers, titleWeighting, broadcastWeighting, availabilityWeighting, Maybe.nothing(), Maybe.nothing(), null, null);
	}
    
    /**
     * Use a Builder 
     */
    @Deprecated
    public SearchQuery(String term, Selection selection, float titleWeighting, float broadcastWeighting, float availabilityWeighting, Maybe priorityChannelWeighting, Maybe firstBroadcastWeighting) {
		this(term, selection, Sets.newHashSet(), Sets.newHashSet(), titleWeighting, broadcastWeighting, availabilityWeighting, priorityChannelWeighting, firstBroadcastWeighting, null, null);
	}
    
    /**
     * Use a Builder 
     */
    @Deprecated
	public SearchQuery(String term, Selection selection, Iterable includedPublishers, float titleWeighting, float broadcastWeighting, float availabilityWeighting, Maybe priorityChannelWeighting, Maybe firstBroadcastWeighting) {
		this(term, selection, Sets.newHashSet(), includedPublishers, titleWeighting, broadcastWeighting, availabilityWeighting, priorityChannelWeighting, firstBroadcastWeighting, null, null);
	}
    
    public SearchQuery(String term, Selection selection, Iterable includedSpecializations, Iterable includedPublishers, float titleWeighting, float broadcastWeighting, float availabilityWeighting, Maybe priorityChannelWeighting, Maybe firstBroadcastWeighting, String type, Boolean topLevelOnly) {
		this.term = term;
		this.selection = selection;
        this.titleWeighting = titleWeighting;
        this.broadcastWeighting = broadcastWeighting;
        this.catchupWeighting = availabilityWeighting;
        this.type = type;
        this.topLevelOnly = topLevelOnly;
        this.includedSpecializations = ImmutableSet.copyOf(includedSpecializations);
		this.includedPublishers = ImmutableSet.copyOf(includedPublishers);
		this.priorityChannelWeighting = priorityChannelWeighting;
		this.firstBroadcastWeighting = firstBroadcastWeighting;
	}
	
	public String getTerm() {
		return term;
	}
	
	public Selection getSelection() {
		return selection;
	}
    
    public Set getIncludedSpecializations() {
        return includedSpecializations;
    }
	
	public Set getIncludedPublishers() {
		return includedPublishers;
	}

    public float getTitleWeighting() {
        return titleWeighting;
    }

    public float getBroadcastWeighting() {
        return broadcastWeighting;
    }

    public float getCatchupWeighting() {
        return catchupWeighting;
    }
    
    public Maybe getPriorityChannelWeighting() {
    	    return priorityChannelWeighting;
    }
    
    public Maybe getFirstBroadcastWeighting() {
    	    return firstBroadcastWeighting;
    }
    
    	public String type() {
        return this.type;
    }
    
    public Boolean topLevelOnly() {
        return this.topLevelOnly;
    }
    
    public QueryStringParameters toQueryStringParameters() {
        QueryStringParameters params = new QueryStringParameters()
            .add("title", UrlEncoding.encode(term))
            .addAll(selection.asQueryStringParameters())
            .add("specializations", CSV.join(includedSpecializations))
            .add("publishers", CSV.join(includedPublishers))
            .add("titleWeighting", String.valueOf(titleWeighting))
            .add("broadcastWeighting",  String.valueOf(broadcastWeighting))
            .add("catchupWeighting",  String.valueOf(catchupWeighting));
        if (topLevelOnly != null) {
            params.add("topLevelOnly", topLevelOnly.toString());
        }
        if (type != null) {
            params.add("type", type);
        }
        if (priorityChannelWeighting.hasValue()) {
            params.add("priorityChannelWeighting",priorityChannelWeighting.requireValue().toString());
        }
        if (firstBroadcastWeighting.hasValue()) {
            params.add("firstBroadcastWeighting",firstBroadcastWeighting.requireValue().toString());
        }
        return params;
    }
}
File
SearchQuery.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
     * Use a Builder 
     */
    @Deprecated
<<<<<<< HEAD
    public SearchQuery(String term, Selection selection, Iterable includedPublishers, float titleWeighting, float broadcastWeighting, float availabilityWeighting) {
		this(term, selection, Sets.newHashSet(), includedPublishers, titleWeighting, broadcastWeighting, availabilityWeighting, Maybe.nothing(), Maybe.nothing());
	}
    
    /**
     * Use a Builder 
     */
    @Deprecated
    public SearchQuery(String term, Selection selection, Iterable includedSpecializations, Iterable includedPublishers, float titleWeighting, float broadcastWeighting, float availabilityWeighting) {
		this(term, selection, includedSpecializations, includedPublishers, titleWeighting, broadcastWeighting, availabilityWeighting, Maybe.nothing(), Maybe.nothing());
	}
    
    /**
     * Use a Builder 
     */
    @Deprecated
    public SearchQuery(String term, Selection selection, float titleWeighting, float broadcastWeighting, float availabilityWeighting, Maybe priorityChannelWeighting, Maybe firstBroadcastWeighting) {
		this(term, selection, Sets.newHashSet(), Sets.newHashSet(), titleWeighting, broadcastWeighting, availabilityWeighting, priorityChannelWeighting, firstBroadcastWeighting);
	}
    
    /**
     * Use a Builder 
     */
    @Deprecated
	public SearchQuery(String term, Selection selection, Iterable includedPublishers, float titleWeighting, float broadcastWeighting, float availabilityWeighting, Maybe priorityChannelWeighting, Maybe firstBroadcastWeighting) {
		this(term, selection, Sets.newHashSet(), includedPublishers, titleWeighting, broadcastWeighting, availabilityWeighting, priorityChannelWeighting, firstBroadcastWeighting);
	}
    
    public SearchQuery(String term, Selection selection, Iterable includedSpecializations, Iterable includedPublishers, float titleWeighting, float broadcastWeighting, float availabilityWeighting, Maybe priorityChannelWeighting, Maybe firstBroadcastWeighting) {
=======
	public SearchQuery(String term, Selection selection, Iterable includedPublishers, float titleWeighting, float broadcastWeighting, float availabilityWeighting) {
		this(term, selection, Sets.newHashSet(), includedPublishers, titleWeighting, broadcastWeighting, availabilityWeighting, null, null);
	}
    
    public SearchQuery(String term, Selection selection, 
       Iterable includedSpecializations, Iterable includedPublishers, 
       float titleWeighting, float broadcastWeighting, float availabilityWeighting, 
       String type, Boolean topLevelOnly) {
>>>>>>> f6026654b140560036642d210da33e4dabc5f7ed
		this.term = term;
		this.selection = selection;
        this.titleWeighting = titleWeighting;
Solution content 
	}
    
    /**
     * Use a Builder 
     */
    @Deprecated
    public SearchQuery(String term, Selection selection, Iterable includedSpecializations, Iterable includedPublishers, float titleWeighting, float broadcastWeighting, float availabilityWeighting) {
		this(term, selection, includedSpecializations, includedPublishers, titleWeighting, broadcastWeighting, availabilityWeighting, Maybe.nothing(), Maybe.nothing(), null, null);
	}
    
    /**
     * Use a Builder 
     */
    @Deprecated
    public SearchQuery(String term, Selection selection, float titleWeighting, float broadcastWeighting, float availabilityWeighting, Maybe priorityChannelWeighting, Maybe firstBroadcastWeighting) {
		this(term, selection, Sets.newHashSet(), Sets.newHashSet(), titleWeighting, broadcastWeighting, availabilityWeighting, priorityChannelWeighting, firstBroadcastWeighting, null, null);
	}
    
    /**
     * Use a Builder 
     */
    @Deprecated
	public SearchQuery(String term, Selection selection, Iterable includedPublishers, float titleWeighting, float broadcastWeighting, float availabilityWeighting, Maybe priorityChannelWeighting, Maybe firstBroadcastWeighting) {
		this(term, selection, Sets.newHashSet(), includedPublishers, titleWeighting, broadcastWeighting, availabilityWeighting, priorityChannelWeighting, firstBroadcastWeighting, null, null);
	}
    
    public SearchQuery(String term, Selection selection, Iterable includedSpecializations, Iterable includedPublishers, float titleWeighting, float broadcastWeighting, float availabilityWeighting, Maybe priorityChannelWeighting, Maybe firstBroadcastWeighting, String type, Boolean topLevelOnly) {
		this.term = term;
		this.selection = selection;
        this.titleWeighting = titleWeighting;
File
SearchQuery.java
Developer's decision
Manual
Kind of conflict
Annotation
Comment
Method declaration
Method signature
Chunk
Conflicting content 
        return catchupWeighting;
    }
    
<<<<<<< HEAD
    public Maybe getPriorityChannelWeighting() {
    	return priorityChannelWeighting;
    }
    
    public Maybe getFirstBroadcastWeighting() {
    	return firstBroadcastWeighting;
=======
    public String type() {
        return this.type;
    }
    
    public Boolean topLevelOnly() {
        return this.topLevelOnly;
    }
    
    public QueryStringParameters toQueryStringParameters() {
        QueryStringParameters params = new QueryStringParameters()
            .add("title", UrlEncoding.encode(term))
            .addAll(selection.asQueryStringParameters())
            .add("specializations", CSV.join(includedSpecializations))
            .add("publishers", CSV.join(includedPublishers))
            .add("titleWeighting", String.valueOf(titleWeighting))
            .add("broadcastWeighting",  String.valueOf(broadcastWeighting))
            .add("catchupWeighting",  String.valueOf(catchupWeighting));
        if (topLevelOnly != null) {
            params.add("topLevelOnly", topLevelOnly.toString());
        }
        if (type != null) {
            params.add("type", type);
        }
        return params;
>>>>>>> f6026654b140560036642d210da33e4dabc5f7ed
    }
}
Solution content 
    }
    
        return catchupWeighting;
    }
    
    public Maybe getPriorityChannelWeighting() {
    	    return priorityChannelWeighting;
    }
    
    public Maybe getFirstBroadcastWeighting() {
    	    return firstBroadcastWeighting;
    }
    
    	public String type() {
        return this.type;
    public Boolean topLevelOnly() {
        return this.topLevelOnly;
    }
    
    public QueryStringParameters toQueryStringParameters() {
        QueryStringParameters params = new QueryStringParameters()
            .add("title", UrlEncoding.encode(term))
            .addAll(selection.asQueryStringParameters())
            .add("specializations", CSV.join(includedSpecializations))
            .add("publishers", CSV.join(includedPublishers))
            .add("titleWeighting", String.valueOf(titleWeighting))
            .add("broadcastWeighting",  String.valueOf(broadcastWeighting))
            .add("catchupWeighting",  String.valueOf(catchupWeighting));
        if (topLevelOnly != null) {
            params.add("topLevelOnly", topLevelOnly.toString());
        }
        if (type != null) {
            params.add("type", type);
        }
        if (priorityChannelWeighting.hasValue()) {
            params.add("priorityChannelWeighting",priorityChannelWeighting.requireValue().toString());
        }
        if (firstBroadcastWeighting.hasValue()) {
            params.add("firstBroadcastWeighting",firstBroadcastWeighting.requireValue().toString());
        }
        return params;
    }
}
File
SearchQuery.java
Developer's decision
Manual
Kind of conflict
Attribute
If statement
Method declaration
Method invocation
Method signature
Return statement
Variable