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

Class JcrLastModifiedConflictHandler

java.lang.Object

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

org.apache.jackrabbit.oak.plugins.commit.JcrLastModifiedConflictHandler

All Implemented Interfaces:

ThreeWayConflictHandler

public class JcrLastModifiedConflictHandler
extends DefaultThreeWayConflictHandler

Conflict Handler that merges concurrent updates to org.apache.jackrabbit.JcrConstants.JCR_LASTMODIFIED by picking the older of the 2 conflicting dates and org.apache.jackrabbit.JcrConstants.JCR_CREATED by picking the newer of the 2 conflicting dates.

Nested Class Summary

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

ThreeWayConflictHandler.Resolution

Field Summary

Fields inherited from class org.apache.jackrabbit.oak.plugins.commit.DefaultThreeWayConflictHandler

OURS, THEIRS

Constructor Summary

Constructors

Constructor	Description
JcrLastModifiedConflictHandler()

Method Summary

Modifier and Type	Method	Description
@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.

Methods inherited from class org.apache.jackrabbit.oak.plugins.commit.DefaultThreeWayConflictHandler

addExistingNode, changeDeletedNode, changeDeletedProperty, deleteChangedNode, deleteChangedProperty, deleteDeletedNode, deleteDeletedProperty

Methods inherited from class java.lang.Object

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

Constructor Details

JcrLastModifiedConflictHandler

public JcrLastModifiedConflictHandler()

Method Details

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

Overrides:

addExistingProperty in class DefaultThreeWayConflictHandler

Parameters:

parent - root of the conflict

ours - our version of the property

theirs - their 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

Overrides:

changeChangedProperty in class DefaultThreeWayConflictHandler

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