Projects >> atlas >>8925ae4c914f02e9c90572a41c99af39b2ba9d46

Chunk
Conflicting content 
    private ScheduledTask nitroScheduleUpdateTask(int back, int forward, Integer threadCount, Integer rateLimit, Optional> fullFetchPermittedPredicate) {
        DayRangeChannelDaySupplier drcds = new DayRangeChannelDaySupplier(bbcChannelSupplier(), dayRangeSupplier(back, forward));
        ExecutorService executor = Executors.newFixedThreadPool(threadCount, nitroThreadFactory);
<<<<<<< HEAD
        return new ChannelDayProcessingTask(executor, drcds, nitroChannelDayProcessor(rateLimit, Optional.of(Predicates.alwaysTrue())),
=======
        return new ChannelDayProcessingTask(executor, drcds, nitroChannelDayProcessor(rateLimit, fullFetchPermittedPredicate),
>>>>>>> ca89150fcf8387b3fdaffeb8347519bf895fa3a9
                null, jobFailureThresholdPercent);
    }
Solution content 
    private ScheduledTask nitroScheduleUpdateTask(int back, int forward, Integer threadCount, Integer rateLimit, Optional> fullFetchPermittedPredicate) {
        DayRangeChannelDaySupplier drcds = new DayRangeChannelDaySupplier(bbcChannelSupplier(), dayRangeSupplier(back, forward));
        ExecutorService executor = Executors.newFixedThreadPool(threadCount, nitroThreadFactory);
        return new ChannelDayProcessingTask(executor, drcds, nitroChannelDayProcessor(rateLimit, fullFetchPermittedPredicate),
                null, jobFailureThresholdPercent);
    }
File
BbcNitroModule.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
                    ImmutableSet.copyOf(Iterables.filter(resolved.getAllResolvedResults(), Brand.class))).getAll();
    }
    
<<<<<<< HEAD
=======
    
>>>>>>> ca89150fcf8387b3fdaffeb8347519bf895fa3a9
    private Multimap toBrandUriMap(Iterable items) {
        return Multimaps.index(Iterables.filter(items, HAS_BRAND), TO_BRAND_REF_URI);
    }
Solution content 
                    ImmutableSet.copyOf(Iterables.filter(resolved.getAllResolvedResults(), Brand.class))).getAll();
    }
    
    
    private Multimap toBrandUriMap(Iterable items) {
        return Multimaps.index(Iterables.filter(items, HAS_BRAND), TO_BRAND_REF_URI);
    }
File
LocalOrRemoteNitroFetcher.java
Developer's decision
Version 1
Kind of conflict
Blank