Package org.apache.jackrabbit.oak.spi.state

Class ConflictAnnotatingRebaseDiff

java.lang.Object

org.apache.jackrabbit.oak.spi.state.AbstractRebaseDiff

org.apache.jackrabbit.oak.spi.state.ConflictAnnotatingRebaseDiff

All Implemented Interfaces:

NodeStateDiff

public class ConflictAnnotatingRebaseDiff
extends AbstractRebaseDiff

This implementation of AbstractRebaseDiff implements a NodeStateDiff, which performs the conflict handling as defined in NodeStore.rebase(NodeBuilder) on the Oak SPI state level by annotating conflicting items with conflict markers.

Field Summary

Fields

Modifier and Type	Field	Description
static final String	BASE
static final String	CONFLICT
static final String	OURS

Constructor Summary

Constructors

Constructor	Description
ConflictAnnotatingRebaseDiff(NodeBuilder builder)

Method Summary

Methods inherited from class org.apache.jackrabbit.oak.spi.state.AbstractRebaseDiff

childNodeAdded, childNodeChanged, childNodeDeleted, propertyAdded, propertyChanged, propertyDeleted

Methods inherited from class java.lang.Object

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

Field Details

CONFLICT

public static final String CONFLICT

See Also:

• Constant Field Values

BASE

public static final String BASE

See Also:

• Constant Field Values

OURS

public static final String OURS

See Also:

• Constant Field Values

Constructor Details

ConflictAnnotatingRebaseDiff

public ConflictAnnotatingRebaseDiff(NodeBuilder builder)