Package org.apache.jackrabbit.oak.plugins.commit

Class ConflictHook

java.lang.Object

org.apache.jackrabbit.oak.plugins.commit.ConflictHook

All Implemented Interfaces:

CommitHook

public class ConflictHook
extends Object
implements CommitHook

This commit hook implementation is responsible for resolving conflicts. It does so by detecting the presence of conflict markers added by the Microkernel and delegating to a ThreeWayConflictHandler for resolving the conflicts.

See Also:

• NodeStore.rebase(org.apache.jackrabbit.oak.spi.state.NodeBuilder)

Constructor Summary

Constructors

Constructor	Description
ConflictHook(ThreeWayConflictHandler conflictHandler)	Create a new instance of the conflict hook using the passed conflict handler for resolving conflicts.

Method Summary

Modifier and Type	Method	Description
static final ConflictHook	of(ConflictHandler handler)	Deprecated. Use of(ThreeWayConflictHandler) instead.
static final ConflictHook	of(ThreeWayConflictHandler handler)
@NotNull NodeState	processCommit(NodeState before, NodeState after, CommitInfo info)	Validates and/or modifies the given content change before it gets persisted.

Methods inherited from class java.lang.Object

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

Constructor Details

ConflictHook

public ConflictHook(ThreeWayConflictHandler conflictHandler)

Create a new instance of the conflict hook using the passed conflict handler for resolving conflicts.

Parameters:

conflictHandler - a conflict handler

Method Details

of

@Deprecated
public static final ConflictHook of(ConflictHandler handler)

Deprecated.

Use of(ThreeWayConflictHandler) instead.

of

public static final ConflictHook of(ThreeWayConflictHandler handler)

processCommit

@NotNull
public @NotNull NodeState processCommit(NodeState before,
 NodeState after,
 CommitInfo info)
                                 throws CommitFailedException

Description copied from interface: CommitHook

Validates and/or modifies the given content change before it gets persisted.

Specified by:

processCommit in interface CommitHook

Parameters:

before - content tree before the commit

after - content tree prepared for the commit

info - metadata associated with this commit

Returns:

content tree to be committed

Throws:

CommitFailedException - if the commit should be rejected