Projects information

Chunk

Conflicting content
public class ItemModelTransformer extends ContentModelTransformer { private final BroadcastModelTransformer broadcastTransformer; <<<<<<< HEAD public ItemModelTransformer(LookupEntryStore lookupStore, TopicStore topicStore, ChannelResolver channelResolver, NumberToShortStringCodec idCodec, ClipModelTransformer clipsModelTransformer, Clock clock) { ======= private final SegmentModelTransformer segmentModelTransformer; public ItemModelTransformer(LookupEntryStore lookupStore, TopicStore topicStore, ChannelResolver channelResolver, NumberToShortStringCodec idCodec, ClipModelTransformer clipsModelTransformer, Clock clock, SegmentModelTransformer segmentModelTransformer) { >>>>>>> e4ab952c300f24c8c0b6a9a3f0451bd35f18aab7 super(lookupStore, topicStore, idCodec, clipsModelTransformer, clock); this.broadcastTransformer = new BroadcastModelTransformer(channelResolver); this.segmentModelTransformer = checkNotNull(segmentModelTransformer);

Conflicting content

public class ItemModelTransformer extends ContentModelTransformer {

    private final BroadcastModelTransformer broadcastTransformer;
<<<<<<< HEAD

    public ItemModelTransformer(LookupEntryStore lookupStore, TopicStore topicStore,
            ChannelResolver channelResolver, NumberToShortStringCodec idCodec, 
            ClipModelTransformer clipsModelTransformer, Clock clock) {
=======
    private final SegmentModelTransformer segmentModelTransformer;

    public ItemModelTransformer(LookupEntryStore lookupStore, TopicStore topicStore,
            ChannelResolver channelResolver, NumberToShortStringCodec idCodec,
            ClipModelTransformer clipsModelTransformer, Clock clock, SegmentModelTransformer segmentModelTransformer) {
>>>>>>> e4ab952c300f24c8c0b6a9a3f0451bd35f18aab7
        super(lookupStore, topicStore, idCodec, clipsModelTransformer, clock);
        this.broadcastTransformer = new BroadcastModelTransformer(channelResolver);
        this.segmentModelTransformer = checkNotNull(segmentModelTransformer);

Solution content
public class ItemModelTransformer extends ContentModelTransformer { private final BroadcastModelTransformer broadcastTransformer; private final SegmentModelTransformer segmentModelTransformer; public ItemModelTransformer(LookupEntryStore lookupStore, TopicStore topicStore, ChannelResolver channelResolver, NumberToShortStringCodec idCodec, ClipModelTransformer clipsModelTransformer, Clock clock, SegmentModelTransformer segmentModelTransformer) { super(lookupStore, topicStore, idCodec, clipsModelTransformer, clock); this.broadcastTransformer = new BroadcastModelTransformer(channelResolver); this.segmentModelTransformer = checkNotNull(segmentModelTransformer);

Solution content

public class ItemModelTransformer extends ContentModelTransformer {

    private final BroadcastModelTransformer broadcastTransformer;
    private final SegmentModelTransformer segmentModelTransformer;

    public ItemModelTransformer(LookupEntryStore lookupStore, TopicStore topicStore,
            ChannelResolver channelResolver, NumberToShortStringCodec idCodec,
            ClipModelTransformer clipsModelTransformer, Clock clock, SegmentModelTransformer segmentModelTransformer) {
        super(lookupStore, topicStore, idCodec, clipsModelTransformer, clock);
        this.broadcastTransformer = new BroadcastModelTransformer(channelResolver);
        this.segmentModelTransformer = checkNotNull(segmentModelTransformer);

File
ItemModelTransformer.java

Developer's decision
Version 2

Kind of conflict
Attribute
Method signature

Chunk

Conflicting content
private @Autowired FeedStatisticsResolver feedStatsResolver; private @Autowired TvAnytimeGenerator feedGenerator; private @Autowired LastUpdatedContentFinder contentFinder; <<<<<<< HEAD ======= private @Autowired SegmentWriter segmentWriter; >>>>>>> e4ab952c300f24c8c0b6a9a3f0451bd35f18aab7 private @Autowired KnownTypeQueryExecutor queryExecutor; private @Autowired ApplicationConfigurationFetcher configFetcher; private @Autowired AdapterLog log;

Conflicting content

    private @Autowired FeedStatisticsResolver feedStatsResolver;
    private @Autowired TvAnytimeGenerator feedGenerator;
    private @Autowired LastUpdatedContentFinder contentFinder;
<<<<<<< HEAD
=======
    private @Autowired SegmentWriter segmentWriter;

>>>>>>> e4ab952c300f24c8c0b6a9a3f0451bd35f18aab7
    private @Autowired KnownTypeQueryExecutor queryExecutor;
    private @Autowired ApplicationConfigurationFetcher configFetcher;
    private @Autowired AdapterLog log;

Solution content
private @Autowired FeedStatisticsResolver feedStatsResolver; private @Autowired TvAnytimeGenerator feedGenerator; private @Autowired LastUpdatedContentFinder contentFinder; private @Autowired SegmentWriter segmentWriter; private @Autowired KnownTypeQueryExecutor queryExecutor; private @Autowired ApplicationConfigurationFetcher configFetcher; private @Autowired AdapterLog log;

Solution content

    private @Autowired FeedStatisticsResolver feedStatsResolver;
    private @Autowired TvAnytimeGenerator feedGenerator;
    private @Autowired LastUpdatedContentFinder contentFinder;
    private @Autowired SegmentWriter segmentWriter;
    private @Autowired KnownTypeQueryExecutor queryExecutor;
    private @Autowired ApplicationConfigurationFetcher configFetcher;
    private @Autowired AdapterLog log;

File
QueryWebModule.java

Developer's decision
Version 2

Kind of conflict
Attribute

Projects >> atlas >>d4e9f1feb9e9e90408061d7b5639691d411cf2d2