Projects >> atlas-search >>5035ebe06b40e172b6e522ac5a54da35ce38c19a

Chunk
Conflicting content 
import com.mongodb.Mongo;
import com.mongodb.ReadPreference;
import com.mongodb.ServerAddress;
<<<<<<< HEAD

import java.io.File;
import java.net.UnknownHostException;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.atlasapi.persistence.content.cassandra.CassandraContentStore;
import org.atlasapi.persistence.lookup.TransitiveLookupWriter;
import org.atlasapi.persistence.lookup.entry.LookupEntryStore;
import org.atlasapi.persistence.lookup.mongo.MongoLookupEntryStore;
import org.atlasapi.search.loader.ContentBootstrapper;
import org.atlasapi.search.searcher.LuceneContentIndex;
import org.joda.time.Duration;
import static org.atlasapi.persistence.content.listing.ContentListingCriteria.defaultCriteria;
=======
import com.netflix.astyanax.AstyanaxContext;
import com.netflix.astyanax.Keyspace;
import com.netflix.astyanax.connectionpool.NodeDiscoveryType;
import com.netflix.astyanax.connectionpool.impl.ConnectionPoolConfigurationImpl;
import com.netflix.astyanax.connectionpool.impl.CountingConnectionPoolMonitor;
import com.netflix.astyanax.impl.AstyanaxConfigurationImpl;
import com.netflix.astyanax.thrift.ThriftFamilyFactory;
>>>>>>> 30b34bf6a7f1a1383f6aa252cbc6be1290bb924c

public class AtlasSearchModule extends WebAwareModule {
Solution content 
import com.mongodb.Mongo;
import com.mongodb.ReadPreference;
import com.mongodb.ServerAddress;
import com.netflix.astyanax.AstyanaxContext;
import com.netflix.astyanax.Keyspace;
import com.netflix.astyanax.connectionpool.NodeDiscoveryType;
import com.netflix.astyanax.connectionpool.impl.ConnectionPoolConfigurationImpl;
import com.netflix.astyanax.connectionpool.impl.CountingConnectionPoolMonitor;
import com.netflix.astyanax.impl.AstyanaxConfigurationImpl;
import com.netflix.astyanax.thrift.ThriftFamilyFactory;

public class AtlasSearchModule extends WebAwareModule {
File
AtlasSearchModule.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
	@Override
	public void configure() {
	    BroadcastBooster booster = new ChannelGroupBroadcastChannelBooster(mongoChannelGroupStore(), channelResolver(), priorityChannelGroup);
<<<<<<< HEAD
        LuceneContentIndex index = new LuceneContentIndex(new File(luceneDir), new MongoContentResolver(mongo(), new MongoLookupEntryStore(mongo().collection("lookup"))), booster);
=======
        LuceneContentIndex index = new LuceneContentIndex(
                new File(luceneDir), 
                new MongoContentResolver(mongo(), new MongoLookupEntryStore(mongo().collection("lookup"))), 
                booster
        );
>>>>>>> 30b34bf6a7f1a1383f6aa252cbc6be1290bb924c
        
        Builder probes = ImmutableList.builder();
Solution content 
	@Override
	public void configure() {
	    BroadcastBooster booster = new ChannelGroupBroadcastChannelBooster(mongoChannelGroupStore(), channelResolver(), priorityChannelGroup);
        LuceneContentIndex index = new LuceneContentIndex(
                new File(luceneDir), 
                new MongoContentResolver(mongo(), new MongoLookupEntryStore(mongo().collection("lookup"))), 
                booster
        );
        
        Builder probes = ImmutableList.builder();
File
AtlasSearchModule.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable