Projects >> atlas >>b284b0e0b11c0b7523e3045fb297077ca3b2b3d5

Chunk
Conflicting content 
import org.atlasapi.media.entity.Publisher;
import org.atlasapi.persistence.content.ContentResolver;
import org.atlasapi.persistence.content.ContentWriter;
<<<<<<< HEAD
=======
import org.atlasapi.persistence.logging.AdapterLog;
import org.atlasapi.persistence.logging.AdapterLogEntry;
import org.atlasapi.persistence.logging.AdapterLogEntry.Severity;
import org.atlasapi.persistence.topic.TopicCreatingTopicResolver;
import org.atlasapi.persistence.topic.TopicQueryResolver;
import org.atlasapi.persistence.topic.TopicStore;
import org.atlasapi.remotesite.knowledgemotion.topics.TopicGuesser;
import org.atlasapi.remotesite.knowledgemotion.topics.cache.KeyphraseTopicCache;
import org.atlasapi.remotesite.knowledgemotion.topics.spotlight.SpotlightKeywordsExtractor;
import org.atlasapi.remotesite.knowledgemotion.topics.spotlight.SpotlightResourceParser;
import org.atlasapi.spreadsheet.GoogleSpreadsheetModule;
>>>>>>> 1618239a60fecf39ceea579b6e9b5d857af9ca03
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Configuration;
Solution content 
import org.atlasapi.media.entity.Publisher;
import org.atlasapi.persistence.content.ContentResolver;
import org.atlasapi.persistence.content.ContentWriter;
<<<<<<< HEAD
=======
import org.atlasapi.persistence.logging.AdapterLog;
import org.atlasapi.persistence.logging.AdapterLogEntry;
import org.atlasapi.persistence.logging.AdapterLogEntry.Severity;
import org.atlasapi.persistence.topic.TopicCreatingTopicResolver;
import org.atlasapi.persistence.topic.TopicQueryResolver;
import org.atlasapi.persistence.topic.TopicStore;
import org.atlasapi.remotesite.knowledgemotion.topics.TopicGuesser;
import org.atlasapi.remotesite.knowledgemotion.topics.cache.KeyphraseTopicCache;
import org.atlasapi.remotesite.knowledgemotion.topics.spotlight.SpotlightKeywordsExtractor;
import org.atlasapi.remotesite.knowledgemotion.topics.spotlight.SpotlightResourceParser;
import org.atlasapi.spreadsheet.GoogleSpreadsheetModule;
>>>>>>> 1618239a60fecf39ceea579b6e9b5d857af9ca03
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Configuration;
File
KnowledgeMotionModule.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
    @PostConstruct
    public void startBackgroundTasks() {
<<<<<<< HEAD
        scheduler.schedule(globalImageUpdater().withName("KnowledgeMotion Spreadsheet Updater"), RepetitionRules.NEVER);
=======
        log.record(new AdapterLogEntry(Severity.INFO).withSource(getClass()).withDescription("KnowledgeMotion Spreadsheet updater"));
        scheduler.schedule(knowledgeMotionUpdater().withName("KnowledgeMotion Spreadsheet Updater"), RepetitionRules.NEVER);
    }

    private TopicGuesser topicGuesser() {
        return new TopicGuesser(
                new SpotlightKeywordsExtractor(new SpotlightResourceParser()),
                new KeyphraseTopicCache(mongo),
                topicStore
        );
>>>>>>> 1618239a60fecf39ceea579b6e9b5d857af9ca03
    }

    private KnowledgeMotionUpdateTask knowledgeMotionUpdater() {
Solution content 
    @PostConstruct
    public void startBackgroundTasks() {
<<<<<<< HEAD
        scheduler.schedule(globalImageUpdater().withName("KnowledgeMotion Spreadsheet Updater"), RepetitionRules.NEVER);
=======
        log.record(new AdapterLogEntry(Severity.INFO).withSource(getClass()).withDescription("KnowledgeMotion Spreadsheet updater"));
        scheduler.schedule(knowledgeMotionUpdater().withName("KnowledgeMotion Spreadsheet Updater"), RepetitionRules.NEVER);
    }

    private TopicGuesser topicGuesser() {
        return new TopicGuesser(
                new SpotlightKeywordsExtractor(new SpotlightResourceParser()),
                new KeyphraseTopicCache(mongo),
                topicStore
        );
>>>>>>> 1618239a60fecf39ceea579b6e9b5d857af9ca03
    }

    private KnowledgeMotionUpdateTask knowledgeMotionUpdater() {
File
KnowledgeMotionModule.java
Developer's decision
Manual
Kind of conflict
Method invocation
Method signature
Return statement