Projects >> atlas-search >>0410501f41b3999a28acf4cf26be82ae1c26be17

Chunk
Conflicting content 
import com.metabroadcast.common.text.MoreStrings;
import java.util.Arrays;
import java.util.Collections;
<<<<<<< HEAD
=======
import java.util.Set;
>>>>>>> 838fd9f18bfc1a6da034bc436df34ad9ae609eb7
import org.atlasapi.media.entity.Specialization;

public class SearchServlet extends HttpServlet {
Solution content 
import com.metabroadcast.common.text.MoreStrings;
import java.util.Arrays;
import java.util.Collections;

import org.atlasapi.media.entity.Specialization;

public class SearchServlet extends HttpServlet {
File
SearchServlet.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        if (catchupWeighting.isNothing()) {
            return;
        }
<<<<<<< HEAD

        Maybe priorityChannelWeighting = getFloatParameter("priorityChannelWeighting", request, response, false);
        Maybe firstBroadcastWeighting = getFloatParameter("firstBroadcastWeighting", request, response, false);

=======
        
>>>>>>> 838fd9f18bfc1a6da034bc436df34ad9ae609eb7
        String publishersCsv = request.getParameter("publishers");
        if (Strings.isNullOrEmpty(publishersCsv)) {
            view.renderError(request, response, new SearchResultsError(HttpStatusCode.BAD_REQUEST, "Missing required (and non-empty) parameter 'publishers'"));
Solution content 
        if (catchupWeighting.isNothing()) {
            return;
        }

        Maybe priorityChannelWeighting = getFloatParameter("priorityChannelWeighting", request, response, false);
        Maybe firstBroadcastWeighting = getFloatParameter("firstBroadcastWeighting", request, response, false);

        String publishersCsv = request.getParameter("publishers");
        if (Strings.isNullOrEmpty(publishersCsv)) {
            view.renderError(request, response, new SearchResultsError(HttpStatusCode.BAD_REQUEST, "Missing required (and non-empty) parameter 'publishers'"));
File
SearchServlet.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
            log.error(e.getMessage(), e);
            return;
        }
<<<<<<< HEAD

=======
        
>>>>>>> 838fd9f18bfc1a6da034bc436df34ad9ae609eb7
        String specializationsCsv = request.getParameter("specializations");
        Iterable specializations = null;
        if (specializationsCsv != null && !specializationsCsv.isEmpty()) {
Solution content 
            log.error(e.getMessage(), e);
            return;
        }

        String specializationsCsv = request.getParameter("specializations");
        Iterable specializations = null;
        if (specializationsCsv != null && !specializationsCsv.isEmpty()) {
File
SearchServlet.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
        } else {
<<<<<<< HEAD
        if (specializationsCsv != null && !specializationsCsv.isEmpty()) {
            specializations = Specialization.fromCsv(specializationsCsv);
            specializations = Arrays.asList(Specialization.FILM, Specialization.TV, Specialization.RADIO);
        }

=======
            specializations = Collections.EMPTY_LIST;
        }
        
>>>>>>> 838fd9f18bfc1a6da034bc436df34ad9ae609eb7
        if (request.getParameter("debug") != null) {
            response.setContentType(MimeType.TEXT_PLAIN.toString());
            ServletOutputStream outputStream = response.getOutputStream();
Solution content 
        if (specializationsCsv != null && !specializationsCsv.isEmpty()) {
            specializations = Specialization.fromCsv(specializationsCsv);
        } else {
            specializations = Collections.EMPTY_LIST;
        }

        if (request.getParameter("debug") != null) {
            response.setContentType(MimeType.TEXT_PLAIN.toString());
            ServletOutputStream outputStream = response.getOutputStream();
File
SearchServlet.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable