Projects >> spring-data-neo4j >>f958f38e050c29d148097aa82bfd3003b87b364e

Chunk
Conflicting content 
    boolean hasPersistentState();

<<<<<<< HEAD
    /**
     * removes the entity using @{link GraphDatabaseContext.removeNodeEntity}
     * the entity and relationship are still accessible after removal but before transaction commit
     * but all modifications will throw an exception
     */
=======
>>>>>>> 0c20e6488c33ead3959c2b33dbda3f8192abd280
    void remove();
}
Solution content 
    boolean hasPersistentState();

    /**
     * removes the entity using @{link GraphDatabaseContext.removeNodeEntity}
     * the entity and relationship are still accessible after removal but before transaction commit
     * but all modifications will throw an exception
     */
    void remove();
}
File
GraphBacked.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	public EntityState getEntityState(final NodeBacked entity) {
        final NodeEntity graphEntityAnnotation = entity.getClass().getAnnotation(NodeEntity.class); // todo cache ??
        if (graphEntityAnnotation.partial()) {
<<<<<<< HEAD
            final PartialNodeEntityState partialNodeEntityState = new PartialNodeEntityState(null, entity, entity.getClass(), graphDatabaseContext, finderFactory, getPersistenceUnitUtils());
=======
            final PartialNodeEntityState partialNodeEntityState = new PartialNodeEntityState(null, entity, entity.getClass(), graphDatabaseContext, graphRepositoryFactory,entityManagerFactory!=null ? entityManagerFactory.getPersistenceUnitUtil() : null);
>>>>>>> 0c20e6488c33ead3959c2b33dbda3f8192abd280
            return new DetachedEntityState(partialNodeEntityState, graphDatabaseContext) {
                @Override
                protected boolean isDetached() {
Solution content 
	public EntityState getEntityState(final NodeBacked entity) {
        final NodeEntity graphEntityAnnotation = entity.getClass().getAnnotation(NodeEntity.class); // todo cache ??
        if (graphEntityAnnotation.partial()) {
            final PartialNodeEntityState partialNodeEntityState = new PartialNodeEntityState(null, entity, entity.getClass(), graphDatabaseContext, graphRepositoryFactory,getPersistenceUnitUtils());
            return new DetachedEntityState(partialNodeEntityState, graphDatabaseContext) {
                @Override
                protected boolean isDetached() {
File
NodeEntityStateFactory.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        assertNull(nodeFor(dev));
    }

<<<<<<< HEAD
    private boolean hasUnderlyingNode(NodeBacked nodeBacked) {
=======
    private boolean hasPersistentState(NodeBacked nodeBacked) {
>>>>>>> 0c20e6488c33ead3959c2b33dbda3f8192abd280
        return nodeBacked.hasPersistentState();
    }
Solution content 
        assertNull(nodeFor(dev));
    }

    private boolean hasPersistentState(NodeBacked nodeBacked) {
        return nodeBacked.hasPersistentState();
    }
File
AttachEntityTest.java
Developer's decision
Version 2
Kind of conflict
Method signature