Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java Wed Nov 7 14:46:03 2018 @@ -32,10 +32,6 @@ import java.util.TreeMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.AbstractIterator; @@ -52,6 +48,8 @@ import org.apache.jackrabbit.oak.commons import org.apache.jackrabbit.oak.commons.json.JsopWriter; import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore; import org.apache.jackrabbit.oak.plugins.document.util.Utils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -357,7 +355,7 @@ public final class NodeDocument extends private final long creationTime; - NodeDocument(@Nonnull DocumentStore store) { + NodeDocument(@NotNull DocumentStore store) { this(store, Revision.getCurrentTimestamp()); } @@ -368,7 +366,7 @@ public final class NodeDocument extends * @param creationTime time at which it was created. Would be different from current time * in case of being resurrected from a serialized for */ - public NodeDocument(@Nonnull DocumentStore store, long creationTime) { + public NodeDocument(@NotNull DocumentStore store, long creationTime) { this.store = checkNotNull(store); this.creationTime = creationTime; } @@ -382,8 +380,8 @@ public final class NodeDocument extends * @param key a string key. * @return the map associated with the key. */ - @Nonnull - public Map<Revision, String> getValueMap(@Nonnull String key) { + @NotNull + public Map<Revision, String> getValueMap(@NotNull String key) { return ValueMap.create(this, key); } @@ -400,7 +398,7 @@ public final class NodeDocument extends * @return the time in seconds this document was last modified with five * seconds precision. Returns {@code null} if none is set. */ - @CheckForNull + @Nullable public Long getModified() { return (Long) get(MODIFIED_IN_SECS); } @@ -498,7 +496,7 @@ public final class NodeDocument extends * * @return the path of the main document. */ - @Nonnull + @NotNull public String getMainPath() { String p = getPath(); if (p.startsWith("p")) { @@ -516,7 +514,7 @@ public final class NodeDocument extends /** * @return a map of the last known revision for each clusterId. */ - @Nonnull + @NotNull public Map<Integer, Revision> getLastRev() { Map<Integer, Revision> map = Maps.newHashMap(); Map<Revision, String> valueMap = getLocalMap(LAST_REV); @@ -539,7 +537,7 @@ public final class NodeDocument extends * @param revision the revision to check. * @return <code>true</code> if this document contains the given revision. */ - public boolean containsRevision(@Nonnull Revision revision) { + public boolean containsRevision(@NotNull Revision revision) { if (getLocalRevisions().containsKey(revision)) { return true; } @@ -621,8 +619,8 @@ public final class NodeDocument extends * @param changes the changes to check. * @return the conflict revisions. */ - @Nonnull - Set<Revision> getConflictsFor(@Nonnull Iterable<Revision> changes) { + @NotNull + Set<Revision> getConflictsFor(@NotNull Iterable<Revision> changes) { checkNotNull(changes); Set<Revision> conflicts = Sets.newHashSet(); @@ -649,7 +647,7 @@ public final class NodeDocument extends * @param revision a revision. * @return the commit root path or <code>null</code>. */ - @CheckForNull + @Nullable public String getCommitRootPath(Revision revision) { String depth = getCommitRootDepth(revision); if (depth != null) { @@ -687,7 +685,7 @@ public final class NodeDocument extends * {@code null} if {@code changeRev} is not a branch commit. * @param collisions changes that happened after {@code baseRev}. */ - @CheckForNull + @Nullable Revision getNewestRevision(final RevisionContext context, final RevisionVector baseRev, final Revision changeRev, @@ -866,11 +864,11 @@ public final class NodeDocument extends * @return <code>true</code> if the revision is valid; <code>false</code> * otherwise. */ - private boolean isValidRevision(@Nonnull RevisionContext context, - @Nonnull Revision rev, + private boolean isValidRevision(@NotNull RevisionContext context, + @NotNull Revision rev, @Nullable String commitValue, - @Nonnull RevisionVector readRevision, - @Nonnull Map<Revision, String> validRevisions) { + @NotNull RevisionVector readRevision, + @NotNull Map<Revision, String> validRevisions) { if (validRevisions.containsKey(rev)) { return true; } @@ -906,9 +904,9 @@ public final class NodeDocument extends * @return the node or <code>null</code> if the node doesn't exist at the * given read revision. */ - @CheckForNull - public DocumentNodeState getNodeAtRevision(@Nonnull DocumentNodeStore nodeStore, - @Nonnull RevisionVector readRevision, + @Nullable + public DocumentNodeState getNodeAtRevision(@NotNull DocumentNodeStore nodeStore, + @NotNull RevisionVector readRevision, @Nullable Revision lastModified) { Map<Revision, String> validRevisions = Maps.newHashMap(); Branch branch = nodeStore.getBranches().getBranch(readRevision); @@ -1031,7 +1029,7 @@ public final class NodeDocument extends * @return the earliest revision, or null if the node is deleted at the * given revision */ - @CheckForNull + @Nullable public Revision getLiveRevision(RevisionContext context, RevisionVector readRevision, Map<Revision, String> validRevisions, @@ -1056,9 +1054,9 @@ public final class NodeDocument extends * @param enableConcurrentAddRemove feature flag for OAK-2673. * @return <code>true</code> if conflicting, <code>false</code> otherwise. */ - boolean isConflicting(@Nonnull UpdateOp op, - @Nonnull RevisionVector baseRevision, - @Nonnull Revision commitRevision, + boolean isConflicting(@NotNull UpdateOp op, + @NotNull RevisionVector baseRevision, + @NotNull Revision commitRevision, boolean enableConcurrentAddRemove) { // did existence of node change after baseRevision? // only check local deleted map, which contains the most @@ -1169,10 +1167,10 @@ public final class NodeDocument extends * JSON property value String. * @return the split operations. */ - @Nonnull - public Iterable<UpdateOp> split(@Nonnull RevisionContext context, - @Nonnull RevisionVector head, - @Nonnull Function<String, Long> binarySize) { + @NotNull + public Iterable<UpdateOp> split(@NotNull RevisionContext context, + @NotNull RevisionVector head, + @NotNull Function<String, Long> binarySize) { return SplitOperations.forDocument(this, context, head, binarySize, NUM_REVS_THRESHOLD); } @@ -1186,7 +1184,7 @@ public final class NodeDocument extends * * @return the previous ranges for this document. */ - @Nonnull + @NotNull NavigableMap<Revision, Range> getPreviousRanges() { return getPreviousRanges(false); } @@ -1198,7 +1196,7 @@ public final class NodeDocument extends * @param includeStale whether stale revision ranges are included or not. * @return the previous ranges for this document. */ - @Nonnull + @NotNull NavigableMap<Revision, Range> getPreviousRanges(boolean includeStale) { if (includeStale) { return createPreviousRanges(true); @@ -1217,7 +1215,7 @@ public final class NodeDocument extends * @param includeStale whether stale revision ranges are included or not. * @return the previous ranges for this document. */ - @Nonnull + @NotNull private NavigableMap<Revision, Range> createPreviousRanges(boolean includeStale) { NavigableMap<Revision, Range> ranges; Map<Revision, String> map = getLocalMap(PREVIOUS); @@ -1253,8 +1251,8 @@ public final class NodeDocument extends * @param revision the revision to match or <code>null</code>. * @return previous documents. */ - @Nonnull - Iterable<NodeDocument> getPreviousDocs(@Nonnull final String property, + @NotNull + Iterable<NodeDocument> getPreviousDocs(@NotNull final String property, @Nullable final Revision revision) { if (getPreviousRanges().isEmpty()) { return Collections.emptyList(); @@ -1312,7 +1310,7 @@ public final class NodeDocument extends return doc; } - @Nonnull + @NotNull Iterator<NodeDocument> getAllPreviousDocs() { if (getPreviousRanges().isEmpty()) { return Collections.emptyIterator(); @@ -1347,7 +1345,7 @@ public final class NodeDocument extends * * @return the leaf documents in descending order. */ - @Nonnull + @NotNull Iterator<NodeDocument> getPreviousDocLeaves() { if (getPreviousRanges().isEmpty()) { return Collections.emptyIterator(); @@ -1384,7 +1382,7 @@ public final class NodeDocument extends }; } - @CheckForNull + @Nullable private NodeDocument getPreviousDoc(Revision rev, Range range){ int h = range.height; String prevId = Utils.getPreviousIdFor(getMainPath(), rev, h); @@ -1458,9 +1456,9 @@ public final class NodeDocument extends * @param min the lower bound revision (exclusive). * @return changes back to {@code min} revision. */ - @Nonnull - Iterable<Revision> getChanges(@Nonnull final String property, - @Nonnull final RevisionVector min) { + @NotNull + Iterable<Revision> getChanges(@NotNull final String property, + @NotNull final RevisionVector min) { Predicate<Revision> p = new Predicate<Revision>() { @Override public boolean apply(Revision input) { @@ -1494,9 +1492,9 @@ public final class NodeDocument extends * @param readRevision the read revision vector. * @return property changes visible from the given read revision vector. */ - @Nonnull - Iterable<Map.Entry<Revision, String>> getVisibleChanges(@Nonnull final String property, - @Nonnull final RevisionVector readRevision) { + @NotNull + Iterable<Map.Entry<Revision, String>> getVisibleChanges(@NotNull final String property, + @NotNull final RevisionVector readRevision) { Predicate<Map.Entry<Revision, String>> p = new Predicate<Map.Entry<Revision, String>>() { @Override public boolean apply(Map.Entry<Revision, String> input) { @@ -1531,9 +1529,9 @@ public final class NodeDocument extends * @param readRevision collect changes for this part of the readRevision. * @param changes where to add the changes to. */ - private void collectVisiblePreviousChanges(@Nonnull final String property, - @Nonnull final Revision readRevision, - @Nonnull final List<Iterable<Entry<Revision, String>>> changes) { + private void collectVisiblePreviousChanges(@NotNull final String property, + @NotNull final Revision readRevision, + @NotNull final List<Iterable<Entry<Revision, String>>> changes) { List<Iterable<Map.Entry<Revision, String>>> revs = Lists.newArrayList(); RevisionVector readRV = new RevisionVector(readRevision); @@ -1627,7 +1625,7 @@ public final class NodeDocument extends * @param key the key. * @return local value map. */ - @Nonnull + @NotNull SortedMap<Revision, String> getLocalMap(String key) { @SuppressWarnings("unchecked") SortedMap<Revision, String> map = (SortedMap<Revision, String>) data.get(key); @@ -1640,22 +1638,22 @@ public final class NodeDocument extends /** * @return the {@link #REVISIONS} stored on this document. */ - @Nonnull + @NotNull SortedMap<Revision, String> getLocalRevisions() { return getLocalMap(REVISIONS); } - @Nonnull + @NotNull SortedMap<Revision, String> getLocalCommitRoot() { return getLocalMap(COMMIT_ROOT); } - @Nonnull + @NotNull SortedMap<Revision, String> getLocalDeleted() { return getLocalMap(DELETED); } - @Nonnull + @NotNull SortedMap<Revision, String> getStalePrev() { return getLocalMap(STALE_PREV); } @@ -1665,7 +1663,7 @@ public final class NodeDocument extends * ({@link #BRANCH_COMMITS}). This method does not consider previous * documents, but only returns the entries on this document. */ - @Nonnull + @NotNull public Set<Revision> getLocalBranchCommits() { return getLocalMap(BRANCH_COMMITS).keySet(); } @@ -1678,7 +1676,7 @@ public final class NodeDocument extends * @param revision the revision of a change on this document. * @return the commit value associated with the change. */ - @CheckForNull + @Nullable String resolveCommitValue(Revision revision) { NodeDocument commitRoot = getCommitRoot(revision); if (commitRoot == null) { @@ -1694,7 +1692,7 @@ public final class NodeDocument extends * * @return the sweep revisions as a {@link RevisionVector}. */ - @Nonnull + @NotNull RevisionVector getSweepRevisions() { return new RevisionVector(transform(getLocalMap(SWEEP_REV).values(), new Function<String, Revision>() { @@ -1707,25 +1705,25 @@ public final class NodeDocument extends //-------------------------< UpdateOp modifiers >--------------------------- - public static void setChildrenFlag(@Nonnull UpdateOp op, + public static void setChildrenFlag(@NotNull UpdateOp op, boolean hasChildNode) { checkNotNull(op).set(CHILDREN_FLAG, hasChildNode); } - public static void setModified(@Nonnull UpdateOp op, - @Nonnull Revision revision) { + public static void setModified(@NotNull UpdateOp op, + @NotNull Revision revision) { checkNotNull(op).max(MODIFIED_IN_SECS, getModifiedInSecs(checkNotNull(revision).getTimestamp())); } - public static void setRevision(@Nonnull UpdateOp op, - @Nonnull Revision revision, - @Nonnull String commitValue) { + public static void setRevision(@NotNull UpdateOp op, + @NotNull Revision revision, + @NotNull String commitValue) { checkNotNull(op).setMapEntry(REVISIONS, checkNotNull(revision), checkNotNull(commitValue)); } - public static void unsetRevision(@Nonnull UpdateOp op, - @Nonnull Revision revision) { + public static void unsetRevision(@NotNull UpdateOp op, + @NotNull Revision revision) { checkNotNull(op).unsetMapEntry(REVISIONS, checkNotNull(revision)); } @@ -1745,8 +1743,8 @@ public final class NodeDocument extends return LAST_REV.equals(name); } - public static void removeRevision(@Nonnull UpdateOp op, - @Nonnull Revision revision) { + public static void removeRevision(@NotNull UpdateOp op, + @NotNull Revision revision) { checkNotNull(op).removeMapEntry(REVISIONS, checkNotNull(revision)); } @@ -1757,44 +1755,44 @@ public final class NodeDocument extends * @param revision the commit for which a collision was detected. * @param other the revision for the commit, which detected the collision. */ - public static void addCollision(@Nonnull UpdateOp op, - @Nonnull Revision revision, - @Nonnull Revision other) { + public static void addCollision(@NotNull UpdateOp op, + @NotNull Revision revision, + @NotNull Revision other) { checkNotNull(op).setMapEntry(COLLISIONS, checkNotNull(revision), other.toString()); } - public static void removeCollision(@Nonnull UpdateOp op, - @Nonnull Revision revision) { + public static void removeCollision(@NotNull UpdateOp op, + @NotNull Revision revision) { checkNotNull(op).removeMapEntry(COLLISIONS, checkNotNull(revision)); } - public static void setLastRev(@Nonnull UpdateOp op, - @Nonnull Revision revision) { + public static void setLastRev(@NotNull UpdateOp op, + @NotNull Revision revision) { checkNotNull(op).setMapEntry(LAST_REV, new Revision(0, 0, revision.getClusterId()), revision.toString()); } - public static void setCommitRoot(@Nonnull UpdateOp op, - @Nonnull Revision revision, + public static void setCommitRoot(@NotNull UpdateOp op, + @NotNull Revision revision, int commitRootDepth) { checkNotNull(op).setMapEntry(COMMIT_ROOT, checkNotNull(revision), String.valueOf(commitRootDepth)); } - public static void removeCommitRoot(@Nonnull UpdateOp op, - @Nonnull Revision revision) { + public static void removeCommitRoot(@NotNull UpdateOp op, + @NotNull Revision revision) { checkNotNull(op).removeMapEntry(COMMIT_ROOT, revision); } - public static void unsetCommitRoot(@Nonnull UpdateOp op, - @Nonnull Revision revision) { + public static void unsetCommitRoot(@NotNull UpdateOp op, + @NotNull Revision revision) { checkNotNull(op).unsetMapEntry(COMMIT_ROOT, revision); } - public static void setDeleted(@Nonnull UpdateOp op, - @Nonnull Revision revision, + public static void setDeleted(@NotNull UpdateOp op, + @NotNull Revision revision, boolean deleted) { if(deleted) { //DELETED_ONCE would be set upon every delete. @@ -1804,60 +1802,60 @@ public final class NodeDocument extends checkNotNull(op).setMapEntry(DELETED, checkNotNull(revision), String.valueOf(deleted)); } - public static void setDeletedOnce(@Nonnull UpdateOp op) { + public static void setDeletedOnce(@NotNull UpdateOp op) { checkNotNull(op).set(DELETED_ONCE, Boolean.TRUE); } - public static void removeDeleted(@Nonnull UpdateOp op, - @Nonnull Revision revision) { + public static void removeDeleted(@NotNull UpdateOp op, + @NotNull Revision revision) { checkNotNull(op).removeMapEntry(DELETED, revision); } - public static void setPrevious(@Nonnull UpdateOp op, - @Nonnull Range range) { + public static void setPrevious(@NotNull UpdateOp op, + @NotNull Range range) { checkNotNull(op).setMapEntry(PREVIOUS, checkNotNull(range).high, range.getLowValue()); } - public static void removePrevious(@Nonnull UpdateOp op, - @Nonnull Range range) { + public static void removePrevious(@NotNull UpdateOp op, + @NotNull Range range) { removePrevious(op, checkNotNull(range).high); } - public static void removePrevious(@Nonnull UpdateOp op, - @Nonnull Revision revision) { + public static void removePrevious(@NotNull UpdateOp op, + @NotNull Revision revision) { checkNotNull(op).removeMapEntry(PREVIOUS, checkNotNull(revision)); } - public static void setStalePrevious(@Nonnull UpdateOp op, - @Nonnull Revision revision, + public static void setStalePrevious(@NotNull UpdateOp op, + @NotNull Revision revision, int height) { checkNotNull(op).setMapEntry(STALE_PREV, checkNotNull(revision), String.valueOf(height)); } - public static void removeStalePrevious(@Nonnull UpdateOp op, - @Nonnull Revision revision) { + public static void removeStalePrevious(@NotNull UpdateOp op, + @NotNull Revision revision) { checkNotNull(op).removeMapEntry(STALE_PREV, checkNotNull(revision)); } - public static void setHasBinary(@Nonnull UpdateOp op) { + public static void setHasBinary(@NotNull UpdateOp op) { checkNotNull(op).set(HAS_BINARY_FLAG, HAS_BINARY_VAL); } - public static void setBranchCommit(@Nonnull UpdateOp op, - @Nonnull Revision revision) { + public static void setBranchCommit(@NotNull UpdateOp op, + @NotNull Revision revision) { checkNotNull(op).setMapEntry(BRANCH_COMMITS, revision, String.valueOf(true)); } - public static void removeBranchCommit(@Nonnull UpdateOp op, - @Nonnull Revision revision) { + public static void removeBranchCommit(@NotNull UpdateOp op, + @NotNull Revision revision) { checkNotNull(op).removeMapEntry(BRANCH_COMMITS, revision); } - public static void setSweepRevision(@Nonnull UpdateOp op, - @Nonnull Revision revision) { + public static void setSweepRevision(@NotNull UpdateOp op, + @NotNull Revision revision) { checkNotNull(op).setMapEntry(SWEEP_REV, new Revision(0, 0, revision.getClusterId()), revision.toString()); @@ -1891,8 +1889,8 @@ public final class NodeDocument extends } } - private LastRevs createLastRevs(@Nonnull RevisionVector readRevision, - @Nonnull RevisionContext context, + private LastRevs createLastRevs(@NotNull RevisionVector readRevision, + @NotNull RevisionContext context, @Nullable Branch branch, @Nullable Revision pendingLastRev) { LastRevs lastRevs = new LastRevs(getLastRev(), readRevision, branch); @@ -1975,8 +1973,8 @@ public final class NodeDocument extends * @param rev a revision. * @return the commit root or <code>null</code> if there is none. */ - @CheckForNull - private NodeDocument getCommitRoot(@Nonnull Revision rev) { + @Nullable + private NodeDocument getCommitRoot(@NotNull Revision rev) { // check local revisions and commitRoot first if (getLocalRevisions().containsKey(rev)) { return this; @@ -2010,8 +2008,8 @@ public final class NodeDocument extends * @throws NumberFormatException if {@code depth} cannot be parsed as an * integer. */ - @Nonnull - private String getPathAtDepth(@Nonnull String depth) { + @NotNull + private String getPathAtDepth(@NotNull String depth) { if (checkNotNull(depth).equals("0")) { return "/"; } @@ -2027,8 +2025,8 @@ public final class NodeDocument extends * @return the depth or <code>null</code> if there is no commit root entry * for the given revision on this document or previous documents. */ - @CheckForNull - private String getCommitRootDepth(@Nonnull Revision revision) { + @Nullable + private String getCommitRootDepth(@NotNull Revision revision) { // check local map first Map<Revision, String> local = getLocalCommitRoot(); String depth = local.get(revision); @@ -2059,10 +2057,10 @@ public final class NodeDocument extends * @return <code>true</code> if the revision is visible, otherwise * <code>false</code>. */ - private boolean isVisible(@Nonnull RevisionContext context, - @Nonnull Revision revision, + private boolean isVisible(@NotNull RevisionContext context, + @NotNull Revision revision, @Nullable String commitValue, - @Nonnull RevisionVector readRevision) { + @NotNull RevisionVector readRevision) { if (commitValue == null) { commitValue = context.getCommitValue(revision, this); } @@ -2105,7 +2103,7 @@ public final class NodeDocument extends * @param revision a revision. * @return the commit value or <code>null</code> if the revision is unknown. */ - @CheckForNull + @Nullable private String getCommitValue(Revision revision) { String value = getLocalRevisions().get(revision); if (value == null) { @@ -2161,12 +2159,12 @@ public final class NodeDocument extends * @param lastRevs to keep track of the most recent modification. * @return the latest value from the {@code readRevision} point of view. */ - @CheckForNull - private Value getLatestValue(@Nonnull RevisionContext context, - @Nonnull Iterable<Map.Entry<Revision, String>> valueMap, - @Nonnull RevisionVector readRevision, - @Nonnull Map<Revision, String> validRevisions, - @Nonnull LastRevs lastRevs) { + @Nullable + private Value getLatestValue(@NotNull RevisionContext context, + @NotNull Iterable<Map.Entry<Revision, String>> valueMap, + @NotNull RevisionVector readRevision, + @NotNull Map<Revision, String> validRevisions, + @NotNull LastRevs lastRevs) { for (Map.Entry<Revision, String> entry : valueMap) { Revision propRev = entry.getKey(); String commitValue = validRevisions.get(propRev); @@ -2200,7 +2198,7 @@ public final class NodeDocument extends return Utils.getPathFromId(getId()); } - @Nonnull + @NotNull Map<Revision, String> getDeleted() { return ValueMap.create(this, DELETED); } @@ -2384,7 +2382,7 @@ public final class NodeDocument extends */ final String value; - Value(@Nonnull Revision revision, @Nullable String value) { + Value(@NotNull Revision revision, @Nullable String value) { this.revision = checkNotNull(revision); this.value = value; }
Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentSweeper.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentSweeper.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentSweeper.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentSweeper.java Wed Nov 7 14:46:03 2018 @@ -19,13 +19,12 @@ package org.apache.jackrabbit.oak.plugin import java.util.List; import java.util.Map; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import com.google.common.base.Function; import com.google.common.base.Predicate; import org.apache.jackrabbit.oak.plugins.document.util.Utils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -109,9 +108,9 @@ final class NodeDocumentSweeper { * @throws DocumentStoreException if reading from the store or writing to * the store failed. */ - @CheckForNull - Revision sweep(@Nonnull Iterable<NodeDocument> documents, - @Nonnull NodeDocumentSweepListener listener) + @Nullable + Revision sweep(@NotNull Iterable<NodeDocument> documents, + @NotNull NodeDocumentSweepListener listener) throws DocumentStoreException { return performSweep(documents, checkNotNull(listener)); } @@ -125,7 +124,7 @@ final class NodeDocumentSweeper { //----------------------------< internal >---------------------------------- - @CheckForNull + @Nullable private Revision performSweep(Iterable<NodeDocument> documents, NodeDocumentSweepListener listener) throws DocumentStoreException { @@ -281,7 +280,7 @@ final class NodeDocumentSweeper { return new UpdateOp(doc.getId(), false); } - @CheckForNull + @Nullable private Revision getCommitRevision(final NodeDocument doc, final Revision rev) throws DocumentStoreException { Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeStateDiffer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeStateDiffer.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeStateDiffer.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeStateDiffer.java Wed Nov 7 14:46:03 2018 @@ -19,15 +19,14 @@ package org.apache.jackrabbit.oak.plugins.document; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; +import org.jetbrains.annotations.NotNull; public interface NodeStateDiffer { NodeStateDiffer DEFAULT_DIFFER = new NodeStateDiffer() { @Override - public boolean compare(@Nonnull AbstractDocumentNodeState node, - @Nonnull AbstractDocumentNodeState base, @Nonnull NodeStateDiff diff) { + public boolean compare(@NotNull AbstractDocumentNodeState node, + @NotNull AbstractDocumentNodeState base, @NotNull NodeStateDiff diff) { return node.compareAgainstBaseState(base, diff); } }; @@ -44,7 +43,7 @@ public interface NodeStateDiffer { * {@code false} if it was aborted as requested by the handler * (see the {@link NodeStateDiff} contract for more details) */ - boolean compare(@Nonnull final AbstractDocumentNodeState node, - @Nonnull final AbstractDocumentNodeState base, - @Nonnull NodeStateDiff diff); + boolean compare(@NotNull final AbstractDocumentNodeState node, + @NotNull final AbstractDocumentNodeState base, + @NotNull NodeStateDiff diff); } Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PathRev.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PathRev.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PathRev.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PathRev.java Wed Nov 7 14:46:03 2018 @@ -18,10 +18,9 @@ */ package org.apache.jackrabbit.oak.plugins.document; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.commons.StringUtils; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +38,7 @@ public final class PathRev implements Ca private final RevisionVector revision; - public PathRev(@Nonnull String path, @Nonnull RevisionVector revision) { + public PathRev(@NotNull String path, @NotNull RevisionVector revision) { this.path = checkNotNull(path); this.revision = checkNotNull(revision); } Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PrefetchDispatcher.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PrefetchDispatcher.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PrefetchDispatcher.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PrefetchDispatcher.java Wed Nov 7 14:46:03 2018 @@ -18,9 +18,6 @@ package org.apache.jackrabbit.oak.plugin import java.util.concurrent.Executor; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.spi.commit.ChangeDispatcher; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; @@ -29,6 +26,8 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.commit.EditorDiff; import org.apache.jackrabbit.oak.spi.commit.VisibleEditor; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import static com.google.common.base.Preconditions.checkNotNull; @@ -41,16 +40,16 @@ class PrefetchDispatcher extends ChangeD private final Executor executor; private NodeState root; - public PrefetchDispatcher(@Nonnull NodeState root, - @Nonnull Executor executor) { + public PrefetchDispatcher(@NotNull NodeState root, + @NotNull Executor executor) { super(root); this.root = root; this.executor = checkNotNull(executor); } @Override - public synchronized void contentChanged(@Nonnull NodeState root, - @Nonnull CommitInfo info) { + public synchronized void contentChanged(@NotNull NodeState root, + @NotNull CommitInfo info) { if (root instanceof DocumentNodeState) { final DocumentNodeState state = (DocumentNodeState) root; if (state.isFromExternalChange()) { Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java Wed Nov 7 14:46:03 2018 @@ -25,15 +25,14 @@ import java.util.Iterator; import java.util.Map; import java.util.TreeMap; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.Predicates; import com.google.common.collect.AbstractIterator; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; import org.apache.jackrabbit.oak.plugins.document.util.Utils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,8 +49,8 @@ class PropertyHistory implements Iterabl // path of the main document private final String mainPath; - public PropertyHistory(@Nonnull NodeDocument doc, - @Nonnull String property) { + public PropertyHistory(@NotNull NodeDocument doc, + @NotNull String property) { this.doc = checkNotNull(doc); this.property = checkNotNull(property); this.mainPath = doc.getMainPath(); Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Range.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Range.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Range.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Range.java Wed Nov 7 14:46:03 2018 @@ -16,11 +16,11 @@ */ package org.apache.jackrabbit.oak.plugins.document; -import javax.annotation.Nonnull; - import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import org.jetbrains.annotations.NotNull; + /** * A revision range for {@link NodeDocument#PREVIOUS} documents. */ @@ -36,7 +36,7 @@ final class Range { * @param high the high bound. * @param low the low bound. */ - Range(@Nonnull Revision high, @Nonnull Revision low, int height) { + Range(@NotNull Revision high, @NotNull Revision low, int height) { this.high = checkNotNull(high); this.low = checkNotNull(low); this.height = height; @@ -56,7 +56,7 @@ final class Range { * (e.g. r1-0-1/0). * @return the range. */ - @Nonnull + @NotNull static Range fromEntry(Revision rev, String value) { Revision low; int height; @@ -76,7 +76,7 @@ final class Range { * @return the string representation of the lower bound, including the * height (e.g. r1-0-1/0). */ - @Nonnull + @NotNull String getLowValue() { return low + "/" + height; } @@ -88,7 +88,7 @@ final class Range { * @return <code>true</code> if within this range; <code>false</code> * otherwise. */ - boolean includes(@Nonnull Revision r) { + boolean includes(@NotNull Revision r) { return high.getClusterId() == r.getClusterId() && high.compareRevisionTime(r) >= 0 && low.compareRevisionTime(r) <= 0; Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ResetDiff.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ResetDiff.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ResetDiff.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ResetDiff.java Wed Nov 7 14:46:03 2018 @@ -18,13 +18,12 @@ package org.apache.jackrabbit.oak.plugin import java.util.Map; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.document.util.Utils; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateDiff; +import org.jetbrains.annotations.NotNull; import static com.google.common.base.Preconditions.checkNotNull; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE; @@ -41,14 +40,14 @@ class ResetDiff implements NodeStateDiff private final Map<String, UpdateOp> operations; private UpdateOp update; - ResetDiff(@Nonnull Revision revision, - @Nonnull Map<String, UpdateOp> operations) { + ResetDiff(@NotNull Revision revision, + @NotNull Map<String, UpdateOp> operations) { this(revision, "/", operations); } - private ResetDiff(@Nonnull Revision revision, - @Nonnull String path, - @Nonnull Map<String, UpdateOp> operations) { + private ResetDiff(@NotNull Revision revision, + @NotNull String path, + @NotNull Map<String, UpdateOp> operations) { this.revision = checkNotNull(revision); this.path = checkNotNull(path); this.operations = checkNotNull(operations); Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContext.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContext.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContext.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContext.java Wed Nov 7 14:46:03 2018 @@ -16,10 +16,9 @@ */ package org.apache.jackrabbit.oak.plugins.document; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.stats.Clock; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Provides revision related context. @@ -45,19 +44,19 @@ public interface RevisionContext { /** * @return the current head revision. */ - @Nonnull + @NotNull RevisionVector getHeadRevision(); /** * @return a new revision for the local document node store instance. */ - @Nonnull + @NotNull Revision newRevision(); /** * @return the clock in use when a new revision is created. */ - @Nonnull + @NotNull Clock getClock(); /** @@ -78,7 +77,7 @@ public interface RevisionContext { * @return the commit value or {@code null} if the change does not * have a commit value (yet). */ - @CheckForNull - String getCommitValue(@Nonnull Revision changeRevision, - @Nonnull NodeDocument doc); + @Nullable + String getCommitValue(@NotNull Revision changeRevision, + @NotNull NodeDocument doc); } Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java Wed Nov 7 14:46:03 2018 @@ -22,9 +22,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import com.google.common.collect.AbstractIterator; import com.google.common.collect.Iterators; import com.google.common.collect.PeekingIterator; @@ -32,6 +29,8 @@ import com.google.common.collect.Sets; import com.google.common.primitives.Ints; import org.apache.jackrabbit.oak.cache.CacheValue; import org.apache.jackrabbit.oak.plugins.document.util.Utils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,7 +61,7 @@ public final class RevisionVector implem //lazily initialized private int hash; - private RevisionVector(@Nonnull Revision[] revisions, + private RevisionVector(@NotNull Revision[] revisions, boolean checkUniqueClusterIds, boolean sort) { checkNotNull(revisions); @@ -75,15 +74,15 @@ public final class RevisionVector implem this.revisions = revisions; } - public RevisionVector(@Nonnull Revision... revisions) { + public RevisionVector(@NotNull Revision... revisions) { this(Arrays.copyOf(revisions, revisions.length), true, true); } - public RevisionVector(@Nonnull Iterable<Revision> revisions) { + public RevisionVector(@NotNull Iterable<Revision> revisions) { this(toArray(revisions, Revision.class), true, true); } - public RevisionVector(@Nonnull Set<Revision> revisions) { + public RevisionVector(@NotNull Set<Revision> revisions) { this(toArray(revisions, Revision.class), false, true); } @@ -97,7 +96,7 @@ public final class RevisionVector implem * @param revision the revision set to use for the new vector. * @return the resulting revision vector. */ - public RevisionVector update(@Nonnull Revision revision) { + public RevisionVector update(@NotNull Revision revision) { checkNotNull(revision); Revision existing = null; int i; @@ -166,7 +165,7 @@ public final class RevisionVector implem * @param vector the other vector. * @return the parallel minimum of the two. */ - public RevisionVector pmin(@Nonnull RevisionVector vector) { + public RevisionVector pmin(@NotNull RevisionVector vector) { // optimize single revision case if (revisions.length == 1 && vector.revisions.length == 1) { if (revisions[0].getClusterId() == vector.revisions[0].getClusterId()) { @@ -197,7 +196,7 @@ public final class RevisionVector implem * @param vector the other vector. * @return the parallel maximum of the two. */ - public RevisionVector pmax(@Nonnull RevisionVector vector) { + public RevisionVector pmax(@NotNull RevisionVector vector) { // optimize single revision case if (revisions.length == 1 && vector.revisions.length == 1) { if (revisions[0].getClusterId() == vector.revisions[0].getClusterId()) { @@ -256,7 +255,7 @@ public final class RevisionVector implem * @param revision the revision to check. * @return {@code true} if considered newer, {@code false} otherwise. */ - public boolean isRevisionNewer(@Nonnull Revision revision) { + public boolean isRevisionNewer(@NotNull Revision revision) { checkNotNull(revision); for (Revision r : revisions) { if (r.getClusterId() == revision.getClusterId()) { @@ -287,7 +286,7 @@ public final class RevisionVector implem * @throws IllegalStateException if this vector does not contain a branch * revision. */ - @Nonnull + @NotNull public Revision getBranchRevision() { for (Revision r : revisions) { if (r.isBranch()) { @@ -442,7 +441,7 @@ public final class RevisionVector implem //------------------------< Comparable >------------------------------------ @Override - public int compareTo(@Nonnull RevisionVector other) { + public int compareTo(@NotNull RevisionVector other) { Iterator<Revision> it = other.iterator(); for (Revision r : revisions) { if (!it.hasNext()) { @@ -508,7 +507,7 @@ public final class RevisionVector implem //-------------------------< internal >------------------------------------- - @CheckForNull + @Nullable private Revision peekRevision(PeekingIterator<Revision> it, int minClusterId) { while (it.hasNext() && it.peek().getClusterId() < minClusterId) { Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java Wed Nov 7 14:46:03 2018 @@ -27,11 +27,10 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore; import org.apache.jackrabbit.oak.plugins.document.util.Utils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -98,10 +97,10 @@ class SplitOperations { private List<UpdateOp> splitOps; private UpdateOp main; - private SplitOperations(@Nonnull final NodeDocument doc, - @Nonnull final RevisionContext context, - @Nonnull final RevisionVector headRev, - @Nonnull final Function<String, Long> binarySize, + private SplitOperations(@NotNull final NodeDocument doc, + @NotNull final RevisionContext context, + @NotNull final RevisionVector headRev, + @NotNull final Function<String, Long> binarySize, int numRevsThreshold) { this.doc = checkNotNull(doc); this.context = checkNotNull(context); @@ -140,11 +139,11 @@ class SplitOperations { * @throws IllegalArgumentException if the given document is a split * document. */ - @Nonnull - static List<UpdateOp> forDocument(@Nonnull NodeDocument doc, - @Nonnull RevisionContext context, - @Nonnull RevisionVector headRevision, - @Nonnull Function<String, Long> binarySize, + @NotNull + static List<UpdateOp> forDocument(@NotNull NodeDocument doc, + @NotNull RevisionContext context, + @NotNull RevisionVector headRevision, + @NotNull Function<String, Long> binarySize, int numRevsThreshold) { if (doc.isSplitDocument()) { throw new IllegalArgumentException( @@ -340,7 +339,7 @@ class SplitOperations { * @return the UpdateOp for the main document or {@code null} if there is * not enough data to split. */ - @CheckForNull + @Nullable private UpdateOp createSplitOps() { UpdateOp main = null; // check if we have enough data to split off @@ -584,13 +583,13 @@ class SplitOperations { //----------------------------< internal modifiers >------------------------ - private static void setSplitDocType(@Nonnull UpdateOp op, - @Nonnull SplitDocType type) { + private static void setSplitDocType(@NotNull UpdateOp op, + @NotNull SplitDocType type) { checkNotNull(op).set(NodeDocument.SD_TYPE, type.type); } - private static void setSplitDocMaxRev(@Nonnull UpdateOp op, - @Nonnull Revision maxRev) { + private static void setSplitDocMaxRev(@NotNull UpdateOp op, + @NotNull Revision maxRev) { checkNotNull(op).set(NodeDocument.SD_MAX_REV_TIME_IN_SECS, NodeDocument.getModifiedInSecs(maxRev.getTimestamp())); } Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java Wed Nov 7 14:46:03 2018 @@ -16,12 +16,11 @@ */ package org.apache.jackrabbit.oak.plugins.document; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.collect.Iterables; import org.apache.jackrabbit.oak.cache.CacheStats; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * Implements a tiered diff cache which consists of a {@link LocalDiffCache} and @@ -38,9 +37,9 @@ class TieredDiffCache extends DiffCache } @Override - public String getChanges(@Nonnull RevisionVector from, - @Nonnull RevisionVector to, - @Nonnull String path, + public String getChanges(@NotNull RevisionVector from, + @NotNull RevisionVector to, + @NotNull String path, @Nullable Loader loader) { // check local first without loader String changes = localCache.getChanges(from, to, path, null); @@ -58,9 +57,9 @@ class TieredDiffCache extends DiffCache * @param to the to revision. * @return the new entry. */ - @Nonnull + @NotNull @Override - public Entry newEntry(@Nonnull RevisionVector from, @Nonnull RevisionVector to, boolean local) { + public Entry newEntry(@NotNull RevisionVector from, @NotNull RevisionVector to, boolean local) { if (local) { return localCache.newEntry(from, to, true); } else { @@ -68,7 +67,7 @@ class TieredDiffCache extends DiffCache } } - @Nonnull + @NotNull @Override public Iterable<CacheStats> getStats() { return Iterables.concat(localCache.getStats(), memoryCache.getStats()); Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnmergedBranches.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnmergedBranches.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnmergedBranches.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnmergedBranches.java Wed Nov 7 14:46:03 2018 @@ -23,13 +23,11 @@ import java.util.TreeSet; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicBoolean; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import org.apache.jackrabbit.oak.plugins.document.Branch.BranchCommit; import org.apache.jackrabbit.oak.plugins.document.Branch.BranchReference; import org.apache.jackrabbit.oak.plugins.document.util.Utils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -101,9 +99,9 @@ class UnmergedBranches { * @throws IllegalArgumentException if {@code base} is a branch revision * or {@code initial} is not a branch revision. */ - @Nonnull - Branch create(@Nonnull RevisionVector base, - @Nonnull Revision initial, + @NotNull + Branch create(@NotNull RevisionVector base, + @NotNull Revision initial, @Nullable Object guard) { checkArgument(!checkNotNull(base).isBranch(), "base is not a trunk revision: %s", base); @@ -123,8 +121,8 @@ class UnmergedBranches { * @param r a revision. * @return the branch containing the given revision or <code>null</code>. */ - @CheckForNull - Branch getBranch(@Nonnull RevisionVector r) { + @Nullable + Branch getBranch(@NotNull RevisionVector r) { if (!r.isBranch()) { return null; } @@ -144,7 +142,7 @@ class UnmergedBranches { * @param r the base revision of a branch. * @return {@code true} if such a branch exists, {@code false} otherwise. */ - boolean isBranchBase(@Nonnull RevisionVector r) { + boolean isBranchBase(@NotNull RevisionVector r) { if (!r.isBranch()) { return false; } @@ -164,8 +162,8 @@ class UnmergedBranches { * @param r a revision. * @return the branch commit or {@code null} if it doesn't exist. */ - @CheckForNull - BranchCommit getBranchCommit(@Nonnull Revision r) { + @Nullable + BranchCommit getBranchCommit(@NotNull Revision r) { for (Branch b : branches) { BranchCommit c = b.getCommit(r); if (c != null) { Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java Wed Nov 7 14:46:03 2018 @@ -24,12 +24,11 @@ import java.util.concurrent.ConcurrentMa import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.document.util.MapFactory; import org.apache.jackrabbit.oak.plugins.document.util.Utils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,8 +71,8 @@ class UnsavedModifications { * @return the previously set revision for the given path or null if there * was none or the current revision is newer. */ - @CheckForNull - public Revision put(@Nonnull String path, @Nonnull Revision revision) { + @Nullable + public Revision put(@NotNull String path, @NotNull Revision revision) { checkNotNull(path); checkNotNull(revision); for (;;) { @@ -95,12 +94,12 @@ class UnsavedModifications { } } - @CheckForNull + @Nullable public Revision get(String path) { return map.get(path); } - @Nonnull + @NotNull public Collection<String> getPaths() { return map.keySet(); } @@ -112,8 +111,8 @@ class UnsavedModifications { * @param start the start revision (inclusive). * @return matching paths with pending modifications. */ - @Nonnull - public Iterable<String> getPaths(@Nonnull final Revision start) { + @NotNull + public Iterable<String> getPaths(@NotNull final Revision start) { if (map.isEmpty()) { return Collections.emptyList(); } else { @@ -145,10 +144,10 @@ class UnsavedModifications { * revisions to write back. * @return stats about the write operation. */ - public BackgroundWriteStats persist(@Nonnull DocumentStore store, - @Nonnull Supplier<Revision> sweepRevision, - @Nonnull Snapshot snapshot, - @Nonnull Lock lock) { + public BackgroundWriteStats persist(@NotNull DocumentStore store, + @NotNull Supplier<Revision> sweepRevision, + @NotNull Snapshot snapshot, + @NotNull Lock lock) { BackgroundWriteStats stats = new BackgroundWriteStats(); if (map.size() == 0) { return stats; Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java Wed Nov 7 14:46:03 2018 @@ -21,14 +21,13 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import javax.annotation.CheckForNull; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.collect.Maps; import static com.google.common.base.Preconditions.checkNotNull; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + /** * A DocumentStore "update" operation for one document. */ @@ -49,12 +48,12 @@ public final class UpdateOp { * @param id the primary key * @param isNew whether this is a new document */ - public UpdateOp(@Nonnull String id, boolean isNew) { + public UpdateOp(@NotNull String id, boolean isNew) { this(id, isNew, false, new HashMap<Key, Operation>(), null); } - private UpdateOp(@Nonnull String id, boolean isNew, boolean isDelete, - @Nonnull Map<Key, Operation> changes, + private UpdateOp(@NotNull String id, boolean isNew, boolean isDelete, + @NotNull Map<Key, Operation> changes, @Nullable Map<Key, Condition> conditions) { this.id = checkNotNull(id, "id must not be null"); this.isNew = isNew; @@ -103,7 +102,7 @@ public final class UpdateOp { new HashMap<Key, Operation>(changes), conditionMap); } - @Nonnull + @NotNull public String getId() { return id; } @@ -154,7 +153,7 @@ public final class UpdateOp { * @param revision the revision * @param value the value */ - void setMapEntry(@Nonnull String property, @Nonnull Revision revision, String value) { + void setMapEntry(@NotNull String property, @NotNull Revision revision, String value) { Operation op = new Operation(Operation.Type.SET_MAP_ENTRY, value); changes.put(new Key(property, checkNotNull(revision)), op); } @@ -164,7 +163,7 @@ public final class UpdateOp { * * @param property the property name */ - public void remove(@Nonnull String property) { + public void remove(@NotNull String property) { if (Document.ID.equals(property)) { throw new IllegalArgumentException(Document.ID + " must not be removed"); } @@ -179,7 +178,7 @@ public final class UpdateOp { * @param property the property * @param revision the revision */ - public void removeMapEntry(@Nonnull String property, @Nonnull Revision revision) { + public void removeMapEntry(@NotNull String property, @NotNull Revision revision) { Operation op = new Operation(Operation.Type.REMOVE_MAP_ENTRY, null); changes.put(new Key(property, checkNotNull(revision)), op); } @@ -242,7 +241,7 @@ public final class UpdateOp { * @param property the property name * @param revision the revision */ - void unsetMapEntry(@Nonnull String property, @Nonnull Revision revision) { + void unsetMapEntry(@NotNull String property, @NotNull Revision revision) { changes.remove(new Key(property, checkNotNull(revision))); } @@ -253,8 +252,8 @@ public final class UpdateOp { * @param property the property name * @param revision the revision */ - void containsMapEntry(@Nonnull String property, - @Nonnull Revision revision, + void containsMapEntry(@NotNull String property, + @NotNull Revision revision, boolean exists) { if (isNew) { throw new IllegalStateException("Cannot use containsMapEntry() on new document"); @@ -269,7 +268,7 @@ public final class UpdateOp { * @param property the name of the property or map. * @param value the value to compare to ({@code null} checks both for non-existence and the value being null) */ - void equals(@Nonnull String property, @Nullable Object value) { + void equals(@NotNull String property, @Nullable Object value) { equals(property, null, value); } @@ -281,7 +280,7 @@ public final class UpdateOp { * is for a property. * @param value the value to compare to ({@code null} checks both for non-existence and the value being null) */ - void equals(@Nonnull String property, + void equals(@NotNull String property, @Nullable Revision revision, @Nullable Object value) { if (isNew) { @@ -297,7 +296,7 @@ public final class UpdateOp { * @param property the name of the property or map. * @param value the value to compare to. */ - void notEquals(@Nonnull String property, @Nullable Object value) { + void notEquals(@NotNull String property, @Nullable Object value) { notEquals(property, null, value); } @@ -309,7 +308,7 @@ public final class UpdateOp { * is for a property. * @param value the value to compare to. */ - void notEquals(@Nonnull String property, + void notEquals(@NotNull String property, @Nullable Revision revision, @Nullable Object value) { if (isNew) { @@ -325,7 +324,7 @@ public final class UpdateOp { * @param property the key * @param value the increment */ - public void increment(@Nonnull String property, long value) { + public void increment(@NotNull String property, long value) { Operation op = new Operation(Operation.Type.INCREMENT, value); changes.put(new Key(property, null), op); } @@ -541,17 +540,17 @@ public final class UpdateOp { private final String name; private final Revision revision; - public Key(@Nonnull String name, @Nullable Revision revision) { + public Key(@NotNull String name, @Nullable Revision revision) { this.name = checkNotNull(name); this.revision = revision; } - @Nonnull + @NotNull public String getName() { return name; } - @CheckForNull + @Nullable public Revision getRevision() { return revision; } Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java Wed Nov 7 14:46:03 2018 @@ -22,13 +22,12 @@ import java.util.Map; import java.util.TreeMap; import java.util.Map.Entry; -import javax.annotation.Nonnull; - import com.google.common.base.Objects; import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Condition; import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Key; import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Operation; +import org.jetbrains.annotations.NotNull; /** * Provides convenience methods for applying {@link UpdateOp}s to @@ -44,8 +43,8 @@ public class UpdateUtils { * @param update * the changes to apply. */ - public static void applyChanges(@Nonnull Document doc, - @Nonnull UpdateOp update) { + public static void applyChanges(@NotNull Document doc, + @NotNull UpdateOp update) { doc.put(Document.ID, update.getId()); for (Entry<Key, Operation> e : checkNotNull(update).getChanges().entrySet()) { Key k = e.getKey(); @@ -104,8 +103,8 @@ public class UpdateUtils { } } - public static boolean checkConditions(@Nonnull Document doc, - @Nonnull Map<Key, Condition> conditions) { + public static boolean checkConditions(@NotNull Document doc, + @NotNull Map<Key, Condition> conditions) { for (Map.Entry<Key, Condition> entry : conditions.entrySet()) { Condition c = entry.getValue(); Key k = entry.getKey(); @@ -161,7 +160,7 @@ public class UpdateUtils { * @param up the update operation * @throws IllegalArgumentException when the operations is conditional */ - public static void assertUnconditional(@Nonnull UpdateOp up) { + public static void assertUnconditional(@NotNull UpdateOp up) { Map<Key, Condition> conditions = up.getConditions(); if (!conditions.isEmpty()) { throw new IllegalArgumentException( Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ValueMap.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ValueMap.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ValueMap.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ValueMap.java Wed Nov 7 14:46:03 2018 @@ -28,9 +28,8 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.plugins.document.util.MergeSortedIterators; +import org.jetbrains.annotations.NotNull; import com.google.common.base.Objects; import com.google.common.collect.Iterators; @@ -44,9 +43,9 @@ class ValueMap { static final SortedMap<Revision, String> EMPTY = Collections.unmodifiableSortedMap( new TreeMap<Revision, String>(StableRevisionComparator.REVERSE)); - @Nonnull - static Map<Revision, String> create(@Nonnull final NodeDocument doc, - @Nonnull final String property) { + @NotNull + static Map<Revision, String> create(@NotNull final NodeDocument doc, + @NotNull final String property) { final SortedMap<Revision, String> map = doc.getLocalMap(property); if (doc.getPreviousRanges().isEmpty()) { return map; @@ -55,7 +54,7 @@ class ValueMap { = new AbstractSet<Map.Entry<Revision, String>>() { @Override - @Nonnull + @NotNull public Iterator<Map.Entry<Revision, String>> iterator() { final Comparator<? super Revision> c = map.comparator(); @@ -138,7 +137,7 @@ class ValueMap { private final Map<Revision, String> map = doc.getLocalMap(property); @Override - @Nonnull + @NotNull public Set<Entry<Revision, String>> entrySet() { return entrySet; } Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java Wed Nov 7 14:46:03 2018 @@ -26,12 +26,11 @@ import static org.apache.jackrabbit.oak. import java.util.Set; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.plugins.document.NodeDocument.SplitDocType; import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats; import org.apache.jackrabbit.oak.plugins.document.util.Utils; import org.apache.jackrabbit.oak.stats.Clock; +import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -89,7 +88,7 @@ public class VersionGCSupport { * * @return the underlying document store. */ - @Nonnull + @NotNull public DocumentStore getDocumentStore() { return store; } Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java Wed Nov 7 14:46:03 2018 @@ -31,9 +31,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Predicate; @@ -52,6 +49,8 @@ import org.apache.jackrabbit.oak.spi.gc. import org.apache.jackrabbit.oak.stats.Clock; import org.apache.jackrabbit.oak.commons.TimeDurationFormatter; import org.apache.jackrabbit.oak.stats.StatisticsProvider; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -120,7 +119,7 @@ public class VersionGarbageCollector { this.gcStats = new RevisionGCStats(provider); } - @Nonnull + @NotNull RevisionGCStats getRevisionGCStats() { return gcStats; } @@ -183,7 +182,7 @@ public class VersionGarbageCollector { } } - public void setGCMonitor(@Nonnull GCMonitor gcMonitor) { + public void setGCMonitor(@NotNull GCMonitor gcMonitor) { this.gcMonitor = checkNotNull(gcMonitor); } @@ -621,10 +620,10 @@ public class VersionGarbageCollector { private final VersionGCOptions options; private final GCMonitor monitor; - public DeletedDocsGC(@Nonnull RevisionVector headRevision, - @Nonnull AtomicBoolean cancel, - @Nonnull VersionGCOptions options, - @Nonnull GCMonitor monitor) { + public DeletedDocsGC(@NotNull RevisionVector headRevision, + @NotNull AtomicBoolean cancel, + @NotNull VersionGCOptions options, + @NotNull GCMonitor monitor) { this.headRevision = checkNotNull(headRevision); this.cancel = checkNotNull(cancel); this.timer = Stopwatch.createUnstarted(); @@ -1006,7 +1005,7 @@ public class VersionGarbageCollector { } } - @Nonnull + @NotNull private StringSort newStringSort(VersionGCOptions options) { return new StringSort(options.overflowToDiskThreshold, NodeDocumentIdComparator.INSTANCE); } Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundledTypesRegistry.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundledTypesRegistry.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundledTypesRegistry.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundledTypesRegistry.java Wed Nov 7 14:46:03 2018 @@ -23,8 +23,6 @@ import java.util.Collections; import java.util.Map; import java.util.Set; -import javax.annotation.CheckForNull; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -35,6 +33,7 @@ import org.apache.jackrabbit.oak.spi.nod import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.Nullable; import static org.apache.jackrabbit.oak.api.Type.STRINGS; import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE; @@ -60,7 +59,7 @@ public class BundledTypesRegistry { return new BundledTypesRegistry(bundlors); } - @CheckForNull + @Nullable public DocumentBundlor getBundlor(NodeState state) { if (isVersionedNode(state)){ return getBundlorForVersionedNode(state); Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigHandler.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigHandler.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigHandler.java Wed Nov 7 14:46:03 2018 @@ -23,9 +23,6 @@ import java.io.Closeable; import java.io.IOException; import java.util.concurrent.Executor; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.google.common.collect.Iterables; import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.commons.PathUtils; @@ -39,6 +36,8 @@ import org.apache.jackrabbit.oak.spi.com import org.apache.jackrabbit.oak.spi.commit.Observer; import org.apache.jackrabbit.oak.spi.commit.SubtreeEditor; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,7 +65,7 @@ public class BundlingConfigHandler imple }, Iterables.toArray(PathUtils.elements(CONFIG_PATH), String.class)); @Override - public synchronized void contentChanged(@Nonnull NodeState root, @Nonnull CommitInfo info) { + public synchronized void contentChanged(@NotNull NodeState root, @NotNull CommitInfo info) { EditorDiff.process(changeDetector, this.root, root); this.root = root; } Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java Wed Nov 7 14:46:03 2018 @@ -19,13 +19,12 @@ package org.apache.jackrabbit.oak.plugins.document.bundlor; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE; import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM; @@ -36,7 +35,7 @@ public enum BundlingConfigInitializer im INSTANCE; @Override - public void initialize(@Nonnull NodeBuilder builder) { + public void initialize(@NotNull NodeBuilder builder) { if (builder.hasChildNode(JCR_SYSTEM)){ NodeBuilder system = builder.getChildNode(JCR_SYSTEM); Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtils.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtils.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtils.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtils.java Wed Nov 7 14:46:03 2018 @@ -25,8 +25,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.annotation.Nonnull; - import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -35,6 +33,7 @@ import com.google.common.collect.Sets; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.jetbrains.annotations.NotNull; import static org.apache.jackrabbit.oak.plugins.document.bundlor.DocumentBundlor.META_PROP_BUNDLING_PATH; @@ -74,7 +73,7 @@ public final class BundlorUtils { if (depth > 0){ value = new PropertyStateWrapper(value){ - @Nonnull + @NotNull @Override public String getName() { return newKey; Modified: jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/PropertyStateWrapper.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/PropertyStateWrapper.java?rev=1846037&r1=1846036&r2=1846037&view=diff ============================================================================== --- jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/PropertyStateWrapper.java (original) +++ jackrabbit/oak/branches/1.8/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/PropertyStateWrapper.java Wed Nov 7 14:46:03 2018 @@ -19,11 +19,10 @@ package org.apache.jackrabbit.oak.plugins.document.bundlor; -import javax.annotation.Nonnull; - import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.memory.AbstractPropertyState; +import org.jetbrains.annotations.NotNull; //TODO Move this to org.apache.jackrabbit.oak.plugins.memory class PropertyStateWrapper extends AbstractPropertyState implements PropertyState { @@ -33,7 +32,7 @@ class PropertyStateWrapper extends Abstr this.delegate = delegate; } - @Nonnull + @NotNull @Override public String getName() { return delegate.getName(); @@ -49,13 +48,13 @@ class PropertyStateWrapper extends Abstr return delegate.getType(); } - @Nonnull + @NotNull @Override public <T> T getValue(Type<T> type) { return delegate.getValue(type); } - @Nonnull + @NotNull @Override public <T> T getValue(Type<T> type, int index) { return delegate.getValue(type, index);
