org.apache.jackrabbit.oak.plugins.commit

Class DefaultConflictHandler

java.lang.Object

org.apache.jackrabbit.oak.plugins.commit.DefaultConflictHandler

All Implemented Interfaces:

ConflictHandler, PartialConflictHandler

Deprecated.

Use DefaultThreeWayConflictHandler instead.

@Deprecated
public class DefaultConflictHandler
extends Object
implements ConflictHandler

This implementation of a ConflictHandler always returns the same resolution. It can be used to implement default behaviour or as a base class for more specialised implementations.

Nested Class Summary

Nested classes/interfaces inherited from interface org.apache.jackrabbit.oak.spi.commit.PartialConflictHandler

PartialConflictHandler.Resolution

Field Summary

Fields

Modifier and Type	Field and Description
static ConflictHandler	OURS Deprecated. A ConflictHandler which always return org.apache.jackrabbit.oak.spi.commit.ConflictHandler.Resolution#OURS.
static ConflictHandler	THEIRS Deprecated. A ConflictHandler which always return org.apache.jackrabbit.oak.spi.commit.ConflictHandler.Resolution#THEIRS.

Constructor Summary

Constructors

Constructor and Description
DefaultConflictHandler(PartialConflictHandler.Resolution resolution) Deprecated. Create a new ConflictHandler which always returns resolution.

Method Summary

Modifier and Type	Method and Description
PartialConflictHandler.Resolution	addExistingNode(NodeBuilder parent, String name, NodeState ours, NodeState theirs) Deprecated. The node ours has been added to parent which conflicts with node theirs which has been added in the persistence store.
PartialConflictHandler.Resolution	addExistingProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs) Deprecated. The property ours has been added to parent which conflicts with property theirs which has been added in the persistence store.
PartialConflictHandler.Resolution	changeChangedProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs) Deprecated. The property ours has been changed in parent while it was also changed to a different value (theirs) in the persistence store.
PartialConflictHandler.Resolution	changeDeletedNode(NodeBuilder parent, String name, NodeState ours) Deprecated. The node ours has been changed in parent while it was removed in the persistence store.
PartialConflictHandler.Resolution	changeDeletedProperty(NodeBuilder parent, PropertyState ours) Deprecated. The property ours has been changed in parent while it was removed in the persistence store.
PartialConflictHandler.Resolution	deleteChangedNode(NodeBuilder parent, String name, NodeState theirs) Deprecated. The node theirs changed in the persistence store while it has been deleted locally.
PartialConflictHandler.Resolution	deleteChangedProperty(NodeBuilder parent, PropertyState theirs) Deprecated. The property theirs changed in the persistence store while it has been deleted locally.
PartialConflictHandler.Resolution	deleteDeletedNode(NodeBuilder parent, String name) Deprecated. The node name has been removed in parent while it was also removed in the persistence store.
PartialConflictHandler.Resolution	deleteDeletedProperty(NodeBuilder parent, PropertyState ours) Deprecated. The property ours has been removed in parent while it was also removed in the persistence store.

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Detail

OURS

public static final ConflictHandler OURS

Deprecated.

A ConflictHandler which always return org.apache.jackrabbit.oak.spi.commit.ConflictHandler.Resolution#OURS.

THEIRS

public static final ConflictHandler THEIRS

Deprecated.

A ConflictHandler which always return org.apache.jackrabbit.oak.spi.commit.ConflictHandler.Resolution#THEIRS.

Constructor Detail

DefaultConflictHandler

public DefaultConflictHandler(PartialConflictHandler.Resolution resolution)

Deprecated.

Create a new ConflictHandler which always returns resolution.

Parameters:

resolution - the resolution to return from all methods of this ConflictHandler instance.

Method Detail

addExistingProperty

public PartialConflictHandler.Resolution addExistingProperty(NodeBuilder parent,
                                                             PropertyState ours,
                                                             PropertyState theirs)

Deprecated.

Description copied from interface: ConflictHandler

The property ours has been added to parent which conflicts with property theirs which has been added in the persistence store.

Specified by:

addExistingProperty in interface ConflictHandler

Specified by:

addExistingProperty in interface PartialConflictHandler

Parameters:

parent - root of the conflict

ours - our version of the property

theirs - their version of the property

Returns:

Resolution of the conflict

changeDeletedProperty

public PartialConflictHandler.Resolution changeDeletedProperty(NodeBuilder parent,
                                                               PropertyState ours)

Deprecated.

Description copied from interface: ConflictHandler

The property ours has been changed in parent while it was removed in the persistence store.

Specified by:

changeDeletedProperty in interface ConflictHandler

Specified by:

changeDeletedProperty in interface PartialConflictHandler

Parameters:

parent - root of the conflict

ours - our version of the property

Returns:

Resolution of the conflict

changeChangedProperty

public PartialConflictHandler.Resolution changeChangedProperty(NodeBuilder parent,
                                                               PropertyState ours,
                                                               PropertyState theirs)

Deprecated.

Description copied from interface: ConflictHandler

The property ours has been changed in parent while it was also changed to a different value (theirs) in the persistence store.

Specified by:

changeChangedProperty in interface ConflictHandler

Specified by:

changeChangedProperty in interface PartialConflictHandler

Parameters:

parent - root of the conflict

ours - our version of the property

theirs - their version of the property

Returns:

Resolution of the conflict

deleteChangedProperty

public PartialConflictHandler.Resolution deleteChangedProperty(NodeBuilder parent,
                                                               PropertyState theirs)

Deprecated.

Description copied from interface: ConflictHandler

The property theirs changed in the persistence store while it has been deleted locally.

Specified by:

deleteChangedProperty in interface ConflictHandler

Specified by:

deleteChangedProperty in interface PartialConflictHandler

Parameters:

parent - root of the conflict

theirs - their version of the property

Returns:

Resolution of the conflict

deleteDeletedProperty

public PartialConflictHandler.Resolution deleteDeletedProperty(NodeBuilder parent,
                                                               PropertyState ours)

Deprecated.

Description copied from interface: ConflictHandler

The property ours has been removed in parent while it was also removed in the persistence store.

Specified by:

deleteDeletedProperty in interface ConflictHandler

Specified by:

deleteDeletedProperty in interface PartialConflictHandler

Parameters:

parent - root of the conflict

ours - our version of the property

Returns:

Resolution of the conflict

addExistingNode

public PartialConflictHandler.Resolution addExistingNode(NodeBuilder parent,
                                                         String name,
                                                         NodeState ours,
                                                         NodeState theirs)

Deprecated.

Description copied from interface: ConflictHandler

The node ours has been added to parent which conflicts with node theirs which has been added in the persistence store.

Specified by:

addExistingNode in interface ConflictHandler

Specified by:

addExistingNode in interface PartialConflictHandler

Parameters:

parent - root of the conflict

name - name of the node

ours - our version of the node

theirs - their version of the node

Returns:

Resolution of the conflict

changeDeletedNode

public PartialConflictHandler.Resolution changeDeletedNode(NodeBuilder parent,
                                                           String name,
                                                           NodeState ours)

Deprecated.

Description copied from interface: ConflictHandler

The node ours has been changed in parent while it was removed in the persistence store.

Specified by:

changeDeletedNode in interface ConflictHandler

Specified by:

changeDeletedNode in interface PartialConflictHandler

Parameters:

parent - root of the conflict

name - name of the node

ours - our version of the node

Returns:

Resolution of the conflict

deleteChangedNode

public PartialConflictHandler.Resolution deleteChangedNode(NodeBuilder parent,
                                                           String name,
                                                           NodeState theirs)

Deprecated.

Description copied from interface: ConflictHandler

The node theirs changed in the persistence store while it has been deleted locally.

Specified by:

deleteChangedNode in interface ConflictHandler

Specified by:

deleteChangedNode in interface PartialConflictHandler

Parameters:

parent - root of the conflict

name - name of the node

theirs - their version of the node

Returns:

Resolution of the conflict

deleteDeletedNode

public PartialConflictHandler.Resolution deleteDeletedNode(NodeBuilder parent,
                                                           String name)

Deprecated.

Description copied from interface: ConflictHandler

The node name has been removed in parent while it was also removed in the persistence store.

Specified by:

deleteDeletedNode in interface ConflictHandler

Specified by:

deleteDeletedNode in interface PartialConflictHandler

Parameters:

parent - root of the conflict

name - name of the node

Returns:

Resolution of the conflict