Projects >> atlas >>0036395598485bad3503bcd01c71ed079e45c8f2

Chunk
Conflicting content 
import com.mongodb.MongoReplicaSetProbe;
import com.mongodb.ServerAddress;
import com.mongodb.WriteConcern;
<<<<<<< HEAD
import javax.annotation.PreDestroy;
import org.atlasapi.persistence.bootstrap.ContentBootstrapper;
import org.atlasapi.persistence.content.cassandra.CassandraContentGroupStore;
import org.atlasapi.persistence.content.cassandra.CassandraProductStore;
import org.atlasapi.persistence.content.people.cassandra.CassandraPersonStore;
import org.atlasapi.persistence.media.channel.cassandra.CassandraChannelGroupStore;
import org.atlasapi.persistence.media.channel.cassandra.CassandraChannelStore;
import org.atlasapi.persistence.media.segment.cassandra.CassandraSegmentStore;
import org.atlasapi.persistence.topic.cassandra.CassandraTopicStore;
=======
import org.atlasapi.persistence.bootstrap.ContentBootstrapper;
>>>>>>> e3d7e327e0ffbd4053ae9e8b666e7354521e6b71
import org.atlasapi.persistence.topic.elasticsearch.ESTopicSearcher;

@Configuration
Solution content 
import com.mongodb.MongoReplicaSetProbe;
import com.mongodb.ServerAddress;
import com.mongodb.WriteConcern;
import javax.annotation.PreDestroy;
import org.atlasapi.persistence.bootstrap.ContentBootstrapper;
import org.atlasapi.persistence.content.cassandra.CassandraContentGroupStore;
import org.atlasapi.persistence.content.cassandra.CassandraProductStore;
import org.atlasapi.persistence.content.people.cassandra.CassandraPersonStore;
import org.atlasapi.persistence.media.channel.cassandra.CassandraChannelGroupStore;
import org.atlasapi.persistence.media.channel.cassandra.CassandraChannelStore;
import org.atlasapi.persistence.media.segment.cassandra.CassandraSegmentStore;
import org.atlasapi.persistence.topic.cassandra.CassandraTopicStore;
import org.atlasapi.persistence.topic.elasticsearch.ESTopicSearcher;

@Configuration
File
AtlasPersistenceModule.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.metabroadcast.common.webapp.health.HealthController;
import org.atlasapi.messaging.producers.MessageReplayer;
import org.atlasapi.persistence.bootstrap.ContentBootstrapper;
<<<<<<< HEAD
import org.atlasapi.persistence.content.cassandra.CassandraContentGroupStore;
import org.atlasapi.persistence.content.cassandra.CassandraContentStore;
import org.atlasapi.persistence.content.cassandra.CassandraProductStore;
import org.atlasapi.persistence.content.elasticsearch.ESContentIndexer;
import org.atlasapi.persistence.content.people.cassandra.CassandraPersonStore;
import org.atlasapi.persistence.media.channel.cassandra.CassandraChannelGroupStore;
import org.atlasapi.persistence.media.channel.cassandra.CassandraChannelStore;
import org.atlasapi.persistence.media.segment.cassandra.CassandraSegmentStore;
import org.atlasapi.persistence.topic.cassandra.CassandraTopicStore;
import org.springframework.beans.factory.annotation.Qualifier;
=======
import org.atlasapi.persistence.content.elasticsearch.ESContentIndexer;
>>>>>>> e3d7e327e0ffbd4053ae9e8b666e7354521e6b71
import org.springframework.context.annotation.Configuration;

@Configuration
Solution content 
import com.metabroadcast.common.webapp.health.HealthController;
import org.atlasapi.messaging.producers.MessageReplayer;
import org.atlasapi.persistence.bootstrap.ContentBootstrapper;
import org.atlasapi.persistence.content.cassandra.CassandraContentGroupStore;
import org.atlasapi.persistence.content.cassandra.CassandraContentStore;
import org.atlasapi.persistence.content.cassandra.CassandraProductStore;
import org.atlasapi.persistence.content.elasticsearch.ESContentIndexer;
import org.atlasapi.persistence.content.people.cassandra.CassandraPersonStore;
import org.atlasapi.persistence.media.channel.cassandra.CassandraChannelGroupStore;
import org.atlasapi.persistence.media.channel.cassandra.CassandraChannelStore;
import org.atlasapi.persistence.media.segment.cassandra.CassandraSegmentStore;
import org.atlasapi.persistence.topic.cassandra.CassandraTopicStore;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Configuration;

@Configuration
File
SystemModule.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
	private @Autowired Collection probes;
	private @Autowired HealthController healthController;
    private @Autowired MessageReplayer messageReplayer;
<<<<<<< HEAD
    private @Autowired CassandraContentStore cassandraContentStore;
    private @Autowired CassandraChannelGroupStore cassandraChannelGroupStore;
    private @Autowired CassandraChannelStore cassandraChannelStore;
    private @Autowired CassandraContentGroupStore cassandraContentGroupStore;
    private @Autowired CassandraPersonStore cassandraPersonStore;
    private @Autowired CassandraProductStore cassandraProductStore;
    private @Autowired CassandraSegmentStore cassandraSegmentStore;
    private @Autowired CassandraTopicStore cassandraTopicStore;
    private @Autowired ESContentIndexer esContentIndexer;
    private @Autowired @Qualifier("cassandra") ContentBootstrapper cassandraContentBootstrapper;
    private @Autowired @Qualifier("es") ContentBootstrapper esContentBootstrapper;
=======
    private @Autowired ContentBootstrapper contentBootstrapper;
    private @Autowired ESContentIndexer esContentIndexer;
>>>>>>> e3d7e327e0ffbd4053ae9e8b666e7354521e6b71

	public @Bean HealthController healthController() {
		return new HealthController(systemProbes);
Solution content 
	private @Autowired Collection probes;
	private @Autowired HealthController healthController;
    private @Autowired MessageReplayer messageReplayer;
    private @Autowired CassandraContentStore cassandraContentStore;
    private @Autowired CassandraChannelGroupStore cassandraChannelGroupStore;
    private @Autowired CassandraChannelStore cassandraChannelStore;
    private @Autowired CassandraContentGroupStore cassandraContentGroupStore;
    private @Autowired CassandraPersonStore cassandraPersonStore;
    private @Autowired CassandraProductStore cassandraProductStore;
    private @Autowired CassandraSegmentStore cassandraSegmentStore;
    private @Autowired CassandraTopicStore cassandraTopicStore;
    private @Autowired ESContentIndexer esContentIndexer;
    private @Autowired @Qualifier("cassandra") ContentBootstrapper cassandraContentBootstrapper;
    private @Autowired @Qualifier("es") ContentBootstrapper esContentBootstrapper;

	public @Bean HealthController healthController() {
		return new HealthController(systemProbes);
File
SystemModule.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
    }
    
    public @Bean BootstrapController bootstrapController() {
<<<<<<< HEAD
        BootstrapController bootstrapController = new BootstrapController();
        bootstrapController.setCassandraChannelGroupStore(cassandraChannelGroupStore);
        bootstrapController.setCassandraChannelStore(cassandraChannelStore);
        bootstrapController.setCassandraContentGroupStore(cassandraContentGroupStore);
        bootstrapController.setCassandraContentStore(cassandraContentStore);
        bootstrapController.setCassandraPersonStore(cassandraPersonStore);
        bootstrapController.setCassandraProductStore(cassandraProductStore);
        bootstrapController.setCassandraSegmentStore(cassandraSegmentStore);
        bootstrapController.setCassandraTopicStore(cassandraTopicStore);
        bootstrapController.setEsContentIndexer(esContentIndexer);
        bootstrapController.setCassandraContentBootstrapper(cassandraContentBootstrapper);
        bootstrapController.setEsContentBootstrapper(esContentBootstrapper);
        return bootstrapController;
=======
        return new BootstrapController(contentBootstrapper, esContentIndexer);
>>>>>>> e3d7e327e0ffbd4053ae9e8b666e7354521e6b71
    }
	
	@PostConstruct
Solution content 
    }
    
    public @Bean BootstrapController bootstrapController() {
        BootstrapController bootstrapController = new BootstrapController();
        bootstrapController.setCassandraChannelGroupStore(cassandraChannelGroupStore);
        bootstrapController.setCassandraChannelStore(cassandraChannelStore);
        bootstrapController.setCassandraContentGroupStore(cassandraContentGroupStore);
        bootstrapController.setCassandraContentStore(cassandraContentStore);
        bootstrapController.setCassandraPersonStore(cassandraPersonStore);
        bootstrapController.setCassandraProductStore(cassandraProductStore);
        bootstrapController.setCassandraSegmentStore(cassandraSegmentStore);
        bootstrapController.setCassandraTopicStore(cassandraTopicStore);
        bootstrapController.setEsContentIndexer(esContentIndexer);
        bootstrapController.setCassandraContentBootstrapper(cassandraContentBootstrapper);
        bootstrapController.setEsContentBootstrapper(esContentBootstrapper);
        return bootstrapController;
    }
	
	@PostConstruct
File
SystemModule.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Return statement
Variable