Projects >> atlas >>addbce3104807eec8c9fb699284faf78e37578bd

Chunk
Conflicting content 
import org.atlasapi.feeds.interlinking.delta.InterlinkingDeltaModule;
import org.atlasapi.feeds.radioplayer.RadioPlayerModule;
import org.atlasapi.feeds.xmltv.XmlTvModule;
<<<<<<< HEAD
import org.atlasapi.feeds.youview.TVAnytimeFeedsModule;
=======
import org.atlasapi.feeds.youview.TvAnytimeFeedsModule;
>>>>>>> 2e23eb4d8da544d689bfa57fec6d6788187edd2d
import org.atlasapi.feeds.youview.YouViewUploadModule;
import org.atlasapi.googlespreadsheet.GoogleSpreadsheetModule;
import org.atlasapi.logging.AtlasLoggingModule;
Solution content 
import org.atlasapi.feeds.interlinking.delta.InterlinkingDeltaModule;
import org.atlasapi.feeds.radioplayer.RadioPlayerModule;
import org.atlasapi.feeds.xmltv.XmlTvModule;
import org.atlasapi.feeds.youview.TVAnytimeFeedsModule;
import org.atlasapi.feeds.youview.YouViewUploadModule;
import org.atlasapi.googlespreadsheet.GoogleSpreadsheetModule;
import org.atlasapi.logging.AtlasLoggingModule;
File
ConfigurableAnnotationWebApplicationContext.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
            XmlTvModule.class, 
            RemoteSiteHealthModule.class, 
            EquivModule.class,
<<<<<<< HEAD
            CodecModule.class,
            TVAnytimeFeedsModule.class
=======
            TvAnytimeFeedsModule.class
>>>>>>> 2e23eb4d8da544d689bfa57fec6d6788187edd2d
        );
        
        if(runProcessingOnly()) {
Solution content 
            XmlTvModule.class, 
            RemoteSiteHealthModule.class, 
            EquivModule.class,
            CodecModule.class,
            TVAnytimeFeedsModule.class
        );
        
        if(runProcessingOnly()) {
File
ConfigurableAnnotationWebApplicationContext.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
import org.atlasapi.output.SimpleContentGroupModelWriter;
import org.atlasapi.output.SimpleContentModelWriter;
import org.atlasapi.output.SimpleEventModelWriter;
<<<<<<< HEAD
import org.atlasapi.output.SimpleOrganisationModelWriter;
=======
>>>>>>> 2e23eb4d8da544d689bfa57fec6d6788187edd2d
import org.atlasapi.output.SimpleFeedStatisticsModelWriter;
import org.atlasapi.output.SimplePersonModelWriter;
import org.atlasapi.output.SimpleProductModelWriter;
Solution content 
import org.atlasapi.output.SimpleContentGroupModelWriter;
import org.atlasapi.output.SimpleContentModelWriter;
import org.atlasapi.output.SimpleEventModelWriter;
import org.atlasapi.output.SimpleFeedStatisticsModelWriter;
import org.atlasapi.output.SimpleOrganisationModelWriter;
import org.atlasapi.output.SimplePersonModelWriter;
import org.atlasapi.output.SimpleProductModelWriter;
File
QueryWebModule.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import org.atlasapi.query.v2.ContentWriteController;
import org.atlasapi.query.v2.EventsController;
import org.atlasapi.query.v2.FeedStatsController;
<<<<<<< HEAD
import org.atlasapi.query.v2.OrganisationController;
=======
>>>>>>> 2e23eb4d8da544d689bfa57fec6d6788187edd2d
import org.atlasapi.query.v2.PeopleController;
import org.atlasapi.query.v2.PeopleWriteController;
import org.atlasapi.query.v2.ProductController;
Solution content 
import org.atlasapi.query.v2.ContentWriteController;
import org.atlasapi.query.v2.EventsController;
import org.atlasapi.query.v2.FeedStatsController;
import org.atlasapi.query.v2.OrganisationController;
import org.atlasapi.query.v2.PeopleController;
import org.atlasapi.query.v2.PeopleWriteController;
import org.atlasapi.query.v2.ProductController;
File
QueryWebModule.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    private @Autowired LookupEntryStore lookupStore;
    private @Autowired DescriptionWatermarker descriptionWatermarker;
    private @Autowired EventResolver eventResolver;
<<<<<<< HEAD
    private @Autowired OrganisationResolver organisationResolver;
    private @Autowired TransactionStore transactionStore;
    private @Autowired FeedStatisticsResolver feedStatsResolver;
    private @Autowired TvAnytimeGenerator feedGenerator;
    private @Autowired LastUpdatedContentFinder contentFinder;
=======
    private @Autowired TransactionStore transactionStore;
    private @Autowired FeedStatisticsResolver feedStatsResolver;
    private @Autowired TvAnytimeGenerator feedGenerator;
>>>>>>> 2e23eb4d8da544d689bfa57fec6d6788187edd2d

    private @Autowired KnownTypeQueryExecutor queryExecutor;
    private @Autowired ApplicationConfigurationFetcher configFetcher;
Solution content 
    private @Autowired LookupEntryStore lookupStore;
    private @Autowired DescriptionWatermarker descriptionWatermarker;
    private @Autowired EventResolver eventResolver;
    private @Autowired OrganisationResolver organisationResolver;
    private @Autowired TransactionStore transactionStore;
    private @Autowired FeedStatisticsResolver feedStatsResolver;
    private @Autowired TvAnytimeGenerator feedGenerator;
    private @Autowired LastUpdatedContentFinder contentFinder;
    private @Autowired KnownTypeQueryExecutor queryExecutor;
    private @Autowired ApplicationConfigurationFetcher configFetcher;
File
QueryWebModule.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
    
    @Bean
    ContentFeedController contentFeedController() {
<<<<<<< HEAD
        return new ContentFeedController(configFetcher, log, tvaModelOutputter(), feedGenerator, contentFinder, contentResolver);
=======
        return new ContentFeedController(configFetcher, log, tvaModelOutputter(), feedGenerator, contentResolver);
>>>>>>> 2e23eb4d8da544d689bfa57fec6d6788187edd2d
    }
    
    @Bean
Solution content 
    
    @Bean
    ContentFeedController contentFeedController() {
        return new ContentFeedController(configFetcher, log, tvaModelOutputter(), feedGenerator, contentResolver);
    }
    
    @Bean
File
QueryWebModule.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
    @Bean
<<<<<<< HEAD
    }

    AtlasModelWriter> organisationModelOutputter() {
        OrganisationModelSimplifier organisationModelSimplifier = organisationSimplifier();
        return this.>standardWriter(
                new SimpleOrganisationModelWriter(new JsonTranslator(), contentResolver, organisationModelSimplifier),
                new SimpleOrganisationModelWriter(new JaxbXmlTranslator(), contentResolver, organisationModelSimplifier));
    }
    
    @Bean
=======
>>>>>>> 2e23eb4d8da544d689bfa57fec6d6788187edd2d
    AtlasModelWriter> transactionModelOutputter() {
        TransactionModelSimplifier transactionModelSimplifier = transactionSimplifier();
        return this.>standardWriter(
Solution content 
    }

    @Bean
    AtlasModelWriter> organisationModelOutputter() {
        OrganisationModelSimplifier organisationModelSimplifier = organisationSimplifier();
        return this.>standardWriter(
                new SimpleOrganisationModelWriter(new JsonTranslator(), contentResolver, organisationModelSimplifier),
                new SimpleOrganisationModelWriter(new JaxbXmlTranslator(), contentResolver, organisationModelSimplifier));
    }
    
    @Bean
    AtlasModelWriter> transactionModelOutputter() {
        TransactionModelSimplifier transactionModelSimplifier = transactionSimplifier();
        return this.>standardWriter(
File
QueryWebModule.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Return statement
Variable