Projects >> atlas-persistence >>ecb8f436107c54157eb14cfae48d11c8ac56a197

Chunk
Conflicting content 
                    }
                    ContentCategory table = tablesIt.next();
                    currentTranslator = TRANSLATORS.get(table);
<<<<<<< HEAD
                    currentResults = cursorBuilder.cursorFor(table);
=======
                    currentResults = contentTables.collectionFor(table).find(queryFor(uri, when, publisher)).batchSize(10).sort(sortFor(uri, when));
                    uri = null;//only use the id for the first table.
>>>>>>> 0274adb89ec1810519771e531ae0a2d20283ba68
                }
                return currentTranslator.apply(currentResults.next());
            }
Solution content 
                    }
                    ContentCategory table = tablesIt.next();
                    currentTranslator = TRANSLATORS.get(table);
                    currentResults = cursorBuilder.cursorFor(table);
                }
                return currentTranslator.apply(currentResults.next());
            }
File
MongoContentLister.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
<<<<<<< HEAD

import static com.metabroadcast.common.persistence.mongo.MongoBuilders.where;
import java.nio.channels.Channels;
=======
>>>>>>> 0274adb89ec1810519771e531ae0a2d20283ba68
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
Solution content 
import static com.metabroadcast.common.persistence.mongo.MongoBuilders.where;

import java.util.Collections;
import java.util.Comparator;
import java.util.List;
File
MongoScheduleStore.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
		});
	
		DateTime currentEndTime = null;
<<<<<<< HEAD
		String channel = null;
=======
>>>>>>> 0274adb89ec1810519771e531ae0a2d20283ba68
		
		for(Broadcast b : broadcasts) {
Solution content 
		});
	
		DateTime currentEndTime = null;
		
		for(Broadcast b : broadcasts) {
File
MongoScheduleStore.java
Developer's decision
Version 2
Kind of conflict
Variable
Chunk
Conflicting content 
			if(expectedChannel != Channel.fromUri(b.getBroadcastOn()).requireValue()) {
				throw new IllegalArgumentException("All broadcasts must be on the same channel");
			}	
<<<<<<< HEAD
			channel = b.getBroadcastOn();
=======
>>>>>>> 0274adb89ec1810519771e531ae0a2d20283ba68
			
			if(allowGaps) {
				if(currentEndTime != null && b.getTransmissionTime().isBefore(currentEndTime)) {
Solution content 
			if(expectedChannel != Channel.fromUri(b.getBroadcastOn()).requireValue()) {
				throw new IllegalArgumentException("All broadcasts must be on the same channel");
			}	
			
			if(allowGaps) {
				if(currentEndTime != null && b.getTransmissionTime().isBefore(currentEndTime)) {
File
MongoScheduleStore.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
public class ContentTranslator implements ModelTranslator {

<<<<<<< HEAD
	public static String CLIPS_KEY = "clips";
	public static String TOPICS_KEY = "topics";
	public static String ID_KEY = "id";
=======
    private static final String LINKS_KEY = "links";
    private static final String PHRASES_KEY = "phrases";
    public static final String CLIPS_KEY = "clips";
>>>>>>> 0274adb89ec1810519771e531ae0a2d20283ba68
	
	private final ClipTranslator clipTranslator;
	private final KeyPhraseTranslator keyPhraseTranslator;
Solution content 
public class ContentTranslator implements ModelTranslator {

	public static String CLIPS_KEY = "clips";
	public static String TOPICS_KEY = "topics";
	public static String ID_KEY = "id";
    private static final String LINKS_KEY = "links";
    private static final String PHRASES_KEY = "phrases";
	
	private final ClipTranslator clipTranslator;
	private final KeyPhraseTranslator keyPhraseTranslator;
File
ContentTranslator.java
Developer's decision
Combination
Kind of conflict
Attribute
Chunk
Conflicting content 
            }
			entity.setClips(clips);
		}
<<<<<<< HEAD
		
		if (dbObject.containsField(TOPICS_KEY)) {
		    entity.setTopicUris(TranslatorUtils.toSet(dbObject, TOPICS_KEY));
		}
		
		entity.setId(TranslatorUtils.toString(dbObject, ID_KEY));

		return entity;
	}
=======
    }
>>>>>>> 0274adb89ec1810519771e531ae0a2d20283ba68

	@Override
	public DBObject toDBObject(DBObject dbObject, Content entity) {
Solution content 
            }
			entity.setClips(clips);
		}
		
	}

	@Override
	public DBObject toDBObject(DBObject dbObject, Content entity) {
File
ContentTranslator.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Return statement
Variable
Chunk
Conflicting content 
            }
			dbObject.put(CLIPS_KEY, clipDbos);
		}
<<<<<<< HEAD
		
		if (!entity.getTopics().isEmpty()) {
		    BasicDBList topics = new BasicDBList();
		    topics.addAll(entity.getTopics());
		    dbObject.put(TOPICS_KEY, topics);
		}
		
		TranslatorUtils.from(dbObject, ID_KEY, entity.getId());
		
        return dbObject;
	}
=======
    }

    private void encodeKeyPhrases(DBObject dbObject, Content entity) {
        if (!entity.getKeyPhrases().isEmpty()) {
            dbObject.put(PHRASES_KEY, ImmutableSet.copyOf(Iterables.transform(entity.getKeyPhrases(), new Function() {
                @Override
                public DBObject apply(KeyPhrase input) {
                    return keyPhraseTranslator.toDBObject(input);
                }
            })));
        }
    }
>>>>>>> 0274adb89ec1810519771e531ae0a2d20283ba68
}
Solution content 
            }
			dbObject.put(CLIPS_KEY, clipDbos);
		}
    }

    private void encodeKeyPhrases(DBObject dbObject, Content entity) {
        if (!entity.getKeyPhrases().isEmpty()) {
            dbObject.put(PHRASES_KEY, ImmutableSet.copyOf(Iterables.transform(entity.getKeyPhrases(), new Function() {
                @Override
                public DBObject apply(KeyPhrase input) {
                    return keyPhraseTranslator.toDBObject(input);
                }
            })));
        }
    }
}
File
ContentTranslator.java
Developer's decision
Version 2
Kind of conflict
If statement
Method declaration
Method invocation
Return statement
Variable