You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2018/07/18 15:08:28 UTC
svn commit: r1836194 [1/6] - in /jackrabbit/oak/trunk/oak-store-document: ./
src/main/java/org/apache/jackrabbit/oak/plugins/document/
src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/
src/main/java/org/apache/jackrabbit/oak/plugins/doc...
Author: reschke
Date: Wed Jul 18 15:08:27 2018
New Revision: 1836194
URL: http://svn.apache.org/viewvc?rev=1836194&view=rev
Log:
OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-store-document
Modified:
jackrabbit/oak/trunk/oak-store-document/pom.xml
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeBuilder.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeState.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommitQueue.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CachingCommitValueResolver.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfoDocument.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collection.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitValueResolver.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ConflictException.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentBranchRootNodeState.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteService.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStateCache.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranch.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentPropertyState.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentRootBuilder.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreException.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ExternalChange.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/FailedWithConflictException.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/FormatVersion.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JsopNodeStateDiffer.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevs.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MergeCommit.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MissingLastRevSeeker.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ModifiedDocumentNodeState.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentSweeper.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeStateDiffer.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PathRev.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PrefetchDispatcher.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Range.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RecoveryContext.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ResetDiff.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionContext.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnmergedBranches.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UnsavedModifications.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateOp.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/UpdateUtils.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ValueMap.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundledTypesRegistry.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigHandler.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlingConfigInitializer.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/BundlorUtils.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/PropertyStateWrapper.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentNodeStoreBuilderBase.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeeker.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoStatus.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/RevisionEntry.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetInfo.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/replica/ReplicaSetStatus.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/NodeCache.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBBlobStoreDB.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBConnectionHandler.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentSerializer.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreDB.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBExport.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJDBCTools.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBJSONSupport.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBOptions.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBRow.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/DelegatingDocumentNodeState.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCache.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreCacheService.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreObserver.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreRootObserver.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/spi/JournalPropertyBuilder.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/CloseableIterable.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/MongoConnection.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ReadOnlyDocumentStoreWrapperFactory.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/RevisionsKey.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/StringValue.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java
jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchStateTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyRDBTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterConflictTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CollisionTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CommitQueueTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ConcurrentReadAndAddTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDiffCache.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMK.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchInCommitHookTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBranchesTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreServiceTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreSweepTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DummyRevisionContext.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ExternalChangesTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoaderTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/JournalTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyChildNodesTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MergeRetryTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoBlobGCTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MongoConnectionFactory.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/OptimizedChildFetchTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/PrefetchDispatcherTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestNodeObserver.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TestUtils.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VisibleChangesTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/bundlor/DocumentBundlingTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/ClusterConflictTest.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/RetryReadIT.java
jackrabbit/oak/trunk/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/AsyncQueueTest.java
Modified: jackrabbit/oak/trunk/oak-store-document/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/pom.xml?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-store-document/pom.xml Wed Jul 18 15:08:27 2018
@@ -200,10 +200,10 @@
<artifactId>slf4j-api</artifactId>
</dependency>
- <!-- Findbugs annotations -->
+ <!-- Nullability annotations -->
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
</dependency>
<!-- Test Dependencies -->
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeBuilder.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeBuilder.java Wed Jul 18 15:08:27 2018
@@ -16,13 +16,12 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeBuilder;
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.NotNull;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.apache.jackrabbit.oak.spi.state.AbstractNodeState.checkValidName;
@@ -33,7 +32,7 @@ import static org.apache.jackrabbit.oak.
*/
abstract class AbstractDocumentNodeBuilder extends MemoryNodeBuilder {
- public AbstractDocumentNodeBuilder(@Nonnull NodeState base) {
+ public AbstractDocumentNodeBuilder(@NotNull NodeState base) {
super(base);
}
@@ -52,8 +51,8 @@ abstract class AbstractDocumentNodeBuild
* See also: OAK-1768
*/
@Override
- @Nonnull
- public NodeBuilder setChildNode(@Nonnull String name, @Nonnull NodeState state) {
+ @NotNull
+ public NodeBuilder setChildNode(@NotNull String name, @NotNull NodeState state) {
NodeBuilder builder = super.setChildNode(name, EMPTY_NODE);
for (PropertyState property : state.getProperties()) {
builder.setProperty(property);
@@ -68,8 +67,8 @@ abstract class AbstractDocumentNodeBuild
protected abstract DocumentNodeBuilder createChildBuilder(String name);
@Override
- @Nonnull
- public DocumentNodeBuilder getChildNode(@Nonnull String name) {
+ @NotNull
+ public DocumentNodeBuilder getChildNode(@NotNull String name) {
checkValidName(name);
return createChildBuilder(name);
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeState.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/AbstractDocumentNodeState.java Wed Jul 18 15:08:27 2018
@@ -19,8 +19,6 @@
package org.apache.jackrabbit.oak.plugins.document;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
import org.apache.jackrabbit.oak.plugins.memory.ModifiedNodeState;
import org.apache.jackrabbit.oak.spi.state.AbstractNodeState;
@@ -28,6 +26,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
import org.apache.jackrabbit.oak.commons.PerfLogger;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.LoggerFactory;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
@@ -58,7 +57,7 @@ public abstract class AbstractDocumentNo
* @return a copy of this node state with the given root revision and
* external change flag.
*/
- public abstract AbstractDocumentNodeState withRootRevision(@Nonnull RevisionVector root,
+ public abstract AbstractDocumentNodeState withRootRevision(@NotNull RevisionVector root,
boolean externalChange);
public abstract boolean hasNoChildren();
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommitQueue.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommitQueue.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommitQueue.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/BatchCommitQueue.java Wed Jul 18 15:08:27 2018
@@ -19,8 +19,7 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Map;
import java.util.concurrent.Callable;
-import javax.annotation.Nonnull;
-
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,7 +47,7 @@ final class BatchCommitQueue {
private final DocumentStore store;
- BatchCommitQueue(@Nonnull DocumentStore store) {
+ BatchCommitQueue(@NotNull DocumentStore store) {
this.store = checkNotNull(store);
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java Wed Jul 18 15:08:27 2018
@@ -31,15 +31,14 @@ import java.util.SortedSet;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentSkipListMap;
-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.Iterables;
import com.google.common.collect.Sets;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
/**
* Contains commit information about a branch and its base revision.
*/
@@ -75,9 +74,9 @@ class Branch {
* @param guard controls the life time of this branch.
* @throws IllegalArgumentException if base is a branch revision.
*/
- Branch(@Nonnull SortedSet<Revision> commits,
- @Nonnull RevisionVector base,
- @Nonnull ReferenceQueue<Object> queue,
+ Branch(@NotNull SortedSet<Revision> commits,
+ @NotNull RevisionVector base,
+ @NotNull ReferenceQueue<Object> queue,
@Nullable Object guard) {
checkArgument(!checkNotNull(base).isBranch(), "base is not a trunk revision: %s", base);
this.base = base;
@@ -96,7 +95,7 @@ class Branch {
/**
* @return the initial base of this branch.
*/
- @Nonnull
+ @NotNull
RevisionVector getBase() {
return base;
}
@@ -109,8 +108,8 @@ class Branch {
* @throws IllegalArgumentException if <code>r</code> is not a commit of
* this branch.
*/
- @Nonnull
- RevisionVector getBase(@Nonnull Revision r) {
+ @NotNull
+ RevisionVector getBase(@NotNull Revision r) {
BranchCommit c = commits.get(checkNotNull(r).asBranchRevision());
if (c == null) {
throw new IllegalArgumentException(
@@ -127,7 +126,7 @@ class Branch {
* @throws IllegalArgumentException if head is a trunk revision or base is a
* branch revision.
*/
- void rebase(@Nonnull Revision head, @Nonnull RevisionVector base) {
+ void rebase(@NotNull Revision head, @NotNull RevisionVector base) {
checkArgument(checkNotNull(head).isBranch(), "Not a branch revision: %s", head);
checkArgument(!checkNotNull(base).isBranch(), "Not a trunk revision: %s", base);
Revision last = commits.lastKey();
@@ -141,7 +140,7 @@ class Branch {
* @param r the revision of the branch commit to add.
* @throws IllegalArgumentException if r is not a branch revision.
*/
- void addCommit(@Nonnull Revision r) {
+ void addCommit(@NotNull Revision r) {
checkArgument(checkNotNull(r).isBranch(), "Not a branch revision: %s", r);
Revision last = commits.lastKey();
checkArgument(commits.comparator().compare(r, last) > 0);
@@ -170,7 +169,7 @@ class Branch {
* @return <code>true</code> if this branch contains a commit with the given
* revision; <code>false</code> otherwise.
*/
- boolean containsCommit(@Nonnull Revision r) {
+ boolean containsCommit(@NotNull Revision r) {
return commits.containsKey(checkNotNull(r).asBranchRevision());
}
@@ -181,8 +180,8 @@ class Branch {
* @param r the revision of a commit.
* @return the branch commit or {@code null} if it doesn't exist.
*/
- @CheckForNull
- BranchCommit getCommit(@Nonnull Revision r) {
+ @Nullable
+ BranchCommit getCommit(@NotNull Revision r) {
return commits.get(checkNotNull(r).asBranchRevision());
}
@@ -190,7 +189,7 @@ class Branch {
* @return the branch reference or {@code null} if no guard object was
* passed to the constructor of this branch.
*/
- @CheckForNull
+ @Nullable
BranchReference getRef() {
return ref;
}
@@ -202,7 +201,7 @@ class Branch {
* @param r the revision of the commit to remove.
* @throws IllegalArgumentException if r is not a branch revision.
*/
- public void removeCommit(@Nonnull Revision r) {
+ public void removeCommit(@NotNull Revision r) {
checkArgument(checkNotNull(r).isBranch(), "Not a branch revision: %s", r);
commits.remove(r);
}
@@ -214,8 +213,8 @@ class Branch {
* @param trunk the unsaved trunk modifications.
* @param mergeCommit the revision of the merge commit.
*/
- public void applyTo(@Nonnull UnsavedModifications trunk,
- @Nonnull Revision mergeCommit) {
+ public void applyTo(@NotNull UnsavedModifications trunk,
+ @NotNull Revision mergeCommit) {
checkNotNull(trunk);
for (BranchCommit c : commits.values()) {
c.applyTo(trunk, mergeCommit);
@@ -232,7 +231,7 @@ class Branch {
* @return the most recent unsaved last revision or <code>null</code> if
* there is none in this branch.
*/
- @CheckForNull
+ @Nullable
public Revision getUnsavedLastRevision(String path,
Revision readRevision) {
readRevision = readRevision.asBranchRevision();
@@ -253,7 +252,7 @@ class Branch {
* @return {@code true} if the given revision is the head of this branch,
* {@code false} otherwise.
*/
- public boolean isHead(@Nonnull Revision rev) {
+ public boolean isHead(@NotNull Revision rev) {
checkArgument(checkNotNull(rev).isBranch(),
"Not a branch revision: %s", rev);
return checkNotNull(rev).equals(commits.lastKey());
@@ -267,7 +266,7 @@ class Branch {
* @return modified paths until {@code r}.
* @throws IllegalArgumentException if r is not a branch revision.
*/
- Iterable<String> getModifiedPathsUntil(@Nonnull final Revision r) {
+ Iterable<String> getModifiedPathsUntil(@NotNull final Revision r) {
checkArgument(checkNotNull(r).isBranch(),
"Not a branch revision: %s", r);
if (!commits.containsKey(r)) {
@@ -438,9 +437,9 @@ class Branch {
private final Branch branch;
- private BranchReference(@Nonnull ReferenceQueue<Object> queue,
- @Nonnull Branch branch,
- @Nonnull Object referent) {
+ private BranchReference(@NotNull ReferenceQueue<Object> queue,
+ @NotNull Branch branch,
+ @NotNull Object referent) {
super(checkNotNull(referent), queue);
this.branch = checkNotNull(branch);
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CachingCommitValueResolver.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CachingCommitValueResolver.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CachingCommitValueResolver.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CachingCommitValueResolver.java Wed Jul 18 15:08:27 2018
@@ -18,13 +18,12 @@ package org.apache.jackrabbit.oak.plugin
import java.util.List;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Supplier;
import com.google.common.cache.Cache;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.cache.CacheBuilder.newBuilder;
import static com.google.common.collect.ImmutableList.of;
@@ -47,8 +46,8 @@ final class CachingCommitValueResolver i
}
@Override
- public String resolve(@Nonnull Revision changeRevision,
- @Nonnull NodeDocument doc) {
+ public String resolve(@NotNull Revision changeRevision,
+ @NotNull NodeDocument doc) {
// check cache first
String value = commitValueCache.getIfPresent(changeRevision);
if (value != null) {
@@ -126,9 +125,9 @@ final class CachingCommitValueResolver i
* @return the document with the change or {@code null} if there is no
* document with such a change.
*/
- @CheckForNull
- private NodeDocument resolveDocument(@Nonnull NodeDocument doc,
- @Nonnull Revision changeRevision) {
+ @Nullable
+ private NodeDocument resolveDocument(@NotNull NodeDocument doc,
+ @NotNull Revision changeRevision) {
// check if the document contains the change or we need to
// look up previous documents for the actual change
if (doc.getLocalCommitRoot().containsKey(changeRevision)
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Checkpoints.java Wed Jul 18 15:08:27 2018
@@ -26,15 +26,13 @@ import java.util.Map;
import java.util.SortedMap;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.commons.json.JsopReader;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
import org.apache.jackrabbit.oak.commons.json.JsopWriter;
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;
@@ -87,7 +85,7 @@ class Checkpoints {
final RevisionVector[] rv = new RevisionVector[1];
nodeStore.commitQueue.done(r, new CommitQueue.Callback() {
@Override
- public void headOfQueue(@Nonnull Revision revision) {
+ public void headOfQueue(@NotNull Revision revision) {
rv[0] = nodeStore.getHeadRevision();
}
});
@@ -117,7 +115,7 @@ class Checkpoints {
* checkpoint found
*/
@SuppressWarnings("unchecked")
- @CheckForNull
+ @Nullable
public Revision getOldestRevisionToKeep() {
//Get uncached doc
SortedMap<Revision, Info> checkpoints = getCheckpoints();
@@ -154,7 +152,7 @@ class Checkpoints {
}
@SuppressWarnings("unchecked")
- @Nonnull
+ @NotNull
SortedMap<Revision, Info> getCheckpoints() {
Document cdoc = store.find(Collection.SETTINGS, ID, 0);
SortedMap<Revision, String> data = null;
@@ -178,8 +176,8 @@ class Checkpoints {
* if there is no such checkpoint.
* @throws IllegalArgumentException if the checkpoint is malformed.
*/
- @CheckForNull
- RevisionVector retrieve(@Nonnull String checkpoint)
+ @Nullable
+ RevisionVector retrieve(@NotNull String checkpoint)
throws IllegalArgumentException {
Revision r;
try {
@@ -199,7 +197,7 @@ class Checkpoints {
return rv;
}
- void setInfoProperty(@Nonnull String checkpoint, @Nonnull String key, @Nullable String value) {
+ void setInfoProperty(@NotNull String checkpoint, @NotNull String key, @Nullable String value) {
Revision r = Revision.fromString(checkNotNull(checkpoint));
Info info = getCheckpoints().get(r);
if (info == null) {
@@ -273,7 +271,7 @@ class Checkpoints {
private Info(long expiryTime,
@Nullable RevisionVector checkpoint,
- @Nonnull Map<String, String> info) {
+ @NotNull Map<String, String> info) {
this.expiryTime = expiryTime;
this.checkpoint = checkpoint;
this.info = Collections.unmodifiableMap(info);
@@ -336,7 +334,7 @@ class Checkpoints {
*
* @return the revision vector checkpoint or {@code null}.
*/
- @CheckForNull
+ @Nullable
RevisionVector getCheckpoint() {
return checkpoint;
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java Wed Jul 18 15:08:27 2018
@@ -38,12 +38,11 @@ import java.util.TreeSet;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Stopwatch;
import org.apache.jackrabbit.oak.commons.StringUtils;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -352,7 +351,7 @@ public class ClusterNodeInfo {
this.newEntry = newEntry;
}
- void setLeaseCheckMode(@Nonnull LeaseCheckMode mode) {
+ void setLeaseCheckMode(@NotNull LeaseCheckMode mode) {
this.leaseCheckMode = checkNotNull(mode);
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfoDocument.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfoDocument.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfoDocument.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfoDocument.java Wed Jul 18 15:08:27 2018
@@ -18,12 +18,12 @@ package org.apache.jackrabbit.oak.plugin
import java.util.List;
-import javax.annotation.CheckForNull;
-
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.plugins.document.ClusterNodeInfo.ClusterNodeState;
import static org.apache.jackrabbit.oak.plugins.document.ClusterNodeInfo.RecoverLockState;
+import org.jetbrains.annotations.Nullable;
+
/**
* A document storing cluster node info. See also {@link ClusterNodeInfo}.
*/
@@ -114,7 +114,7 @@ public class ClusterNodeInfoDocument ext
* @return the id of the cluster node performing recovery or {@code null} if
* currently not set.
*/
- @CheckForNull
+ @Nullable
public Long getRecoveryBy() {
return (Long) get(ClusterNodeInfo.REV_RECOVERY_BY);
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collection.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collection.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collection.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collection.java Wed Jul 18 15:08:27 2018
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* The collection types.
@@ -39,7 +39,7 @@ public abstract class Collection<T exten
public static final Collection<NodeDocument> NODES =
new Collection<NodeDocument>("nodes") {
@Override
- @Nonnull
+ @NotNull
public NodeDocument newDocument(DocumentStore store) {
return new NodeDocument(store);
}
@@ -52,7 +52,7 @@ public abstract class Collection<T exten
public static final Collection<ClusterNodeInfoDocument> CLUSTER_NODES =
new Collection<ClusterNodeInfoDocument>("clusterNodes") {
@Override
- @Nonnull
+ @NotNull
public ClusterNodeInfoDocument newDocument(DocumentStore store) {
return new ClusterNodeInfoDocument();
}
@@ -64,7 +64,7 @@ public abstract class Collection<T exten
public static final Collection<Document> SETTINGS =
new Collection<Document>("settings") {
@Override
- @Nonnull
+ @NotNull
public Document newDocument(DocumentStore store) {
return new Document();
}
@@ -77,7 +77,7 @@ public abstract class Collection<T exten
*/
public static final Collection<JournalEntry> JOURNAL =
new Collection<JournalEntry>("journal") {
- @Nonnull
+ @NotNull
@Override
public JournalEntry newDocument(DocumentStore store) {
return new JournalEntry(store);
@@ -92,7 +92,7 @@ public abstract class Collection<T exten
*/
public static final Collection<Document> BLOBS =
new Collection<Document>("blobs") {
- @Nonnull
+ @NotNull
@Override
public Document newDocument(DocumentStore store) {
throw new UnsupportedOperationException();
@@ -115,6 +115,6 @@ public abstract class Collection<T exten
* @param store the document store.
* @return a new document for this collection.
*/
- @Nonnull
+ @NotNull
public abstract T newDocument(DocumentStore store);
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Collision.java Wed Jul 18 15:08:27 2018
@@ -18,11 +18,10 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Map;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Key;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Operation;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,11 +53,11 @@ class Collision {
private final Revision ourRev;
private final RevisionContext context;
- Collision(@Nonnull NodeDocument document,
- @Nonnull Revision theirRev,
- @Nonnull UpdateOp ourOp,
- @Nonnull Revision ourRev,
- @Nonnull RevisionContext context) {
+ Collision(@NotNull NodeDocument document,
+ @NotNull Revision theirRev,
+ @NotNull UpdateOp ourOp,
+ @NotNull Revision ourRev,
+ @NotNull RevisionContext context) {
this.document = checkNotNull(document);
this.theirRev = checkNotNull(theirRev);
this.ourOp = checkNotNull(ourOp);
@@ -77,7 +76,7 @@ class Collision {
* @throws IllegalStateException if neither their nor our revision can be
* marked because both are already committed.
*/
- @Nonnull
+ @NotNull
Revision mark(DocumentStore store) throws DocumentStoreException {
// first try to mark their revision
if (markCommitRoot(document, theirRev, ourRev, store, context)) {
@@ -141,11 +140,11 @@ class Collision {
* @return <code>true</code> if the commit for the given revision was marked
* successfully; <code>false</code> otherwise.
*/
- private static boolean markCommitRoot(@Nonnull NodeDocument document,
- @Nonnull Revision revision,
- @Nonnull Revision other,
- @Nonnull DocumentStore store,
- @Nonnull RevisionContext context) {
+ private static boolean markCommitRoot(@NotNull NodeDocument document,
+ @NotNull Revision revision,
+ @NotNull Revision other,
+ @NotNull DocumentStore store,
+ @NotNull RevisionContext context) {
String p = document.getPath();
String commitRootPath;
// first check if we can mark the commit with the given revision
@@ -211,8 +210,8 @@ class Collision {
return true;
}
- private static void throwNoCommitRootException(@Nonnull Revision revision,
- @Nonnull Document document)
+ private static void throwNoCommitRootException(@NotNull Revision revision,
+ @NotNull Document document)
throws DocumentStoreException {
throw new DocumentStoreException("No commit root for revision: "
+ revision + ", document: " + document.format());
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java Wed Jul 18 15:08:27 2018
@@ -25,10 +25,6 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
@@ -39,6 +35,8 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.commons.json.JsopWriter;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
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;
@@ -90,8 +88,8 @@ public class Commit {
* @param baseRevision the base revision for this commit or {@code null} if
* there is none.
*/
- Commit(@Nonnull DocumentNodeStore nodeStore,
- @Nonnull Revision revision,
+ Commit(@NotNull DocumentNodeStore nodeStore,
+ @NotNull Revision revision,
@Nullable RevisionVector baseRevision) {
this.nodeStore = checkNotNull(nodeStore);
this.revision = checkNotNull(revision);
@@ -125,7 +123,7 @@ public class Commit {
*
* @return the revision for this new commit.
*/
- @Nonnull
+ @NotNull
Revision getRevision() {
return revision;
}
@@ -138,7 +136,7 @@ public class Commit {
*
* @return the base revision of this commit or <code>null</code>.
*/
- @CheckForNull
+ @Nullable
RevisionVector getBaseRevision() {
return baseRevision;
}
@@ -147,7 +145,7 @@ public class Commit {
* @return all modified paths, including ancestors without explicit
* modifications.
*/
- @Nonnull
+ @NotNull
Iterable<String> getModifiedPaths() {
return modifiedNodes;
}
@@ -545,7 +543,7 @@ public class Commit {
* @throws ConflictException if there was a conflict introduced by the
* given update operation.
*/
- private void checkConflicts(@Nonnull UpdateOp op,
+ private void checkConflicts(@NotNull UpdateOp op,
@Nullable NodeDocument before)
throws ConflictException {
DocumentStore store = nodeStore.getDocumentStore();
@@ -670,7 +668,7 @@ public class Commit {
* otherwise.
*/
private boolean isConflicting(@Nullable NodeDocument doc,
- @Nonnull UpdateOp op) {
+ @NotNull UpdateOp op) {
if (baseRevision == null || doc == null) {
// no conflict is possible when there is no baseRevision
// or document did not exist before
@@ -694,7 +692,7 @@ public class Commit {
* {@code false} otherwise.
*/
private boolean allowConcurrentAddRemove(@Nullable NodeDocument before,
- @Nonnull UpdateOp op) {
+ @NotNull UpdateOp op) {
return nodeStore.getEnableConcurrentAddRemove()
&& !isConflicting(before, op);
}
@@ -702,7 +700,7 @@ public class Commit {
/**
* @return the branch if this is a branch commit, otherwise {@code null}.
*/
- @CheckForNull
+ @Nullable
private Branch getBranch() {
if (baseRevision == null || !baseRevision.isBranch()) {
return null;
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitDiff.java Wed Jul 18 15:08:27 2018
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
@@ -27,6 +25,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.document.bundlor.DocumentBundlor;
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;
@@ -49,8 +48,8 @@ class CommitDiff implements NodeStateDif
private final BundlingHandler bundlingHandler;
- CommitDiff(@Nonnull DocumentNodeStore store, @Nonnull Commit commit,
- @Nonnull BlobSerializer blobs) {
+ CommitDiff(@NotNull DocumentNodeStore store, @NotNull Commit commit,
+ @NotNull BlobSerializer blobs) {
this(checkNotNull(store), checkNotNull(commit), store.getBundlingConfigHandler().newBundlingHandler(),
new JsopBuilder(), checkNotNull(blobs));
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitQueue.java Wed Jul 18 15:08:27 2018
@@ -31,10 +31,9 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Maps;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,16 +61,16 @@ final class CommitQueue {
private long suspendTimeout = Long.getLong("oak.documentMK.suspendTimeoutMillis", DEFAULT_SUSPEND_TIMEOUT);
- CommitQueue(@Nonnull RevisionContext context) {
+ CommitQueue(@NotNull RevisionContext context) {
this.context = checkNotNull(context);
}
- @Nonnull
+ @NotNull
Revision createRevision() {
return createRevisions(1).first();
}
- @Nonnull
+ @NotNull
SortedSet<Revision> createRevisions(int num) {
checkArgument(num > 0);
SortedSet<Revision> revs = new TreeSet<Revision>(StableRevisionComparator.INSTANCE);
@@ -87,17 +86,17 @@ final class CommitQueue {
return revs;
}
- void done(@Nonnull Revision revision, @Nonnull Callback c) {
+ void done(@NotNull Revision revision, @NotNull Callback c) {
checkNotNull(revision);
waitUntilHeadOfQueue(revision, c);
}
- void canceled(@Nonnull Revision rev) {
+ void canceled(@NotNull Revision rev) {
removeCommit(rev);
notifySuspendedCommits(rev);
}
- boolean contains(@Nonnull Revision revision) {
+ boolean contains(@NotNull Revision revision) {
synchronized (this) {
return commits.containsKey(checkNotNull(revision));
}
@@ -114,7 +113,7 @@ final class CommitQueue {
*
* @param revisions the revisions to become visible.
*/
- void suspendUntilAll(@Nonnull Set<Revision> revisions) {
+ void suspendUntilAll(@NotNull Set<Revision> revisions) {
try {
suspendUntilAll(revisions, suspendTimeout);
} catch (InterruptedException e) {
@@ -137,7 +136,7 @@ final class CommitQueue {
* status set or was interrupted while waiting. The current thread's
* interrupted status is cleared when this exception is thrown.
*/
- void suspendUntilAll(@Nonnull Set<Revision> revisions, long suspendTimeoutMillis)
+ void suspendUntilAll(@NotNull Set<Revision> revisions, long suspendTimeoutMillis)
throws InterruptedException {
Semaphore s;
int addedRevisions;
@@ -192,7 +191,7 @@ final class CommitQueue {
interface Callback {
- void headOfQueue(@Nonnull Revision revision);
+ void headOfQueue(@NotNull Revision revision);
}
//------------------------< internal >--------------------------------------
@@ -213,7 +212,7 @@ final class CommitQueue {
}
}
- private void notifySuspendedCommits(@Nonnull Revision revision) {
+ private void notifySuspendedCommits(@NotNull Revision revision) {
checkNotNull(revision);
synchronized (suspendedCommits) {
if (suspendedCommits.isEmpty()) {
@@ -229,7 +228,7 @@ final class CommitQueue {
}
}
- private void removeCommit(@Nonnull Revision rev) {
+ private void removeCommit(@NotNull Revision rev) {
// simply remove and notify next head if any
synchronized (this) {
boolean wasHead = commits.firstKey().equals(rev);
@@ -241,8 +240,8 @@ final class CommitQueue {
}
}
- private void waitUntilHeadOfQueue(@Nonnull Revision rev,
- @Nonnull Callback c) {
+ private void waitUntilHeadOfQueue(@NotNull Revision rev,
+ @NotNull Callback c) {
assert !commits.isEmpty();
boolean isHead;
@@ -353,4 +352,4 @@ final class CommitQueue {
}
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitValueResolver.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitValueResolver.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitValueResolver.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/CommitValueResolver.java Wed Jul 18 15:08:27 2018
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* Resolves the commit value for a given change revision on a document.
@@ -31,5 +31,5 @@ public interface CommitValueResolver {
* @param doc the document with the change.
* @return the commit value of the revision.
*/
- String resolve(@Nonnull Revision changeRevision, @Nonnull NodeDocument doc);
+ String resolve(@NotNull Revision changeRevision, @NotNull NodeDocument doc);
}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ConflictException.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ConflictException.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ConflictException.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/ConflictException.java Wed Jul 18 15:08:27 2018
@@ -16,9 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.jetbrains.annotations.NotNull;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.api.CommitFailedException.MERGE;
@@ -44,8 +43,8 @@ class ConflictException extends Exceptio
* @param message the exception / conflict message.
* @param conflictRevision the conflict revision
*/
- ConflictException(@Nonnull String message,
- @Nonnull Revision conflictRevision) {
+ ConflictException(@NotNull String message,
+ @NotNull Revision conflictRevision) {
super(checkNotNull(message));
this.conflictRevisions = Collections.singleton(checkNotNull(conflictRevision));
}
@@ -54,8 +53,8 @@ class ConflictException extends Exceptio
* @param message the exception / conflict message.
* @param conflictRevisions the conflict revision list
*/
- ConflictException(@Nonnull String message,
- @Nonnull Set<Revision> conflictRevisions) {
+ ConflictException(@NotNull String message,
+ @NotNull Set<Revision> conflictRevisions) {
super(checkNotNull(message));
this.conflictRevisions = checkNotNull(conflictRevisions);
}
@@ -63,7 +62,7 @@ class ConflictException extends Exceptio
/**
* @param message the exception / conflict message.
*/
- ConflictException(@Nonnull String message) {
+ ConflictException(@NotNull String message) {
super(checkNotNull(message));
this.conflictRevisions = Collections.emptySet();
}
@@ -88,8 +87,8 @@ class ConflictException extends Exceptio
*
* @return a list of conflict revisions (may be empty)
*/
- @Nonnull
+ @NotNull
Iterable<Revision> getConflictRevisions() {
return conflictRevisions;
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java Wed Jul 18 15:08:27 2018
@@ -16,13 +16,11 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.json.JsopReader;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* A cache for child node diffs.
@@ -46,10 +44,10 @@ abstract class DiffCache {
* @param loader an optional loader for the cache entry.
* @return the diff or {@code null} if unknown and no loader was passed.
*/
- @CheckForNull
- abstract String getChanges(@Nonnull RevisionVector from,
- @Nonnull RevisionVector to,
- @Nonnull String path,
+ @Nullable
+ abstract String getChanges(@NotNull RevisionVector from,
+ @NotNull RevisionVector to,
+ @NotNull String path,
@Nullable Loader loader);
/**
@@ -62,15 +60,15 @@ abstract class DiffCache {
* false if it results from an external change
* @return the cache entry.
*/
- @Nonnull
- abstract Entry newEntry(@Nonnull RevisionVector from,
- @Nonnull RevisionVector to,
+ @NotNull
+ abstract Entry newEntry(@NotNull RevisionVector from,
+ @NotNull RevisionVector to,
boolean local);
/**
* @return the statistics for this cache.
*/
- @Nonnull
+ @NotNull
abstract Iterable<CacheStats> getStats();
/**
@@ -84,8 +82,8 @@ abstract class DiffCache {
* if one of the {@code diff} callbacks requested a stop.
* @throws IllegalArgumentException if {@code jsop} is malformed.
*/
- static boolean parseJsopDiff(@Nonnull String jsop,
- @Nonnull Diff diff) {
+ static boolean parseJsopDiff(@NotNull String jsop,
+ @NotNull Diff diff) {
if (jsop.trim().isEmpty()) {
return true;
}
@@ -136,8 +134,8 @@ abstract class DiffCache {
* @param path the path of the parent node.
* @param changes the child node changes.
*/
- void append(@Nonnull String path,
- @Nonnull String changes);
+ void append(@NotNull String path,
+ @NotNull String changes);
/**
* Called when all changes have been appended and the entry is ready
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Document.java Wed Jul 18 15:08:27 2018
@@ -23,12 +23,10 @@ import java.util.NavigableMap;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
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 com.google.common.collect.Maps;
@@ -71,7 +69,7 @@ public class Document implements CacheVa
*
* @return the id or <code>null</code> if none is set.
*/
- @CheckForNull
+ @Nullable
public String getId() {
return (String) get(ID);
}
@@ -82,7 +80,7 @@ public class Document implements CacheVa
* @return the count or <code>null</code> if
* none is set.
*/
- @CheckForNull
+ @Nullable
public Long getModCount() {
return Utils.asLong((Number) get(MOD_COUNT));
}
@@ -93,7 +91,7 @@ public class Document implements CacheVa
* @param key the key.
* @return the data or <code>null</code>.
*/
- @CheckForNull
+ @Nullable
public Object get(String key) {
return data.get(key);
}
@@ -105,7 +103,7 @@ public class Document implements CacheVa
* @param value the value to set.
* @return the previous value or <code>null</code> if there was none.
*/
- @CheckForNull
+ @Nullable
public Object put(String key, Object value) {
return data.put(key, value);
}
@@ -116,7 +114,7 @@ public class Document implements CacheVa
* @param key the key.
* @return the previous value or <code>null</code> if there was none.
*/
- @CheckForNull
+ @Nullable
public Object remove(String key) {
return data.remove(key);
}
@@ -197,8 +195,8 @@ public class Document implements CacheVa
* the top level map, etc.
* @return the transformed and sealed map.
*/
- @Nonnull
- protected Map<?, ?> transformAndSeal(@Nonnull Map<Object, Object> map,
+ @NotNull
+ protected Map<?, ?> transformAndSeal(@NotNull Map<Object, Object> map,
@Nullable String key,
int level) {
for (Map.Entry<Object, Object> entry : map.entrySet()) {
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentBranchRootNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentBranchRootNodeState.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentBranchRootNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentBranchRootNodeState.java Wed Jul 18 15:08:27 2018
@@ -16,10 +16,9 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -31,18 +30,18 @@ class DocumentBranchRootNodeState extend
private final DocumentNodeStore store;
private final DocumentNodeStoreBranch branch;
- DocumentBranchRootNodeState(@Nonnull DocumentNodeStore store,
- @Nonnull DocumentNodeStoreBranch branch,
- @Nonnull String path,
- @Nonnull RevisionVector rootRevision,
+ DocumentBranchRootNodeState(@NotNull DocumentNodeStore store,
+ @NotNull DocumentNodeStoreBranch branch,
+ @NotNull String path,
+ @NotNull RevisionVector rootRevision,
@Nullable RevisionVector lastRevision,
- @Nonnull BundlingContext bundlingContext) {
+ @NotNull BundlingContext bundlingContext) {
super(store, path, lastRevision, rootRevision, false, bundlingContext);
this.store = store;
this.branch = checkNotNull(branch);
}
- @Nonnull
+ @NotNull
@Override
public NodeBuilder builder() {
return new DocumentRootBuilder(store.getRoot(getRootRevision()), store, branch);
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteService.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteService.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteService.java Wed Jul 18 15:08:27 2018
@@ -27,7 +27,6 @@ import java.util.Map;
import java.util.Random;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.Value;
import org.apache.jackrabbit.commons.SimpleValueFactory;
@@ -37,6 +36,7 @@ import org.apache.jackrabbit.oak.spi.clu
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.osgi.framework.Version;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
@@ -651,7 +651,7 @@ public class DocumentDiscoveryLiteServic
* that's why this approach has been chosen).
*/
@Override
- public void contentChanged(@Nonnull NodeState root,@Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root,@NotNull CommitInfo info) {
// contentChanged is only used to react as quickly as possible
// when we have instances that have a 'backlog' - ie when instances
// crashed
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeBuilder.java Wed Jul 18 15:08:27 2018
@@ -19,13 +19,12 @@ package org.apache.jackrabbit.oak.plugin
import java.io.IOException;
import java.io.InputStream;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeBuilder;
import org.apache.jackrabbit.oak.spi.state.ApplyDiff;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.jackrabbit.oak.spi.state.AbstractNodeState.checkValidName;
@@ -49,7 +48,7 @@ class DocumentNodeBuilder extends Abstra
}
@Override
- @Nonnull
+ @NotNull
public NodeState getBaseState() {
if (base == null || rootBase != root.getBaseState()) {
base = getParent().getBaseState().getChildNode(getName());
@@ -64,7 +63,7 @@ class DocumentNodeBuilder extends Abstra
}
@Override
- public boolean moveTo(@Nonnull NodeBuilder newParent, @Nonnull String newName) {
+ public boolean moveTo(@NotNull NodeBuilder newParent, @NotNull String newName) {
checkNotNull(newParent);
checkValidName(newName);
if (isRoot() || !exists() || newParent.hasChildNode(newName)) {
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeState.java Wed Jul 18 15:08:27 2018
@@ -26,10 +26,6 @@ import java.util.Map.Entry;
import java.util.NoSuchElementException;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.TreeTraverser;
@@ -52,6 +48,8 @@ import org.apache.jackrabbit.oak.spi.sta
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.NotNull;
+import org.jetbrains.annotations.Nullable;
import com.google.common.base.Function;
import com.google.common.collect.Iterables;
@@ -96,14 +94,14 @@ public class DocumentNodeState extends A
private AbstractDocumentNodeState cachedSecondaryState;
- DocumentNodeState(@Nonnull DocumentNodeStore store,
- @Nonnull String path,
- @Nonnull RevisionVector rootRevision) {
+ DocumentNodeState(@NotNull DocumentNodeStore store,
+ @NotNull String path,
+ @NotNull RevisionVector rootRevision) {
this(store, path, rootRevision, Collections.<PropertyState>emptyList(), false, null);
}
- DocumentNodeState(@Nonnull DocumentNodeStore store, @Nonnull String path,
- @Nonnull RevisionVector rootRevision,
+ DocumentNodeState(@NotNull DocumentNodeStore store, @NotNull String path,
+ @NotNull RevisionVector rootRevision,
Iterable<? extends PropertyState> properties,
boolean hasChildren,
@Nullable RevisionVector lastRevision) {
@@ -111,10 +109,10 @@ public class DocumentNodeState extends A
hasChildren, lastRevision, false);
}
- private DocumentNodeState(@Nonnull DocumentNodeStore store,
- @Nonnull String path,
- @Nonnull RevisionVector rootRevision,
- @Nonnull Map<String, PropertyState> properties,
+ private DocumentNodeState(@NotNull DocumentNodeStore store,
+ @NotNull String path,
+ @NotNull RevisionVector rootRevision,
+ @NotNull Map<String, PropertyState> properties,
boolean hasChildren,
@Nullable RevisionVector lastRevision,
boolean fromExternalChange) {
@@ -122,8 +120,8 @@ public class DocumentNodeState extends A
fromExternalChange, createBundlingContext(checkNotNull(properties), hasChildren));
}
- protected DocumentNodeState(@Nonnull DocumentNodeStore store,
- @Nonnull String path,
+ protected DocumentNodeState(@NotNull DocumentNodeStore store,
+ @NotNull String path,
@Nullable RevisionVector lastRevision,
@Nullable RevisionVector rootRevision,
boolean fromExternalChange,
@@ -152,7 +150,7 @@ public class DocumentNodeState extends A
* external change flag.
*/
@Override
- public DocumentNodeState withRootRevision(@Nonnull RevisionVector root,
+ public DocumentNodeState withRootRevision(@NotNull RevisionVector root,
boolean externalChange) {
if (rootRevision.equals(root) && fromExternalChange == externalChange) {
return this;
@@ -165,7 +163,7 @@ public class DocumentNodeState extends A
* @return a copy of this {@code DocumentNodeState} with the
* {@link #fromExternalChange} flag set to {@code true}.
*/
- @Nonnull
+ @NotNull
public DocumentNodeState fromExternalChange() {
return new DocumentNodeState(store, path, lastRevision, rootRevision, true, bundlingContext);
}
@@ -180,8 +178,8 @@ public class DocumentNodeState extends A
* @throws IllegalStateException if this is not a root node state or does
* not represent a branch state.
*/
- @Nonnull
- DocumentNodeState asBranchRootState(@Nonnull DocumentNodeStoreBranch branch) {
+ @NotNull
+ DocumentNodeState asBranchRootState(@NotNull DocumentNodeStoreBranch branch) {
checkState(PathUtils.denotesRoot(path));
checkState(getRootRevision().isBranch());
return new DocumentBranchRootNodeState(store, branch, path, rootRevision, lastRevision, bundlingContext);
@@ -206,7 +204,7 @@ public class DocumentNodeState extends A
*
* @return the revision of the root node state.
*/
- @Nonnull
+ @NotNull
public RevisionVector getRootRevision() {
return rootRevision;
}
@@ -230,16 +228,16 @@ public class DocumentNodeState extends A
}
@Override
- public PropertyState getProperty(@Nonnull String name) {
+ public PropertyState getProperty(@NotNull String name) {
return properties.get(name);
}
@Override
- public boolean hasProperty(@Nonnull String name) {
+ public boolean hasProperty(@NotNull String name) {
return properties.containsKey(name);
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends PropertyState> getProperties() {
//Filter out the meta properties related to bundling from
@@ -251,7 +249,7 @@ public class DocumentNodeState extends A
}
@Override
- public boolean hasChildNode(@Nonnull String name) {
+ public boolean hasChildNode(@NotNull String name) {
if (!hasChildren || !isValidName(name)) {
return false;
} else {
@@ -259,9 +257,9 @@ public class DocumentNodeState extends A
}
}
- @Nonnull
+ @NotNull
@Override
- public NodeState getChildNode(@Nonnull String name) {
+ public NodeState getChildNode(@NotNull String name) {
if (!hasChildren) {
checkValidName(name);
return EmptyNodeState.MISSING_NODE;
@@ -318,7 +316,7 @@ public class DocumentNodeState extends A
return properties.size();
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends ChildNodeEntry> getChildNodeEntries() {
if (!hasChildren) {
@@ -346,7 +344,7 @@ public class DocumentNodeState extends A
};
}
- @Nonnull
+ @NotNull
@Override
public NodeBuilder builder() {
if ("/".equals(getPath())) {
@@ -415,7 +413,7 @@ public class DocumentNodeState extends A
*
* @param revision the revision this node is created.
*/
- UpdateOp asOperation(@Nonnull Revision revision) {
+ UpdateOp asOperation(@NotNull Revision revision) {
String id = Utils.getIdFromPath(path);
UpdateOp op = new UpdateOp(id, true);
if (Utils.isLongPath(path)) {
@@ -482,7 +480,7 @@ public class DocumentNodeState extends A
//------------------------------< internal >--------------------------------
- @CheckForNull
+ @Nullable
private AbstractDocumentNodeState getChildNodeDoc(String childNodeName){
AbstractDocumentNodeState secondaryState = getSecondaryNodeState();
if (secondaryState != null){
@@ -509,7 +507,7 @@ public class DocumentNodeState extends A
return store.getNode(concat(getPath(), childNodeName), lastRevision);
}
- @CheckForNull
+ @Nullable
private AbstractDocumentNodeState getSecondaryNodeState(){
if (cachedSecondaryState == null){
cachedSecondaryState = store.getSecondaryNodeState(getPath(), rootRevision, lastRevision);
@@ -528,7 +526,7 @@ public class DocumentNodeState extends A
* @param limit the maximum number of child node entries to return.
* @return the child node entries.
*/
- @Nonnull
+ @NotNull
private Iterable<ChildNodeEntry> getChildNodeEntries(@Nullable String name,
int limit) {
Iterable<? extends AbstractDocumentNodeState> children = store.getChildNodes(this, name, limit);
@@ -536,13 +534,13 @@ public class DocumentNodeState extends A
@Override
public ChildNodeEntry apply(final AbstractDocumentNodeState input) {
return new AbstractChildNodeEntry() {
- @Nonnull
+ @NotNull
@Override
public String getName() {
return PathUtils.getName(input.getPath());
}
- @Nonnull
+ @NotNull
@Override
public NodeState getNodeState() {
return input;
@@ -783,13 +781,13 @@ public class DocumentNodeState extends A
@Override
public ChildNodeEntry apply(final String childNodeName) {
return new AbstractChildNodeEntry() {
- @Nonnull
+ @NotNull
@Override
public String getName() {
return childNodeName;
}
- @Nonnull
+ @NotNull
@Override
public NodeState getNodeState() {
return createBundledState(childNodeName, bundlingContext.matcher.next(childNodeName));
Modified: jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStateCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStateCache.java?rev=1836194&r1=1836193&r2=1836194&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStateCache.java (original)
+++ jackrabbit/oak/trunk/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStateCache.java Wed Jul 18 15:08:27 2018
@@ -19,9 +19,8 @@
package org.apache.jackrabbit.oak.plugins.document;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
public interface DocumentNodeStateCache {
DocumentNodeStateCache NOOP = new DocumentNodeStateCache() {
@@ -47,7 +46,7 @@ public interface DocumentNodeStateCache
* @return nodeState at given path or null. If given revision is not present or the
* path is not cached then <code>null</code> would be returned
*/
- @CheckForNull
+ @Nullable
AbstractDocumentNodeState getDocumentNodeState(String path, RevisionVector rootRevision, RevisionVector lastRev);
/**