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/13 11:47:02 UTC
svn commit: r1835819 - in /jackrabbit/oak/trunk:
oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/
oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/
Author: reschke
Date: Fri Jul 13 11:47:02 2018
New Revision: 1835819
URL: http://svn.apache.org/viewvc?rev=1835819&view=rev
Log:
OAK-7632: remove JSR 305 annotations in Groovy code
Modified:
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy
jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy
jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy?rev=1835819&r1=1835818&r2=1835819&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/JaasConfigSpiTest.groovy Fri Jul 13 11:47:02 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/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy?rev=1835819&r1=1835818&r2=1835819&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/groovy/org/apache/jackrabbit/oak/run/osgi/TokenAuthenticationTest.groovy Fri Jul 13 11:47:02 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
@@ -70,7 +69,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/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy?rev=1835819&r1=1835818&r2=1835819&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy Fri Jul 13 11:47:02 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));
}