Class ChildOrderConflictHandler
- java.lang.Object
 - 
- org.apache.jackrabbit.oak.plugins.commit.ChildOrderConflictHandler
 
 
- 
- All Implemented Interfaces:
 PartialConflictHandler
public class ChildOrderConflictHandler extends java.lang.Object implements PartialConflictHandler
This conflict handler instance takes care of properly merging conflicts occurring by concurrent reorder operations.- See Also:
 TreeConstants.OAK_CHILD_ORDER
 
- 
- 
Nested Class Summary
- 
Nested classes/interfaces inherited from interface org.apache.jackrabbit.oak.spi.commit.PartialConflictHandler
PartialConflictHandler.Resolution 
 - 
 
- 
Constructor Summary
Constructors Constructor Description ChildOrderConflictHandler() 
- 
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description PartialConflictHandler.ResolutionaddExistingNode(NodeBuilder parent, java.lang.String name, NodeState ours, NodeState theirs)The nodeourshas been added toparentwhich conflicts with nodetheirswhich has been added in the persistence store.PartialConflictHandler.ResolutionaddExistingProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs)The propertyourshas been added toparentwhich conflicts with propertytheirswhich has been added in the persistence store.PartialConflictHandler.ResolutionchangeChangedProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs)The propertyourshas been changed inparentwhile it was also changed to a different value (theirs) in the persistence store.PartialConflictHandler.ResolutionchangeDeletedNode(NodeBuilder parent, java.lang.String name, NodeState ours)The nodeourshas been changed inparentwhile it was removed in the persistence store.PartialConflictHandler.ResolutionchangeDeletedProperty(NodeBuilder parent, PropertyState ours)The propertyourshas been changed inparentwhile it was removed in the persistence store.PartialConflictHandler.ResolutiondeleteChangedNode(NodeBuilder parent, java.lang.String name, NodeState theirs)The nodetheirschanged in the persistence store while it has been deleted locally.PartialConflictHandler.ResolutiondeleteChangedProperty(NodeBuilder parent, PropertyState theirs)The propertytheirschanged in the persistence store while it has been deleted locally.PartialConflictHandler.ResolutiondeleteDeletedNode(NodeBuilder parent, java.lang.String name)The nodenamehas been removed inparentwhile it was also removed in the persistence store.PartialConflictHandler.ResolutiondeleteDeletedProperty(NodeBuilder parent, PropertyState ours)The propertyourshas been removed inparentwhile it was also removed in the persistence store. 
 - 
 
- 
- 
Method Detail
- 
addExistingProperty
public PartialConflictHandler.Resolution addExistingProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs)
Description copied from interface:PartialConflictHandlerThe propertyourshas been added toparentwhich conflicts with propertytheirswhich has been added in the persistence store.- Specified by:
 addExistingPropertyin interfacePartialConflictHandler- Parameters:
 parent- root of the conflictours- our version of the propertytheirs- their version of the property- Returns:
 PartialConflictHandler.Resolutionof the conflict ornull
 
- 
changeDeletedProperty
public PartialConflictHandler.Resolution changeDeletedProperty(NodeBuilder parent, PropertyState ours)
Description copied from interface:PartialConflictHandlerThe propertyourshas been changed inparentwhile it was removed in the persistence store.- Specified by:
 changeDeletedPropertyin interfacePartialConflictHandler- Parameters:
 parent- root of the conflictours- our version of the property- Returns:
 PartialConflictHandler.Resolutionof the conflict ornull
 
- 
changeChangedProperty
public PartialConflictHandler.Resolution changeChangedProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs)
Description copied from interface:PartialConflictHandlerThe propertyourshas been changed inparentwhile it was also changed to a different value (theirs) in the persistence store.- Specified by:
 changeChangedPropertyin interfacePartialConflictHandler- Parameters:
 parent- root of the conflictours- our version of the propertytheirs- their version of the property- Returns:
 PartialConflictHandler.Resolutionof the conflict ornull
 
- 
deleteDeletedProperty
public PartialConflictHandler.Resolution deleteDeletedProperty(NodeBuilder parent, PropertyState ours)
Description copied from interface:PartialConflictHandlerThe propertyourshas been removed inparentwhile it was also removed in the persistence store.- Specified by:
 deleteDeletedPropertyin interfacePartialConflictHandler- Parameters:
 parent- root of the conflictours- our version of the property- Returns:
 PartialConflictHandler.Resolutionof the conflict ornull
 
- 
deleteChangedProperty
public PartialConflictHandler.Resolution deleteChangedProperty(NodeBuilder parent, PropertyState theirs)
Description copied from interface:PartialConflictHandlerThe propertytheirschanged in the persistence store while it has been deleted locally.- Specified by:
 deleteChangedPropertyin interfacePartialConflictHandler- Parameters:
 parent- root of the conflicttheirs- their version of the property- Returns:
 PartialConflictHandler.Resolutionof the conflict ornull
 
- 
addExistingNode
public PartialConflictHandler.Resolution addExistingNode(NodeBuilder parent, java.lang.String name, NodeState ours, NodeState theirs)
Description copied from interface:PartialConflictHandlerThe nodeourshas been added toparentwhich conflicts with nodetheirswhich has been added in the persistence store.- Specified by:
 addExistingNodein interfacePartialConflictHandler- Parameters:
 parent- root of the conflictname- name of the nodeours- our version of the nodetheirs- their version of the node- Returns:
 PartialConflictHandler.Resolutionof the conflict ornull
 
- 
changeDeletedNode
public PartialConflictHandler.Resolution changeDeletedNode(NodeBuilder parent, java.lang.String name, NodeState ours)
Description copied from interface:PartialConflictHandlerThe nodeourshas been changed inparentwhile it was removed in the persistence store.- Specified by:
 changeDeletedNodein interfacePartialConflictHandler- Parameters:
 parent- root of the conflictname- name of the nodeours- our version of the node- Returns:
 PartialConflictHandler.Resolutionof the conflict ornull
 
- 
deleteChangedNode
public PartialConflictHandler.Resolution deleteChangedNode(NodeBuilder parent, java.lang.String name, NodeState theirs)
Description copied from interface:PartialConflictHandlerThe nodetheirschanged in the persistence store while it has been deleted locally.- Specified by:
 deleteChangedNodein interfacePartialConflictHandler- Parameters:
 parent- root of the conflictname- name of the nodetheirs- their version of the node- Returns:
 PartialConflictHandler.Resolutionof the conflict ornull
 
- 
deleteDeletedNode
public PartialConflictHandler.Resolution deleteDeletedNode(NodeBuilder parent, java.lang.String name)
Description copied from interface:PartialConflictHandlerThe nodenamehas been removed inparentwhile it was also removed in the persistence store.- Specified by:
 deleteDeletedNodein interfacePartialConflictHandler- Parameters:
 parent- root of the conflictname- name of the node- Returns:
 PartialConflictHandler.Resolutionof the conflict ornull
 
 - 
 
 -