Interface PartialConflictHandler

    • Method Detail

      • addExistingProperty

        @Nullable
        @Nullable 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.
        Parameters:
        parent - root of the conflict
        ours - our version of the property
        theirs - their version of the property
        Returns:
        PartialConflictHandler.Resolution of the conflict or null
      • changeDeletedProperty

        @Nullable
        @Nullable 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.
        Parameters:
        parent - root of the conflict
        ours - our version of the property
        Returns:
        PartialConflictHandler.Resolution of the conflict or null
      • changeChangedProperty

        @Nullable
        @Nullable 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.
        Parameters:
        parent - root of the conflict
        ours - our version of the property
        theirs - their version of the property
        Returns:
        PartialConflictHandler.Resolution of the conflict or null
      • deleteDeletedProperty

        @Nullable
        @Nullable 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.
        Parameters:
        parent - root of the conflict
        ours - our version of the property
        Returns:
        PartialConflictHandler.Resolution of the conflict or null
      • deleteChangedProperty

        @Nullable
        @Nullable 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.
        Parameters:
        parent - root of the conflict
        theirs - their version of the property
        Returns:
        PartialConflictHandler.Resolution of the conflict or null
      • addExistingNode

        @Nullable
        @Nullable 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.
        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 or null