Package org.apache.jackrabbit.oak.plugins.commit

Class DefaultThreeWayConflictHandler

java.lang.Object

org.apache.jackrabbit.oak.plugins.commit.DefaultThreeWayConflictHandler

All Implemented Interfaces:

ThreeWayConflictHandler

Direct Known Subclasses:

JcrLastModifiedConflictHandler

public class DefaultThreeWayConflictHandler
extends java.lang.Object
implements ThreeWayConflictHandler

This implementation of a ThreeWayConflictHandler 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.ThreeWayConflictHandler

ThreeWayConflictHandler.Resolution

Field Summary

Fields

Modifier and Type	Field	Description
static ThreeWayConflictHandler	OURS	A ConflictHandler which always return ThreeWayConflictHandler.Resolution.OURS.
static ThreeWayConflictHandler	THEIRS	A ConflictHandler which always return ThreeWayConflictHandler.Resolution.THEIRS.

Constructor Summary

Constructors

Constructor	Description
DefaultThreeWayConflictHandler(ThreeWayConflictHandler.Resolution resolution)	Create a new ConflictHandler which always returns resolution.

Method Summary

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

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

Field Detail

OURS

public static final ThreeWayConflictHandler OURS

A ConflictHandler which always return ThreeWayConflictHandler.Resolution.OURS.

THEIRS

public static final ThreeWayConflictHandler THEIRS

A ConflictHandler which always return ThreeWayConflictHandler.Resolution.THEIRS.

Constructor Detail

DefaultThreeWayConflictHandler

public DefaultThreeWayConflictHandler(ThreeWayConflictHandler.Resolution resolution)

Create a new ConflictHandler which always returns resolution.

Parameters:

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

Method Detail

addExistingProperty

@NotNull
public @NotNull ThreeWayConflictHandler.Resolution addExistingProperty(@NotNull
                                                                       @NotNull NodeBuilder parent,
                                                                       @NotNull
                                                                       @NotNull PropertyState ours,
                                                                       @NotNull
                                                                       @NotNull 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

@NotNull
public @NotNull ThreeWayConflictHandler.Resolution changeDeletedProperty(@NotNull
                                                                         @NotNull NodeBuilder parent,
                                                                         @NotNull
                                                                         @NotNull PropertyState ours,
                                                                         @NotNull
                                                                         @NotNull 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

@NotNull
public @NotNull ThreeWayConflictHandler.Resolution changeChangedProperty(@NotNull
                                                                         @NotNull NodeBuilder parent,
                                                                         @NotNull
                                                                         @NotNull PropertyState ours,
                                                                         @NotNull
                                                                         @NotNull PropertyState theirs,
                                                                         @NotNull
                                                                         @NotNull 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

deleteDeletedProperty

@NotNull
public @NotNull ThreeWayConflictHandler.Resolution deleteDeletedProperty(@NotNull
                                                                         @NotNull NodeBuilder parent,
                                                                         @NotNull
                                                                         @NotNull 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

deleteChangedProperty

@NotNull
public @NotNull ThreeWayConflictHandler.Resolution deleteChangedProperty(@NotNull
                                                                         @NotNull NodeBuilder parent,
                                                                         @NotNull
                                                                         @NotNull PropertyState theirs,
                                                                         @NotNull
                                                                         @NotNull 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

addExistingNode

@NotNull
public @NotNull ThreeWayConflictHandler.Resolution addExistingNode(@NotNull
                                                                   @NotNull NodeBuilder parent,
                                                                   @NotNull
                                                                   @NotNull java.lang.String name,
                                                                   @NotNull
                                                                   @NotNull NodeState ours,
                                                                   @NotNull
                                                                   @NotNull 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

@NotNull
public @NotNull ThreeWayConflictHandler.Resolution changeDeletedNode(@NotNull
                                                                     @NotNull NodeBuilder parent,
                                                                     @NotNull
                                                                     @NotNull java.lang.String name,
                                                                     @NotNull
                                                                     @NotNull NodeState ours,
                                                                     @NotNull
                                                                     @NotNull 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

@NotNull
public @NotNull ThreeWayConflictHandler.Resolution deleteChangedNode(@NotNull
                                                                     @NotNull NodeBuilder parent,
                                                                     @NotNull
                                                                     @NotNull java.lang.String name,
                                                                     @NotNull
                                                                     @NotNull NodeState theirs,
                                                                     @NotNull
                                                                     @NotNull 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

@NotNull
public @NotNull ThreeWayConflictHandler.Resolution deleteDeletedNode(@NotNull
                                                                     @NotNull NodeBuilder parent,
                                                                     @NotNull
                                                                     @NotNull java.lang.String name,
                                                                     @NotNull
                                                                     @NotNull 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