Projects information

Chunk

Conflicting content
return new MongoTopicStore(db); } <<<<<<< HEAD ======= >>>>>>> 5abe71222fbabcb8333cebf5c01d7dbf941b20dd }

Solution content
return new MongoTopicStore(db); } }

File
MongoContentPersistenceModule.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content
CONTAINER, TO_CONTAINER); private interface ListingCursorBuilder { <<<<<<< HEAD DBCursor cursorFor(ContentCategory category); ======= DBCursor cursorFor(ContentCategory category); >>>>>>> 5abe71222fbabcb8333cebf5c01d7dbf941b20dd } @Override

Conflicting content

            CONTAINER, TO_CONTAINER);

    private interface ListingCursorBuilder {
<<<<<<< HEAD
        DBCursor cursorFor(ContentCategory category);
=======
        
        DBCursor cursorFor(ContentCategory category);
        
>>>>>>> 5abe71222fbabcb8333cebf5c01d7dbf941b20dd
    }
    
    @Override

Solution content
CONTAINER, TO_CONTAINER); private interface ListingCursorBuilder { DBCursor cursorFor(ContentCategory category); } @Override

File
MongoContentLister.java

Developer's decision
Version 1

Kind of conflict
Method interface

Chunk

Conflicting content
public static String ID_KEY = "id"; private static final String LINKS_KEY = "links"; private static final String PHRASES_KEY = "phrases"; <<<<<<< HEAD ======= public static String CLIPS_KEY = "clips"; public static String TOPICS_KEY = "topics"; >>>>>>> 5abe71222fbabcb8333cebf5c01d7dbf941b20dd private final ClipTranslator clipTranslator; private final KeyPhraseTranslator keyPhraseTranslator;

Conflicting content

	public static String ID_KEY = "id";
    private static final String LINKS_KEY = "links";
    private static final String PHRASES_KEY = "phrases";
<<<<<<< HEAD
=======
	public static String CLIPS_KEY = "clips";
	public static String TOPICS_KEY = "topics";
>>>>>>> 5abe71222fbabcb8333cebf5c01d7dbf941b20dd
	
	private final ClipTranslator clipTranslator;
	private final KeyPhraseTranslator keyPhraseTranslator;

Solution content
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;

Solution content

	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
Version 1

Kind of conflict
Attribute

Chunk

Conflicting content
entity.setTopicUris(TranslatorUtils.toSet(dbObject, TOPICS_KEY)); } <<<<<<< HEAD entity.setId(TranslatorUtils.toString(dbObject, ID_KEY)); return entity; ======= return entity; >>>>>>> 5abe71222fbabcb8333cebf5c01d7dbf941b20dd } @SuppressWarnings("unchecked")

Conflicting content

            entity.setTopicUris(TranslatorUtils.toSet(dbObject, TOPICS_KEY));
        }
        
<<<<<<< HEAD
        entity.setId(TranslatorUtils.toString(dbObject, ID_KEY));

        return entity;
=======
		return entity;
>>>>>>> 5abe71222fbabcb8333cebf5c01d7dbf941b20dd
	}

    @SuppressWarnings("unchecked")

Solution content
entity.setTopicUris(TranslatorUtils.toSet(dbObject, TOPICS_KEY)); } entity.setId(TranslatorUtils.toString(dbObject, ID_KEY)); return entity; } @SuppressWarnings("unchecked")

File
ContentTranslator.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Return statement
Variable

Chunk

Conflicting content
encodeClips(dbObject, entity); encodeKeyPhrases(dbObject, entity); encodeRelatedLinks(dbObject, entity); <<<<<<< HEAD ======= >>>>>>> 5abe71222fbabcb8333cebf5c01d7dbf941b20dd if (!entity.getTopics().isEmpty()) { BasicDBList topics = new BasicDBList(); topics.addAll(entity.getTopics());

Conflicting content

		encodeClips(dbObject, entity);
        encodeKeyPhrases(dbObject, entity);
        encodeRelatedLinks(dbObject, entity);
<<<<<<< HEAD
        
=======
>>>>>>> 5abe71222fbabcb8333cebf5c01d7dbf941b20dd
        if (!entity.getTopics().isEmpty()) {
            BasicDBList topics = new BasicDBList();
            topics.addAll(entity.getTopics());

Solution content
topics.addAll(entity.getTopics()); encodeClips(dbObject, entity); encodeKeyPhrases(dbObject, entity); encodeRelatedLinks(dbObject, entity); if (!entity.getTopics().isEmpty()) { BasicDBList topics = new BasicDBList();

Solution content

            topics.addAll(entity.getTopics());
		encodeClips(dbObject, entity);
        encodeKeyPhrases(dbObject, entity);
        encodeRelatedLinks(dbObject, entity);
        if (!entity.getTopics().isEmpty()) {
            BasicDBList topics = new BasicDBList();

File
ContentTranslator.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content
topics.addAll(entity.getTopics()); dbObject.put(TOPICS_KEY, topics); } <<<<<<< HEAD TranslatorUtils.from(dbObject, ID_KEY, entity.getId()); ======= >>>>>>> 5abe71222fbabcb8333cebf5c01d7dbf941b20dd return dbObject; }

Conflicting content

            topics.addAll(entity.getTopics());
            dbObject.put(TOPICS_KEY, topics);
        }
<<<<<<< HEAD
        
        TranslatorUtils.from(dbObject, ID_KEY, entity.getId());
        
=======
>>>>>>> 5abe71222fbabcb8333cebf5c01d7dbf941b20dd
        return dbObject;
	}

Solution content
topics.addAll(entity.getTopics()); dbObject.put(TOPICS_KEY, topics); } TranslatorUtils.from(dbObject, ID_KEY, entity.getId()); return dbObject; }

File
ContentTranslator.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Projects >> atlas-persistence >>e9805f24b9e8e85a155689f5de4f8df341c387f3