Interface ThreeWayConflictHandler

    • Method Detail

      • changeChangedProperty

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

        @NotNull
        @NotNull ThreeWayConflictHandler.Resolution addExistingNode​(@NotNull
                                                                    @NotNull NodeBuilder parent,
                                                                    @NotNull
                                                                    @NotNull java.lang.String name,
                                                                    @NotNull
                                                                    @NotNull NodeState ours,
                                                                    @NotNull
                                                                    @NotNull NodeState theirs)
        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:
        ThreeWayConflictHandler.Resolution of the conflict
      • changeDeletedNode

        @NotNull
        @NotNull ThreeWayConflictHandler.Resolution changeDeletedNode​(@NotNull
                                                                      @NotNull NodeBuilder parent,
                                                                      @NotNull
                                                                      @NotNull java.lang.String name,
                                                                      @NotNull
                                                                      @NotNull NodeState ours,
                                                                      @NotNull
                                                                      @NotNull NodeState base)
        The node ours has been changed in parent while it was removed in the persistence store.
        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
        @NotNull ThreeWayConflictHandler.Resolution deleteChangedNode​(@NotNull
                                                                      @NotNull NodeBuilder parent,
                                                                      @NotNull
                                                                      @NotNull java.lang.String name,
                                                                      @NotNull
                                                                      @NotNull NodeState theirs,
                                                                      @NotNull
                                                                      @NotNull NodeState base)
        The node theirs changed in the persistence store while it has been deleted locally.
        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
        @NotNull ThreeWayConflictHandler.Resolution deleteDeletedNode​(@NotNull
                                                                      @NotNull NodeBuilder parent,
                                                                      @NotNull
                                                                      @NotNull java.lang.String name,
                                                                      @NotNull
                                                                      @NotNull NodeState base)
        The node name has been removed in parent while it was also removed in the persistence store.
        Parameters:
        parent - root of the conflict
        name - name of the node
        base - the base version of the node
        Returns:
        ThreeWayConflictHandler.Resolution of the conflict