Projects information

Chunk

Conflicting content
public abstract class DefaultEntityStateAccessors, STATE> implements EntityStateAccessors { private final STATE underlyingState; protected final ENTITY entity; <<<<<<< HEAD private final Class type; private final Map> fieldAccessors; private final Map>> fieldAccessorListeners; ======= protected final Class type; private final Map> fieldAccessors=new HashMap>(); private final Map>> fieldAccessorListeners=new HashMap>>(); >>>>>>> 7ae9634bbc97533c836c9324e4c302c9e58552ff private STATE state; protected final static Log log= LogFactory.getLog(DefaultEntityStateAccessors.class);

Conflicting content

public abstract class DefaultEntityStateAccessors, STATE> implements EntityStateAccessors {
    private final STATE underlyingState;
    protected final ENTITY entity;
<<<<<<< HEAD
    private final Class type;
    private final Map> fieldAccessors;
    private final Map>> fieldAccessorListeners;
=======
    protected final Class type;
    private final Map> fieldAccessors=new HashMap>();
    private final Map>> fieldAccessorListeners=new HashMap>>();
>>>>>>> 7ae9634bbc97533c836c9324e4c302c9e58552ff
    private STATE state;
    protected final static Log log= LogFactory.getLog(DefaultEntityStateAccessors.class);

Solution content
public abstract class DefaultEntityStateAccessors, STATE> implements EntityStateAccessors { private final STATE underlyingState; protected final ENTITY entity; protected final Class type; private final Map> fieldAccessors; private final Map>> fieldAccessorListeners; private STATE state; protected final static Log log= LogFactory.getLog(DefaultEntityStateAccessors.class);

Solution content

public abstract class DefaultEntityStateAccessors, STATE> implements EntityStateAccessors {
    private final STATE underlyingState;
    protected final ENTITY entity;
    protected final Class type;
    private final Map> fieldAccessors;
    private final Map>> fieldAccessorListeners;
    private STATE state;
    protected final static Log log= LogFactory.getLog(DefaultEntityStateAccessors.class);

File
DefaultEntityStateAccessors.java

Developer's decision
Combination

Kind of conflict
Attribute
Method invocation

Chunk

Conflicting content
import static org.springframework.datastore.graph.neo4j.fieldaccess.PartialNodeEntityStateAccessors.getId; public class NodeEntityStateAccessorsFactory { <<<<<<< HEAD @Autowired private GraphDatabaseContext graphDatabaseContext; @Autowired private NodeDelegatingFieldAccessorFactory nodeDelegatingFieldAccessorFactory; public EntityStateAccessors getEntityStateAccessors(final NodeBacked entity) { return new DetachableEntityStateAccessors( new NodeEntityStateAccessors(null,entity,entity.getClass(), graphDatabaseContext, nodeDelegatingFieldAccessorFactory),graphDatabaseContext); } ======= @Autowired private GraphDatabaseContext graphDatabaseContext; public EntityStateAccessors getEntityStateAccessors(final NodeBacked entity) { final GraphEntity graphEntityAnnotation = entity.getClass().getAnnotation(GraphEntity.class); if (graphEntityAnnotation!=null && graphEntityAnnotation.partial()) { return new DetachableEntityStateAccessors( new PartialNodeEntityStateAccessors(null, entity, entity.getClass(), graphDatabaseContext), graphDatabaseContext) { @Override protected boolean transactionIsRunning() { return super.transactionIsRunning() && getId(entity, entity.getClass()) != null; } }; } else { return new DetachableEntityStateAccessors( new NodeEntityStateAccessors(null, entity, entity.getClass(), graphDatabaseContext), graphDatabaseContext); } } >>>>>>> 7ae9634bbc97533c836c9324e4c302c9e58552ff }

Conflicting content

import static org.springframework.datastore.graph.neo4j.fieldaccess.PartialNodeEntityStateAccessors.getId;

public class NodeEntityStateAccessorsFactory {
<<<<<<< HEAD
	@Autowired
	private GraphDatabaseContext graphDatabaseContext;
    @Autowired
    private NodeDelegatingFieldAccessorFactory nodeDelegatingFieldAccessorFactory;

	public EntityStateAccessors getEntityStateAccessors(final NodeBacked entity) {
		return new DetachableEntityStateAccessors(
				new NodeEntityStateAccessors(null,entity,entity.getClass(), graphDatabaseContext, nodeDelegatingFieldAccessorFactory),graphDatabaseContext);
	}
=======
    @Autowired
    private GraphDatabaseContext graphDatabaseContext;

    public EntityStateAccessors getEntityStateAccessors(final NodeBacked entity) {
        final GraphEntity graphEntityAnnotation = entity.getClass().getAnnotation(GraphEntity.class);
        if (graphEntityAnnotation!=null && graphEntityAnnotation.partial()) {
            return new DetachableEntityStateAccessors(
                    new PartialNodeEntityStateAccessors(null, entity, entity.getClass(), graphDatabaseContext), graphDatabaseContext) {
                @Override
                protected boolean transactionIsRunning() {
                    return super.transactionIsRunning() && getId(entity, entity.getClass()) != null;
                }
            };
        } else {
            return new DetachableEntityStateAccessors(
                    new NodeEntityStateAccessors(null, entity, entity.getClass(), graphDatabaseContext), graphDatabaseContext);
        }
    }
>>>>>>> 7ae9634bbc97533c836c9324e4c302c9e58552ff
}

Solution content
import static org.springframework.datastore.graph.neo4j.fieldaccess.PartialNodeEntityStateAccessors.getId; public class NodeEntityStateAccessorsFactory { @Autowired private GraphDatabaseContext graphDatabaseContext; @Autowired private NodeDelegatingFieldAccessorFactory nodeDelegatingFieldAccessorFactory; public EntityStateAccessors getEntityStateAccessors(final NodeBacked entity) { final GraphEntity graphEntityAnnotation = entity.getClass().getAnnotation(GraphEntity.class); if (graphEntityAnnotation!=null && graphEntityAnnotation.partial()) { return new DetachableEntityStateAccessors( new PartialNodeEntityStateAccessors(null, entity, entity.getClass(), graphDatabaseContext), graphDatabaseContext) { @Override protected boolean transactionIsRunning() { return super.transactionIsRunning() && getId(entity, entity.getClass()) != null; } }; } else { return new DetachableEntityStateAccessors( new NodeEntityStateAccessors(null,entity,entity.getClass(), graphDatabaseContext, nodeDelegatingFieldAccessorFactory),graphDatabaseContext); } } }

Solution content

import static org.springframework.datastore.graph.neo4j.fieldaccess.PartialNodeEntityStateAccessors.getId;

public class NodeEntityStateAccessorsFactory {
	@Autowired
	private GraphDatabaseContext graphDatabaseContext;
    @Autowired
    private NodeDelegatingFieldAccessorFactory nodeDelegatingFieldAccessorFactory;

	public EntityStateAccessors getEntityStateAccessors(final NodeBacked entity) {
        final GraphEntity graphEntityAnnotation = entity.getClass().getAnnotation(GraphEntity.class);
        if (graphEntityAnnotation!=null && graphEntityAnnotation.partial()) {
            return new DetachableEntityStateAccessors(
                    new PartialNodeEntityStateAccessors(null, entity, entity.getClass(), graphDatabaseContext), graphDatabaseContext) {
                @Override
                protected boolean transactionIsRunning() {
                    return super.transactionIsRunning() && getId(entity, entity.getClass()) != null;
                }
            };
        } else {
            return new DetachableEntityStateAccessors(
                    new NodeEntityStateAccessors(null,entity,entity.getClass(), graphDatabaseContext, nodeDelegatingFieldAccessorFactory),graphDatabaseContext);
        }
    }
}

File
NodeEntityStateAccessorsFactory.java

Developer's decision
Combination

Kind of conflict
Annotation
Attribute
Method declaration

Projects >> spring-data-neo4j >>a535e845120d036a3890a76d10b136327a53b6eb