Projects >> atlas >>d76326b51844ee7e2db93e0d1056a9840d1e64b0

Chunk
Conflicting content 
import static com.metabroadcast.common.scheduling.RepetitionRules.every;
import static com.metabroadcast.common.time.DateTimeZones.UTC;
<<<<<<< HEAD
=======
import static org.atlasapi.http.HttpBackedRemoteSiteClient.httpRemoteSiteClient;
import static org.atlasapi.http.HttpResponseTransformers.gsonResponseTransformer;
import static org.atlasapi.http.HttpResponseTransformers.htmlNavigatorTransformer;
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
import static org.atlasapi.remotesite.bbc.ion.HttpBackedBbcIonClient.ionClient;
import static org.joda.time.Duration.standardMinutes;
Solution content 
import static com.metabroadcast.common.scheduling.RepetitionRules.every;
import static com.metabroadcast.common.time.DateTimeZones.UTC;
import static org.atlasapi.http.HttpBackedRemoteSiteClient.httpRemoteSiteClient;
import static org.atlasapi.http.HttpResponseTransformers.gsonResponseTransformer;
import static org.atlasapi.http.HttpResponseTransformers.htmlNavigatorTransformer;
import static org.atlasapi.remotesite.bbc.ion.HttpBackedBbcIonClient.ionClient;
import static org.joda.time.Duration.standardMinutes;
File
BbcModule.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.atlasapi.persistence.logging.AdapterLog;
import org.atlasapi.persistence.logging.AdapterLogEntry;
import org.atlasapi.persistence.logging.AdapterLogEntry.Severity;
<<<<<<< HEAD
import org.atlasapi.persistence.topic.TopicStore;
import org.atlasapi.remotesite.HttpClients;
import org.atlasapi.remotesite.bbc.atoz.BbcSlashProgrammesAtoZUpdater;
import org.atlasapi.remotesite.bbc.ion.BbcIonContentUpdateController;
=======
import org.atlasapi.remotesite.HttpClients;
import org.atlasapi.remotesite.bbc.atoz.BbcSlashProgrammesAtoZUpdater;
import org.atlasapi.remotesite.bbc.ion.BbcIonBroadcastHandler;
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
import org.atlasapi.remotesite.bbc.ion.BbcIonContainerFetcherClient;
import org.atlasapi.remotesite.bbc.ion.BbcIonDayRangeUrlSupplier;
import org.atlasapi.remotesite.bbc.ion.BbcIonEpisodeDetailItemAdapter;
Solution content 
import org.atlasapi.persistence.logging.AdapterLog;
import org.atlasapi.persistence.logging.AdapterLogEntry;
import org.atlasapi.persistence.logging.AdapterLogEntry.Severity;
import org.atlasapi.persistence.topic.TopicStore;
import org.atlasapi.remotesite.HttpClients;
import org.atlasapi.remotesite.bbc.atoz.BbcSlashProgrammesAtoZUpdater;
import org.atlasapi.remotesite.bbc.ion.BbcIonContentUpdateController;
import org.atlasapi.remotesite.bbc.ion.BbcIonBroadcastHandler;
import org.atlasapi.remotesite.bbc.ion.BbcIonContainerFetcherClient;
import org.atlasapi.remotesite.bbc.ion.BbcIonDayRangeUrlSupplier;
import org.atlasapi.remotesite.bbc.ion.BbcIonEpisodeDetailItemAdapter;
File
BbcModule.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.atlasapi.remotesite.bbc.ion.BbcIonEpisodeDetailItemContentExtractor;
import org.atlasapi.remotesite.bbc.ion.BbcIonScheduleController;
import org.atlasapi.remotesite.bbc.ion.BbcIonScheduleUpdater;
<<<<<<< HEAD
import org.atlasapi.remotesite.bbc.ion.DefaultBbcIonScheduleHandler;
import org.atlasapi.remotesite.bbc.ion.HttpBackedBbcIonClient;
import org.atlasapi.remotesite.bbc.ion.OndemandBbcIonScheduleHandler;
=======
import org.atlasapi.remotesite.bbc.ion.DefaultBbcIonBroadcastHandler;
import org.atlasapi.remotesite.bbc.ion.HttpBackedBbcIonClient;
import org.atlasapi.remotesite.bbc.ion.OndemandBbcIonBroadcastHandler;
import org.atlasapi.remotesite.bbc.ion.SocialDataFetchingIonBroadcastHandler;
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
import org.atlasapi.remotesite.bbc.ion.model.IonContainerFeed;
import org.atlasapi.remotesite.bbc.ion.model.IonEpisodeDetailFeed;
import org.atlasapi.remotesite.bbc.ion.model.IonOndemandChanges;
Solution content 
import org.atlasapi.remotesite.bbc.ion.BbcIonEpisodeDetailItemContentExtractor;
import org.atlasapi.remotesite.bbc.ion.BbcIonScheduleController;
import org.atlasapi.remotesite.bbc.ion.BbcIonScheduleUpdater;
import org.atlasapi.remotesite.bbc.ion.HttpBackedBbcIonClient;
import org.atlasapi.remotesite.bbc.ion.DefaultBbcIonBroadcastHandler;
import org.atlasapi.remotesite.bbc.ion.OndemandBbcIonBroadcastHandler;
import org.atlasapi.remotesite.bbc.ion.SocialDataFetchingIonBroadcastHandler;
import org.atlasapi.remotesite.bbc.ion.model.IonContainerFeed;
import org.atlasapi.remotesite.bbc.ion.model.IonEpisodeDetailFeed;
import org.atlasapi.remotesite.bbc.ion.model.IonOndemandChanges;
File
BbcModule.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

<<<<<<< HEAD
import com.metabroadcast.common.persistence.mongo.DatabasedMongo;
import com.google.gson.reflect.TypeToken;
=======
import com.google.gson.FieldNamingPolicy;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.metabroadcast.common.http.SimpleHttpClient;
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
import com.metabroadcast.common.scheduling.RepetitionRule;
import com.metabroadcast.common.scheduling.RepetitionRules;
import com.metabroadcast.common.scheduling.SimpleScheduler;
Solution content 
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import com.metabroadcast.common.persistence.mongo.DatabasedMongo;
import com.google.gson.reflect.TypeToken;
import com.google.gson.FieldNamingPolicy;
import com.google.gson.GsonBuilder;
import com.metabroadcast.common.http.SimpleHttpClient;
import com.metabroadcast.common.scheduling.RepetitionRule;
import com.metabroadcast.common.scheduling.RepetitionRules;
import com.metabroadcast.common.scheduling.SimpleScheduler;
File
BbcModule.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    
    private BbcIonScheduleUpdater bbcIonScheduleOndemandUpdater(int lookBack) {
        BbcIonDayRangeUrlSupplier urlSupplier = dayRangeUrlSupplier(SCHEDULE_ONDEMAND_FORMAT, 0, lookBack);
<<<<<<< HEAD
        return new BbcIonScheduleUpdater(urlSupplier, bbcIonScheduleClient(), new OndemandBbcIonScheduleHandler(contentResolver, contentWriters, log), log);
=======
        return new BbcIonScheduleUpdater(urlSupplier, bbcIonScheduleClient(), new OndemandBbcIonBroadcastHandler(contentResolver, contentWriters, log), log);
    }
    
    private BbcIonScheduleUpdater bbcIonSocialDataUpdater() {
        BbcIonDayRangeUrlSupplier urlSupplier = dayRangeUrlSupplier(SCHEDULE_DEFAULT_FORMAT, 7, 7);
        SimpleHttpClient httpClient = HttpClients.webserviceClient();
        BbcRelatedLinksAdapter linksAdapter = new BbcRelatedLinksAdapter(httpRemoteSiteClient(httpClient,
                gsonResponseTransformer(new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES), SlashProgrammesContainer.class)));
        BbcHashTagAdapter hashTagAdapter = new BbcHashTagAdapter(httpRemoteSiteClient(httpClient, htmlNavigatorTransformer()));
        BbcIonBroadcastHandler handler = new SocialDataFetchingIonBroadcastHandler(linksAdapter, hashTagAdapter, contentResolver, contentWriters, log);
        return new BbcIonScheduleUpdater(urlSupplier, bbcIonScheduleClient(), handler, log);
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
    }
	
	private BbcIonDayRangeUrlSupplier dayRangeUrlSupplier(String urlPattern, int ahead, int back) {
Solution content 
    
    private BbcIonScheduleUpdater bbcIonScheduleOndemandUpdater(int lookBack) {
        BbcIonDayRangeUrlSupplier urlSupplier = dayRangeUrlSupplier(SCHEDULE_ONDEMAND_FORMAT, 0, lookBack);
        return new BbcIonScheduleUpdater(urlSupplier, bbcIonScheduleClient(), new OndemandBbcIonBroadcastHandler(contentResolver, contentWriters, log), log);
    }
    
    private BbcIonScheduleUpdater bbcIonSocialDataUpdater() {
        BbcIonDayRangeUrlSupplier urlSupplier = dayRangeUrlSupplier(SCHEDULE_DEFAULT_FORMAT, 7, 7);
        SimpleHttpClient httpClient = HttpClients.webserviceClient();
        BbcRelatedLinksAdapter linksAdapter = new BbcRelatedLinksAdapter(httpRemoteSiteClient(httpClient,
                gsonResponseTransformer(new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES), SlashProgrammesContainer.class)));
        BbcHashTagAdapter hashTagAdapter = new BbcHashTagAdapter(httpRemoteSiteClient(httpClient, htmlNavigatorTransformer()));
        BbcIonBroadcastHandler handler = new SocialDataFetchingIonBroadcastHandler(linksAdapter, hashTagAdapter, contentResolver, contentWriters, log);
        return new BbcIonScheduleUpdater(urlSupplier, bbcIonScheduleClient(), handler, log);
    }
	
	private BbcIonDayRangeUrlSupplier dayRangeUrlSupplier(String urlPattern, int ahead, int back) {
File
BbcModule.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
	}
	
	@Bean BbcIonScheduleController bbcIonScheduleController() {
<<<<<<< HEAD
	    return new BbcIonScheduleController(bbcIonScheduleClient(), defaultBbcIonScheduleHandler(), log);
	}
	
	@Bean HttpBackedBbcIonClient bbcIonScheduleClient() {
	    return ionClient(HttpClients.webserviceClient(), new TypeToken(){});
	}
	
    @Bean DefaultBbcIonScheduleHandler defaultBbcIonScheduleHandler() {
        return new DefaultBbcIonScheduleHandler(contentResolver, contentWriters, log)
=======
        return new BbcIonScheduleController(bbcIonScheduleClient(), defaultBbcIonScheduleHandler(), log);
    }

    @Bean HttpBackedBbcIonClient bbcIonScheduleClient() {
        return ionClient(HttpClients.webserviceClient(), new TypeToken(){});
    }
	
    @Bean DefaultBbcIonBroadcastHandler defaultBbcIonScheduleHandler() {
        return new DefaultBbcIonBroadcastHandler(contentResolver, contentWriters, log)
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
            .withItemFetcherClient(bbcIonEpisodeDetailItemAdapter())
            .withContainerFetcherClient(new BbcIonContainerFetcherClient(log))
            .withItemPeopleWriter(itemsPeopleWriter);
Solution content 
	}
	
	@Bean BbcIonScheduleController bbcIonScheduleController() {
	    return new BbcIonScheduleController(bbcIonScheduleClient(), defaultBbcIonBroadcastHandler(), log);
	}
	
	@Bean HttpBackedBbcIonClient bbcIonScheduleClient() {
	    return ionClient(HttpClients.webserviceClient(), new TypeToken(){});
	}

    @Bean DefaultBbcIonBroadcastHandler defaultBbcIonBroadcastHandler() {
        return new DefaultBbcIonBroadcastHandler(contentResolver, contentWriters, log)
            .withItemFetcherClient(bbcIonEpisodeDetailItemAdapter())
            .withContainerFetcherClient(new BbcIonContainerFetcherClient(log))
            .withItemPeopleWriter(itemsPeopleWriter);
File
BbcModule.java
Developer's decision
Manual
Kind of conflict
Method declaration
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
	    return new BbcIonOndemandChangeUpdater(bbcIonOndemandChangeUpdateBuilder(), log);
	}

<<<<<<< HEAD
    @Bean BbcIonOndemandChangeUpdateBuilder bbcIonOndemandChangeUpdateBuilder() {
=======
    private BbcIonOndemandChangeUpdateBuilder bbcIonOndemandChangeUpdateBuilder() {
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
        return new BbcIonOndemandChangeUpdateBuilder(new BbcIonOndemandChangeTaskBuilder(contentResolver, contentWriters, log), log, ionClient(HttpClients.webserviceClient(),IonOndemandChanges.class));
    }
Solution content 
	    return new BbcIonOndemandChangeUpdater(bbcIonOndemandChangeUpdateBuilder(), log);
	}

    @Bean BbcIonOndemandChangeUpdateBuilder bbcIonOndemandChangeUpdateBuilder() {
        return new BbcIonOndemandChangeUpdateBuilder(new BbcIonOndemandChangeTaskBuilder(contentResolver, contentWriters, log), log, ionClient(HttpClients.webserviceClient(),IonOndemandChanges.class));
    }
File
BbcModule.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
    private final RemoteSiteClient scheduleClient;

<<<<<<< HEAD

    public BbcIonScheduleController(RemoteSiteClient scheduleClient, BbcIonScheduleHandler handler, AdapterLog log) {
=======
    public BbcIonScheduleController(RemoteSiteClient scheduleClient, BbcIonBroadcastHandler handler, AdapterLog log) {
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
        this.scheduleClient = scheduleClient;
        this.handler = handler;
        this.log = log;
Solution content 
    private final RemoteSiteClient scheduleClient;

    public BbcIonScheduleController(RemoteSiteClient scheduleClient, BbcIonBroadcastHandler handler, AdapterLog log) {
        this.scheduleClient = scheduleClient;
        this.handler = handler;
        this.log = log;
File
BbcIonScheduleController.java
Developer's decision
Version 2
Kind of conflict
Method signature
Chunk
Conflicting content 
import org.atlasapi.persistence.logging.AdapterLog;
import org.atlasapi.persistence.system.RemoteSiteClient;
<<<<<<< HEAD
=======
import org.atlasapi.remotesite.bbc.ion.model.IonBroadcast;
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
import org.atlasapi.remotesite.bbc.ion.model.IonSchedule;

public class BbcIonScheduleUpdateTask implements Callable {
Solution content 
import org.atlasapi.persistence.logging.AdapterLog;
import org.atlasapi.persistence.system.RemoteSiteClient;
import org.atlasapi.remotesite.bbc.ion.model.IonBroadcast;
import org.atlasapi.remotesite.bbc.ion.model.IonSchedule;

public class BbcIonScheduleUpdateTask implements Callable {
File
BbcIonScheduleUpdateTask.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
    private final String scheduleUrl;
    private final RemoteSiteClient scheduleClient;
<<<<<<< HEAD
    private final BbcIonScheduleHandler handler;
    private final AdapterLog log;

    public BbcIonScheduleUpdateTask(String scheduleUrl, RemoteSiteClient scheduleClient, BbcIonScheduleHandler handler, AdapterLog log){
=======

    private final BbcIonBroadcastHandler handler;
    private final AdapterLog log;

    public BbcIonScheduleUpdateTask(String scheduleUrl, RemoteSiteClient scheduleClient, BbcIonBroadcastHandler handler, AdapterLog log) {
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
        this.scheduleUrl = scheduleUrl;
        this.scheduleClient = scheduleClient;
        this.handler = handler;
Solution content 
    private final String scheduleUrl;
    private final RemoteSiteClient scheduleClient;
    private final BbcIonBroadcastHandler handler;
    private final AdapterLog log;

    public BbcIonScheduleUpdateTask(String scheduleUrl, RemoteSiteClient scheduleClient, BbcIonBroadcastHandler handler, AdapterLog log) {
        this.scheduleUrl = scheduleUrl;
        this.scheduleClient = scheduleClient;
        this.handler = handler;
File
BbcIonScheduleUpdateTask.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method signature
Chunk
Conflicting content 
        log.record(debugEntry().withSource(getClass()).withDescription("update schedule: %s", scheduleUrl));

        try {
<<<<<<< HEAD
            schedule = scheduleClient.get(scheduleUrl);
=======
            IonSchedule schedule = scheduleClient.get(scheduleUrl);
            for (IonBroadcast broadcast : schedule.getBlocklist()) {
                handler.handle(broadcast);
            }
            return schedule.getBlocklist().size();
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
        } catch (Exception e) {
            log.record(errorEntry().withCause(e).withSource(getClass()).withDescription("exception handling schedule schedule: %s", scheduleUrl));
            throw e;
Solution content 
        log.record(debugEntry().withSource(getClass()).withDescription("update schedule: %s", scheduleUrl));

        try {
            IonSchedule schedule = scheduleClient.get(scheduleUrl);
            for (IonBroadcast broadcast : schedule.getBlocklist()) {
                handler.handle(broadcast);
            }
            return schedule.getBlocklist().size();
        } catch (Exception e) {
            log.record(errorEntry().withCause(e).withSource(getClass()).withDescription("exception handling schedule schedule: %s", scheduleUrl));
            throw e;
File
BbcIonScheduleUpdateTask.java
Developer's decision
Version 2
Kind of conflict
For statement
Method invocation
Return statement
Variable
Chunk
Conflicting content 
    private final Supplier> urlSupplier;
    private final RemoteSiteClient scheduleClient;
<<<<<<< HEAD
    private final BbcIonScheduleHandler handler;
    private final AdapterLog log;


    public BbcIonScheduleUpdater(Supplier> urlSupplier, RemoteSiteClient client, BbcIonScheduleHandler handler, AdapterLog log) {
=======
    private final BbcIonBroadcastHandler handler;
    private final AdapterLog log;


    public BbcIonScheduleUpdater(Supplier> urlSupplier, RemoteSiteClient client, BbcIonBroadcastHandler handler, AdapterLog log) {
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
        this.urlSupplier = urlSupplier;
        this.scheduleClient = client;
        this.handler = handler;
Solution content 
    private final Supplier> urlSupplier;
    private final RemoteSiteClient scheduleClient;
    private final BbcIonBroadcastHandler handler;
    private final AdapterLog log;

    public BbcIonScheduleUpdater(Supplier> urlSupplier, RemoteSiteClient client, BbcIonBroadcastHandler handler, AdapterLog log) {
        this.urlSupplier = urlSupplier;
        this.scheduleClient = client;
        this.handler = handler;
File
BbcIonScheduleUpdater.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method signature
Chunk
Conflicting content 
import org.atlasapi.persistence.content.query.KnownTypeQueryExecutor;

import com.google.common.collect.ImmutableList;
<<<<<<< HEAD
import com.google.common.collect.Maps;
=======
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
Solution content 
import org.atlasapi.persistence.content.query.KnownTypeQueryExecutor;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
File
MergeOnOutputQueryExecutorTest.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.atlasapi.persistence.logging.AdapterLog;
import org.atlasapi.persistence.logging.SystemOutAdapterLog;
import org.atlasapi.persistence.system.RemoteSiteClient;
<<<<<<< HEAD
import org.atlasapi.persistence.testing.StubContentResolver;
=======
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
import org.atlasapi.remotesite.FixedResponseHttpClient;
import org.atlasapi.remotesite.bbc.ion.model.IonSchedule;
import org.hamcrest.Matcher;
Solution content 
import org.atlasapi.persistence.logging.AdapterLog;
import org.atlasapi.persistence.logging.SystemOutAdapterLog;
import org.atlasapi.persistence.system.RemoteSiteClient;
import org.atlasapi.remotesite.FixedResponseHttpClient;
import org.atlasapi.remotesite.bbc.ion.model.IonSchedule;
import org.hamcrest.Matcher;
File
BbcIonScheduleUpdaterTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
    @SuppressWarnings("unchecked")
    public void testProcessNewItemWithNoBrandOrSeries() throws Exception {

<<<<<<< HEAD
        ContentResolver resolver = StubContentResolver.RESOLVES_NOTHING;
=======
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
        RemoteSiteClient client = ionClient(FixedResponseHttpClient.respondTo(ION_FEED_URI, Resources.getResource("ion-item-no-brand-no-series.json")),IonSchedule.class);
        
        context.checking(new Expectations(){{
Solution content 
    @SuppressWarnings("unchecked")
    public void testProcessNewItemWithNoBrandOrSeries() throws Exception {

        RemoteSiteClient client = ionClient(FixedResponseHttpClient.respondTo(ION_FEED_URI, Resources.getResource("ion-item-no-brand-no-series.json")),IonSchedule.class);
        
        context.checking(new Expectations(){{
File
BbcIonScheduleUpdaterTest.java
Developer's decision
Version 2
Kind of conflict
Variable
Chunk
Conflicting content 
    	final String item1 = slashProgrammesUriForPid("b00y1w9h");
    	final String item2 = slashProgrammesUriForPid("b006m86d");
    	
<<<<<<< HEAD
        ContentResolver resolver = StubContentResolver.RESOLVES_NOTHING;
=======
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
        RemoteSiteClient client = ionClient(FixedResponseHttpClient.respondTo(ION_FEED_URI, Resources.getResource("ion-item-brand-no-series.json")), IonSchedule.class);

        context.checking(new Expectations(){{
Solution content 
    	final String item1 = slashProgrammesUriForPid("b00y1w9h");
    	final String item2 = slashProgrammesUriForPid("b006m86d");
    	
        RemoteSiteClient client = ionClient(FixedResponseHttpClient.respondTo(ION_FEED_URI, Resources.getResource("ion-item-brand-no-series.json")), IonSchedule.class);

        context.checking(new Expectations(){{
File
BbcIonScheduleUpdaterTest.java
Developer's decision
Version 2
Kind of conflict
Variable
Chunk
Conflicting content 
    @SuppressWarnings("unchecked")
    public void testProcessNewEpisodeWithBrandAndSeries() throws Exception {
<<<<<<< HEAD
        ContentResolver resolver = StubContentResolver.RESOLVES_NOTHING;
=======
>>>>>>> 0b249f0b3423cf042f8cff22c0ce8ab1a8cc2ce7
        RemoteSiteClient client = ionClient(FixedResponseHttpClient.respondTo(ION_FEED_URI, Resources.getResource("ion-item-brand-series.json")), IonSchedule.class);

        context.checking(new Expectations(){{
Solution content 
    @SuppressWarnings("unchecked")
    public void testProcessNewEpisodeWithBrandAndSeries() throws Exception {
        RemoteSiteClient client = ionClient(FixedResponseHttpClient.respondTo(ION_FEED_URI, Resources.getResource("ion-item-brand-series.json")), IonSchedule.class);

        context.checking(new Expectations(){{
File
BbcIonScheduleUpdaterTest.java
Developer's decision
Version 2
Kind of conflict
Variable