NodeDocument extends Document { @NotNull Set<Revision> getConflictsFor(@NotNull Iterable<Revision> changes) { checkNotNull(changes); Set<Revision> conflicts = Sets.newHashSet(); Map<Revision, String> collisions = getLocalMap(COLLISIONS); for (Revision r : changes) { String value = collisions.get(r.asTrunkRevision()); if (value == null) { continue; } try { conflicts.add(Revision.fromString(value)); } catch (IllegalArgumentException e) { } } return conflicts; } NodeDocument(@NotNull DocumentStore store);  NodeDocument(@NotNull DocumentStore store, long creationTime); static long getModifiedInSecs(long timestamp); @NotNull Map<Revision, String> getValueMap(@NotNull String key); long getCreated(); @Nullable Long getModified(); boolean hasChildren(); boolean wasDeletedOnce(); boolean hasBeenModifiedSince(long lastModifiedTime); boolean hasAllRevisionLessThan(long maxRevisionTime); boolean isSplitDocument(); SplitDocType getSplitDocType(); void markUpToDate(long checkTime); long getLastCheckTime(); boolean hasBinary(); @NotNull Path getMainPath(); @NotNull Map<Integer, Revision> getLastRev(); boolean containsRevision(@NotNull Revision revision); @Nullable Path getCommitRootPath(Revision revision); @Nullable DocumentNodeState getNodeAtRevision(@NotNull DocumentNodeStore nodeStore,
                                               @NotNull RevisionVector readRevision,
                                               @Nullable Revision lastModified); @Nullable Revision getLiveRevision(RevisionContext context,
                                    RevisionVector readRevision,
                                    Map<Revision, String> validRevisions,
                                    LastRevs lastRevs); @NotNull Iterable<UpdateOp> split(@NotNull RevisionContext context,
                                    @NotNull RevisionVector head,
                                    @NotNull Function<String, Long> binarySize); @NotNull Set<Revision> getLocalBranchCommits(); static void setChildrenFlag(@NotNull UpdateOp op,
                                       boolean hasChildNode); static void setModified(@NotNull UpdateOp op,
                                   @NotNull Revision revision); static void setRevision(@NotNull UpdateOp op,
                                   @NotNull Revision revision,
                                   @NotNull String commitValue); static void unsetRevision(@NotNull UpdateOp op,
                                     @NotNull Revision revision); static boolean isRevisionsEntry(String name); static boolean isCommitRootEntry(String name); static boolean isDeletedEntry(String name); static boolean isLastRevEntry(String name); static void removeRevision(@NotNull UpdateOp op,
                                      @NotNull Revision revision); static void addCollision(@NotNull UpdateOp op,
                                    @NotNull Revision revision,
                                    @NotNull Revision other); static void removeCollision(@NotNull UpdateOp op,
                                       @NotNull Revision revision); static void setLastRev(@NotNull UpdateOp op,
                                  @NotNull Revision revision); static void setCommitRoot(@NotNull UpdateOp op,
                                     @NotNull Revision revision,
                                     int commitRootDepth); static void removeCommitRoot(@NotNull UpdateOp op,
                                        @NotNull Revision revision); static void unsetCommitRoot(@NotNull UpdateOp op,
                                       @NotNull Revision revision); static void setDeleted(@NotNull UpdateOp op,
                                  @NotNull Revision revision,
                                  boolean deleted); static void setDeletedOnce(@NotNull UpdateOp op); static void removeDeleted(@NotNull UpdateOp op,
                                     @NotNull Revision revision); static void setPrevious(@NotNull UpdateOp op,
                                   @NotNull Range range); static void removePrevious(@NotNull UpdateOp op,
                                      @NotNull Range range); static void removePrevious(@NotNull UpdateOp op,
                                      @NotNull Revision revision); static void setStalePrevious(@NotNull UpdateOp op,
                                        @NotNull Revision revision,
                                        int height); static void removeStalePrevious(@NotNull UpdateOp op,
                                           @NotNull Revision revision); static void setHasBinary(@NotNull UpdateOp op); static void setBranchCommit(@NotNull UpdateOp op,
                                       @NotNull Revision revision); static void removeBranchCommit(@NotNull UpdateOp op,
                                          @NotNull Revision revision); static void setSweepRevision(@NotNull UpdateOp op,
                                        @NotNull Revision revision); static void hasLastRev(@NotNull UpdateOp op,
                                  @NotNull Revision revision); @NotNull Path getPath(); String asString(); static NodeDocument fromString(DocumentStore store, String s); static final NodeDocument NULL; static final String MIN_ID_VALUE; static final String MAX_ID_VALUE; static final String COLLISIONS; static final String MODIFIED_IN_SECS; static final String DELETED_ONCE; static final String PATH; static final String HAS_BINARY_FLAG; static final String SD_TYPE; static final String SD_MAX_REV_TIME_IN_SECS; static final long HAS_BINARY_VAL; }
@Test public void getConflictsFor() { MemoryDocumentStore docStore = new MemoryDocumentStore(); String id = Utils.getPathFromId("/"); NodeDocument doc = new NodeDocument(docStore); doc.put(Document.ID, id); Iterable<Revision> branchCommits = Collections.emptyList(); Set<Revision> conflicts = doc.getConflictsFor(branchCommits); assertTrue(conflicts.isEmpty()); UpdateOp op = new UpdateOp(id, false); Revision r0 = Revision.newRevision(1); Revision r1 = Revision.newRevision(1); Revision c1 = Revision.newRevision(1); Revision r2 = Revision.newRevision(1); Revision c2 = Revision.newRevision(1); op.setMapEntry(COLLISIONS, r0, String.valueOf(true)); NodeDocument.addCollision(op, r1, c1); NodeDocument.addCollision(op, r2, c2); UpdateUtils.applyChanges(doc, op); branchCommits = Collections.singleton(r0); conflicts = doc.getConflictsFor(branchCommits); assertTrue(conflicts.isEmpty()); branchCommits = Collections.singleton(r1.asBranchRevision()); conflicts = doc.getConflictsFor(branchCommits); assertEquals(newHashSet(c1), conflicts); branchCommits = Collections.singleton(r2.asBranchRevision()); conflicts = doc.getConflictsFor(branchCommits); assertEquals(newHashSet(c2), conflicts); branchCommits = Lists.newArrayList(r1.asBranchRevision(), r2.asBranchRevision()); conflicts = doc.getConflictsFor(branchCommits); assertEquals(newHashSet(c1, c2), conflicts); branchCommits = Lists.newArrayList(r2.asBranchRevision(), r1.asBranchRevision()); conflicts = doc.getConflictsFor(branchCommits); assertEquals(newHashSet(c1, c2), conflicts); }