Projects >> atlas-feeds >>f83d2067f6587db16d8e00844c67f23c8fcc8904

Chunk
Conflicting content 
import org.atlasapi.feeds.youview.ids.IdParsers;
import org.atlasapi.feeds.youview.ids.PublisherIdUtilities;
import org.atlasapi.feeds.youview.images.ImageConfigurations;
<<<<<<< HEAD
=======
import org.atlasapi.feeds.youview.transactions.MongoTransactionStore;
import org.atlasapi.feeds.youview.transactions.TransactionStore;
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
import org.atlasapi.feeds.youview.www.YouViewFeedController;
import org.atlasapi.feeds.youview.www.YouViewUploadController;
import org.atlasapi.media.channel.ChannelResolver;
Solution content 
import org.atlasapi.feeds.youview.ids.IdParsers;
import org.atlasapi.feeds.youview.ids.PublisherIdUtilities;
import org.atlasapi.feeds.youview.images.ImageConfigurations;
import org.atlasapi.feeds.youview.transactions.MongoTransactionStore;
import org.atlasapi.feeds.youview.transactions.TransactionStore;
import org.atlasapi.feeds.youview.www.YouViewFeedController;
import org.atlasapi.feeds.youview.www.YouViewUploadController;
import org.atlasapi.media.channel.ChannelResolver;
File
YouViewFeedsWebModule.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
    
    // screw javax and exceptions from constructors
    @Bean
<<<<<<< HEAD
    public YouViewUploadController uploadController() {
=======
    public YouViewUploadController uploadController() throws DatatypeConfigurationException {
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
        return new YouViewUploadController(contentFinder, contentResolver, youViewUploadClient());
    }
Solution content 
    
    @Bean
    public YouViewUploadController uploadController() {
        return new YouViewUploadController(contentFinder, contentResolver, youViewUploadClient());
    }
File
YouViewFeedsWebModule.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
    }

    @Bean
<<<<<<< HEAD
    public YouViewRemoteClient youViewUploadClient() {
=======
    public YouViewRemoteClient youViewUploadClient() throws DatatypeConfigurationException {
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
        return new YouViewRemoteClient(feedGenerator(), configFactory());
    }
Solution content 
    }

    @Bean
    public YouViewRemoteClient youViewUploadClient() {
        return new YouViewRemoteClient(feedGenerator(), configFactory());
    }
File
YouViewFeedsWebModule.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
                    ImageConfigurations.imageConfigFor(config.publisher()),
                    IdParsers.parserFor(config.publisher()), 
                    GenreMappings.mappingFor(config.publisher()), 
<<<<<<< HEAD
                    httpClient(config.credentials().username(), config.credentials().password())
=======
                    httpClient(config.credentials().username(), config.credentials().password()),
                    transactionStore(config.publisher())
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
            );
        }
        return factory.build();
Solution content 
                    ImageConfigurations.imageConfigFor(config.publisher()),
                    IdParsers.parserFor(config.publisher()), 
                    GenreMappings.mappingFor(config.publisher()), 
                    httpClient(config.credentials().username(), config.credentials().password()),
                    transactionStore(config.publisher())
            );
        }
        return factory.build();
File
YouViewFeedsWebModule.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
        return factory.build();
    }
    
<<<<<<< HEAD
    @Bean
    public Set parseConfig() {
        ImmutableSet.Builder config = ImmutableSet.builder();
        for (Entry publisher : PUBLISHER_MAPPING.entrySet()) {
            String publisherPrefix = CONFIG_PREFIX + publisher.getKey();
            boolean isEnabled = Boolean.parseBoolean(Configurer.get(publisherPrefix + ".enabled").get());
            if (isEnabled) {
                config.add(new UploadPublisherConfiguration(publisher.getValue(), parseUrl(publisherPrefix), parseCredentials(publisherPrefix), parseChunkSize(publisherPrefix)));
            }
        }
        return config.build();
    }

    private String parseUrl(String publisherPrefix) {
        return Configurer.get(publisherPrefix + ".url").get();
    }
    
    private UsernameAndPassword parseCredentials(String publisherPrefix) {
        return new UsernameAndPassword(
                Configurer.get(publisherPrefix + ".username").get(), 
                Configurer.get(publisherPrefix + ".password").get()
        );
    }
    
=======
    private TransactionStore transactionStore(Publisher publisher) {
        return new MongoTransactionStore(mongo, publisher);
    }
    
    @Bean
    public Set parseConfig() {
        ImmutableSet.Builder config = ImmutableSet.builder();
        for (Entry publisher : PUBLISHER_MAPPING.entrySet()) {
            String publisherPrefix = CONFIG_PREFIX + publisher.getKey();
            boolean isEnabled = isEnabled(publisherPrefix);
            if (isEnabled) {
                config.add(new UploadPublisherConfiguration(
                        publisher.getValue(), 
                        parseUrl(publisherPrefix), 
                        parseCredentials(publisherPrefix), 
                        parseChunkSize(publisherPrefix))
                );
            }
        }
        return config.build();
    }

    private boolean isEnabled(String publisherPrefix) {
        return Boolean.parseBoolean(Configurer.get(publisherPrefix + ".endpoints.enabled").get())
                || Boolean.parseBoolean(Configurer.get(publisherPrefix + ".upload.enabled").get());
    }

    private String parseUrl(String publisherPrefix) {
        return Configurer.get(publisherPrefix + ".url").get();
    }
    
    private UsernameAndPassword parseCredentials(String publisherPrefix) {
        return new UsernameAndPassword(
                Configurer.get(publisherPrefix + ".username").get(), 
                Configurer.get(publisherPrefix + ".password").get()
        );
    }
    
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
    private int parseChunkSize(String publisherPrefix) {
        return Configurer.get(publisherPrefix + ".chunkSize").toInt();
    }
Solution content 
        return factory.build();
    }
    
    private TransactionStore transactionStore(Publisher publisher) {
        return new MongoTransactionStore(mongo, publisher);
    }
    
    @Bean
    public Set parseConfig() {
        ImmutableSet.Builder config = ImmutableSet.builder();
        for (Entry publisher : PUBLISHER_MAPPING.entrySet()) {
            String publisherPrefix = CONFIG_PREFIX + publisher.getKey();
            boolean isEnabled = isEnabled(publisherPrefix);
            if (isEnabled) {
                config.add(new UploadPublisherConfiguration(
                        publisher.getValue(), 
                        parseUrl(publisherPrefix), 
                        parseCredentials(publisherPrefix), 
                        parseChunkSize(publisherPrefix))
                );
            }
        }
        return config.build();
    }

    private boolean isEnabled(String publisherPrefix) {
        return Boolean.parseBoolean(Configurer.get(publisherPrefix + ".endpoints.enabled").get())
                || Boolean.parseBoolean(Configurer.get(publisherPrefix + ".upload.enabled").get());
    }

    private String parseUrl(String publisherPrefix) {
        return Configurer.get(publisherPrefix + ".url").get();
    }
    
    private UsernameAndPassword parseCredentials(String publisherPrefix) {
        return new UsernameAndPassword(
                Configurer.get(publisherPrefix + ".username").get(), 
                Configurer.get(publisherPrefix + ".password").get()
        );
    }
    
    private int parseChunkSize(String publisherPrefix) {
        return Configurer.get(publisherPrefix + ".chunkSize").toInt();
    }
File
YouViewFeedsWebModule.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
import org.atlasapi.feeds.youview.ids.IdParser;
import org.atlasapi.feeds.youview.ids.PublisherIdUtility;
import org.atlasapi.feeds.youview.images.ImageConfiguration;
<<<<<<< HEAD
=======
import org.atlasapi.feeds.youview.transactions.TransactionStore;
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
import org.atlasapi.media.entity.Publisher;

import com.google.common.collect.ImmutableMap;
Solution content 
import org.atlasapi.media.entity.Publisher;
import org.atlasapi.feeds.youview.ids.IdParser;
import org.atlasapi.feeds.youview.ids.PublisherIdUtility;
import org.atlasapi.feeds.youview.images.ImageConfiguration;
import org.atlasapi.feeds.youview.transactions.TransactionStore;
import com.google.common.collect.ImmutableMap;
File
YouViewPerPublisherFactory.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
        return new Builder();
    }
    
<<<<<<< HEAD
    private YouViewPerPublisherFactory(Map configurations, Map imageConfigurations,
            Map idParsers, Map genreMaps, Map httpClients) {
=======
    private YouViewPerPublisherFactory(Map configurations, 
            Map imageConfigurations,
            Map idParsers, Map genreMaps, 
            Map httpClients, Map transactionStores) {
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
                this.configurations = ImmutableMap.copyOf(checkNotNull(configurations));
                this.imageConfigurations = ImmutableMap.copyOf(checkNotNull(imageConfigurations));
                this.idParsers = ImmutableMap.copyOf(checkNotNull(idParsers));
Solution content 
        return new Builder();
    }
    
    private YouViewPerPublisherFactory(Map configurations, 
            Map imageConfigurations,
            Map idParsers, Map genreMaps, 
            Map httpClients, Map transactionStores) {
                this.configurations = ImmutableMap.copyOf(checkNotNull(configurations));
                this.imageConfigurations = ImmutableMap.copyOf(checkNotNull(imageConfigurations));
                this.idParsers = ImmutableMap.copyOf(checkNotNull(idParsers));
File
YouViewPerPublisherFactory.java
Developer's decision
Version 2
Kind of conflict
Method signature
Chunk
Conflicting content 
        
<<<<<<< HEAD
    public static class Builder {
    
        // TODO use ImmutableMap.builder instead of Maps.newHashMap
        private Map idUtilities = Maps.newHashMap();
        private Map imageConfigurations = Maps.newHashMap();
        private Map idParsers = Maps.newHashMap();
        private Map genreMaps = Maps.newHashMap();
        private Map httpClients = Maps.newHashMap();
=======
        private ImmutableMap.Builder idUtilities = ImmutableMap.builder();
        private ImmutableMap.Builder imageConfigurations = ImmutableMap.builder();
        private ImmutableMap.Builder idParsers = ImmutableMap.builder();
        private ImmutableMap.Builder genreMaps = ImmutableMap.builder();
        private ImmutableMap.Builder httpClients = ImmutableMap.builder();
        private ImmutableMap.Builder transactionStores = ImmutableMap.builder();
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
        
        private Builder() {}
Solution content 
    
    public static class Builder {
        
        private ImmutableMap.Builder idUtilities = ImmutableMap.builder();
        private ImmutableMap.Builder imageConfigurations = ImmutableMap.builder();
        private ImmutableMap.Builder idParsers = ImmutableMap.builder();
        private ImmutableMap.Builder genreMaps = ImmutableMap.builder();
        private ImmutableMap.Builder httpClients = ImmutableMap.builder();
        private ImmutableMap.Builder transactionStores = ImmutableMap.builder();
        
        private Builder() {}
File
YouViewPerPublisherFactory.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
        private Builder() {}
        
        public YouViewPerPublisherFactory build() {
<<<<<<< HEAD
            return new YouViewPerPublisherFactory(idUtilities, imageConfigurations, idParsers, genreMaps, httpClients);
        }
        
        public Builder withPublisher(Publisher publisher, PublisherIdUtility config, ImageConfiguration imageConfig,
                IdParser idParser, GenreMapping genreMap, SimpleHttpClient httpClient) {
=======
            return new YouViewPerPublisherFactory(idUtilities.build(), imageConfigurations.build(), 
                    idParsers.build(), genreMaps.build(), httpClients.build(), transactionStores.build());
        }
        
        public Builder withPublisher(Publisher publisher, PublisherIdUtility config, ImageConfiguration imageConfig,
                IdParser idParser, GenreMapping genreMap, SimpleHttpClient httpClient, TransactionStore transactionStore) {
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
            idUtilities.put(checkNotNull(publisher), checkNotNull(config));
            imageConfigurations.put(publisher, checkNotNull(imageConfig));
            idParsers.put(publisher, checkNotNull(idParser));
Solution content 
        private Builder() {}
        
        public YouViewPerPublisherFactory build() {
            return new YouViewPerPublisherFactory(idUtilities.build(), imageConfigurations.build(), 
                    idParsers.build(), genreMaps.build(), httpClients.build(), transactionStores.build());
        }
        
        public Builder withPublisher(Publisher publisher, PublisherIdUtility config, ImageConfiguration imageConfig,
                IdParser idParser, GenreMapping genreMap, SimpleHttpClient httpClient, TransactionStore transactionStore) {
            idUtilities.put(checkNotNull(publisher), checkNotNull(config));
            imageConfigurations.put(publisher, checkNotNull(imageConfig));
            idParsers.put(publisher, checkNotNull(idParser));
File
YouViewPerPublisherFactory.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
import org.atlasapi.feeds.tvanytime.TvAnytimeGenerator;
import org.atlasapi.feeds.youview.ids.IdParser;
import org.atlasapi.feeds.youview.ids.PublisherIdUtility;
<<<<<<< HEAD
=======
import org.atlasapi.feeds.youview.transactions.TransactionStore;
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
import org.atlasapi.media.entity.Brand;
import org.atlasapi.media.entity.Content;
import org.atlasapi.media.entity.Item;
Solution content 
import org.atlasapi.feeds.tvanytime.TvAnytimeGenerator;
import org.atlasapi.feeds.youview.ids.IdParser;
import org.atlasapi.feeds.youview.ids.PublisherIdUtility;
import org.atlasapi.feeds.youview.transactions.TransactionStore;
import org.atlasapi.media.entity.Brand;
import org.atlasapi.media.entity.Content;
import org.atlasapi.media.entity.Item;
File
YouViewRemoteClient.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
            return;
        }
        Publisher publisher = first.getPublisher();
<<<<<<< HEAD
        SimpleHttpClient httpClient = configurationFactory.getHttpClient(publisher);
        PublisherIdUtility config = configurationFactory.getIdUtil(publisher);
=======
        SimpleHttpClient httpClient = publisherConfig.getHttpClient(publisher);
        PublisherIdUtility config = publisherConfig.getIdUtil(publisher);
        TransactionStore transactionStore = publisherConfig.getTransactionStore(publisher);
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
        
        String queryUrl = config.getYouViewBaseUrl() + UPLOAD_URL_SUFFIX;
        log.trace(String.format("Posting YouView output xml to %s", queryUrl));
Solution content 
            return;
        }
        Publisher publisher = first.getPublisher();
        SimpleHttpClient httpClient = publisherConfig.getHttpClient(publisher);
        PublisherIdUtility config = publisherConfig.getIdUtil(publisher);
        TransactionStore transactionStore = publisherConfig.getTransactionStore(publisher);
        
        String queryUrl = config.getYouViewBaseUrl() + UPLOAD_URL_SUFFIX;
        log.trace(String.format("Posting YouView output xml to %s", queryUrl));
File
YouViewRemoteClient.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    // TODO does this need two deletes for the item crid? surely it only needs deletes for crid, version-crid and imi?
    private boolean sendDelete(Item item) {
        Publisher publisher = item.getPublisher();
<<<<<<< HEAD
        IdParser idParser = configurationFactory.getIdParser(publisher);
        PublisherIdUtility config = configurationFactory.getIdUtil(publisher);
        SimpleHttpClient httpClient = configurationFactory.getHttpClient(publisher);
=======
        IdParser idParser = publisherConfig.getIdParser(publisher);
        PublisherIdUtility config = publisherConfig.getIdUtil(publisher);
        SimpleHttpClient httpClient = publisherConfig.getHttpClient(publisher);
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
        
        return sendDelete(httpClient, config.getYouViewBaseUrl(), idParser.createCrid(config.getCridPrefix(), item))
//                && sendDelete(httpClient, config.getYouViewBaseUrl(), idParser.createCrid(config.getCridPrefix(), item))
Solution content 
    // TODO does this need two deletes for the item crid? surely it only needs deletes for crid, version-crid and imi?
    private boolean sendDelete(Item item) {
        Publisher publisher = item.getPublisher();
        IdParser idParser = publisherConfig.getIdParser(publisher);
        PublisherIdUtility config = publisherConfig.getIdUtil(publisher);
        SimpleHttpClient httpClient = publisherConfig.getHttpClient(publisher);
        
        return sendDelete(httpClient, config.getYouViewBaseUrl(), idParser.createCrid(config.getCridPrefix(), item))
//                && sendDelete(httpClient, config.getYouViewBaseUrl(), idParser.createCrid(config.getCridPrefix(), item))
File
YouViewRemoteClient.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    
    private boolean sendDelete(Series series) {
        Publisher publisher = series.getPublisher();
<<<<<<< HEAD
        IdParser idParser = configurationFactory.getIdParser(publisher);
        PublisherIdUtility config = configurationFactory.getIdUtil(publisher);
        SimpleHttpClient httpClient = configurationFactory.getHttpClient(publisher);
=======
        IdParser idParser = publisherConfig.getIdParser(publisher);
        PublisherIdUtility config = publisherConfig.getIdUtil(publisher);
        SimpleHttpClient httpClient = publisherConfig.getHttpClient(publisher);
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
        
        return sendDelete(httpClient, config.getYouViewBaseUrl(), idParser.createCrid(config.getCridPrefix(), series));
    }
Solution content 
    
    private boolean sendDelete(Series series) {
        Publisher publisher = series.getPublisher();
        IdParser idParser = publisherConfig.getIdParser(publisher);
        PublisherIdUtility config = publisherConfig.getIdUtil(publisher);
        SimpleHttpClient httpClient = publisherConfig.getHttpClient(publisher);
        
        return sendDelete(httpClient, config.getYouViewBaseUrl(), idParser.createCrid(config.getCridPrefix(), series));
    }
File
YouViewRemoteClient.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    
    private boolean sendDelete(Brand brand) {
        Publisher publisher = brand.getPublisher();
<<<<<<< HEAD
        IdParser idParser = configurationFactory.getIdParser(publisher);
        PublisherIdUtility config = configurationFactory.getIdUtil(publisher);
        SimpleHttpClient httpClient = configurationFactory.getHttpClient(publisher);
=======
        IdParser idParser = publisherConfig.getIdParser(publisher);
        PublisherIdUtility config = publisherConfig.getIdUtil(publisher);
        SimpleHttpClient httpClient = publisherConfig.getHttpClient(publisher);
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
        
        return sendDelete(httpClient, config.getYouViewBaseUrl(), idParser.createCrid(config.getCridPrefix(), brand));
    }
Solution content 
    
    private boolean sendDelete(Brand brand) {
        Publisher publisher = brand.getPublisher();
        IdParser idParser = publisherConfig.getIdParser(publisher);
        PublisherIdUtility config = publisherConfig.getIdUtil(publisher);
        SimpleHttpClient httpClient = publisherConfig.getHttpClient(publisher);
        
        return sendDelete(httpClient, config.getYouViewBaseUrl(), idParser.createCrid(config.getCridPrefix(), brand));
    }
File
YouViewRemoteClient.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
                    PublisherIdUtilities.idUtilFor(Publisher.LOVEFILM, "youviewurl"),
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
<<<<<<< HEAD
                    GenreMappings.mappingFor(Publisher.LOVEFILM), 
                    httpClient)
=======
                    GenreMappings.mappingFor(Publisher.LOVEFILM),
                    httpClient,
                    Mockito.mock(TransactionStore.class))
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
            .build();
    private ProgramInformationGenerator progInfoGenerator = new DefaultProgramInformationGenerator(configFactory);
    private GroupInformationGenerator groupInfoGenerator = new DefaultGroupInformationGenerator(configFactory);
Solution content 
                    PublisherIdUtilities.idUtilFor(Publisher.LOVEFILM, "youviewurl"),
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    GenreMappings.mappingFor(Publisher.LOVEFILM),
                    httpClient,
                    Mockito.mock(TransactionStore.class))
            .build();
    private ProgramInformationGenerator progInfoGenerator = new DefaultProgramInformationGenerator(configFactory);
    private GroupInformationGenerator groupInfoGenerator = new DefaultGroupInformationGenerator(configFactory);
File
BootstrapIntegrationTest.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
import org.atlasapi.feeds.youview.ids.IdParsers;
import org.atlasapi.feeds.youview.ids.PublisherIdUtilities;
import org.atlasapi.feeds.youview.images.ImageConfigurations;
<<<<<<< HEAD
=======
import org.atlasapi.feeds.youview.transactions.TransactionStore;
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
import org.atlasapi.media.entity.Alias;
import org.atlasapi.media.entity.Brand;
import org.atlasapi.media.entity.Certificate;
Solution content 
import org.atlasapi.feeds.youview.ids.IdParsers;
import org.atlasapi.feeds.youview.ids.PublisherIdUtilities;
import org.atlasapi.feeds.youview.images.ImageConfigurations;
import org.atlasapi.feeds.youview.transactions.TransactionStore;
import org.atlasapi.media.entity.Alias;
import org.atlasapi.media.entity.Brand;
import org.atlasapi.media.entity.Certificate;
File
DefaultGroupInformationGeneratorTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    GenreMappings.mappingFor(Publisher.LOVEFILM), 
<<<<<<< HEAD
                    Mockito.mock(SimpleHttpClient.class))
=======
                    Mockito.mock(SimpleHttpClient.class),
                    Mockito.mock(TransactionStore.class))
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
            .withPublisher(
                    Publisher.AMAZON_UNBOX, 
                    PublisherIdUtilities.idUtilFor(Publisher.AMAZON_UNBOX, "base uri"),
Solution content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    GenreMappings.mappingFor(Publisher.LOVEFILM), 
                    Mockito.mock(SimpleHttpClient.class),
                    Mockito.mock(TransactionStore.class))
            .withPublisher(
                    Publisher.AMAZON_UNBOX, 
                    PublisherIdUtilities.idUtilFor(Publisher.AMAZON_UNBOX, "base uri"),
File
DefaultGroupInformationGeneratorTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
                    ImageConfigurations.imageConfigFor(Publisher.AMAZON_UNBOX),
                    IdParsers.parserFor(Publisher.AMAZON_UNBOX), 
                    GenreMappings.mappingFor(Publisher.AMAZON_UNBOX), 
<<<<<<< HEAD
                    Mockito.mock(SimpleHttpClient.class))
=======
                    Mockito.mock(SimpleHttpClient.class),
                    Mockito.mock(TransactionStore.class))
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
            .build(); 

    private final GroupInformationGenerator generator = new DefaultGroupInformationGenerator(configFactory);
Solution content 
                    ImageConfigurations.imageConfigFor(Publisher.AMAZON_UNBOX),
                    IdParsers.parserFor(Publisher.AMAZON_UNBOX), 
                    GenreMappings.mappingFor(Publisher.AMAZON_UNBOX), 
                    Mockito.mock(SimpleHttpClient.class),
                    Mockito.mock(TransactionStore.class))
            .build(); 

    private final GroupInformationGenerator generator = new DefaultGroupInformationGenerator(configFactory);
File
DefaultGroupInformationGeneratorTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
<<<<<<< HEAD
=======
import org.atlasapi.feeds.youview.ids.IdParsers;
import org.atlasapi.feeds.youview.ids.PublisherIdUtilities;
import org.atlasapi.feeds.youview.images.ImageConfigurations;
import org.atlasapi.feeds.youview.transactions.TransactionStore;
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
import org.atlasapi.media.entity.Alias;
import org.atlasapi.media.entity.Certificate;
import org.atlasapi.media.entity.Encoding;
Solution content 
import org.atlasapi.feeds.youview.ids.IdParsers;
import org.atlasapi.feeds.youview.ids.PublisherIdUtilities;
import org.atlasapi.feeds.youview.images.ImageConfigurations;
import org.atlasapi.feeds.youview.transactions.TransactionStore;
import org.atlasapi.media.entity.Alias;
import org.atlasapi.media.entity.Certificate;
import org.atlasapi.media.entity.Encoding;
File
DefaultOnDemandLocationGeneratorTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    GenreMappings.mappingFor(Publisher.LOVEFILM), 
<<<<<<< HEAD
                    Mockito.mock(SimpleHttpClient.class))
=======
                    Mockito.mock(SimpleHttpClient.class),
                    Mockito.mock(TransactionStore.class))
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
            .withPublisher(
                    Publisher.AMAZON_UNBOX, 
                    PublisherIdUtilities.idUtilFor(Publisher.AMAZON_UNBOX, "base uri"),
Solution content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    GenreMappings.mappingFor(Publisher.LOVEFILM), 
                    Mockito.mock(SimpleHttpClient.class),
                    Mockito.mock(TransactionStore.class))
            .withPublisher(
                    Publisher.AMAZON_UNBOX, 
                    PublisherIdUtilities.idUtilFor(Publisher.AMAZON_UNBOX, "base uri"),
File
DefaultOnDemandLocationGeneratorTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
                    ImageConfigurations.imageConfigFor(Publisher.AMAZON_UNBOX),
                    IdParsers.parserFor(Publisher.AMAZON_UNBOX), 
                    GenreMappings.mappingFor(Publisher.AMAZON_UNBOX), 
<<<<<<< HEAD
                    Mockito.mock(SimpleHttpClient.class))
=======
                    Mockito.mock(SimpleHttpClient.class),
                    Mockito.mock(TransactionStore.class))
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
            .build();
    private final OnDemandLocationGenerator generator = new DefaultOnDemandLocationGenerator(configFactory);
Solution content 
                    ImageConfigurations.imageConfigFor(Publisher.AMAZON_UNBOX),
                    IdParsers.parserFor(Publisher.AMAZON_UNBOX), 
                    GenreMappings.mappingFor(Publisher.AMAZON_UNBOX), 
                    Mockito.mock(SimpleHttpClient.class),
                    Mockito.mock(TransactionStore.class))
            .build();
    private final OnDemandLocationGenerator generator = new DefaultOnDemandLocationGenerator(configFactory);
File
DefaultOnDemandLocationGeneratorTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
import org.atlasapi.feeds.youview.ids.IdParsers;
import org.atlasapi.feeds.youview.ids.PublisherIdUtilities;
import org.atlasapi.feeds.youview.images.ImageConfigurations;
<<<<<<< HEAD
=======
import org.atlasapi.feeds.youview.transactions.TransactionStore;
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
import org.atlasapi.media.entity.Alias;
import org.atlasapi.media.entity.Certificate;
import org.atlasapi.media.entity.Film;
Solution content 
import org.atlasapi.feeds.youview.ids.IdParsers;
import org.atlasapi.feeds.youview.ids.PublisherIdUtilities;
import org.atlasapi.feeds.youview.images.ImageConfigurations;
import org.atlasapi.feeds.youview.transactions.TransactionStore;
import org.atlasapi.media.entity.Alias;
import org.atlasapi.media.entity.Certificate;
import org.atlasapi.media.entity.Film;
File
DefaultProgramInformationGeneratorTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    GenreMappings.mappingFor(Publisher.LOVEFILM), 
<<<<<<< HEAD
                    Mockito.mock(SimpleHttpClient.class))
=======
                    Mockito.mock(SimpleHttpClient.class),
                    Mockito.mock(TransactionStore.class))
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
            .withPublisher(
                    Publisher.AMAZON_UNBOX, 
                    PublisherIdUtilities.idUtilFor(Publisher.AMAZON_UNBOX, "base uri"),
Solution content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    GenreMappings.mappingFor(Publisher.LOVEFILM), 
                    Mockito.mock(SimpleHttpClient.class),
                    Mockito.mock(TransactionStore.class))
            .withPublisher(
                    Publisher.AMAZON_UNBOX, 
                    PublisherIdUtilities.idUtilFor(Publisher.AMAZON_UNBOX, "base uri"),
File
DefaultProgramInformationGeneratorTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
                    ImageConfigurations.imageConfigFor(Publisher.AMAZON_UNBOX),
                    IdParsers.parserFor(Publisher.AMAZON_UNBOX), 
                    GenreMappings.mappingFor(Publisher.AMAZON_UNBOX), 
<<<<<<< HEAD
                    Mockito.mock(SimpleHttpClient.class))
=======
                    Mockito.mock(SimpleHttpClient.class),
                    Mockito.mock(TransactionStore.class))
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
            .build();
    private final ProgramInformationGenerator generator = new DefaultProgramInformationGenerator(configFactory);
Solution content 
                    ImageConfigurations.imageConfigFor(Publisher.AMAZON_UNBOX),
                    IdParsers.parserFor(Publisher.AMAZON_UNBOX), 
                    GenreMappings.mappingFor(Publisher.AMAZON_UNBOX), 
                    Mockito.mock(SimpleHttpClient.class),
                    Mockito.mock(TransactionStore.class))
            .build();
    private final ProgramInformationGenerator generator = new DefaultProgramInformationGenerator(configFactory);
File
DefaultProgramInformationGeneratorTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
import org.atlasapi.feeds.youview.ids.IdParsers;
import org.atlasapi.feeds.youview.ids.PublisherIdUtilities;
import org.atlasapi.feeds.youview.images.ImageConfigurations;
<<<<<<< HEAD
=======
import org.atlasapi.feeds.youview.transactions.TransactionStore;
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
import org.atlasapi.media.entity.Alias;
import org.atlasapi.media.entity.Brand;
import org.atlasapi.media.entity.Content;
Solution content 
import org.atlasapi.feeds.youview.ids.IdParsers;
import org.atlasapi.feeds.youview.ids.PublisherIdUtilities;
import org.atlasapi.feeds.youview.images.ImageConfigurations;
import org.atlasapi.feeds.youview.transactions.TransactionStore;
import org.atlasapi.media.entity.Alias;
import org.atlasapi.media.entity.Brand;
import org.atlasapi.media.entity.Content;
File
DeletionUrlTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    Mockito.mock(GenreMapping.class), 
<<<<<<< HEAD
                    httpClient)
=======
                    httpClient,
                    Mockito.mock(TransactionStore.class))
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
            .build();
    
    private final YouViewRemoteClient youViewClient = new YouViewRemoteClient(generator, configurationFactory);
Solution content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    Mockito.mock(GenreMapping.class), 
                    httpClient,
                    Mockito.mock(TransactionStore.class))
            .build();
    
    private final YouViewRemoteClient youViewClient = new YouViewRemoteClient(generator, configurationFactory);
File
DeletionUrlTest.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    GenreMappings.mappingFor(Publisher.LOVEFILM), 
<<<<<<< HEAD
                    httpClient)
=======
                    httpClient,
                    Mockito.mock(TransactionStore.class))
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
            .build();
    private ProgramInformationGenerator progInfoGenerator = new DefaultProgramInformationGenerator(configFactory);
    private GroupInformationGenerator groupInfoGenerator = new DefaultGroupInformationGenerator(configFactory);
Solution content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    GenreMappings.mappingFor(Publisher.LOVEFILM), 
                    httpClient,
                    Mockito.mock(TransactionStore.class))
            .build();
    private ProgramInformationGenerator progInfoGenerator = new DefaultProgramInformationGenerator(configFactory);
    private GroupInformationGenerator groupInfoGenerator = new DefaultGroupInformationGenerator(configFactory);
File
DeltaIntegrationTest.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
import org.atlasapi.feeds.youview.ids.IdParsers;
import org.atlasapi.feeds.youview.ids.PublisherIdUtilities;
import org.atlasapi.feeds.youview.images.ImageConfigurations;
<<<<<<< HEAD
=======
import org.atlasapi.feeds.youview.transactions.TransactionStore;
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
import org.atlasapi.media.entity.Alias;
import org.atlasapi.media.entity.Brand;
import org.atlasapi.media.entity.Certificate;
Solution content 
import org.atlasapi.feeds.youview.ids.IdParsers;
import org.atlasapi.feeds.youview.ids.PublisherIdUtilities;
import org.atlasapi.feeds.youview.images.ImageConfigurations;
import org.atlasapi.feeds.youview.transactions.TransactionStore;
import org.atlasapi.media.entity.Alias;
import org.atlasapi.media.entity.Brand;
import org.atlasapi.media.entity.Certificate;
File
LoveFilmGroupInformationHierarchyTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    GenreMappings.mappingFor(Publisher.LOVEFILM), 
<<<<<<< HEAD
                    Mockito.mock(SimpleHttpClient.class))
=======
                    Mockito.mock(SimpleHttpClient.class),
                    Mockito.mock(TransactionStore.class))
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
            .build();
    private ProgramInformationGenerator progInfoGenerator = new DefaultProgramInformationGenerator(configFactory);
    private GroupInformationGenerator groupInfoGenerator = new DefaultGroupInformationGenerator(configFactory);
Solution content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    GenreMappings.mappingFor(Publisher.LOVEFILM), 
                    Mockito.mock(SimpleHttpClient.class),
                    Mockito.mock(TransactionStore.class))
            .build();
    private ProgramInformationGenerator progInfoGenerator = new DefaultProgramInformationGenerator(configFactory);
    private GroupInformationGenerator groupInfoGenerator = new DefaultGroupInformationGenerator(configFactory);
File
LoveFilmGroupInformationHierarchyTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
import org.atlasapi.feeds.youview.ids.IdParsers;
import org.atlasapi.feeds.youview.ids.PublisherIdUtilities;
import org.atlasapi.feeds.youview.images.ImageConfigurations;
<<<<<<< HEAD
=======
import org.atlasapi.feeds.youview.transactions.TransactionStore;
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
import org.atlasapi.feeds.youview.www.YouViewUploadController;
import org.atlasapi.media.entity.Alias;
import org.atlasapi.media.entity.Content;
Solution content 
import org.atlasapi.feeds.youview.ids.IdParsers;
import org.atlasapi.feeds.youview.ids.PublisherIdUtilities;
import org.atlasapi.feeds.youview.images.ImageConfigurations;
import org.atlasapi.feeds.youview.transactions.TransactionStore;
import org.atlasapi.feeds.youview.www.YouViewUploadController;
import org.atlasapi.media.entity.Alias;
import org.atlasapi.media.entity.Content;
File
SingleItemEndpointTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    GenreMappings.mappingFor(Publisher.LOVEFILM), 
<<<<<<< HEAD
                    httpClient)
=======
                    httpClient,
                    Mockito.mock(TransactionStore.class))
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
            .build();
    private DummyContentResolver contentResolver = new DummyContentResolver();
    private ContentPermit contentPermit = Mockito.mock(ContentPermit.class);
Solution content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    GenreMappings.mappingFor(Publisher.LOVEFILM), 
                    httpClient,
                    Mockito.mock(TransactionStore.class))
            .build();
    private DummyContentResolver contentResolver = new DummyContentResolver();
    private ContentPermit contentPermit = Mockito.mock(ContentPermit.class);
File
SingleItemEndpointTest.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    GenreMappings.mappingFor(Publisher.LOVEFILM), 
<<<<<<< HEAD
                    httpClient)
=======
                    httpClient,
                    Mockito.mock(TransactionStore.class))
>>>>>>> 5f3d6e7455ff07010096e8ba003c75df8f1c84b1
            .build();
    private TVAnytimeElementCreator elementCreator = Mockito.mock(TVAnytimeElementCreator.class);
    private TvAnytimeGenerator generator = new DefaultTvAnytimeGenerator(elementCreator, false);
Solution content 
                    ImageConfigurations.imageConfigFor(Publisher.LOVEFILM),
                    IdParsers.parserFor(Publisher.LOVEFILM), 
                    GenreMappings.mappingFor(Publisher.LOVEFILM), 
                    httpClient,
                    Mockito.mock(TransactionStore.class))
            .build();
    private TVAnytimeElementCreator elementCreator = Mockito.mock(TVAnytimeElementCreator.class);
    private TvAnytimeGenerator generator = new DefaultTvAnytimeGenerator(elementCreator, false);
File
YouViewLastUpdatedStoreTest.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation