Projects >> sensei >>09ff8f72c4bc49e2ffa96ef003e8087edf032a19

Chunk
Conflicting content 
import com.browseengine.bobo.facets.impl.PathFacetHandler;
import com.browseengine.bobo.facets.impl.RangeFacetHandler;
import com.browseengine.bobo.facets.impl.SimpleFacetHandler;
<<<<<<< HEAD:sensei-core/src/main/java/com/sensei/conf/SenseiFacetHandlerBuilder.java
import com.sensei.facet.attribute.AttributesFacetHandler;
import com.sensei.indexing.api.DefaultSenseiInterpreter;
import com.sensei.plugin.SenseiPluginRegistry;
import com.sensei.search.facet.UIDFacetHandler;
import com.sensei.search.req.SenseiSystemInfo;
=======
import com.senseidb.indexing.DefaultSenseiInterpreter;
import com.senseidb.plugin.SenseiPluginRegistry;
import com.senseidb.search.facet.UIDFacetHandler;
import com.senseidb.search.req.SenseiSystemInfo;
>>>>>>> 165eb3abccdbffa2276a9e6a94d9426e619aea06:sensei-core/src/main/java/com/senseidb/conf/SenseiFacetHandlerBuilder.java

public class SenseiFacetHandlerBuilder {
Solution content 
import com.browseengine.bobo.facets.impl.PathFacetHandler;
import com.browseengine.bobo.facets.impl.RangeFacetHandler;
import com.browseengine.bobo.facets.impl.SimpleFacetHandler;
import com.senseidb.indexing.DefaultSenseiInterpreter;
import com.senseidb.plugin.SenseiPluginRegistry;
import com.senseidb.search.facet.UIDFacetHandler;
import com.senseidb.search.facet.attribute.AttributesFacetHandler;
import com.senseidb.search.req.SenseiSystemInfo;

public class SenseiFacetHandlerBuilder {
File
SenseiFacetHandlerBuilder.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
import com.linkedin.norbert.javacompat.cluster.ClusterClient;
import com.linkedin.norbert.javacompat.cluster.Node;
import com.linkedin.norbert.javacompat.network.PartitionedNetworkClient;
<<<<<<< HEAD:sensei-core/src/main/java/com/sensei/search/nodes/SenseiBroker.java
import com.sensei.conf.SenseiSchema;
import com.sensei.indexing.api.DefaultJsonSchemaInterpreter;
import com.sensei.search.client.ResultMerger;
import com.sensei.search.cluster.routing.SenseiLoadBalancerFactory;
import com.sensei.search.req.SenseiHit;
import com.sensei.search.req.SenseiRequest;
import com.sensei.search.req.SenseiResult;
import com.sensei.search.svc.impl.CoreSenseiServiceImpl;
=======
import com.senseidb.cluster.routing.SenseiLoadBalancerFactory;
import com.senseidb.conf.SenseiSchema;
import com.senseidb.indexing.DefaultJsonSchemaInterpreter;
import com.senseidb.search.req.SenseiHit;
import com.senseidb.search.req.SenseiRequest;
import com.senseidb.search.req.SenseiResult;
import com.senseidb.svc.impl.CoreSenseiServiceImpl;
>>>>>>> 165eb3abccdbffa2276a9e6a94d9426e619aea06:sensei-core/src/main/java/com/senseidb/search/node/SenseiBroker.java

/**
 * This SenseiBroker routes search(browse) request using the routers created by
Solution content 
import com.linkedin.norbert.javacompat.cluster.ClusterClient;
import com.linkedin.norbert.javacompat.cluster.Node;
import com.linkedin.norbert.javacompat.network.PartitionedNetworkClient;
import com.senseidb.cluster.routing.SenseiLoadBalancerFactory;
import com.senseidb.conf.SenseiSchema;
import com.senseidb.indexing.DefaultJsonSchemaInterpreter;
import com.senseidb.search.req.SenseiHit;
import com.senseidb.search.req.SenseiRequest;
import com.senseidb.search.req.SenseiResult;
import com.senseidb.svc.impl.CoreSenseiServiceImpl;


/**
 * This SenseiBroker routes search(browse) request using the routers created by
File
SenseiBroker.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import com.browseengine.bobo.api.FacetSpec;
import com.browseengine.bobo.facets.DefaultFacetHandlerInitializerParam;
import com.browseengine.bobo.facets.impl.PathFacetHandler;
<<<<<<< HEAD:sensei-core/src/main/java/com/sensei/search/util/RequestConverter2.java
import com.sensei.search.req.SenseiJSONQuery;
import com.sensei.search.req.SenseiRequest;
=======
import com.senseidb.search.req.SenseiJSONQuery;
import com.senseidb.search.req.SenseiRequest;
>>>>>>> 165eb3abccdbffa2276a9e6a94d9426e619aea06:sensei-core/src/main/java/com/senseidb/util/RequestConverter2.java

public class RequestConverter2 {
Solution content 
import com.browseengine.bobo.api.FacetSpec;
import com.browseengine.bobo.facets.DefaultFacetHandlerInitializerParam;
import com.browseengine.bobo.facets.impl.PathFacetHandler;
import com.senseidb.search.req.SenseiJSONQuery;
import com.senseidb.search.req.SenseiRequest;


public class RequestConverter2 {
File
RequestConverter2.java
Developer's decision
Version 2
Kind of conflict
Import