Author: reschke
Date: Wed Nov 7 14:06:20 2018
New Revision: 1846021
URL: http://svn.apache.org/viewvc?rev=1846021&view=rev
Log:
OAK-7669: OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability
annotations instead - oak-it
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-it/pom.xml
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateClusterTestIT.java
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/ClusterPermissionsTest.java
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 7 14:06:20 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157
-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836180,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840455,1840574,1841314,1841352,1842089,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845336
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911,1830923,1831157
-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836181,1836487,1836493,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840455,1840574,1841314,1841352,1842089,1842677,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845336
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-it/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-it/pom.xml?rev=1846021&r1=1846020&r2=1846021&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-it/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-it/pom.xml Wed Nov 7 14:06:20 2018
@@ -154,8 +154,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified:
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java?rev=1846021&r1=1846020&r2=1846021&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java
Wed Nov 7 14:06:20 2018
@@ -44,7 +44,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
import javax.sql.DataSource;
import com.google.common.base.Predicate;
@@ -80,6 +79,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
Modified:
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateClusterTestIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateClusterTestIT.java?rev=1846021&r1=1846020&r2=1846021&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateClusterTestIT.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateClusterTestIT.java
Wed Nov 7 14:06:20 2018
@@ -31,8 +31,6 @@ import java.util.concurrent.ScheduledExe
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
@@ -47,6 +45,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -232,9 +231,9 @@ public class AsyncIndexUpdateClusterTest
}
@Override
- public Editor getIndexEditor(@Nonnull String type,
- @Nonnull NodeBuilder definition, @Nonnull NodeState root,
- @Nonnull IndexUpdateCallback callback)
+ public Editor getIndexEditor(@NotNull String type,
+ @NotNull NodeBuilder definition, @NotNull NodeState root,
+ @NotNull IndexUpdateCallback callback)
throws CommitFailedException {
Editor e = delegate
.getIndexEditor(type, definition, root, callback);
@@ -323,4 +322,4 @@ public class AsyncIndexUpdateClusterTest
}
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/ClusterPermissionsTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/ClusterPermissionsTest.java?rev=1846021&r1=1846020&r2=1846021&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/ClusterPermissionsTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/ClusterPermissionsTest.java
Wed Nov 7 14:06:20 2018
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import javax.annotation.Nullable;
import javax.jcr.Credentials;
import javax.jcr.NoSuchWorkspaceException;
import javax.jcr.SimpleCredentials;
@@ -59,6 +58,7 @@ import org.apache.jackrabbit.oak.spi.sec
import
org.apache.jackrabbit.oak.spi.security.authorization.AuthorizationConfiguration;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -236,4 +236,4 @@ public class ClusterPermissionsTest {
ns2.runBackgroundOperations();
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java?rev=1846021&r1=1846020&r2=1846021&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/commit/CommitContextTest.java
Wed Nov 7 14:06:20 2018
@@ -23,7 +23,6 @@ import java.io.Closeable;
import java.io.IOException;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
import javax.jcr.NoSuchWorkspaceException;
import javax.security.auth.login.LoginException;
@@ -38,6 +37,7 @@ import org.apache.jackrabbit.oak.api.Tre
import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Assume;
import org.junit.Test;
@@ -102,7 +102,7 @@ public class CommitContextTest extends O
.with(new OpenSecurityProvider())
.with(observer)
.with(new CommitHook() {
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(NodeState before, NodeState
after, CommitInfo info)
throws CommitFailedException {
@@ -137,7 +137,7 @@ public class CommitContextTest extends O
.with(new OpenSecurityProvider())
.with(observer)
.with(new CommitHook() {
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(NodeState before, NodeState
after, CommitInfo info)
throws CommitFailedException {
@@ -153,7 +153,7 @@ public class CommitContextTest extends O
}
})
.with(new CommitHook() {
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(NodeState before, NodeState
after,
CommitInfo info) throws
CommitFailedException {
@@ -190,7 +190,7 @@ public class CommitContextTest extends O
CommitInfo info;
@Override
- public void contentChanged(@Nonnull NodeState root, @Nonnull
CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root, @NotNull
CommitInfo info) {
this.info = info;
}
}
Modified:
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java?rev=1846021&r1=1846020&r2=1846021&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/CheckpointTest.java
Wed Nov 7 14:06:20 2018
@@ -21,8 +21,6 @@ package org.apache.jackrabbit.oak.spi.st
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -37,6 +35,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.commit.Observable;
import org.apache.jackrabbit.oak.spi.commit.Observer;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -94,7 +93,7 @@ public class CheckpointTest extends OakB
final AtomicInteger invocationCount = new AtomicInteger();
((Observable)store).addObserver(new Observer() {
@Override
- public void contentChanged(@Nonnull NodeState root, @Nonnull
CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root, @NotNull
CommitInfo info) {
invocationCount.incrementAndGet();
}
});
Modified:
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java?rev=1846021&r1=1846020&r2=1846021&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
(original)
+++
jackrabbit/oak/branches/1.8/oak-it/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
Wed Nov 7 14:06:20 2018
@@ -38,8 +38,6 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.NodeStoreFixtures;
import org.apache.jackrabbit.oak.OakBaseTest;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -56,6 +54,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.commit.Observable;
import org.apache.jackrabbit.oak.spi.commit.Observer;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -229,7 +228,7 @@ public class NodeStoreTest extends OakBa
((Observable) store).addObserver(new Observer() {
@Override
public void contentChanged(
- @Nonnull NodeState root, @Nonnull CommitInfo info) {
+ @NotNull NodeState root, @NotNull CommitInfo info) {
if (root.getChildNode("test").hasChildNode("newNode")) {
observedRoot.set(checkNotNull(root));
latch.countDown();
@@ -269,7 +268,7 @@ public class NodeStoreTest extends OakBa
testBuilder.getChildNode("a").remove();
store.merge(rootBuilder, new CommitHook() {
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(
NodeState before, NodeState after, CommitInfo info) {
@@ -536,7 +535,7 @@ public class NodeStoreTest extends OakBa
try {
store.merge(rootBuilder, new CommitHook() {
- @Nonnull
+ @NotNull
@Override
public NodeState processCommit(
NodeState before, NodeState after, CommitInfo info)
@@ -630,4 +629,4 @@ public class NodeStoreTest extends OakBa
}
}
-}
\ No newline at end of file
+}
