Projects >> atlas >>010f9b63bfcf76c1c5e09d1d269ff38dc3c0e2b2

Chunk
Conflicting content 
        PaModule.class, SeesawModule.class })
public class RemoteSiteModule {

<<<<<<< HEAD
	private @Autowired AdapterLog log;
	private @Autowired C4Module c4Module; 
	private @Autowired ArchiveOrgModule archiveOrgModule;
	private @Autowired HboModule hboModule;
	
	private @Autowired BbcModule bbcModule; 
	private @Autowired ItvModule itvModule;
	private @Autowired ItunesModule itunesModule;
	private @Autowired MsnVideoModule msnVideoModule;
	private @Autowired HuluModule huluModule;

	private @Autowired DatabasedMongo mongo;
	
	public @Bean SimpleScheduler scheduler() {
	    return new SimpleScheduler();
	}
	
	@PostConstruct 
	public void scheduleAvailabilityUpdater() {
		scheduler().schedule(itemAvailabilityUpdater(), RepetitionRules.atInterval(new Duration(5*60*1000L)));
	}
	
	public @Bean Runnable itemAvailabilityUpdater() {
		return new ItemAvailabilityUpdater(mongo, log);
	}
	
	public @Bean ManualTaskTrigger manualTaskTrigger() {
	    return new ManualTaskTrigger(scheduler());
	}
	
	public @Bean Fetcher remoteFetcher() {
		
		 PerSiteAdapterDispatcher dispatcher = new PerSiteAdapterDispatcher(log);
		 
		 List> adapters = Lists.newArrayList();
		 
		 adapters.add(new YouTubeAdapter());
		 adapters.add(new YouTubeFeedAdapter());
		 // Commented out for now, as it generates too much gdata traffic
		 //adapters.add(new YouTubeUserAdapter());
		 adapters.add(new TedTalkAdapter());
		 
		 adapters.addAll(c4Module.adapters());
		 adapters.addAll(bbcModule.adapters());
		 adapters.addAll(itvModule.adapters());
		 adapters.addAll(archiveOrgModule.adapters());
		 adapters.addAll(hboModule.adapters());
		 adapters.addAll(itunesModule.adapters());
		 adapters.addAll(msnVideoModule.adapters());
		 adapters.addAll(huluModule.adapters());
		 
		 adapters.add(new DailyMotionItemAdapter());
		 adapters.add(new BlipTvAdapter());
		 adapters.add(new BbcProgrammeAdapter(log));

		 adapters.add(new BbcPodcastAdapter());
		 
		 adapters.add(new VimeoAdapter());
		 
		 OembedXmlAdapter flickrAdapter = new OembedXmlAdapter();
		 flickrAdapter.setAcceptedUriPattern("http://www.flickr.com/photos/[^/]+/[\\d]+");
		 flickrAdapter.setOembedEndpoint("http://www.flickr.com/services/oembed/");
		 flickrAdapter.setPublisher(Publisher.FLICKR);
		 
		 adapters.add(flickrAdapter);
		 adapters.add(new OpmlAdapter(dispatcher));
		 
		 adapters.add(new SeesawBrandAdapter());
		 adapters.add(new SeesawItemAdapter());
		 adapters.add(new SeesawSeriesAdapter());
		 
		 dispatcher.setAdapters(adapters);
		 return dispatcher;
	}
	
	public @Bean ContentWriters contentWriters() {
		return new ContentWriters();
	}
=======
    private @Autowired AdapterLog log;
    private @Autowired C4Module c4Module;
    private @Autowired ArchiveOrgModule archiveOrgModule;
    private @Autowired HboModule hboModule;

    private @Autowired BbcModule bbcModule;
    private @Autowired ItvModule itvModule;
    private @Autowired ItunesModule itunesModule;
    private @Autowired MsnVideoModule msnVideoModule;
    private @Autowired HuluModule huluModule;

    private @Autowired DatabasedMongo mongo;

    public @Bean SimpleScheduler scheduler() {
        return new SimpleScheduler();
    }

    @PostConstruct
    public void scheduleAvailabilityUpdater() {
        scheduler().schedule(itemAvailabilityUpdater(), RepetitionRules.atInterval(new Duration(5 * 60 * 1000L)));
    }

    public @Bean Runnable itemAvailabilityUpdater() {
        return new ItemAvailabilityUpdater(mongo, log);
    }

    public @Bean ManualTaskTrigger manualTaskTrigger() {
        return new ManualTaskTrigger(scheduler());
    }

    public @Bean Fetcher remoteFetcher() {

        PerSiteAdapterDispatcher dispatcher = new PerSiteAdapterDispatcher(log);

        List> adapters = Lists.newArrayList();

        adapters.add(new YouTubeAdapter());
        adapters.add(new YouTubeFeedAdapter());
        // Commented out for now, as it generates too much gdata traffic
        // adapters.add(new YouTubeUserAdapter());
        adapters.add(new TedTalkAdapter());

        adapters.addAll(c4Module.adapters());
        adapters.addAll(bbcModule.adapters());
        adapters.addAll(itvModule.adapters());
        adapters.addAll(archiveOrgModule.adapters());
        adapters.addAll(hboModule.adapters());
        adapters.addAll(itunesModule.adapters());
        adapters.addAll(msnVideoModule.adapters());
        adapters.addAll(huluModule.adapters());

        adapters.add(new DailyMotionItemAdapter());
        adapters.add(new BlipTvAdapter());
        adapters.add(new BbcProgrammeAdapter(log));

        adapters.add(new BbcPodcastAdapter());

        adapters.add(new VimeoAdapter());

        OembedXmlAdapter flickrAdapter = new OembedXmlAdapter();
        flickrAdapter.setAcceptedUriPattern("http://www.flickr.com/photos/[^/]+/[\\d]+");
        flickrAdapter.setOembedEndpoint("http://www.flickr.com/services/oembed/");
        flickrAdapter.setPublisher(Publisher.FLICKR);

        adapters.add(flickrAdapter);
        adapters.add(new OpmlAdapter(dispatcher));

        // avoid overloading with equiv requests
        // adapters.add(new WikipediaSparqlAdapter());

        adapters.add(new ImdbAdapter(dispatcher));

        dispatcher.setAdapters(adapters);
        return dispatcher;
    }

    public @Bean ContentWriters contentWriters() {
        return new ContentWriters();
    }
>>>>>>> fb6c1c7b5971906eadbf3c8a356194501d41328e
}
Solution content 
        PaModule.class, SeesawModule.class })
public class RemoteSiteModule {

	private @Autowired AdapterLog log;
	private @Autowired C4Module c4Module; 
	private @Autowired ArchiveOrgModule archiveOrgModule;
	private @Autowired HboModule hboModule;
	
	private @Autowired BbcModule bbcModule; 
	private @Autowired ItvModule itvModule;
	private @Autowired ItunesModule itunesModule;
	private @Autowired MsnVideoModule msnVideoModule;
	private @Autowired HuluModule huluModule;

	private @Autowired DatabasedMongo mongo;
	
	public @Bean SimpleScheduler scheduler() {
	    return new SimpleScheduler();
	}
	
	@PostConstruct 
	public void scheduleAvailabilityUpdater() {
		scheduler().schedule(itemAvailabilityUpdater(), RepetitionRules.atInterval(new Duration(5*60*1000L)));
	}
	
	public @Bean Runnable itemAvailabilityUpdater() {
		return new ItemAvailabilityUpdater(mongo, log);
	}
	
	public @Bean ManualTaskTrigger manualTaskTrigger() {
	    return new ManualTaskTrigger(scheduler());
	}
	
	public @Bean Fetcher remoteFetcher() {
		
		 PerSiteAdapterDispatcher dispatcher = new PerSiteAdapterDispatcher(log);
		 
		 List> adapters = Lists.newArrayList();
		 
		 adapters.add(new YouTubeAdapter());
		 adapters.add(new YouTubeFeedAdapter());
		 // Commented out for now, as it generates too much gdata traffic
		 //adapters.add(new YouTubeUserAdapter());
		 adapters.add(new TedTalkAdapter());
		 
		 adapters.addAll(c4Module.adapters());
		 adapters.addAll(bbcModule.adapters());
		 adapters.addAll(itvModule.adapters());
		 adapters.addAll(archiveOrgModule.adapters());
		 adapters.addAll(hboModule.adapters());
		 adapters.addAll(itunesModule.adapters());
		 adapters.addAll(msnVideoModule.adapters());
		 adapters.addAll(huluModule.adapters());
		 
		 adapters.add(new DailyMotionItemAdapter());
		 adapters.add(new BlipTvAdapter());
		 adapters.add(new BbcProgrammeAdapter(log));

		 adapters.add(new BbcPodcastAdapter());
		 
		 adapters.add(new VimeoAdapter());
		 
		 OembedXmlAdapter flickrAdapter = new OembedXmlAdapter();
		 flickrAdapter.setAcceptedUriPattern("http://www.flickr.com/photos/[^/]+/[\\d]+");
		 flickrAdapter.setOembedEndpoint("http://www.flickr.com/services/oembed/");
		 flickrAdapter.setPublisher(Publisher.FLICKR);
		 
		 adapters.add(flickrAdapter);
		 adapters.add(new OpmlAdapter(dispatcher));
		 
		 dispatcher.setAdapters(adapters);
		 return dispatcher;
	}
	
	public @Bean ContentWriters contentWriters() {
		return new ContentWriters();
	}
}
File
RemoteSiteModule.java
Developer's decision
Combination
Kind of conflict
Annotation
Attribute
Method declaration
Chunk
Conflicting content 
				if (!series.getContentType().equals(brand.getContentType())) {
					series.setContentType(brand.getContentType());
				}
<<<<<<< HEAD
				for (Content episode : series.getContents()) {
					if(!episode.getContentType().equals(brand.getContentType())) {
						episode.setContentType(brand.getContentType());
=======
				for (Item item : series.getItems()) {
					if(brand.getContentType() != null && !brand.getContentType().equals(item.getContentType())) {
						item.setContentType(brand.getContentType());
>>>>>>> fb6c1c7b5971906eadbf3c8a356194501d41328e
					}
					brand.addContents((Episode) episode);
				}
Solution content 
				if (!series.getContentType().equals(brand.getContentType())) {
					series.setContentType(brand.getContentType());
				}

				for (Content item : series.getContents()) {
					if(brand.getContentType() != null && !brand.getContentType().equals(item.getContentType())) {
						item.setContentType(brand.getContentType());
					}
					brand.addContents((Episode) item);
				}
File
BbcBrandExtractor.java
Developer's decision
Manual
Kind of conflict
For statement
If statement
Method invocation
Chunk
Conflicting content 
import javax.annotation.PostConstruct;
import javax.xml.bind.JAXBException;

<<<<<<< HEAD
import org.atlasapi.media.entity.Identified;
=======
import org.atlasapi.media.entity.Content;
import org.atlasapi.persistence.content.mongo.MongoDbBackedContentStore;
>>>>>>> fb6c1c7b5971906eadbf3c8a356194501d41328e
import org.atlasapi.persistence.logging.AdapterLog;
import org.atlasapi.persistence.logging.AdapterLogEntry;
import org.atlasapi.persistence.logging.AdapterLogEntry.Severity;
Solution content 
import javax.annotation.PostConstruct;
import javax.xml.bind.JAXBException;

import org.atlasapi.media.entity.Identified;
import org.atlasapi.persistence.content.mongo.MongoDbBackedContentStore;
import org.atlasapi.persistence.logging.AdapterLog;
import org.atlasapi.persistence.logging.AdapterLogEntry;
import org.atlasapi.persistence.logging.AdapterLogEntry.Severity;
File
BbcModule.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
                }
            }
            
<<<<<<< HEAD
            ContentGroup ictomorrowPlaylist = new ContentGroup("http://ictomorrow.co.uk/all-content", "ict:all", Publisher.ICTOMORROW);
=======
            log.info("Metadata file recieved for job " + jobId);
            
            Playlist ictomorrowPlaylist = new Playlist("http://ictomorrow.co.uk/all-content", "ict:all", Publisher.ICTOMORROW);
>>>>>>> fb6c1c7b5971906eadbf3c8a356194501d41328e
            ictomorrowPlaylist.setTitle("Classic Telly");
            ictomorrowPlaylist.setDescription("Classic TV provided by ICTomorrow");
Solution content 
                }
            }
            
            ContentGroup ictomorrowPlaylist = new ContentGroup("http://ictomorrow.co.uk/all-content", "ict:all", Publisher.ICTOMORROW);
            log.info("Metadata file recieved for job " + jobId);
            
            ictomorrowPlaylist.setTitle("Classic Telly");
            ictomorrowPlaylist.setDescription("Classic TV provided by ICTomorrow");
File
ICTomorrowPlaylistUpdater.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable