ThreeWayConflictHandler
instead.@Deprecated
public interface PartialConflictHandler
PartialConflictHandler
is responsible for handling conflicts which happen
on Root.rebase()
and on the implicit rebase operation which
takes part on Root.commit()
.
This interface contains one method per type of conflict which might occur.
Each of these methods may return a PartialConflictHandler.Resolution
for the current conflict or
null
if it cannot resolve the conflict.
The resolution indicates to use the changes in the current Root
instance
(PartialConflictHandler.Resolution.OURS
) or to use the changes from the underlying persistence
store (PartialConflictHandler.Resolution.THEIRS
). Alternatively the resolution can also indicate
that the changes have been successfully merged by this ConflictHandler
instance (PartialConflictHandler.Resolution.MERGED
).
ConflictHandler
Modifier and Type | Interface and Description |
---|---|
static class |
PartialConflictHandler.Resolution
Deprecated.
Resolutions for conflicts
|
Modifier and Type | Method and Description |
---|---|
@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. |
@Nullable PartialConflictHandler.Resolution |
addExistingProperty(NodeBuilder parent,
PropertyState ours,
PropertyState theirs)
Deprecated.
The property
ours has been added to parent which conflicts
with property theirs which has been added in the persistence store. |
@Nullable PartialConflictHandler.Resolution |
changeChangedProperty(NodeBuilder parent,
PropertyState ours,
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. |
@Nullable PartialConflictHandler.Resolution |
changeDeletedNode(NodeBuilder parent,
java.lang.String name,
NodeState ours)
Deprecated.
The node
ours has been changed in parent while it was
removed in the persistence store. |
@Nullable PartialConflictHandler.Resolution |
changeDeletedProperty(NodeBuilder parent,
PropertyState ours)
Deprecated.
The property
ours has been changed in parent while it was
removed in the persistence store. |
@Nullable PartialConflictHandler.Resolution |
deleteChangedNode(NodeBuilder parent,
java.lang.String name,
NodeState theirs)
Deprecated.
The node
theirs changed in the persistence store while it has been
deleted locally. |
@Nullable PartialConflictHandler.Resolution |
deleteChangedProperty(NodeBuilder parent,
PropertyState theirs)
Deprecated.
The property
theirs changed in the persistence store while it has been
deleted locally. |
@Nullable PartialConflictHandler.Resolution |
deleteDeletedNode(NodeBuilder parent,
java.lang.String name)
Deprecated.
The node
name has been removed in parent while it was
also removed in the persistence store. |
@Nullable PartialConflictHandler.Resolution |
deleteDeletedProperty(NodeBuilder parent,
PropertyState ours)
Deprecated.
The property
ours has been removed in parent while it was
also removed in the persistence store. |
@Nullable @Nullable PartialConflictHandler.Resolution addExistingProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs)
ours
has been added to parent
which conflicts
with property theirs
which has been added in the persistence store.parent
- root of the conflictours
- our version of the propertytheirs
- their version of the propertyPartialConflictHandler.Resolution
of the conflict or null
@Nullable @Nullable PartialConflictHandler.Resolution changeDeletedProperty(NodeBuilder parent, PropertyState ours)
ours
has been changed in parent
while it was
removed in the persistence store.parent
- root of the conflictours
- our version of the propertyPartialConflictHandler.Resolution
of the conflict or null
@Nullable @Nullable PartialConflictHandler.Resolution changeChangedProperty(NodeBuilder parent, PropertyState ours, PropertyState theirs)
ours
has been changed in parent
while it was
also changed to a different value (theirs
) in the persistence store.parent
- root of the conflictours
- our version of the propertytheirs
- their version of the propertyPartialConflictHandler.Resolution
of the conflict or null
@Nullable @Nullable PartialConflictHandler.Resolution deleteDeletedProperty(NodeBuilder parent, PropertyState ours)
ours
has been removed in parent
while it was
also removed in the persistence store.parent
- root of the conflictours
- our version of the propertyPartialConflictHandler.Resolution
of the conflict or null
@Nullable @Nullable PartialConflictHandler.Resolution deleteChangedProperty(NodeBuilder parent, PropertyState theirs)
theirs
changed in the persistence store while it has been
deleted locally.parent
- root of the conflicttheirs
- their version of the propertyPartialConflictHandler.Resolution
of the conflict or null
@Nullable @Nullable PartialConflictHandler.Resolution addExistingNode(NodeBuilder parent, java.lang.String name, NodeState ours, NodeState theirs)
ours
has been added to parent
which conflicts
with node theirs
which has been added in the persistence store.parent
- root of the conflictname
- name of the nodeours
- our version of the nodetheirs
- their version of the nodePartialConflictHandler.Resolution
of the conflict or null
@Nullable @Nullable PartialConflictHandler.Resolution changeDeletedNode(NodeBuilder parent, java.lang.String name, NodeState ours)
ours
has been changed in parent
while it was
removed in the persistence store.parent
- root of the conflictname
- name of the nodeours
- our version of the nodePartialConflictHandler.Resolution
of the conflict or null
@Nullable @Nullable PartialConflictHandler.Resolution deleteChangedNode(NodeBuilder parent, java.lang.String name, NodeState theirs)
theirs
changed in the persistence store while it has been
deleted locally.parent
- root of the conflictname
- name of the nodetheirs
- their version of the nodePartialConflictHandler.Resolution
of the conflict or null
@Nullable @Nullable PartialConflictHandler.Resolution deleteDeletedNode(NodeBuilder parent, java.lang.String name)
name
has been removed in parent
while it was
also removed in the persistence store.parent
- root of the conflictname
- name of the nodePartialConflictHandler.Resolution
of the conflict or null
Copyright © 2010 - 2020 Adobe. All Rights Reserved