Projects >> atlas-feeds >>a87bcf5e4863afd63a5a7168d7b6bddfc37afca6

Chunk
Conflicting content 
import org.atlasapi.media.entity.simple.Restriction;
import org.atlasapi.media.entity.simple.ScheduleQueryResult;
import org.atlasapi.media.entity.simple.SeriesSummary;
<<<<<<< HEAD
import org.atlasapi.media.entity.simple.TopicQueryResult;
import org.atlasapi.persistence.topic.TopicQueryResolver;
=======
import org.atlasapi.media.segment.Segment;
import org.atlasapi.media.segment.SegmentEvent;
import org.atlasapi.media.segment.SegmentRef;
import org.atlasapi.media.segment.SegmentResolver;
>>>>>>> 3795163ec41d5e685bd2eecd58a33d79b88193ab
import org.atlasapi.persistence.content.ContentResolver;

import com.google.common.base.Function;
Solution content 
import org.atlasapi.media.entity.simple.Restriction;
import org.atlasapi.media.entity.simple.ScheduleQueryResult;
import org.atlasapi.media.entity.simple.SeriesSummary;
import org.atlasapi.media.entity.simple.TopicQueryResult;
import org.atlasapi.persistence.topic.TopicQueryResolver;
import org.atlasapi.media.segment.Segment;
import org.atlasapi.media.segment.SegmentEvent;
import org.atlasapi.media.segment.SegmentRef;
import org.atlasapi.media.segment.SegmentResolver;
import org.atlasapi.persistence.content.ContentResolver;

import com.google.common.base.Function;
File
FullToSimpleModelTranslator.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
    private final ContentResolver contentResolver;
    private final SegmentResolver segmentResolver;

<<<<<<< HEAD
	public FullToSimpleModelTranslator(AtlasModelWriter outputter, ContentResolver contentResolver, TopicQueryResolver topicResolver) {
=======
	public FullToSimpleModelTranslator(AtlasModelWriter outputter, ContentResolver contentResolver, SegmentResolver segmentResolver) {
>>>>>>> 3795163ec41d5e685bd2eecd58a33d79b88193ab
		this.outputWriter = outputter;
        this.topicResolver = topicResolver;
        this.contentResolver = contentResolver;
Solution content 
    private final ContentResolver contentResolver;
    private final SegmentResolver segmentResolver;

	public FullToSimpleModelTranslator(AtlasModelWriter outputter, ContentResolver contentResolver, TopicQueryResolver topicResolver, SegmentResolver segmentResolver) {
		this.outputWriter = outputter;
        this.topicResolver = topicResolver;
        this.contentResolver = contentResolver;
File
FullToSimpleModelTranslator.java
Developer's decision
Manual
Kind of conflict
Method signature
Chunk
Conflicting content 
import org.atlasapi.beans.OembedJsonTranslator;
import org.atlasapi.beans.OembedXmlTranslator;
import org.atlasapi.beans.html.HtmlTranslator;
<<<<<<< HEAD
import org.atlasapi.persistence.topic.TopicQueryResolver;
=======
import org.atlasapi.media.segment.SegmentResolver;
>>>>>>> 3795163ec41d5e685bd2eecd58a33d79b88193ab
import org.atlasapi.persistence.content.ContentResolver;
import org.atlasapi.rdf.beans.RdfXmlTranslator;
Solution content 
import org.atlasapi.beans.OembedJsonTranslator;
import org.atlasapi.beans.OembedXmlTranslator;
import org.atlasapi.beans.html.HtmlTranslator;
import org.atlasapi.persistence.topic.TopicQueryResolver;
import org.atlasapi.media.segment.SegmentResolver;
import org.atlasapi.persistence.content.ContentResolver;
import org.atlasapi.rdf.beans.RdfXmlTranslator;
File
DispatchingAtlasModelWriter.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
	private final List writers = Lists.newArrayList();
	
<<<<<<< HEAD
	public DispatchingAtlasModelWriter(ContentResolver contentResolver, TopicQueryResolver topicResolver) {
		add("json", APPLICATION_JSON,  new FullToSimpleModelTranslator(new JsonTranslator(), contentResolver, topicResolver));
		add("rdf.xml", APPLICATION_RDF_XML, new RdfXmlTranslator());
		add("oembed.xml", APPLICATION_OEMBED_XML,  new OembedXmlTranslator());
		add("oembed.json",APPLICATION_OEMBED_JSON,  new OembedJsonTranslator());
		add("xml", APPLICATION_XML,  new FullToSimpleModelTranslator(new JaxbXmlTranslator(), contentResolver, topicResolver));
=======
	public DispatchingAtlasModelWriter(ContentResolver resolver, SegmentResolver segmentResolver) {
		add("json", APPLICATION_JSON,  new FullToSimpleModelTranslator(new JsonTranslator(),resolver, segmentResolver));
		add("rdf.xml", APPLICATION_RDF_XML, new RdfXmlTranslator());
		add("oembed.xml", APPLICATION_OEMBED_XML,  new OembedXmlTranslator());
		add("oembed.json",APPLICATION_OEMBED_JSON,  new OembedJsonTranslator());
		add("xml", APPLICATION_XML,  new FullToSimpleModelTranslator(new JaxbXmlTranslator(),resolver, segmentResolver));
>>>>>>> 3795163ec41d5e685bd2eecd58a33d79b88193ab
		add("html", TEXT_HTML, new HtmlTranslator());
	}
Solution content 
	private final List writers = Lists.newArrayList();
	
	public DispatchingAtlasModelWriter(ContentResolver contentResolver, TopicQueryResolver topicResolver, SegmentResolver segmentResolver) {
		add("json", APPLICATION_JSON,  new FullToSimpleModelTranslator(new JsonTranslator(), contentResolver, topicResolver,segmentResolver));
		add("rdf.xml", APPLICATION_RDF_XML, new RdfXmlTranslator());
		add("oembed.xml", APPLICATION_OEMBED_XML,  new OembedXmlTranslator());
		add("oembed.json",APPLICATION_OEMBED_JSON,  new OembedJsonTranslator());
		add("xml", APPLICATION_XML,  new FullToSimpleModelTranslator(new JaxbXmlTranslator(), contentResolver, topicResolver,segmentResolver));
		add("html", TEXT_HTML, new HtmlTranslator());
	}
File
DispatchingAtlasModelWriter.java
Developer's decision
Manual
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 
    private final Mockery context = new Mockery();
    private final ContentResolver contentResolver = context.mock(ContentResolver.class);
    private final AtlasModelWriter xmlOutputter = context.mock(AtlasModelWriter.class);
<<<<<<< HEAD
    private final FullToSimpleModelTranslator translator = new FullToSimpleModelTranslator(xmlOutputter, contentResolver, TopicQueryResolver.NULL_RESOLVER);
=======
    private final FullToSimpleModelTranslator translator = new FullToSimpleModelTranslator(xmlOutputter, contentResolver, null);
>>>>>>> 3795163ec41d5e685bd2eecd58a33d79b88193ab
    
	private StubHttpServletRequest request;
	private StubHttpServletResponse response;
Solution content 
    private final Mockery context = new Mockery();
    private final ContentResolver contentResolver = context.mock(ContentResolver.class);
    private final AtlasModelWriter xmlOutputter = context.mock(AtlasModelWriter.class);
    private final FullToSimpleModelTranslator translator = new FullToSimpleModelTranslator(xmlOutputter, contentResolver, TopicQueryResolver.NULL_RESOLVER, null);
    
	private StubHttpServletRequest request;
	private StubHttpServletResponse response;
File
FullToSimpleModelTranslatorTest.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation