/** * @deprecated Use {@link #of(ThreeWayConflictHandler)} instead. */ @Deprecated public static final ConflictHook of(ConflictHandler handler) { return of(ConflictHandlers.wrap(handler)); }
/** * @deprecated Use {@link #with(ThreeWayConflictHandler)} instead */ @Deprecated @NotNull public final Jcr with(@NotNull PartialConflictHandler conflictHandler) { return with(ConflictHandlers.wrap(conflictHandler)); }
/** * Associates the given conflict handler with the repository to be created. * * @param conflictHandler conflict handler * @return this builder * @deprecated Use {@link #with(ThreeWayConflictHandler)} instead */ @Deprecated @NotNull public Oak with(@NotNull ConflictHandler conflictHandler) { return with(ConflictHandlers.wrap(conflictHandler)); }
/** * @deprecated Use {@link #with(ThreeWayConflictHandler)} instead */ @Deprecated @Nonnull public final Jcr with(@Nonnull PartialConflictHandler conflictHandler) { return with(ConflictHandlers.wrap(conflictHandler)); }
/** * Associates the given conflict handler with the repository to be created. * * @param conflictHandler conflict handler * @return this builder * @deprecated Use {@link #with(ThreeWayConflictHandler)} instead */ @Deprecated @Nonnull public Oak with(@Nonnull ConflictHandler conflictHandler) { return with(ConflictHandlers.wrap(conflictHandler)); }
/** * @deprecated Use {@link #of(ThreeWayConflictHandler)} instead. */ @Deprecated public static final ConflictHook of(ConflictHandler handler) { return of(ConflictHandlers.wrap(handler)); }
/** * @deprecated Use {@link #with(ThreeWayConflictHandler)} instead */ @Deprecated @NotNull public final Jcr with(@NotNull PartialConflictHandler conflictHandler) { return with(ConflictHandlers.wrap(conflictHandler)); }
/** * Associates the given conflict handler with the repository to be created. * * @param conflictHandler conflict handler * @return this builder * @deprecated Use {@link #with(ThreeWayConflictHandler)} instead */ @Deprecated @NotNull public Oak with(@NotNull ConflictHandler conflictHandler) { return with(ConflictHandlers.wrap(conflictHandler)); }
/** * @deprecated Use {@link #of(ThreeWayConflictHandler)} instead. */ @Deprecated public static final ConflictHook of(ConflictHandler handler) { return of(ConflictHandlers.wrap(handler)); }
/** * The conflict handler is a composite of * {@link JcrLastModifiedConflictHandler}, {@link ChildOrderConflictHandler} * and {@link AnnotatingConflictHandler}. */ public static CompositeConflictHandler createJcrConflictHandler() { return new CompositeConflictHandler(ImmutableList.of( new JcrLastModifiedConflictHandler(), ConflictHandlers.wrap(new ChildOrderConflictHandler()), new AnnotatingConflictHandler())); }
/** * The conflict handler is a composite of * {@link JcrLastModifiedConflictHandler}, {@link ChildOrderConflictHandler} * and {@link AnnotatingConflictHandler}. */ public static CompositeConflictHandler createJcrConflictHandler() { return new CompositeConflictHandler(ImmutableList.of( new JcrLastModifiedConflictHandler(), ConflictHandlers.wrap(new ChildOrderConflictHandler()), new AnnotatingConflictHandler())); }
/** * The conflict handler is a composite of * {@link JcrLastModifiedConflictHandler}, {@link ChildOrderConflictHandler} * and {@link AnnotatingConflictHandler}. */ public static CompositeConflictHandler createJcrConflictHandler() { return new CompositeConflictHandler(ImmutableList.of( new JcrLastModifiedConflictHandler(), ConflictHandlers.wrap(new ChildOrderConflictHandler()), new AnnotatingConflictHandler())); }
@Before public void setUp() { repository = new Oak(store) .with(new OpenSecurityProvider()) .with(new CompositeConflictHandler(ImmutableList.of( ConflictHandlers.wrap(new ChildOrderConflictHandler() { /** * Allow deleting changed node. * See {@link TreeTest#removeWithConcurrentOrderBefore()} */ @Override public Resolution deleteChangedNode(NodeBuilder parent, String name, NodeState theirs) { return Resolution.OURS; } }), new AnnotatingConflictHandler() ))) .with(new ConflictValidatorProvider()) .createContentRepository(); }