Package org.apache.jackrabbit.oak.spi.commit

Interface ConflictHandler

All Superinterfaces:

PartialConflictHandler

@Deprecated
public interface ConflictHandler
extends PartialConflictHandler

Deprecated.

Use ThreeWayConflictHandler instead.

A ConflictHandler is responsible for handling conflicts which happen on Root.rebase() and on the implicit rebase operation which takes part on Root.commit(). This interface contains one method per type of conflict which might occur. Each of these methods must return a PartialConflictHandler.Resolution for the current conflict. The resolution indicates to use the changes in the current Root instance (PartialConflictHandler.Resolution.OURS) or to use the changes from the underlying persistence store (PartialConflictHandler.Resolution.THEIRS). Alternatively the resolution can also indicate that the changes have been successfully merged by this ConflictHandler instance (PartialConflictHandler.Resolution.MERGED).

Nested Class Summary

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

PartialConflictHandler.Resolution

Method Summary

Modifier and Type	Method	Description
@NotNull PartialConflictHandler.Resolution	addExistingNode(NodeBuilder parent, java.lang.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.
@NotNull PartialConflictHandler.Resolution	addExistingProperty(NodeBuilder parent, org.apache.jackrabbit.oak.api.PropertyState ours, org.apache.jackrabbit.oak.api.PropertyState theirs)	Deprecated. The property ours has been added to parent which conflicts with property theirs which has been added in the persistence store.
@NotNull PartialConflictHandler.Resolution	changeChangedProperty(NodeBuilder parent, org.apache.jackrabbit.oak.api.PropertyState ours, org.apache.jackrabbit.oak.api.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.
@NotNull PartialConflictHandler.Resolution	changeDeletedNode(NodeBuilder parent, java.lang.String name, NodeState ours)	Deprecated. The node ours has been changed in parent while it was removed in the persistence store.
@NotNull PartialConflictHandler.Resolution	changeDeletedProperty(NodeBuilder parent, org.apache.jackrabbit.oak.api.PropertyState ours)	Deprecated. The property ours has been changed in parent while it was removed in the persistence store.
@NotNull PartialConflictHandler.Resolution	deleteChangedNode(NodeBuilder parent, java.lang.String name, NodeState theirs)	Deprecated. The node theirs changed in the persistence store while it has been deleted locally.
@NotNull PartialConflictHandler.Resolution	deleteChangedProperty(NodeBuilder parent, org.apache.jackrabbit.oak.api.PropertyState theirs)	Deprecated. The property theirs changed in the persistence store while it has been deleted locally.
@NotNull PartialConflictHandler.Resolution	deleteDeletedNode(NodeBuilder parent, java.lang.String name)	Deprecated. The node name has been removed in parent while it was also removed in the persistence store.
@NotNull PartialConflictHandler.Resolution	deleteDeletedProperty(NodeBuilder parent, org.apache.jackrabbit.oak.api.PropertyState ours)	Deprecated. The property ours has been removed in parent while it was also removed in the persistence store.

Method Detail

addExistingProperty

@NotNull
@NotNull PartialConflictHandler.Resolution addExistingProperty(NodeBuilder parent,
                                                               org.apache.jackrabbit.oak.api.PropertyState ours,
                                                               org.apache.jackrabbit.oak.api.PropertyState theirs)

Deprecated.

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 PartialConflictHandler

Parameters:

parent - root of the conflict

ours - our version of the property

theirs - their version of the property

Returns:

PartialConflictHandler.Resolution of the conflict

changeDeletedProperty

@NotNull
@NotNull PartialConflictHandler.Resolution changeDeletedProperty(NodeBuilder parent,
                                                                 org.apache.jackrabbit.oak.api.PropertyState ours)

Deprecated.

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

Specified by:

changeDeletedProperty in interface PartialConflictHandler

Parameters:

parent - root of the conflict

ours - our version of the property

Returns:

PartialConflictHandler.Resolution of the conflict

changeChangedProperty

@NotNull
@NotNull PartialConflictHandler.Resolution changeChangedProperty(NodeBuilder parent,
                                                                 org.apache.jackrabbit.oak.api.PropertyState ours,
                                                                 org.apache.jackrabbit.oak.api.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.

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:

PartialConflictHandler.Resolution of the conflict

deleteDeletedProperty

@NotNull
@NotNull PartialConflictHandler.Resolution deleteDeletedProperty(NodeBuilder parent,
                                                                 org.apache.jackrabbit.oak.api.PropertyState ours)

Deprecated.

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

Specified by:

deleteDeletedProperty in interface PartialConflictHandler

Parameters:

parent - root of the conflict

ours - our version of the property

Returns:

PartialConflictHandler.Resolution of the conflict

deleteChangedProperty

@NotNull
@NotNull PartialConflictHandler.Resolution deleteChangedProperty(NodeBuilder parent,
                                                                 org.apache.jackrabbit.oak.api.PropertyState theirs)

Deprecated.

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

Specified by:

deleteChangedProperty in interface PartialConflictHandler

Parameters:

parent - root of the conflict

theirs - their version of the property

Returns:

PartialConflictHandler.Resolution of the conflict

addExistingNode

@NotNull
@NotNull PartialConflictHandler.Resolution addExistingNode(NodeBuilder parent,
                                                           java.lang.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.

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:

PartialConflictHandler.Resolution of the conflict

changeDeletedNode

@NotNull
@NotNull PartialConflictHandler.Resolution changeDeletedNode(NodeBuilder parent,
                                                             java.lang.String name,
                                                             NodeState ours)

Deprecated.

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

Specified by:

changeDeletedNode in interface PartialConflictHandler

Parameters:

parent - root of the conflict

name - name of the node

ours - our version of the node

Returns:

PartialConflictHandler.Resolution of the conflict

deleteChangedNode

@NotNull
@NotNull PartialConflictHandler.Resolution deleteChangedNode(NodeBuilder parent,
                                                             java.lang.String name,
                                                             NodeState theirs)

Deprecated.

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

Specified by:

deleteChangedNode in interface PartialConflictHandler

Parameters:

parent - root of the conflict

name - name of the node

theirs - their version of the node

Returns:

PartialConflictHandler.Resolution of the conflict

deleteDeletedNode

@NotNull
@NotNull PartialConflictHandler.Resolution deleteDeletedNode(NodeBuilder parent,
                                                             java.lang.String name)

Deprecated.

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

Specified by:

deleteDeletedNode in interface PartialConflictHandler

Parameters:

parent - root of the conflict

name - name of the node

Returns:

PartialConflictHandler.Resolution of the conflict