Projects >> atlas >>4009f0e37811f6930e7768e906b2fe52e1236a84

Chunk
Conflicting content 
	@Bean KnownTypeQueryExecutor queryExecutor() {
	    
<<<<<<< HEAD
	    MongoLookupEntryStore lookupStore = new MongoLookupEntryStore(mongo.collection("lookup"));
        KnownTypeContentResolver mongoContentResolver = new MongoContentResolver(mongo, lookupStore);
=======
        MongoLookupEntryStore lookupStore = new MongoLookupEntryStore(mongo.collection("lookup"));
	    KnownTypeContentResolver mongoContentResolver = new MongoContentResolver(mongo, lookupStore);
>>>>>>> 2649f651a21a4f70f00928291a5b74fa637c7bea
        KnownTypeContentResolver cassandraContentResolver = new CassandraKnownTypeContentResolver(cassandra);
		
        KnownTypeQueryExecutor queryExecutor = new LookupResolvingQueryExecutor(cassandraContentResolver, mongoContentResolver, lookupStore);
Solution content 
	@Bean KnownTypeQueryExecutor queryExecutor() {
	    
	    MongoLookupEntryStore lookupStore = new MongoLookupEntryStore(mongo.collection("lookup"));
        KnownTypeContentResolver mongoContentResolver = new MongoContentResolver(mongo, lookupStore);
        KnownTypeContentResolver cassandraContentResolver = new CassandraKnownTypeContentResolver(cassandra);
		
        KnownTypeQueryExecutor queryExecutor = new LookupResolvingQueryExecutor(cassandraContentResolver, mongoContentResolver, lookupStore);
File
QueryModule.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable