org.apache.jackrabbit.oak.plugins.commit

Class AnnotatingConflictHandler

java.lang.Object

org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler

All Implemented Interfaces:

ThreeWayConflictHandler

public class AnnotatingConflictHandler
extends Object
implements ThreeWayConflictHandler

This ThreeWayConflictHandler implementation resolves conflicts to ThreeWayConflictHandler.Resolution.THEIRS and in addition marks nodes where a conflict occurred with the mixin rep:MergeConflict:

 [rep:MergeConflict]
   mixin
   primaryitem rep:ours
   + rep:ours (rep:Unstructured) protected IGNORE
 

The rep:ours sub node contains our version of the node prior to the conflict.

See Also:

ConflictValidator

Nested Class Summary

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

ThreeWayConflictHandler.Resolution

Constructor Summary

Constructors

Constructor and Description
AnnotatingConflictHandler()

Method Summary

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

Constructor Detail

AnnotatingConflictHandler

public AnnotatingConflictHandler()

Method Detail

addExistingProperty

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

Description copied from interface: ThreeWayConflictHandler

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 ThreeWayConflictHandler

Parameters:

parent - root of the conflict

ours - our version of the property

theirs - their version of the property

Returns:

ThreeWayConflictHandler.Resolution of the conflict

changeDeletedProperty

public ThreeWayConflictHandler.Resolution changeDeletedProperty(NodeBuilder parent,
                                                                PropertyState ours,
                                                                PropertyState base)

Description copied from interface: ThreeWayConflictHandler

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

Specified by:

changeDeletedProperty in interface ThreeWayConflictHandler

Parameters:

parent - root of the conflict

ours - our version of the property

base - the base version of the property

Returns:

ThreeWayConflictHandler.Resolution of the conflict

changeChangedProperty

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

Description copied from interface: ThreeWayConflictHandler

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 ThreeWayConflictHandler

Parameters:

parent - root of the conflict

ours - our version of the property

theirs - their version of the property

base - the base version of the property

Returns:

ThreeWayConflictHandler.Resolution of the conflict

deleteChangedProperty

public ThreeWayConflictHandler.Resolution deleteChangedProperty(NodeBuilder parent,
                                                                PropertyState theirs,
                                                                PropertyState base)

Description copied from interface: ThreeWayConflictHandler

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

Specified by:

deleteChangedProperty in interface ThreeWayConflictHandler

Parameters:

parent - root of the conflict

theirs - their version of the property

base - the base version of the property

Returns:

ThreeWayConflictHandler.Resolution of the conflict

deleteDeletedProperty

public ThreeWayConflictHandler.Resolution deleteDeletedProperty(NodeBuilder parent,
                                                                PropertyState base)

Description copied from interface: ThreeWayConflictHandler

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

Specified by:

deleteDeletedProperty in interface ThreeWayConflictHandler

Parameters:

parent - root of the conflict

base - the base version of the property

Returns:

ThreeWayConflictHandler.Resolution of the conflict

addExistingNode

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

Description copied from interface: ThreeWayConflictHandler

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 ThreeWayConflictHandler

Parameters:

parent - root of the conflict

name - name of the node

ours - our version of the node

theirs - their version of the node

Returns:

ThreeWayConflictHandler.Resolution of the conflict

changeDeletedNode

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

Description copied from interface: ThreeWayConflictHandler

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

Specified by:

changeDeletedNode in interface ThreeWayConflictHandler

Parameters:

parent - root of the conflict

name - name of the node

ours - our version of the node

base - the base version of the node

Returns:

ThreeWayConflictHandler.Resolution of the conflict

deleteChangedNode

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

Description copied from interface: ThreeWayConflictHandler

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

Specified by:

deleteChangedNode in interface ThreeWayConflictHandler

Parameters:

parent - root of the conflict

name - name of the node

theirs - their version of the node

base - the base version of the node

Returns:

ThreeWayConflictHandler.Resolution of the conflict

deleteDeletedNode

public ThreeWayConflictHandler.Resolution deleteDeletedNode(NodeBuilder parent,
                                                            String name,
                                                            NodeState base)

Description copied from interface: ThreeWayConflictHandler

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

Specified by:

deleteDeletedNode in interface ThreeWayConflictHandler

Parameters:

parent - root of the conflict

name - name of the node

base - the base version of the node

Returns:

ThreeWayConflictHandler.Resolution of the conflict