Examples with ConflictHook org.apache.jackrabbit.oak.plugins.commit.ConflictHook used on opensource projects

Example 6 with ConflictHook

use of org.apache.jackrabbit.oak.plugins.commit.ConflictHook in project jackrabbit-oak by apache.

the class Oak method with.

/**
     * Associates the given conflict handler with the repository to be created.
     *
     * @param conflictHandler conflict handler
     * @return this builder
     */
@Nonnull
public Oak with(@Nonnull ConflictHandler conflictHandler) {
    checkNotNull(conflictHandler);
    withEditorHook();
    commitHooks.add(new ConflictHook(conflictHandler));
    return this;
}

Example 7 with ConflictHook

use of org.apache.jackrabbit.oak.plugins.commit.ConflictHook in project jackrabbit-oak by apache.

the class NodeStoreDiffTest method diffWithConflict.

@Test
public void diffWithConflict() throws Exception {
    //Last rev on /var would be 1-0-1
    createNodes("/var/a", "/var/b/b1");
    //1. Dummy commits to bump the version no
    createNodes("/fake/b");
    createNodes("/fake/c");
    //Root rev = 3-0-1
    //Root rev = 3-0-1
    //2. Create a node under /var/a but hold on commit
    NodeBuilder b1 = ns.getRoot().builder();
    createNodes(b1, "/var/a/a1");
    //3. Remove a node under /var/b and commit it
    NodeBuilder b2 = ns.getRoot().builder();
    b2.child("var").child("b").child("b1").remove();
    merge(b2);
    //4. Now merge and commit the changes in b1 and include conflict hooks
    //For now exception would be thrown
    ns.merge(b1, new CompositeHook(new ConflictHook(new AnnotatingConflictHandler()), new EditorHook(new ConflictValidatorProvider())), CommitInfo.EMPTY);
}

Example 8 with ConflictHook

use of org.apache.jackrabbit.oak.plugins.commit.ConflictHook in project jackrabbit-oak by apache.

the class NodeStoreTest method addExistingNodeJCRLastModified.

@Test
public void addExistingNodeJCRLastModified() throws CommitFailedException {
    CommitHook hook = new CompositeHook(new ConflictHook(JcrConflictHandler.createJcrConflictHandler()), new EditorHook(new ConflictValidatorProvider()));
    NodeBuilder b1 = store.getRoot().builder();
    NodeBuilder b2 = store.getRoot().builder();
    Calendar calendar = Calendar.getInstance();
    b1.setChildNode("addExistingNodeJCRLastModified").setProperty(JCR_LASTMODIFIED, calendar);
    calendar.add(Calendar.MINUTE, 1);
    b2.setChildNode("addExistingNodeJCRLastModified").setProperty(JCR_LASTMODIFIED, calendar);
    b1.setChildNode("conflict");
    b2.setChildNode("conflict");
    store.merge(b1, hook, CommitInfo.EMPTY);
    store.merge(b2, hook, CommitInfo.EMPTY);
}