DocumentNodeStoreBranchesTest uses javax.annotation.Nonnull
@@ -27,8 +27,6 @@ import static org.junit.Assert.fail;
import java.util.Arrays;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
@@ -47,6 +45,7 @@ import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -162,7 +161,7 @@ public class DocumentNodeStoreBranchesTest {
try {
ns.merge(nb, new CommitHook() {
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(NodeState before,
NodeState after,
@@ -218,7 +217,7 @@ public class DocumentNodeStoreBranchesTest {
nb.child("foo");
try {
ns.merge(nb, new CommitHook() {
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(NodeState before,
NodeState after,
@@ -269,7 +268,7 @@ public class DocumentNodeStoreBranchesTest {
nb.child("foo");
try {
ns.merge(nb, new CommitHook() {
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(NodeState before,
NodeState after,
@@ -328,7 +327,7 @@ public class DocumentNodeStoreBranchesTest {
nb.child("foo");
try {
ns.merge(nb, new CommitHook() {
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(NodeState before,
NodeState after,
