| Chunk |
|---|
| Conflicting content |
|---|
}
@Override
<<<<<<< HEAD
public void itemChanged(Iterable extends Item> items, ChangeType changeType) {
if (changeType == ContentListener.ChangeType.BOOTSTRAP) {
delegate.itemChanged(items, changeType);
} else {
Iterables.addAll(itemQueue, items);
}
=======
public void itemChanged(Collection |
| Solution content |
|---|
}
@Override
public void itemChanged(Iterable extends Item> items, ChangeType changeType) {
// if (changeType == ContentListener.ChangeType.BOOTSTRAP) {
// delegate.itemChanged(items, changeType);
// } else {
// Iterables.addAll(itemQueue, items);
// }
}
class BrandChangedJob implements Runnable { |
| File |
|---|
| QueueingContentListener.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
public interface RetrospectiveContentLister {
<<<<<<< HEAD
Iterator |
| Solution content |
|---|
public interface RetrospectiveContentLister {
List |
| File |
|---|
| RetrospectiveContentLister.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method interface |
| Chunk |
|---|
| Conflicting content |
|---|
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
<<<<<<< HEAD
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
=======
>>>>>>> 5022c24c0eab9cff8659a9856f8c8ace7166d8a8
public class MongoDbBackedContentBootstrapper implements InitializingBean {
|
| Solution content |
|---|
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
public class MongoDbBackedContentBootstrapper implements InitializingBean {
|
| File |
|---|
| MongoDbBackedContentBootstrapper.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
if (log.isInfoEnabled()) {
log.info("Bootstrapping top level content");
}
<<<<<<< HEAD
loadAllRoots();
}
public void loadAllRoots() {
load(contentStore.listAllRoots(), new Function |
| Solution content |
|---|
if (log.isInfoEnabled()) {
log.info("Bootstrapping top level content");
}
loadAllBrands();
loadAllItems();
}
public void loadAllItems() {
loadAll(Item.class);
}
|
| File |
|---|
| MongoDbBackedContentBootstrapper.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Comment |
| Do statement |
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
}
public void loadAllBrands() {
<<<<<<< HEAD
load(Iterators.filter(contentStore.listAllRoots(), Brand.class), new Function |
| Solution content |
|---|
public void loadAllBrands() {
loadAll(Container.class);
} |
| File |
|---|
| MongoDbBackedContentBootstrapper.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Do statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import com.google.common.collect.Sets; import com.google.common.collect.ImmutableList.Builder; import com.metabroadcast.common.persistence.mongo.DatabasedMongo; <<<<<<< HEAD ======= import com.metabroadcast.common.persistence.mongo.MongoConstants; import com.metabroadcast.common.persistence.mongo.MongoQueryBuilder; import com.metabroadcast.common.persistence.mongo.MongoSortBuilder; import com.metabroadcast.common.persistence.mongo.MongoUpdateBuilder; >>>>>>> 5022c24c0eab9cff8659a9856f8c8ace7166d8a8 import com.metabroadcast.common.query.Selection; import com.metabroadcast.common.time.Clock; import com.metabroadcast.common.time.DateTimeZones; |
| Solution content |
|---|
import com.google.common.collect.Sets; import com.metabroadcast.common.persistence.mongo.DatabasedMongo; import com.metabroadcast.common.persistence.mongo.MongoConstants; import com.metabroadcast.common.persistence.mongo.MongoQueryBuilder; import com.metabroadcast.common.persistence.mongo.MongoSortBuilder; import com.metabroadcast.common.query.Selection; import com.metabroadcast.common.time.Clock; import com.metabroadcast.common.time.DateTimeZones; |
| File |
|---|
| MongoDbBackedContentStore.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
return ImmutableList.copyOf(extractCanonical(ImmutableSet.copyOf(uris), findByUriOrAlias(uris, true)));
}
<<<<<<< HEAD
@SuppressWarnings("unchecked")
public List |
| Solution content |
|---|
return ImmutableList.copyOf(extractCanonical(ImmutableSet.copyOf(uris), findByUriOrAlias(uris, true)));
}
@SuppressWarnings("unchecked")
public List |
| File |
|---|
| MongoDbBackedContentStore.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Annotation |
| Attribute |
| Method declaration |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
}
};
<<<<<<< HEAD
@Override
@SuppressWarnings("unchecked")
public Iterator |
| Solution content |
|---|
}
};
@SuppressWarnings("unchecked")
@Override
public List |
| File |
|---|
| MongoDbBackedContentStore.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Annotation |
| Cast expression |
| Method declaration |
| Method signature |
| Return statement |
| Try statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import org.atlasapi.media.entity.Clip; import org.atlasapi.media.entity.Content; <<<<<<< HEAD ======= import org.atlasapi.media.entity.MediaType; import org.atlasapi.media.entity.Publisher; import org.atlasapi.media.entity.Specialization; >>>>>>> 5022c24c0eab9cff8659a9856f8c8ace7166d8a8 import org.atlasapi.persistence.ModelTranslator; import com.google.common.base.Function; |
| Solution content |
|---|
import org.atlasapi.media.entity.Clip; import org.atlasapi.media.entity.Content; import org.atlasapi.persistence.ModelTranslator; import com.google.common.base.Function; |
| File |
|---|
| ContentTranslator.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
});
entity.setClips(clips);
}
<<<<<<< HEAD
return entity;
=======
// Hack to transfer from the old name to the new
String cType = (String)dbObject.get("contentType");
if (cType != null) {
entity.setMediaType(MediaType.valueOf(cType.toUpperCase()));
} else {
cType = (String)dbObject.get("mediaType");
if (cType != null) {
entity.setMediaType(MediaType.valueOf(cType.toUpperCase()));
}
}
String specialization = (String) dbObject.get("specialization");
if (specialization != null) {
entity.setSpecialization(Specialization.valueOf(specialization.toUpperCase()));
}
return entity;
>>>>>>> 5022c24c0eab9cff8659a9856f8c8ace7166d8a8
}
@Override |
| Solution content |
|---|
package org.atlasapi.persistence.media.entity; import java.util.List; import org.atlasapi.media.entity.Clip; import org.atlasapi.media.entity.Content; import org.atlasapi.persistence.ModelTranslator; import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.mongodb.BasicDBObject; import com.mongodb.DBObject; public class ContentTranslator implements ModelTranslator |
| File |
|---|
| ContentTranslator.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Cast expression |
| Comment |
| If statement |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD
return dbObject;
}
dbObject.put(CLIPS_KEY, clipDbos);
}
});
=======
}
if (entity.getMediaType() != null) {
TranslatorUtils.from(dbObject, "mediaType", entity.getMediaType().toString().toLowerCase());
}
if (entity.getSpecialization() != null) {
TranslatorUtils.from(dbObject, "specialization", entity.getSpecialization().toString().toLowerCase());
}
return dbObject;
>>>>>>> 5022c24c0eab9cff8659a9856f8c8ace7166d8a8
}
} |
| Solution content |
|---|
}
});
dbObject.put(CLIPS_KEY, clipDbos);
}
return dbObject;
}
} |
| File |
|---|
| ContentTranslator.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
scheduler.tick(120, TimeUnit.SECONDS);
}
<<<<<<< HEAD
@Test
public void testBootstrap() throws Exception {
final List |
| Solution content |
|---|
scheduler.tick(120, TimeUnit.SECONDS);
}
// @Test
// public void testBootstrap() throws Exception {
// final List |
| File |
|---|
| QueueingContentListenerTest.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Annotation |
| Comment |
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
final List |
| Solution content |
|---|
}
bootstrapper.loadAllItems();
}
package org.atlasapi.persistence.content.mongo;
import java.util.List;
import org.atlasapi.media.entity.Item;
import org.atlasapi.media.entity.Publisher;
import org.atlasapi.persistence.content.ContentListener;
import org.atlasapi.persistence.content.RetrospectiveContentLister;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
import org.junit.Test;
import org.junit.runner.RunWith;
import com.google.common.collect.ImmutableList;
@RunWith(JMock.class)
public class MongoDbBackedContentListenerTest {
private final Mockery context = new Mockery();
private RetrospectiveContentLister store = context.mock(RetrospectiveContentLister.class);
private ContentListener listener = context.mock(ContentListener.class);
private MongoDbBackedContentBootstrapper bootstrapper = new MongoDbBackedContentBootstrapper(listener, store);
private final Item item1 = new Item("1", "1", Publisher.ARCHIVE_ORG);
private final Item item2 = new Item("2", "2", Publisher.ARCHIVE_ORG);
private final Item item3 = new Item("3", "3", Publisher.ARCHIVE_ORG);
@Test
public void testShouldLoadItems() throws Exception {
bootstrapper.setBatchSize(2);
final List |
| File |
|---|
| MongoDbBackedContentListenerTest.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
bootstrapper.setBatchSize(2);
<<<<<<< HEAD
final List |
| Solution content |
|---|
context.checking(new Expectations() {{
one(store).listAllRoots(null, 2); will(returnValue(items1));
one(store).listAllRoots(item2.getCanonicalUri(), 2); will(returnValue(items2));
}});
context.checking(new Expectations() {{
one(listener).itemChanged(ImmutableList.of(item1, item2), ContentListener.ChangeType.BOOTSTRAP);
one(listener).itemChanged(ImmutableList.of(item3), ContentListener.ChangeType.BOOTSTRAP);
}});
|
| File |
|---|
| MongoDbBackedContentListenerTest.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
List |
| Solution content |
|---|
List |
| File |
|---|
| MongoDbBackedContentStoreTest.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Cast expression |
| Method declaration |
| Method invocation |
| Method signature |
| Variable |