Projects >> neo4j-java-rest-binding >>1e3c7357d668ea8bee1feb7bdab0e92c3667ce46

Chunk
Conflicting content 
import org.neo4j.graphdb.index.IndexManager;
import org.neo4j.kernel.AbstractGraphDatabase;
import org.neo4j.kernel.Config;
<<<<<<< HEAD
import org.neo4j.kernel.RestConfig;
=======
>>>>>>> 298fe288793082a5ff08ae7c2ff2a8d3be01326a
import org.neo4j.kernel.impl.transaction.TxModule;
import org.neo4j.rest.graphdb.index.RestIndexManager;
Solution content 
import org.neo4j.graphdb.index.IndexManager;
import org.neo4j.kernel.AbstractGraphDatabase;
import org.neo4j.kernel.Config;
import org.neo4j.kernel.RestConfig;
import org.neo4j.rest.graphdb.index.RestIndexManager;
File
RestGraphDatabase.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        return restRequest;
    }

<<<<<<< HEAD
=======
    public long getPropertyRefetchTimeInMillis() {
        return propertyRefetchTimeInMillis;
	}
>>>>>>> 298fe288793082a5ff08ae7c2ff2a8d3be01326a
    @Override
    public String getStoreDir() {
        return restRequest.getUri().toString();
Solution content 
        return restRequest;
    }

    public long getPropertyRefetchTimeInMillis() {
        return propertyRefetchTimeInMillis;
	}
    @Override
    public String getStoreDir() {
        return restRequest.getUri().toString();
File
RestGraphDatabase.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Chunk
Conflicting content 
    @Override
    public Config getConfig() {
<<<<<<< HEAD
        return new RestConfig(this);
=======
        return null;
>>>>>>> 298fe288793082a5ff08ae7c2ff2a8d3be01326a
    }

    @Override
Solution content 
    @Override
    public Config getConfig() {
        return new RestConfig(this);
    }

    @Override
File
RestGraphDatabase.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
import java.util.Arrays;

<<<<<<< HEAD:src/test/java/org/neo4j/rest/graphdb/RestEntityTest.java
public class RestEntityTest {
    private static GraphDatabaseService graphDb;

    private static final String SERVER_ROOT_URI = "http://localhost:7474/db/data/";

    @BeforeClass
    public static void startDb() throws Exception {
        graphDb = new RestGraphDatabase( new URI( SERVER_ROOT_URI ) );
    }

    @AfterClass
    public static void shutdownDb() {
        graphDb.shutdown();
    }
=======
public class TestRestEntity extends RestTestBase {
>>>>>>> 298fe288793082a5ff08ae7c2ff2a8d3be01326a:src/test/java/org/neo4j/rest/graphdb/TestRestEntity.java

    @Test
    public void testSetProperty() {
Solution content 
import java.util.Arrays;

public class RestEntityTest extends RestTestBase  {

    @Test
    public void testSetProperty() {
File
RestEntityTest.java
Developer's decision
Manual
Kind of conflict
Annotation
Attribute
Class signature
Method declaration
Chunk
Conflicting content 
import java.util.Date;

<<<<<<< HEAD:src/test/java/org/neo4j/rest/graphdb/RestGraphDbTest.java
public class RestGraphDbTest {
    private static GraphDatabaseService graphDb;

    private static final String SERVER_ROOT_URI = "http://localhost:7474/db/data/";

    @BeforeClass
    public static void startDb() throws Exception {
        graphDb = new RestGraphDatabase( new URI( SERVER_ROOT_URI ) );
    }

    @AfterClass
    public static void shutdownDb() {
        graphDb.shutdown();
    }
=======
public class TestRestGraphDb extends RestTestBase {
>>>>>>> 298fe288793082a5ff08ae7c2ff2a8d3be01326a:src/test/java/org/neo4j/rest/graphdb/TestRestGraphDb.java

    @Test
    public void testGetRefNode() {
Solution content 
import java.util.Date;

public class RestGraphDbTest extends RestTestBase {

    @Test
    public void testGetRefNode() {
File
RestGraphDbTest.java
Developer's decision
Manual
Kind of conflict
Annotation
Attribute
Class signature
Method declaration
Chunk
Conflicting content 
import java.util.Arrays;
import java.util.Iterator;

<<<<<<< HEAD:src/test/java/org/neo4j/rest/graphdb/RestIndexTest.java
public class RestIndexTest {
    private static GraphDatabaseService graphDb;
=======
public class TestRestIndex extends RestTestBase {
>>>>>>> 298fe288793082a5ff08ae7c2ff2a8d3be01326a:src/test/java/org/neo4j/rest/graphdb/TestRestIndex.java

    private static final String NODE_INDEX_NAME = "NODE_INDEX";
    private static final String REL_INDEX_NAME = "REL_INDEX";
Solution content 
import java.util.Arrays;
import java.util.Iterator;

public class RestIndexTest extends RestTestBase {

    private static final String NODE_INDEX_NAME = "NODE_INDEX";
    private static final String REL_INDEX_NAME = "REL_INDEX";
File
RestIndexTest.java
Developer's decision
Manual
Kind of conflict
Attribute
Class signature