Projects information

Chunk

Conflicting content
//Generally acceptable publishers. Set acceptablePublishers = Sets.difference(ImmutableSet.copyOf(Publisher.values()), ImmutableSet.of(PREVIEW_NETWORKS, BBC_REDUX, RADIO_TIMES, LOVEFILM)); <<<<<<< HEAD EquivalenceUpdater standardItemUpdater = standardItemUpdater(acceptablePublishers); EquivalenceUpdater standardContainerUpdater = standardContainerUpdater(acceptablePublishers); ImmutableSet nonStandardPublishers = ImmutableSet.of(ITUNES, BBC_REDUX, RADIO_TIMES, FACEBOOK); final EquivalenceUpdaters updaters = new EquivalenceUpdaters(); ======= TitleMatchingEquivalenceScoringGenerator titleScoringGenerator = new TitleMatchingEquivalenceScoringGenerator(searchResolver); ItemEquivalenceUpdater itemUpdater = standardItemUpdater(); ImmutableMap.Builder> publisherUpdaters = ImmutableMap.builder(); ContentEquivalenceUpdater standardContainerEquivalenceUpdater = resultHandlingUpdater(new RootEquivalenceUpdater(containerUpdaterBuilder(acceptablePublishers) .withGenerators(ImmutableSet.of( titleScoringGenerator, new ContainerChildEquivalenceGenerator(contentResolver, itemUpdater, liveResultsStore(), log))) .withScorer(titleScoringGenerator) .build(), itemUpdater), acceptablePublishers); ImmutableSet nonStandardPublishers = ImmutableSet.of(ITUNES, BBC_REDUX, RADIO_TIMES, FACEBOOK, LOVEFILM); >>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31 for (Publisher publisher : Iterables.filter(ImmutableList.copyOf(Publisher.values()), not(in(nonStandardPublishers)))) { updaters.register(publisher, Item.class, standardItemUpdater); updaters.register(publisher, Container.class, standardContainerUpdater);

Conflicting content

        //Generally acceptable publishers.
        Set acceptablePublishers = Sets.difference(ImmutableSet.copyOf(Publisher.values()), ImmutableSet.of(PREVIEW_NETWORKS, BBC_REDUX, RADIO_TIMES, LOVEFILM));
        
<<<<<<< HEAD
        EquivalenceUpdater standardItemUpdater = standardItemUpdater(acceptablePublishers);
        EquivalenceUpdater standardContainerUpdater = standardContainerUpdater(acceptablePublishers);

        ImmutableSet nonStandardPublishers = ImmutableSet.of(ITUNES, BBC_REDUX, RADIO_TIMES, FACEBOOK);
        final EquivalenceUpdaters updaters = new EquivalenceUpdaters();
=======
        TitleMatchingEquivalenceScoringGenerator titleScoringGenerator = new TitleMatchingEquivalenceScoringGenerator(searchResolver);
        
        ItemEquivalenceUpdater itemUpdater = standardItemUpdater();
        
        ImmutableMap.Builder> publisherUpdaters = ImmutableMap.builder();
        
        ContentEquivalenceUpdater standardContainerEquivalenceUpdater = resultHandlingUpdater(new RootEquivalenceUpdater(containerUpdaterBuilder(acceptablePublishers)
                .withGenerators(ImmutableSet.of(
                        titleScoringGenerator,
                        new ContainerChildEquivalenceGenerator(contentResolver, itemUpdater, liveResultsStore(), log)))
                .withScorer(titleScoringGenerator)
                .build(), itemUpdater), acceptablePublishers);
        
        ImmutableSet nonStandardPublishers = ImmutableSet.of(ITUNES, BBC_REDUX, RADIO_TIMES, FACEBOOK, LOVEFILM);
>>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31
        for (Publisher publisher : Iterables.filter(ImmutableList.copyOf(Publisher.values()), not(in(nonStandardPublishers)))) {
            updaters.register(publisher, Item.class, standardItemUpdater);    
            updaters.register(publisher, Container.class, standardContainerUpdater);

Solution content
//Generally acceptable publishers. Set acceptablePublishers = Sets.difference(ImmutableSet.copyOf(Publisher.values()), ImmutableSet.of(PREVIEW_NETWORKS, BBC_REDUX, RADIO_TIMES, LOVEFILM)); EquivalenceUpdater standardItemUpdater = standardItemUpdater(acceptablePublishers); EquivalenceUpdater standardContainerUpdater = standardContainerUpdater(acceptablePublishers); ImmutableSet nonStandardPublishers = ImmutableSet.of(ITUNES, BBC_REDUX, RADIO_TIMES, FACEBOOK, LOVEFILM); final EquivalenceUpdaters updaters = new EquivalenceUpdaters(); for (Publisher publisher : Iterables.filter(ImmutableList.copyOf(Publisher.values()), not(in(nonStandardPublishers)))) { updaters.register(publisher, Item.class, standardItemUpdater); updaters.register(publisher, Container.class, standardContainerUpdater);

Solution content

        //Generally acceptable publishers.
        Set acceptablePublishers = Sets.difference(ImmutableSet.copyOf(Publisher.values()), ImmutableSet.of(PREVIEW_NETWORKS, BBC_REDUX, RADIO_TIMES, LOVEFILM));
        
        EquivalenceUpdater standardItemUpdater = standardItemUpdater(acceptablePublishers);
        EquivalenceUpdater standardContainerUpdater = standardContainerUpdater(acceptablePublishers);

        ImmutableSet nonStandardPublishers = ImmutableSet.of(ITUNES, BBC_REDUX, RADIO_TIMES, FACEBOOK, LOVEFILM);
        final EquivalenceUpdaters updaters = new EquivalenceUpdaters();

        for (Publisher publisher : Iterables.filter(ImmutableList.copyOf(Publisher.values()), not(in(nonStandardPublishers)))) {
            updaters.register(publisher, Item.class, standardItemUpdater);    
            updaters.register(publisher, Container.class, standardContainerUpdater);

File
EquivModule.java

Developer's decision
Combination

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
ImmutableSet.of(titleScorer) )); <<<<<<< HEAD updaters.register(ITUNES, Item.class, standardItemUpdater( acceptablePublishers, ImmutableSet.>of( new CandidateContainerEquivalenceGenerator(contentResolver, equivSummaryStore) ), ImmutableSet.of( new TitleMatchingItemScorer(), new SequenceItemEquivalenceScorer() ) )); updaters.register(ITUNES, Container.class, standardContainerUpdater( acceptablePublishers, ImmutableSet.of(titleGenerator), ImmutableSet.of(titleScorer, new ContainerHierarchyMatchingEquivalenceScorer(contentResolver) )) ); ======= publisherUpdaters.put(ITUNES, resultHandlingUpdater(new RootEquivalenceUpdater( containerUpdaterBuilder(acceptablePublishers) .withGenerator(titleScoringGenerator) .withScorers(ImmutableSet.of(titleScoringGenerator, new ContainerChildEquivalenceScorer(itemUpdater, liveResultsStore(), contentResolver, log), new ContainerHierarchyMatchingEquivalenceScorer(contentResolver))) .build(), itemUpdater),acceptablePublishers)); Set lfPublishers = Sets.union(acceptablePublishers, ImmutableSet.of(LOVEFILM)); publisherUpdaters.put(LOVEFILM, resultHandlingUpdater(new RootEquivalenceUpdater( containerUpdaterBuilder(lfPublishers) .withGenerator(titleScoringGenerator) .withScorers(ImmutableSet.of(titleScoringGenerator, new ContainerChildEquivalenceScorer(itemUpdater, liveResultsStore(), contentResolver, log), new ContainerHierarchyMatchingEquivalenceScorer(contentResolver))) .build(), itemUpdater),lfPublishers)); >>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31 Set facebookAcceptablePublishers = Sets.union(acceptablePublishers, ImmutableSet.of(FACEBOOK)); updaters.register(FACEBOOK, Container.class, standardContentUpdater(

Conflicting content

            ImmutableSet.of(titleScorer)
        ));
        
<<<<<<< HEAD
        updaters.register(ITUNES, Item.class, standardItemUpdater(
            acceptablePublishers,
            ImmutableSet.>of(
                new CandidateContainerEquivalenceGenerator(contentResolver, equivSummaryStore)
            ), 
            ImmutableSet.of(
                new TitleMatchingItemScorer(),
                new SequenceItemEquivalenceScorer()
            )
        ));
        updaters.register(ITUNES, Container.class, standardContainerUpdater(
            acceptablePublishers,
            ImmutableSet.of(titleGenerator), 
            ImmutableSet.of(titleScorer, 
                new ContainerHierarchyMatchingEquivalenceScorer(contentResolver)
            ))
        );
=======
        publisherUpdaters.put(ITUNES, resultHandlingUpdater(new RootEquivalenceUpdater(
                containerUpdaterBuilder(acceptablePublishers)
                    .withGenerator(titleScoringGenerator)
                    .withScorers(ImmutableSet.of(titleScoringGenerator, 
                            new ContainerChildEquivalenceScorer(itemUpdater, liveResultsStore(), contentResolver, log),
                            new ContainerHierarchyMatchingEquivalenceScorer(contentResolver)))
                    .build(), 
                itemUpdater),acceptablePublishers));

        Set lfPublishers = Sets.union(acceptablePublishers, ImmutableSet.of(LOVEFILM));
        publisherUpdaters.put(LOVEFILM, resultHandlingUpdater(new RootEquivalenceUpdater(
            containerUpdaterBuilder(lfPublishers)
                .withGenerator(titleScoringGenerator)
                .withScorers(ImmutableSet.of(titleScoringGenerator, 
                    new ContainerChildEquivalenceScorer(itemUpdater, liveResultsStore(), contentResolver, log),
                    new ContainerHierarchyMatchingEquivalenceScorer(contentResolver)))
                .build(), 
            itemUpdater),lfPublishers));
>>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31
        
        Set facebookAcceptablePublishers = Sets.union(acceptablePublishers, ImmutableSet.of(FACEBOOK));
        updaters.register(FACEBOOK, Container.class, standardContentUpdater(

Solution content
ImmutableSet.of(titleScorer) )); updaters.register(ITUNES, Item.class, standardItemUpdater( acceptablePublishers, ImmutableSet.>of( new CandidateContainerEquivalenceGenerator(contentResolver, equivSummaryStore) ), ImmutableSet.of( new TitleMatchingItemScorer(), new SequenceItemEquivalenceScorer() ) )); updaters.register(ITUNES, Container.class, standardContainerUpdater( acceptablePublishers, ImmutableSet.of(titleGenerator), ImmutableSet.of(titleScorer, new ContainerHierarchyMatchingEquivalenceScorer(contentResolver) )) ); Set lfPublishers = Sets.union(acceptablePublishers, ImmutableSet.of(LOVEFILM)); updaters.register(LOVEFILM, Item.class, standardItemUpdater( lfPublishers, ImmutableSet.>of( new CandidateContainerEquivalenceGenerator(contentResolver, equivSummaryStore) ), ImmutableSet.of( new TitleMatchingItemScorer(), new SequenceItemEquivalenceScorer() ) )); updaters.register(LOVEFILM, Container.class, standardContainerUpdater( lfPublishers, ImmutableSet.of(titleGenerator), ImmutableSet.of(titleScorer, new ContainerHierarchyMatchingEquivalenceScorer(contentResolver) )) ); Set facebookAcceptablePublishers = Sets.union(acceptablePublishers, ImmutableSet.of(FACEBOOK)); updaters.register(FACEBOOK, Container.class, standardContentUpdater(

Solution content

            ImmutableSet.of(titleScorer)
        ));
        
        updaters.register(ITUNES, Item.class, standardItemUpdater(
            acceptablePublishers,
            ImmutableSet.>of(
                new CandidateContainerEquivalenceGenerator(contentResolver, equivSummaryStore)
            ), 
            ImmutableSet.of(
                new TitleMatchingItemScorer(),
                new SequenceItemEquivalenceScorer()
            )
        ));
        updaters.register(ITUNES, Container.class, standardContainerUpdater(
            acceptablePublishers,
            ImmutableSet.of(titleGenerator), 
            ImmutableSet.of(titleScorer, 
                new ContainerHierarchyMatchingEquivalenceScorer(contentResolver)
            ))
        );

        Set lfPublishers = Sets.union(acceptablePublishers, ImmutableSet.of(LOVEFILM));
        updaters.register(LOVEFILM, Item.class, standardItemUpdater(
            lfPublishers,
            ImmutableSet.>of(
                new CandidateContainerEquivalenceGenerator(contentResolver, equivSummaryStore)
                    ), 
                    ImmutableSet.of(
                        new TitleMatchingItemScorer(),
                        new SequenceItemEquivalenceScorer()
                            )
                ));
        updaters.register(LOVEFILM, Container.class, standardContainerUpdater(
            lfPublishers,
            ImmutableSet.of(titleGenerator), 
            ImmutableSet.of(titleScorer, 
                new ContainerHierarchyMatchingEquivalenceScorer(contentResolver)
            ))
        );
        
        Set facebookAcceptablePublishers = Sets.union(acceptablePublishers, ImmutableSet.of(FACEBOOK));
        updaters.register(FACEBOOK, Container.class, standardContentUpdater(

File
EquivModule.java

Developer's decision
Manual

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
taskScheduler.schedule(publisherUpdateTask(BBC_REDUX).withName("Redux Equivalence Updater"), RepetitionRules.NEVER); taskScheduler.schedule(publisherUpdateTask(ITUNES).withName("Itunes Equivalence Updater"), RepetitionRules.NEVER); taskScheduler.schedule(publisherUpdateTask(RADIO_TIMES).withName("RT Equivalence Updater"), RepetitionRules.NEVER); <<<<<<< HEAD ======= taskScheduler.schedule(publisherUpdateTask(LOVEFILM).withName("Lovefilm Equivalence Updater"), RepetitionRules.NEVER); //taskScheduler.schedule(childRefUpdateTask().forPublishers(Publisher.BBC).withName("BBC Child Ref Update"), RepetitionRules.NEVER); //taskScheduler.schedule(childRefUpdateTask().forPublishers(Publisher.PA).withName("PA Child Ref Update"), RepetitionRules.NEVER); //taskScheduler.schedule(childRefUpdateTask().forPublishers(publishersApartFrom(Publisher.BBC, Publisher.PA)).withName("Other Publishers Child Ref Update"), RepetitionRules.NEVER); >>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31 } }

Conflicting content

            taskScheduler.schedule(publisherUpdateTask(BBC_REDUX).withName("Redux Equivalence Updater"), RepetitionRules.NEVER);
            taskScheduler.schedule(publisherUpdateTask(ITUNES).withName("Itunes Equivalence Updater"), RepetitionRules.NEVER);
            taskScheduler.schedule(publisherUpdateTask(RADIO_TIMES).withName("RT Equivalence Updater"), RepetitionRules.NEVER);
<<<<<<< HEAD
=======
            taskScheduler.schedule(publisherUpdateTask(LOVEFILM).withName("Lovefilm Equivalence Updater"), RepetitionRules.NEVER);
            
            //taskScheduler.schedule(childRefUpdateTask().forPublishers(Publisher.BBC).withName("BBC Child Ref Update"), RepetitionRules.NEVER);
            //taskScheduler.schedule(childRefUpdateTask().forPublishers(Publisher.PA).withName("PA Child Ref Update"), RepetitionRules.NEVER);
            //taskScheduler.schedule(childRefUpdateTask().forPublishers(publishersApartFrom(Publisher.BBC, Publisher.PA)).withName("Other Publishers Child Ref Update"), RepetitionRules.NEVER);
>>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31
        }
    }

Solution content
taskScheduler.schedule(publisherUpdateTask(BBC_REDUX).withName("Redux Equivalence Updater"), RepetitionRules.NEVER); taskScheduler.schedule(publisherUpdateTask(ITUNES).withName("Itunes Equivalence Updater"), RepetitionRules.NEVER); taskScheduler.schedule(publisherUpdateTask(RADIO_TIMES).withName("RT Equivalence Updater"), RepetitionRules.NEVER); taskScheduler.schedule(publisherUpdateTask(LOVEFILM).withName("Lovefilm Equivalence Updater"), RepetitionRules.NEVER); } }

Solution content

            taskScheduler.schedule(publisherUpdateTask(BBC_REDUX).withName("Redux Equivalence Updater"), RepetitionRules.NEVER);
            taskScheduler.schedule(publisherUpdateTask(ITUNES).withName("Itunes Equivalence Updater"), RepetitionRules.NEVER);
            taskScheduler.schedule(publisherUpdateTask(RADIO_TIMES).withName("RT Equivalence Updater"), RepetitionRules.NEVER);
            taskScheduler.schedule(publisherUpdateTask(LOVEFILM).withName("Lovefilm Equivalence Updater"), RepetitionRules.NEVER);
        }
    }

File
EquivTaskModule.java

Developer's decision
Combination

Kind of conflict
Comment
Method invocation

Chunk

Conflicting content
public ScoredCandidates generate(Item content, ResultDescription desc) { checkArgument(content instanceof Film, "Content not Film:" + content.getCanonicalUri()); <<<<<<< HEAD Builder results = DefaultScoredCandidates.fromSource("RT->PA"); ======= ScoredEquivalentsBuilder results = DefaultScoredEquivalents.fromSource("RTtoPA"); >>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31 Matcher uriMatcher = rtFilmUriPattern.matcher(content.getCanonicalUri()); if (uriMatcher.matches()) {

Conflicting content

    public ScoredCandidates generate(Item content, ResultDescription desc) {
        checkArgument(content instanceof Film, "Content not Film:" + content.getCanonicalUri());
        
<<<<<<< HEAD
        Builder results = DefaultScoredCandidates.fromSource("RT->PA");
=======
        ScoredEquivalentsBuilder results = DefaultScoredEquivalents.fromSource("RTtoPA");
>>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31
        
        Matcher uriMatcher = rtFilmUriPattern.matcher(content.getCanonicalUri());
        if (uriMatcher.matches()) {

Solution content
public ScoredCandidates generate(Item content, ResultDescription desc) { checkArgument(content instanceof Film, "Content not Film:" + content.getCanonicalUri()); Builder results = DefaultScoredCandidates.fromSource("RTtoPA"); Matcher uriMatcher = rtFilmUriPattern.matcher(content.getCanonicalUri()); if (uriMatcher.matches()) {

Solution content

    public ScoredCandidates generate(Item content, ResultDescription desc) {
        checkArgument(content instanceof Film, "Content not Film:" + content.getCanonicalUri());
        
        Builder results = DefaultScoredCandidates.fromSource("RTtoPA");
        
        Matcher uriMatcher = rtFilmUriPattern.matcher(content.getCanonicalUri());
        if (uriMatcher.matches()) {

File
RadioTimesFilmEquivalenceGenerator.java

Developer's decision
Manual

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
import org.atlasapi.media.product.Product; import org.atlasapi.output.Annotation; import org.atlasapi.persistence.content.ContentGroupResolver; <<<<<<< HEAD import org.atlasapi.persistence.media.product.ProductResolver; ======= >>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31 import org.atlasapi.persistence.topic.TopicQueryResolver; import com.google.common.base.Function;

Conflicting content

import org.atlasapi.media.product.Product;
import org.atlasapi.output.Annotation;
import org.atlasapi.persistence.content.ContentGroupResolver;
<<<<<<< HEAD
import org.atlasapi.persistence.media.product.ProductResolver;
=======
>>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31
import org.atlasapi.persistence.topic.TopicQueryResolver;

import com.google.common.base.Function;

Solution content
import org.atlasapi.media.product.Product; import org.atlasapi.output.Annotation; import org.atlasapi.persistence.content.ContentGroupResolver; import org.atlasapi.persistence.media.product.ProductResolver; import org.atlasapi.persistence.topic.TopicQueryResolver; import com.google.common.base.Function;

Solution content

import org.atlasapi.media.product.Product;
import org.atlasapi.output.Annotation;
import org.atlasapi.persistence.content.ContentGroupResolver;
import org.atlasapi.persistence.media.product.ProductResolver;
import org.atlasapi.persistence.topic.TopicQueryResolver;

import com.google.common.base.Function;

File
ContentModelSimplifier.java

Developer's decision
Version 1

Kind of conflict
Import

Chunk

Conflicting content
import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; <<<<<<< HEAD import org.atlasapi.media.entity.ContentGroup; import org.atlasapi.media.entity.ContentGroupRef; import org.atlasapi.media.entity.Identified; ======= >>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31 public abstract class ContentModelSimplifier extends DescribedModelSimplifier {

Conflicting content

import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
<<<<<<< HEAD
import org.atlasapi.media.entity.ContentGroup;
import org.atlasapi.media.entity.ContentGroupRef;
import org.atlasapi.media.entity.Identified;
=======
>>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31

public abstract class ContentModelSimplifier extends DescribedModelSimplifier {

Solution content
import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; public abstract class ContentModelSimplifier extends DescribedModelSimplifier {

Solution content

import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;

public abstract class ContentModelSimplifier extends DescribedModelSimplifier {

File
ContentModelSimplifier.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content
private final ModelSimplifier productSimplifier; protected final CrewMemberSimplifier crewSimplifier = new CrewMemberSimplifier(); private boolean exposeIds = false; <<<<<<< HEAD ======= private final Map localeMap; >>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31 public ContentModelSimplifier(String localHostName, ContentGroupResolver contentGroupResolver, TopicQueryResolver topicResolver, ProductResolver productResolver) { this.contentGroupResolver = contentGroupResolver; this.topicResolver = topicResolver;

Conflicting content

    private final ModelSimplifier productSimplifier;
    protected final CrewMemberSimplifier crewSimplifier = new CrewMemberSimplifier();
    private boolean exposeIds = false;
<<<<<<< HEAD
    
=======
    private final Map localeMap;

>>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31
    public ContentModelSimplifier(String localHostName, ContentGroupResolver contentGroupResolver, TopicQueryResolver topicResolver, ProductResolver productResolver) {
        this.contentGroupResolver = contentGroupResolver;
        this.topicResolver = topicResolver;

Solution content
private final ModelSimplifier productSimplifier; protected final CrewMemberSimplifier crewSimplifier = new CrewMemberSimplifier(); private boolean exposeIds = false; private final Map localeMap; public ContentModelSimplifier(String localHostName, ContentGroupResolver contentGroupResolver, TopicQueryResolver topicResolver, ProductResolver productResolver) { this.contentGroupResolver = contentGroupResolver; this.topicResolver = topicResolver;

Solution content

    private final ModelSimplifier productSimplifier;
    protected final CrewMemberSimplifier crewSimplifier = new CrewMemberSimplifier();
    private boolean exposeIds = false;
    private final Map localeMap;

    public ContentModelSimplifier(String localHostName, ContentGroupResolver contentGroupResolver, TopicQueryResolver topicResolver, ProductResolver productResolver) {
        this.contentGroupResolver = contentGroupResolver;
        this.topicResolver = topicResolver;

File
ContentModelSimplifier.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content
// private final Clock clock; private final SegmentModelSimplifier segmentSimplifier; <<<<<<< HEAD private final Map localeMap; private final ContainerSummaryResolver containerSummaryResolver; protected final CrewMemberSimplifier crewSimplifier = new CrewMemberSimplifier(); public ItemModelSimplifier(String localHostName, ContentGroupResolver contentGroupResolver, TopicQueryResolver topicResolver, ProductResolver productResolver, SegmentResolver segmentResolver, ContainerSummaryResolver containerSummaryResolver) { ======= public ItemModelSimplifier(String localHostName, ContentGroupResolver contentGroupResolver, TopicQueryResolver topicResolver, ProductResolver productResolver, SegmentResolver segmentResolver, ContainerSummaryResolver containerSummaryResolver){ >>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31 this(localHostName, contentGroupResolver, topicResolver, productResolver, segmentResolver, containerSummaryResolver, new SystemClock()); }

Conflicting content

    //
    private final Clock clock;
    private final SegmentModelSimplifier segmentSimplifier;
<<<<<<< HEAD
    private final Map localeMap;
    private final ContainerSummaryResolver containerSummaryResolver;
    protected final CrewMemberSimplifier crewSimplifier = new CrewMemberSimplifier();

    public ItemModelSimplifier(String localHostName, ContentGroupResolver contentGroupResolver, TopicQueryResolver topicResolver, ProductResolver productResolver, SegmentResolver segmentResolver, ContainerSummaryResolver containerSummaryResolver) {
=======
    
    public ItemModelSimplifier(String localHostName, ContentGroupResolver contentGroupResolver, TopicQueryResolver topicResolver, ProductResolver productResolver, SegmentResolver segmentResolver, ContainerSummaryResolver containerSummaryResolver){
>>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31
        this(localHostName, contentGroupResolver, topicResolver, productResolver, segmentResolver, containerSummaryResolver, new SystemClock());
    }

Solution content
// private final Clock clock; private final SegmentModelSimplifier segmentSimplifier; private final ContainerSummaryResolver containerSummaryResolver; public ItemModelSimplifier(String localHostName, ContentGroupResolver contentGroupResolver, TopicQueryResolver topicResolver, ProductResolver productResolver, SegmentResolver segmentResolver, ContainerSummaryResolver containerSummaryResolver) { this(localHostName, contentGroupResolver, topicResolver, productResolver, segmentResolver, containerSummaryResolver, new SystemClock()); }

Solution content

    //
    private final Clock clock;
    private final SegmentModelSimplifier segmentSimplifier;
    private final ContainerSummaryResolver containerSummaryResolver;

    public ItemModelSimplifier(String localHostName, ContentGroupResolver contentGroupResolver, TopicQueryResolver topicResolver, ProductResolver productResolver, SegmentResolver segmentResolver, ContainerSummaryResolver containerSummaryResolver) {
        this(localHostName, contentGroupResolver, topicResolver, productResolver, segmentResolver, containerSummaryResolver, new SystemClock());
    }

File
ItemModelSimplifier.java

Developer's decision
Combination

Kind of conflict
Attribute
Method invocation
Method signature

Chunk

Conflicting content
import org.atlasapi.persistence.logging.AdapterLogEntry; import org.atlasapi.persistence.logging.AdapterLogEntry.Severity; import org.atlasapi.remotesite.pa.PaCountryMap; <<<<<<< HEAD ======= import org.atlasapi.remotesite.pa.PaHelper; import org.atlasapi.remotesite.util.EnglishLanguageCodeMap; >>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31 import org.joda.time.Duration; import org.joda.time.format.DateTimeFormat;

Conflicting content

import org.atlasapi.persistence.logging.AdapterLogEntry;
import org.atlasapi.persistence.logging.AdapterLogEntry.Severity;
import org.atlasapi.remotesite.pa.PaCountryMap;
<<<<<<< HEAD
=======
import org.atlasapi.remotesite.pa.PaHelper;
import org.atlasapi.remotesite.util.EnglishLanguageCodeMap;
>>>>>>> 6aae5917bcf74b07ad48dc43bef7a7c2da6f1e31
import org.joda.time.Duration;
import org.joda.time.format.DateTimeFormat;

Solution content

import org.atlasapi.persistence.logging.AdapterLogEntry;
import org.atlasapi.persistence.logging.AdapterLogEntry.Severity;
import org.atlasapi.remotesite.pa.PaCountryMap;
import org.atlasapi.remotesite.util.EnglishLanguageCodeMap;
import org.joda.time.Duration;
import org.joda.time.format.DateTimeFormat;

File
RtFilmProcessor.java

Developer's decision
Combination

Kind of conflict
Import

Projects >> atlas >>c60309ff94669fdebbc25b9203d5ee6acf186836