Author: reschke
Date: Wed Jul 18 15:05:35 2018
New Revision: 1836193
URL: http://svn.apache.org/viewvc?rev=1836193&view=rev
Log:
OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations
instead - oak-store-composite
Modified:
jackrabbit/oak/trunk/oak-store-composite/pom.xml
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CommitHookEnhancer.java
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java
jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java
Modified: jackrabbit/oak/trunk/oak-store-composite/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/pom.xml?rev=1836193&r1=1836192&r2=1836193&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-composite/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-store-composite/pom.xml Wed Jul 18 15:05:35 2018
@@ -116,10 +116,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-composite/src/main/java/org/apache/jackrabbit/oak/composite/CommitHookEnhancer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CommitHookEnhancer.java?rev=1836193&r1=1836192&r2=1836193&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CommitHookEnhancer.java
(original)
+++
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CommitHookEnhancer.java
Wed Jul 18 15:05:35 2018
@@ -21,11 +21,10 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.state.ApplyDiff;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
-import javax.annotation.Nonnull;
import java.util.Map;
import java.util.Optional;
-
import static com.google.common.collect.Maps.newHashMap;
class CommitHookEnhancer implements CommitHook {
@@ -44,7 +43,7 @@ class CommitHookEnhancer implements Comm
this.hook = hook;
}
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(NodeState before, NodeState after,
CommitInfo info) throws CommitFailedException {
Map<MountedNodeStore, NodeState> beforeStates = newHashMap();
Modified:
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java?rev=1836193&r1=1836192&r2=1836193&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/PrivateStoreValidatorProvider.java
Wed Jul 18 15:05:35 2018
@@ -26,14 +26,13 @@ import org.apache.jackrabbit.oak.spi.mou
import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
import org.apache.jackrabbit.oak.spi.mount.Mounts;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nonnull;
import java.util.Map;
-
/**
* {@link Validator} which detects change commits to the read only mounts.
*/
@@ -55,7 +54,7 @@ public class PrivateStoreValidatorProvid
private ServiceRegistration serviceRegistration;
- @Nonnull
+ @NotNull
public Validator getRootValidator(NodeState before, NodeState after,
CommitInfo info) {
return new PrivateStoreValidator(ROOT_PATH);
}
Modified:
jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java?rev=1836193&r1=1836192&r2=1836193&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java
(original)
+++
jackrabbit/oak/trunk/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java
Wed Jul 18 15:05:35 2018
@@ -35,11 +35,10 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.spi.state.ReadOnlyBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import java.util.List;
import java.util.Map;
@@ -202,24 +201,24 @@ public class CompositeChildrenCountTest
return true;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends PropertyState> getProperties() {
return emptyList();
}
@Override
- public boolean hasChildNode(@Nonnull String name) {
+ public boolean hasChildNode(@NotNull String name) {
return false;
}
- @Nonnull
+ @NotNull
@Override
- public NodeState getChildNode(@Nonnull String name) throws
IllegalArgumentException {
+ public NodeState getChildNode(@NotNull String name) throws
IllegalArgumentException {
return EmptyNodeState.MISSING_NODE;
}
- @Nonnull
+ @NotNull
@Override
public Iterable<? extends ChildNodeEntry> getChildNodeEntries() {
if (children == null) {
@@ -241,7 +240,7 @@ public class CompositeChildrenCountTest
return childrenCount;
}
- @Nonnull
+ @NotNull
@Override
public NodeBuilder builder() {
return new MemoryNodeBuilder(this);
