Author: reschke
Date: Tue Jul 31 14:26:42 2018
New Revision: 1837152
URL: http://svn.apache.org/viewvc?rev=1837152&view=rev
Log:
OAK-7632: remove JSR 305 annotations in Groovy code (ported to 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy
jackrabbit/oak/branches/1.8/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy
jackrabbit/oak/branches/1.8/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 31 14:26:42 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,1827977,1828439,1828529,1828948,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830347,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1833833,1834610,1834648
-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835780,1836487,1836493
+/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,1827977,1828439,1828529,1828948,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830347,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1833833,1834610,1834648
-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835780,1835819,1836487,1836493
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.8/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy?rev=1837152&r1=1837151&r2=1837152&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy
(original)
+++
jackrabbit/oak/branches/1.8/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy
Tue Jul 31 14:26:42 2018
@@ -27,7 +27,6 @@ import org.junit.Before
import org.junit.Ignore
import org.junit.Test
-import javax.annotation.Nonnull
import javax.jcr.Credentials
import javax.jcr.Session
import javax.jcr.SimpleCredentials
@@ -86,7 +85,6 @@ class JaasConfigSpiTest extends Abstract
private Set<? extends Principal> principals;
private String userId;
- @Nonnull
@Override
protected Set<Class> getSupportedCredentials() {
return ImmutableSet.of(SimpleCredentials.class)
Modified:
jackrabbit/oak/branches/1.8/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy?rev=1837152&r1=1837151&r2=1837152&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy
(original)
+++
jackrabbit/oak/branches/1.8/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy
Tue Jul 31 14:26:42 2018
@@ -28,7 +28,6 @@ import org.junit.Before
import org.junit.Ignore
import org.junit.Test
-import javax.annotation.Nonnull
import javax.jcr.Credentials
import javax.jcr.Session
import javax.jcr.SimpleCredentials
@@ -72,7 +71,6 @@ class TokenAuthenticationTest extends Ab
@Slf4j
private static class PreAuthLoginModule extends AbstractLoginModule {
private MyCredential credential
- @Nonnull
@Override
protected Set<Class> getSupportedCredentials() {
return Sets.newHashSet(MyCredential.class)
Modified:
jackrabbit/oak/branches/1.8/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy?rev=1837152&r1=1837151&r2=1837152&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
(original)
+++
jackrabbit/oak/branches/1.8/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
Tue Jul 31 14:26:42 2018
@@ -38,7 +38,6 @@ import org.codehaus.groovy.tools.shell.C
import org.codehaus.groovy.tools.shell.Groovysh
import org.apache.jackrabbit.oak.spi.state.NodeBuilder as OakNodeBuilder
-import javax.annotation.Nonnull
import static com.google.common.base.Preconditions.checkNotNull
import static
org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_DATA_CHILD_NAME
@@ -152,7 +151,7 @@ class LuceneCommand extends ComplexComma
return (ConsoleSession)variables.session
}
- private static NodeBuilder getNode(@Nonnull NodeBuilder node, @Nonnull
String path) {
+ private static NodeBuilder getNode(NodeBuilder node, String path) {
for (String name : PathUtils.elements(checkNotNull(path))) {
node = node.getChildNode(checkNotNull(name));
}
