Projects >> atlas >>c0ab6ab76627456df66f5ab4e486fa7833fcdd87

Chunk
Conflicting content 
import org.atlasapi.media.entity.simple.RelatedLink;
import org.atlasapi.media.product.Product;
import org.atlasapi.output.Annotation;
<<<<<<< HEAD
import org.atlasapi.persistence.content.ContentGroupResolver;
import org.atlasapi.persistence.media.product.ProductResolver;
=======
>>>>>>> c3aef4dc2b117474542200be59499c7b136a27e1
import org.atlasapi.persistence.topic.TopicQueryResolver;

import com.google.common.base.Function;
Solution content 
import org.atlasapi.media.entity.simple.RelatedLink;
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;
import org.atlasapi.persistence.content.ContentGroupResolver;
>>>>>>> c3aef4dc2b117474542200be59499c7b136a27e1

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;
import org.atlasapi.media.entity.ContentGroup;
import org.atlasapi.media.entity.ContentGroupRef;
import org.atlasapi.media.entity.Identified;

public abstract class ContentModelSimplifier extends DescribedModelSimplifier {
File
ContentModelSimplifier.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    	}
		@Override
		public Maybe topicFor(String namespace, String value) {
<<<<<<< HEAD
			Preconditions.checkArgument(namespace.equals("dbpedia.org"), "Unexpected namespace");
=======
			Preconditions.checkArgument(namespace.equals("dbpedia"), "Unexpected namespace");
>>>>>>> c3aef4dc2b117474542200be59499c7b136a27e1
			Preconditions.checkArgument(value.equals(topicUri), "Unexpected URI");
			
			return Maybe.just(new Topic(100l));
Solution content 
    	}
		@Override
		public Maybe topicFor(String namespace, String value) {
			Preconditions.checkArgument(namespace.equals("dbpedia"), "Unexpected namespace");
			Preconditions.checkArgument(value.equals(topicUri), "Unexpected URI");
			
			return Maybe.just(new Topic(100l));
File
BbcSlashProgrammesRdfTopicExtractorTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation