Projects >> atlas-search >>76d0725c6734481553bcda8c5be0dd96a0e408ee

Chunk
Conflicting content 
package org.atlasapi.search;


<<<<<<< HEAD
import static org.atlasapi.persistence.cassandra.CassandraSchema.CLUSTER;
import static org.atlasapi.persistence.cassandra.CassandraSchema.getKeyspace;
import static org.atlasapi.persistence.content.listing.ContentListingCriteria.defaultCriteria;

import java.io.File;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
=======
import com.google.common.base.Function;
import com.google.common.base.Predicates;
import com.google.common.base.Splitter;
>>>>>>> a94107423c12e4fc3cf2a3ec8825e49ad56e35d1

import org.atlasapi.media.entity.Publisher;
import org.atlasapi.persistence.content.ContentCategory;
Solution content 
package org.atlasapi.search;

import static org.atlasapi.persistence.cassandra.CassandraSchema.CLUSTER;
import static org.atlasapi.persistence.cassandra.CassandraSchema.getKeyspace;
import static org.atlasapi.persistence.content.listing.ContentListingCriteria.defaultCriteria;

import java.io.File;
import java.net.UnknownHostException;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;

import org.atlasapi.media.entity.Publisher;
import org.atlasapi.persistence.content.ContentCategory;
File
AtlasSearchModule.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
import org.springframework.context.annotation.Bean;

import com.google.common.collect.ImmutableList;
<<<<<<< HEAD
=======
import com.google.common.collect.Iterables;
import com.google.common.collect.ImmutableList.Builder;
import com.google.common.collect.Lists;
>>>>>>> a94107423c12e4fc3cf2a3ec8825e49ad56e35d1
import com.metabroadcast.common.health.HealthProbe;
import com.metabroadcast.common.persistence.mongo.DatabasedMongo;
import com.metabroadcast.common.properties.Configurer;
Solution content 
import org.springframework.context.annotation.Bean;

import com.google.common.base.Function;
import com.google.common.base.Predicates;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableList.Builder;
import com.google.common.collect.Iterables;
import com.metabroadcast.common.health.HealthProbe;
import com.metabroadcast.common.persistence.mongo.DatabasedMongo;
import com.metabroadcast.common.properties.Configurer;
File
AtlasSearchModule.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
import com.metabroadcast.common.properties.Configurer;
import com.metabroadcast.common.webapp.health.HealthController;
import com.mongodb.Mongo;
<<<<<<< HEAD
import com.netflix.astyanax.AstyanaxContext;
import com.netflix.astyanax.Keyspace;
import com.netflix.astyanax.connectionpool.NodeDiscoveryType;
import com.netflix.astyanax.connectionpool.impl.ConnectionPoolConfigurationImpl;
import com.netflix.astyanax.connectionpool.impl.CountingConnectionPoolMonitor;
import com.netflix.astyanax.impl.AstyanaxConfigurationImpl;
import com.netflix.astyanax.thrift.ThriftFamilyFactory;
=======
import com.mongodb.ReadPreference;
import com.mongodb.ServerAddress;

import java.io.File;
import java.net.UnknownHostException;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.atlasapi.persistence.content.cassandra.CassandraContentStore;
import org.atlasapi.search.loader.ContentBootstrapper;
import org.atlasapi.search.searcher.LuceneContentIndex;
import org.joda.time.Duration;
import static org.atlasapi.persistence.content.listing.ContentListingCriteria.defaultCriteria;
>>>>>>> a94107423c12e4fc3cf2a3ec8825e49ad56e35d1

public class AtlasSearchModule extends WebAwareModule {
Solution content 
import com.metabroadcast.common.properties.Configurer;
import com.metabroadcast.common.webapp.health.HealthController;
import com.mongodb.Mongo;
import com.mongodb.ReadPreference;
import com.mongodb.ServerAddress;
import com.netflix.astyanax.connectionpool.impl.ConnectionPoolConfigurationImpl;
import com.netflix.astyanax.AstyanaxContext;
import com.netflix.astyanax.Keyspace;
import com.netflix.astyanax.connectionpool.NodeDiscoveryType;
import com.netflix.astyanax.connectionpool.impl.CountingConnectionPoolMonitor;
import com.netflix.astyanax.impl.AstyanaxConfigurationImpl;
import com.netflix.astyanax.thrift.ThriftFamilyFactory;

public class AtlasSearchModule extends WebAwareModule {
File
AtlasSearchModule.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import com.google.common.base.Joiner;
import com.google.common.base.Predicate;
import com.google.common.base.Strings;
<<<<<<< HEAD
import com.google.common.collect.ImmutableSet;
=======
import com.google.common.base.Throwables;
>>>>>>> a94107423c12e4fc3cf2a3ec8825e49ad56e35d1
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;
Solution content 
import com.google.common.base.Joiner;
import com.google.common.base.Predicate;
import com.google.common.base.Strings;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;
File
LuceneContentIndex.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
                hourOfClosestBroadcast = Math.max(hourOf(now.minus(Duration.standardDays(30))), hourOfClosestBroadcast);
            }
            
<<<<<<< HEAD
            if (hourOfClosestBroadcast < minHourTimestamp) {
                return false;
            }
            addBroadcastInformation(doc, hourOfClosestBroadcast, closestBroadcast);
=======
            doc.add(new NumericField(FIELD_BROADCAST_HOUR_TS, Field.Store.YES, true).setIntValue(hourOfClosestBroadcast));
>>>>>>> a94107423c12e4fc3cf2a3ec8825e49ad56e35d1
            return true;
            
        } else if (content instanceof Container) {
Solution content 
                hourOfClosestBroadcast = Math.max(hourOf(now.minus(Duration.standardDays(30))), hourOfClosestBroadcast);
            }
            
            addBroadcastInformation(doc, hourOfClosestBroadcast, closestBroadcast);
            return true;
            
        } else if (content instanceof Container) {
File
LuceneContentIndex.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Chunk
Conflicting content 
                if (haveAvailable(items)) {
                    doc.add(new Field(FIELD_AVAILABLE, String.valueOf(TRUE), Field.Store.NO, Field.Index.NOT_ANALYZED));
                }
<<<<<<< HEAD

                Maybe closestBroadcastForItems = closestBroadcastForItems(items, now);
                if (closestBroadcastForItems.isNothing() || hourOf(closestBroadcastForItems.requireValue()) < minHourTimestamp) {
                    return false;
                }
                addBroadcastInformation(doc, hourOf(closestBroadcastForItems.requireValue()), closestBroadcastForItems);
=======
                
                int hourOfClosestBroadcastForItems = hourOfClosestBroadcastForItems(items, now);
                doc.add(new NumericField(FIELD_BROADCAST_HOUR_TS, Field.Store.YES, true).setIntValue(hourOfClosestBroadcastForItems));
>>>>>>> a94107423c12e4fc3cf2a3ec8825e49ad56e35d1
                return true;
            }
        }
Solution content 
                if (haveAvailable(items)) {
                    doc.add(new Field(FIELD_AVAILABLE, String.valueOf(TRUE), Field.Store.NO, Field.Index.NOT_ANALYZED));
                }

                Maybe closestBroadcastForItems = closestBroadcastForItems(items, now);
                if (closestBroadcastForItems.isNothing()) {
                    return false;
                }
                addBroadcastInformation(doc, hourOf(closestBroadcastForItems.requireValue()), closestBroadcastForItems);
                return true;
            }
        }
File
LuceneContentIndex.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Variable