Projects >> atlas >>28b1cfbb2016b54c06abd241f34dedd34723c532

Chunk
Conflicting content 
@Configuration
@Import(RtFilmModule.class)
public class PaModule {
<<<<<<< HEAD
    private final static RepetitionRule PEOPLE_COMPLETE_INGEST = RepetitionRules.NEVER;
    private final static RepetitionRule PEOPLE_INGEST = RepetitionRules.daily(LocalTime.MIDNIGHT);
=======
    private final static RepetitionRule CHANNELS_INGEST = RepetitionRules.every(Duration.standardHours(12));
>>>>>>> f2ef8d4bda4ccbacebe20cd54c2ed91a9005ce18
    private final static RepetitionRule FEATURES_INGEST = RepetitionRules.daily(LocalTime.MIDNIGHT);
    private final static RepetitionRule RECENT_FILE_INGEST = RepetitionRules.every(Duration.standardMinutes(10)).withOffset(Duration.standardMinutes(15));
    private final static RepetitionRule RECENT_FILE_DOWNLOAD = RepetitionRules.every(Duration.standardMinutes(10));
Solution content 
@Configuration
@Import(RtFilmModule.class)
public class PaModule {
    private final static RepetitionRule PEOPLE_COMPLETE_INGEST = RepetitionRules.NEVER;
    private final static RepetitionRule PEOPLE_INGEST = RepetitionRules.daily(LocalTime.MIDNIGHT);
    private final static RepetitionRule CHANNELS_INGEST = RepetitionRules.every(Duration.standardHours(12));
    private final static RepetitionRule FEATURES_INGEST = RepetitionRules.daily(LocalTime.MIDNIGHT);
    private final static RepetitionRule RECENT_FILE_INGEST = RepetitionRules.every(Duration.standardMinutes(10)).withOffset(Duration.standardMinutes(15));
    private final static RepetitionRule RECENT_FILE_DOWNLOAD = RepetitionRules.every(Duration.standardMinutes(10));
File
PaModule.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
    private @Autowired ContentResolver contentResolver;
    private @Autowired ContentGroupWriter contentGroupWriter;
    private @Autowired ContentGroupResolver contentGroupResolver;
<<<<<<< HEAD
    private @Autowired PeopleResolver personResolver;
    private @Autowired PersonWriter personWriter;
=======
    private @Autowired ChannelGroupWriter channelGroupWriter;
    private @Autowired ChannelGroupResolver channelGroupResolver;
>>>>>>> f2ef8d4bda4ccbacebe20cd54c2ed91a9005ce18
    private @Autowired AdapterLog log;
    private @Autowired ScheduleResolver scheduleResolver;
    private @Autowired ItemsPeopleWriter peopleWriter;
Solution content 
    private @Autowired ContentResolver contentResolver;
    private @Autowired ContentGroupWriter contentGroupWriter;
    private @Autowired ContentGroupResolver contentGroupResolver;
    private @Autowired PeopleResolver personResolver;
    private @Autowired PersonWriter personWriter;
    private @Autowired ChannelGroupWriter channelGroupWriter;
    private @Autowired ChannelGroupResolver channelGroupResolver;
    private @Autowired AdapterLog log;
    private @Autowired ScheduleResolver scheduleResolver;
    private @Autowired ItemsPeopleWriter peopleWriter;
File
PaModule.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
    
    @PostConstruct
    public void startBackgroundTasks() {
<<<<<<< HEAD
        if (peopleEnabled) {
            scheduler.schedule(paCompletePeopleUpdater().withName("PA Complete People Updater"), PEOPLE_COMPLETE_INGEST);
            scheduler.schedule(paDailyPeopleUpdater().withName("PA People Updater"), PEOPLE_INGEST);
        }
=======
        scheduler.schedule(paChannelsUpdater().withName("PA Channels Updater"), CHANNELS_INGEST);
>>>>>>> f2ef8d4bda4ccbacebe20cd54c2ed91a9005ce18
        scheduler.schedule(paFeaturesUpdater().withName("PA Features Updater"), FEATURES_INGEST);
        scheduler.schedule(paFileUpdater().withName("PA File Updater"), RECENT_FILE_DOWNLOAD);
        scheduler.schedule(paCompleteUpdater().withName("PA Complete Updater"), COMPLETE_INGEST);
Solution content 
    
    @PostConstruct
    public void startBackgroundTasks() {
        if (peopleEnabled) {
            scheduler.schedule(paCompletePeopleUpdater().withName("PA Complete People Updater"), PEOPLE_COMPLETE_INGEST);
            scheduler.schedule(paDailyPeopleUpdater().withName("PA People Updater"), PEOPLE_INGEST);
        }
        scheduler.schedule(paChannelsUpdater().withName("PA Channels Updater"), CHANNELS_INGEST);
        scheduler.schedule(paFeaturesUpdater().withName("PA Features Updater"), FEATURES_INGEST);
        scheduler.schedule(paFileUpdater().withName("PA File Updater"), RECENT_FILE_DOWNLOAD);
        scheduler.schedule(paCompleteUpdater().withName("PA Complete Updater"), COMPLETE_INGEST);
File
PaModule.java
Developer's decision
Concatenation
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
        log.record(new AdapterLogEntry(Severity.INFO).withDescription("PA update scheduled task installed").withSource(PaCompleteUpdater.class));
    }
    
<<<<<<< HEAD
    private PaCompletePeopleUpdater paCompletePeopleUpdater() {
        return new PaCompletePeopleUpdater(paProgrammeDataStore(), personResolver, personWriter, peopleLock);
    }

    private PaDailyPeopleUpdater paDailyPeopleUpdater() {
        return new PaDailyPeopleUpdater(paProgrammeDataStore(), personResolver, personWriter, fileUploadResultStore, peopleLock);
=======
    @Bean PaChannelsUpdater paChannelsUpdater() {
        return new PaChannelsUpdater(paProgrammeDataStore(), channelDataHandler());
    }
    
    @Bean PaChannelDataHandler channelDataHandler() {
        return new PaChannelDataHandler(new PaChannelsIngester(), new PaChannelGroupsIngester(), channelResolver, channelWriter, channelGroupResolver, channelGroupWriter);
>>>>>>> f2ef8d4bda4ccbacebe20cd54c2ed91a9005ce18
    }

    @Bean PaFeaturesUpdater paFeaturesUpdater() {
Solution content 
        log.record(new AdapterLogEntry(Severity.INFO).withDescription("PA update scheduled task installed").withSource(PaCompleteUpdater.class));
    }
    
    private PaCompletePeopleUpdater paCompletePeopleUpdater() {
        return new PaCompletePeopleUpdater(paProgrammeDataStore(), personResolver, personWriter, peopleLock);
    }

    private PaDailyPeopleUpdater paDailyPeopleUpdater() {
        return new PaDailyPeopleUpdater(paProgrammeDataStore(), personResolver, personWriter, fileUploadResultStore, peopleLock);
    }
    
    @Bean PaChannelsUpdater paChannelsUpdater() {
        return new PaChannelsUpdater(paProgrammeDataStore(), channelDataHandler());
    }
    
    @Bean PaChannelDataHandler channelDataHandler() {
        return new PaChannelDataHandler(new PaChannelsIngester(), new PaChannelGroupsIngester(), channelResolver, channelWriter, channelGroupResolver, channelGroupWriter);
    }

    @Bean PaFeaturesUpdater paFeaturesUpdater() {
File
PaModule.java
Developer's decision
Concatenation
Kind of conflict
Method declaration
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
            return name.endsWith("_features.xml");
        }
    };
<<<<<<< HEAD
    private static final FilenameFilter profilesFilenameFilter = new FilenameFilter() {
        @Override
        public boolean accept(File dir, String name) {
            return name.endsWith("_profiles.xml") || name.endsWith("_profiles_full_dump.xml");
=======
    private static final FilenameFilter channelsFilenameFilter = new FilenameFilter() {
        @Override
        public boolean accept(File dir, String name) {
            return name.endsWith("_tv_channel_data.xml");
>>>>>>> f2ef8d4bda4ccbacebe20cd54c2ed91a9005ce18
        }
    };
    private static final String PROCESSING_DIR = "/processing";
Solution content 
            return name.endsWith("_features.xml");
        }
    };

    private static final FilenameFilter profilesFilenameFilter = new FilenameFilter() {
        @Override
        public boolean accept(File dir, String name) {
            return name.endsWith("_profiles.xml") || name.endsWith("_profiles_full_dump.xml");
        }
    };

    private static final FilenameFilter channelsFilenameFilter = new FilenameFilter() {
        @Override
        public boolean accept(File dir, String name) {
            return name.endsWith("_tv_channel_data.xml");
        }
    };
    private static final String PROCESSING_DIR = "/processing";
File
DefaultPaProgrammeDataStore.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
    
    List localFeaturesFiles(Predicate filter);
    
<<<<<<< HEAD
    List localProfilesFiles(Predicate filter);
=======
    List localChannelsFiles(Predicate filter);
>>>>>>> f2ef8d4bda4ccbacebe20cd54c2ed91a9005ce18
    
    File copyForProcessing(File file);
}
Solution content 
    
    List localFeaturesFiles(Predicate filter);
    
    List localProfilesFiles(Predicate filter);

    List localChannelsFiles(Predicate filter);
    
    File copyForProcessing(File file);
}
File
PaProgrammeDataStore.java
Developer's decision
Concatenation
Kind of conflict
Method interface