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 an...@apache.org on 2015/03/31 14:41:34 UTC
svn commit: r1670318 [3/3] - in /jackrabbit/oak/trunk:
oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/
oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/
...
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java Tue Mar 31 12:41:32 2015
@@ -23,6 +23,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
import com.google.common.collect.Iterators;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -41,7 +44,7 @@ public class CompositePrincipalProvider
//--------------------------------------------------< PrincipalProvider >---
@Override
- public Principal getPrincipal(String principalName) {
+ public Principal getPrincipal(@Nonnull String principalName) {
Principal principal = null;
for (int i = 0; i < providers.size() && principal == null; i++) {
principal = providers.get(i).getPrincipal(principalName);
@@ -50,8 +53,9 @@ public class CompositePrincipalProvider
return principal;
}
+ @Nonnull
@Override
- public Set<Group> getGroupMembership(Principal principal) {
+ public Set<Group> getGroupMembership(@Nonnull Principal principal) {
Set<Group> groups = new HashSet<Group>();
for (PrincipalProvider provider : providers) {
groups.addAll(provider.getGroupMembership(principal));
@@ -59,8 +63,9 @@ public class CompositePrincipalProvider
return groups;
}
+ @Nonnull
@Override
- public Set<Principal> getPrincipals(String userID) {
+ public Set<Principal> getPrincipals(@Nonnull String userID) {
Set<Principal> principals = new HashSet<Principal>();
for (PrincipalProvider provider : providers) {
principals.addAll(provider.getPrincipals(userID));
@@ -68,8 +73,9 @@ public class CompositePrincipalProvider
return principals;
}
+ @Nonnull
@Override
- public Iterator<Principal> findPrincipals(String nameHint, int searchType) {
+ public Iterator<Principal> findPrincipals(@Nullable String nameHint, int searchType) {
Iterator<? extends Principal>[] iterators = new Iterator[providers.size()];
int i = 0;
for (PrincipalProvider provider : providers) {
@@ -82,6 +88,7 @@ public class CompositePrincipalProvider
return Iterators.concat(iterators);
}
+ @Nonnull
@Override
public Iterator<? extends Principal> findPrincipals(int searchType) {
return findPrincipals(null, searchType);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlAction.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlAction.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlAction.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlAction.java Tue Mar 31 12:41:32 2015
@@ -115,12 +115,12 @@ public class AccessControlAction extends
}
@Override
- public void onCreate(Group group, Root root, NamePathMapper namePathMapper) throws RepositoryException {
+ public void onCreate(@Nonnull Group group, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException {
setAC(group, root, namePathMapper);
}
@Override
- public void onCreate(User user, String password, Root root, NamePathMapper namePathMapper) throws RepositoryException {
+ public void onCreate(@Nonnull User user, @Nullable String password, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException {
setAC(user, root, namePathMapper);
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AuthorizableActionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AuthorizableActionProvider.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AuthorizableActionProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/AuthorizableActionProvider.java Tue Mar 31 12:41:32 2015
@@ -29,5 +29,6 @@ import org.apache.jackrabbit.oak.spi.sec
*/
public interface AuthorizableActionProvider {
+ @Nonnull
List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider);
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipAction.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipAction.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipAction.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipAction.java Tue Mar 31 12:41:32 2015
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.spi.security.user.action;
import java.util.Iterator;
+import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -34,7 +35,7 @@ public class ClearMembershipAction exten
//-------------------------------------------------< AuthorizableAction >---
@Override
- public void onRemove(Authorizable authorizable, Root root, NamePathMapper namePathMapper) throws RepositoryException {
+ public void onRemove(@Nonnull Authorizable authorizable, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException {
clearMembership(authorizable);
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/CompositeActionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/CompositeActionProvider.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/CompositeActionProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/CompositeActionProvider.java Tue Mar 31 12:41:32 2015
@@ -20,6 +20,8 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
+import javax.annotation.Nonnull;
+
import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
@@ -39,8 +41,9 @@ public class CompositeActionProvider imp
this.providers = Arrays.asList(providers);
}
+ @Nonnull
@Override
- public List<? extends AuthorizableAction> getAuthorizableActions(SecurityProvider securityProvider) {
+ public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) {
List<AuthorizableAction> actions = Lists.newArrayList();
for (AuthorizableActionProvider p : providers) {
actions.addAll(p.getAuthorizableActions(securityProvider));
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java Tue Mar 31 12:41:32 2015
@@ -19,6 +19,8 @@ package org.apache.jackrabbit.oak.spi.se
import java.util.List;
import java.util.Map;
+import javax.annotation.Nonnull;
+
import com.google.common.collect.Lists;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -78,8 +80,9 @@ public class DefaultAuthorizableActionPr
}
//-----------------------------------------< AuthorizableActionProvider >---
+ @Nonnull
@Override
- public List<? extends AuthorizableAction> getAuthorizableActions(SecurityProvider securityProvider) {
+ public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) {
List<AuthorizableAction> actions = Lists.newArrayList();
for (String className : enabledActions) {
try {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordChangeAction.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordChangeAction.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordChangeAction.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordChangeAction.java Tue Mar 31 12:41:32 2015
@@ -43,7 +43,7 @@ public class PasswordChangeAction extend
//-------------------------------------------------< AuthorizableAction >---
@Override
- public void onPasswordChange(User user, String newPassword, Root root, NamePathMapper namePathMapper) throws RepositoryException {
+ public void onPasswordChange(@Nonnull User user, String newPassword, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException {
if (newPassword == null) {
throw new ConstraintViolationException("Expected a new password that is not null.");
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationAction.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationAction.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationAction.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationAction.java Tue Mar 31 12:41:32 2015
@@ -67,12 +67,12 @@ public class PasswordValidationAction ex
}
@Override
- public void onCreate(User user, String password, Root root, NamePathMapper namePathMapper) throws RepositoryException {
+ public void onCreate(@Nonnull User user, @Nullable String password, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException {
validatePassword(password, false);
}
@Override
- public void onPasswordChange(User user, String newPassword, Root root, NamePathMapper namePathMapper) throws RepositoryException {
+ public void onPasswordChange(@Nonnull User user, @Nullable String newPassword, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException {
validatePassword(newPassword, true);
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/AbstractNodeState.java Tue Mar 31 12:41:32 2015
@@ -217,12 +217,12 @@ public abstract class AbstractNodeState
}
@Override
- public boolean hasProperty(String name) {
+ public boolean hasProperty(@Nonnull String name) {
return getProperty(name) != null;
}
@Override
- public boolean getBoolean(String name) {
+ public boolean getBoolean(@Nonnull String name) {
return getBoolean(this, name);
}
@@ -236,8 +236,9 @@ public abstract class AbstractNodeState
return getString(this, name);
}
+ @Nonnull
@Override
- public Iterable<String> getStrings(String name) {
+ public Iterable<String> getStrings(@Nonnull String name) {
return getStrings(this, name);
}
@@ -252,7 +253,7 @@ public abstract class AbstractNodeState
}
@Override
- public PropertyState getProperty(String name) {
+ public PropertyState getProperty(@Nonnull String name) {
for (PropertyState property : getProperties()) {
if (name.equals(property.getName())) {
return property;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ReadOnlyBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ReadOnlyBuilder.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ReadOnlyBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/state/ReadOnlyBuilder.java Tue Mar 31 12:41:32 2015
@@ -91,17 +91,18 @@ public class ReadOnlyBuilder implements
}
@Override
- public boolean hasChildNode(String name) {
+ public boolean hasChildNode(@Nonnull String name) {
return state.hasChildNode(name);
}
+ @Nonnull
@Override
public Iterable<String> getChildNodeNames() {
return state.getChildNodeNames();
}
@Override @Nonnull
- public NodeBuilder setChildNode(String name, NodeState nodeState) {
+ public NodeBuilder setChildNode(@Nonnull String name, @Nonnull NodeState nodeState) {
throw unsupported();
}
@@ -111,7 +112,7 @@ public class ReadOnlyBuilder implements
}
@Override
- public boolean moveTo(NodeBuilder newParent, String newName) {
+ public boolean moveTo(@Nonnull NodeBuilder newParent, @Nonnull String newName) {
throw unsupported();
}
@@ -120,6 +121,7 @@ public class ReadOnlyBuilder implements
return state.getPropertyCount();
}
+ @Nonnull
@Override
public Iterable<? extends PropertyState> getProperties() {
return state.getProperties();
@@ -136,7 +138,7 @@ public class ReadOnlyBuilder implements
}
@Override
- public boolean getBoolean(String name) {
+ public boolean getBoolean(@Nonnull String name) {
return state.getBoolean(name);
}
@@ -160,23 +162,27 @@ public class ReadOnlyBuilder implements
throw unsupported();
}
+ @Nonnull
@Override
- public NodeBuilder setProperty(PropertyState property) {
+ public NodeBuilder setProperty(@Nonnull PropertyState property) {
throw unsupported();
}
+ @Nonnull
@Override
- public <T> NodeBuilder setProperty(String name, T value) {
+ public <T> NodeBuilder setProperty(String name, @Nonnull T value) {
throw unsupported();
}
+ @Nonnull
@Override
- public <T> NodeBuilder setProperty(String name, T value, Type<T> type) {
+ public <T> NodeBuilder setProperty(String name, @Nonnull T value, Type<T> type) {
throw unsupported();
}
+ @Nonnull
@Override
- public ReadOnlyBuilder child(String name) {
+ public ReadOnlyBuilder child(@Nonnull String name) {
NodeState child = state.getChildNode(name);
if (child.exists()) {
return new ReadOnlyBuilder(child);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardAuthorizableActionProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardAuthorizableActionProvider.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardAuthorizableActionProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardAuthorizableActionProvider.java Tue Mar 31 12:41:32 2015
@@ -37,6 +37,7 @@ public class WhiteboardAuthorizableActio
super(AuthorizableActionProvider.class);
}
+ @Nonnull
@Override
public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) {
AuthorizableActionProvider actionProvider = new CompositeActionProvider(getServices());
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardIndexEditorProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardIndexEditorProvider.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardIndexEditorProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardIndexEditorProvider.java Tue Mar 31 12:41:32 2015
@@ -18,6 +18,8 @@
*/
package org.apache.jackrabbit.oak.spi.whiteboard;
+import javax.annotation.Nonnull;
+
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.index.CompositeIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
@@ -39,8 +41,8 @@ public class WhiteboardIndexEditorProvid
}
@Override
- public Editor getIndexEditor(String type, NodeBuilder builder,
- NodeState root, IndexUpdateCallback callback)
+ public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder builder,
+ @Nonnull NodeState root, @Nonnull IndexUpdateCallback callback)
throws CommitFailedException {
IndexEditorProvider composite = CompositeIndexEditorProvider
.compose(getServices());
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java Tue Mar 31 12:41:32 2015
@@ -22,6 +22,8 @@ package org.apache.jackrabbit.oak.plugin
import java.io.IOException;
import java.util.List;
+import javax.annotation.Nonnull;
+
import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -108,6 +110,7 @@ public class NodeStoreDiffTest {
tds.reset();
//3. Merge which does a rebase
ns.merge(b2, new CommitHook() {
+ @Nonnull
public NodeState processCommit(NodeState before, NodeState after, CommitInfo info) throws CommitFailedException {
NodeBuilder rb = after.builder();
createNodes(rb, "/oak:index/prop-a/a1");
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java Tue Mar 31 12:41:32 2015
@@ -617,8 +617,8 @@ public class AsyncIndexUpdateTest {
private final FaultyIndexEditor faulty = new FaultyIndexEditor();
@Override
- public Editor getIndexEditor(String type, NodeBuilder definition,
- NodeState root, IndexUpdateCallback callback)
+ public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition,
+ @Nonnull NodeState root, @Nonnull IndexUpdateCallback callback)
throws CommitFailedException {
return faulty;
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdateTest.java Tue Mar 31 12:41:32 2015
@@ -35,6 +35,8 @@ import static org.junit.Assert.assertTru
import java.util.Set;
+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;
@@ -419,8 +421,8 @@ public class IndexUpdateTest {
private static IndexEditorProvider emptyProvider() {
return new IndexEditorProvider() {
@Override
- public Editor getIndexEditor(String type, NodeBuilder definition,
- NodeState root, IndexUpdateCallback callback)
+ public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition,
+ @Nonnull NodeState root, @Nonnull IndexUpdateCallback callback)
throws CommitFailedException {
return null;
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultiPropertyOrTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultiPropertyOrTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultiPropertyOrTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultiPropertyOrTest.java Tue Mar 31 12:41:32 2015
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertTru
import java.util.List;
+import javax.annotation.Nonnull;
import javax.jcr.query.Query;
import com.google.common.collect.ImmutableList;
@@ -45,7 +46,7 @@ public class MultiPropertyOrTest extends
return new Oak().with(new InitialContent())
.with(new RepositoryInitializer() {
@Override
- public void initialize(NodeBuilder builder) {
+ public void initialize(@Nonnull NodeBuilder builder) {
NodeBuilder index = IndexUtils.getOrCreateOakIndex(builder);
IndexUtils.createIndexDefinition(
index, "xyz", true, false,
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultipleIndicesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultipleIndicesTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultipleIndicesTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/MultipleIndicesTest.java Tue Mar 31 12:41:32 2015
@@ -21,6 +21,8 @@ import static org.apache.jackrabbit.oak.
import java.util.ArrayList;
+import javax.annotation.Nonnull;
+
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentRepository;
@@ -42,7 +44,7 @@ public class MultipleIndicesTest extends
.with(new InitialContent())
.with(new RepositoryInitializer() {
@Override
- public void initialize(NodeBuilder builder) {
+ public void initialize(@Nonnull NodeBuilder builder) {
createIndexDefinition(
getOrCreateOakIndex(builder), "pid",
true, false, ImmutableList.of("pid"), null);
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/Oak2077QueriesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/Oak2077QueriesTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/Oak2077QueriesTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/Oak2077QueriesTest.java Tue Mar 31 12:41:32 2015
@@ -149,8 +149,8 @@ public class Oak2077QueriesTest extends
private Random rnd = new Random(1);
@Override
- public Editor getIndexEditor(String type, NodeBuilder definition, NodeState root,
- IndexUpdateCallback callback) throws CommitFailedException {
+ public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition, @Nonnull NodeState root,
+ @Nonnull IndexUpdateCallback callback) throws CommitFailedException {
Editor editor = (TYPE.equals(type)) ? new SeededPropertyIndexEditor(definition, root,
callback, rnd) : null;
return editor;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/RelativePathTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/RelativePathTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/RelativePathTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/property/RelativePathTest.java Tue Mar 31 12:41:32 2015
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertTru
import java.util.List;
+import javax.annotation.Nonnull;
import javax.jcr.query.Query;
import com.google.common.collect.ImmutableList;
@@ -45,7 +46,7 @@ public class RelativePathTest extends Ab
return new Oak().with(new InitialContent())
.with(new RepositoryInitializer() {
@Override
- public void initialize(NodeBuilder builder) {
+ public void initialize(@Nonnull NodeBuilder builder) {
NodeBuilder index = IndexUtils.getOrCreateOakIndex(builder);
IndexUtils.createIndexDefinition(index, "myProp", true,
false, ImmutableList.<String>of("myProp"), null);
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java Tue Mar 31 12:41:32 2015
@@ -572,7 +572,7 @@ public class MemoryNodeBuilderTest {
}
@Override
- public boolean hasChildNode(String name) {
+ public boolean hasChildNode(@Nonnull String name) {
return "c".equals(name);
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/ExternalBlobTest.java Tue Mar 31 12:41:32 2015
@@ -43,6 +43,8 @@ import java.io.InputStream;
import java.util.List;
import java.util.Random;
+import javax.annotation.Nonnull;
+
import static junit.framework.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -205,12 +207,12 @@ public class ExternalBlobTest {
}
@Override
- public String getBlobId(String reference) {
+ public String getBlobId(@Nonnull String reference) {
return reference;
}
@Override
- public String getReference(String blobId) {
+ public String getReference(@Nonnull String blobId) {
return blobId;
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACLTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACLTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACLTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACLTest.java Tue Mar 31 12:41:32 2015
@@ -102,6 +102,7 @@ public class ACLTest extends AbstractAcc
final @Nonnull RestrictionProvider restrictionProvider) {
String path = (jcrPath == null) ? null : namePathMapper.getOakPath(jcrPath);
return new ACL(path, entries, namePathMapper) {
+ @Nonnull
@Override
public RestrictionProvider getRestrictionProvider() {
return restrictionProvider;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManagerTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManagerTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManagerTest.java Tue Mar 31 12:41:32 2015
@@ -20,6 +20,7 @@ package org.apache.jackrabbit.oak.securi
import java.util.Collections;
import java.util.List;
import java.util.Set;
+import javax.annotation.Nonnull;
import javax.jcr.security.AccessControlException;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
@@ -216,7 +217,7 @@ public class CompositeAccessControlManag
//----------------------------------------------------< PolicyOwner >---
@Override
- public boolean defines(String absPath, AccessControlPolicy accessControlPolicy) {
+ public boolean defines(String absPath, @Nonnull AccessControlPolicy accessControlPolicy) {
return TEST_PATH.equals(absPath) && accessControlPolicy == TestPolicy.INSTANCE;
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/JcrUUIDTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/JcrUUIDTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/JcrUUIDTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/evaluation/JcrUUIDTest.java Tue Mar 31 12:41:32 2015
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.security.authorization.evaluation;
+import javax.annotation.Nonnull;
import javax.jcr.nodetype.NodeTypeTemplate;
import org.apache.jackrabbit.JcrConstants;
@@ -50,6 +51,7 @@ public class JcrUUIDTest extends Abstrac
super.before();
ntMgr = new ReadWriteNodeTypeManager() {
+ @Nonnull
@Override
protected Root getWriteRoot() {
return root;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryProviderImplTest.java Tue Mar 31 12:41:32 2015
@@ -152,24 +152,25 @@ public class PermissionEntryProviderImpl
@Override
public Collection<PermissionEntry> load(
- Collection<PermissionEntry> entries, String principalName,
- String path) {
+ Collection<PermissionEntry> entries, @Nonnull String principalName,
+ @Nonnull String path) {
return null;
}
@Override
- public void load(Map<String, Collection<PermissionEntry>> entries,
- String principalName) {
+ public void load(@Nonnull Map<String, Collection<PermissionEntry>> entries,
+ @Nonnull String principalName) {
// ignore
}
+ @Nonnull
@Override
- public PrincipalPermissionEntries load(String principalName) {
+ public PrincipalPermissionEntries load(@Nonnull String principalName) {
return new PrincipalPermissionEntries(principalName);
}
@Override
- public long getNumEntries(String principalName, long max) {
+ public long getNumEntries(@Nonnull String principalName, long max) {
long cnt = 0;
if (GROUP_LONG_MAX_MINUS_10.equals(principalName)) {
cnt = Long.MAX_VALUE - 10;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserAuthenticationTest.java Tue Mar 31 12:41:32 2015
@@ -206,6 +206,7 @@ public class UserAuthenticationTest exte
public Object getAttribute(String attributeName) {
return null;
}
+ @Nonnull
@Override
public Set<Principal> getPrincipals() {
return null;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java Tue Mar 31 12:41:32 2015
@@ -19,6 +19,8 @@ package org.apache.jackrabbit.oak.spi.se
import java.util.ArrayList;
import java.util.List;
+import javax.annotation.Nonnull;
+
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AbstractAccessControlTest;
import org.junit.Before;
@@ -96,10 +98,12 @@ public class RestrictionDefinitionImplTe
defs.add(new RestrictionDefinitionImpl(name, Type.NAMES, true));
// - different impl
defs.add(new RestrictionDefinition() {
+ @Nonnull
@Override
public String getName() {
return name;
}
+ @Nonnull
@Override
public Type<?> getRequiredType() {
return Type.NAME;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java Tue Mar 31 12:41:32 2015
@@ -109,6 +109,7 @@ public class RestrictionImplTest extends
return new RestrictionDefinitionImpl(name, Type.NAME, true);
}
+ @Nonnull
@Override
public PropertyState getProperty() {
return createProperty(name, value);
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java Tue Mar 31 12:41:32 2015
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.spi.se
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.ConstraintViolationException;
@@ -165,12 +166,12 @@ public class PasswordValidationActionTes
}
@Override
- public void onCreate(User user, String password, Root root, NamePathMapper namePathMapper) throws RepositoryException {
+ public void onCreate(@Nonnull User user, @Nullable String password, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException {
onCreateCalled++;
}
@Override
- public void onPasswordChange(User user, String newPassword, Root root, NamePathMapper namePathMapper) throws RepositoryException {
+ public void onPasswordChange(@Nonnull User user, @Nullable String newPassword, @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException {
onPasswordChangeCalled++;
}
}
@@ -181,6 +182,7 @@ public class PasswordValidationActionTes
private TestSecurityProvider() {
actionProvider = new AuthorizableActionProvider() {
+ @Nonnull
@Override
public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) {
return ImmutableList.of(pwAction, testAction);
@@ -188,7 +190,8 @@ public class PasswordValidationActionTes
};
}
- public <T> T getConfiguration(Class<T> configClass) {
+ @Nonnull
+ public <T> T getConfiguration(@Nonnull Class<T> configClass) {
if (UserConfiguration.class == configClass) {
return (T) new UserConfigurationImpl(this) {
@Nonnull
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/state/NodeStoreTest.java Tue Mar 31 12:41:32 2015
@@ -255,6 +255,7 @@ public class NodeStoreTest extends OakBa
testBuilder.getChildNode("a").remove();
store.merge(rootBuilder, new CommitHook() {
+ @Nonnull
@Override
public NodeState processCommit(
NodeState before, NodeState after, CommitInfo info) {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUserAuthenticationFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUserAuthenticationFactoryTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUserAuthenticationFactoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardUserAuthenticationFactoryTest.java Tue Mar 31 12:41:32 2015
@@ -100,7 +100,7 @@ public class WhiteboardUserAuthenticatio
if (this.userId.equals(userId)) {
return new Authentication() {
@Override
- public boolean authenticate(Credentials credentials) {
+ public boolean authenticate(@Nullable Credentials credentials) {
return true;
}
};
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PropertyDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PropertyDelegate.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PropertyDelegate.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/PropertyDelegate.java Tue Mar 31 12:41:32 2015
@@ -135,7 +135,7 @@ public class PropertyDelegate extends It
return p;
}
- public void setState(PropertyState propertyState) {
+ public void setState(@Nonnull PropertyState propertyState) {
parent.setProperty(propertyState);
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java Tue Mar 31 12:41:32 2015
@@ -723,7 +723,7 @@ public class SessionDelegate {
}
@Override
- public boolean tryLock(long time, TimeUnit unit) throws InterruptedException {
+ public boolean tryLock(long time, @Nonnull TimeUnit unit) throws InterruptedException {
if (lock.tryLock(time, unit)) {
holderTrace = null;
holderThread = null;
@@ -738,6 +738,7 @@ public class SessionDelegate {
lock.unlock();
}
+ @Nonnull
@Override
public Condition newCondition() {
return lock.newCondition();
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/ItemImpl.java Tue Mar 31 12:41:32 2015
@@ -359,6 +359,7 @@ abstract class ItemImpl<T extends ItemDe
return sessionContext.getWorkspace().getVersionManager();
}
+ @Nonnull
protected PropertyState createSingleState(
String oakName, Value value, Type<?> type)
throws RepositoryException {
@@ -372,6 +373,7 @@ abstract class ItemImpl<T extends ItemDe
}
}
+ @Nonnull
protected PropertyState createMultiState(
String oakName, List<Value> values, Type<?> type)
throws RepositoryException {
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionContext.java Tue Mar 31 12:41:32 2015
@@ -285,7 +285,7 @@ public class SessionContext implements N
@Override
@Nonnull
- public String getOakName(String jcrName) throws RepositoryException {
+ public String getOakName(@Nonnull String jcrName) throws RepositoryException {
return namePathMapper.getOakName(jcrName);
}
@@ -295,6 +295,7 @@ public class SessionContext implements N
return namePathMapper.getOakNameOrNull(jcrName);
}
+ @Nonnull
@Override
public String getJcrName(@Nonnull String oakName) {
return namePathMapper.getJcrName(oakName);
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java Tue Mar 31 12:41:32 2015
@@ -211,6 +211,7 @@ public class UserImportWithActionsTest e
private void addAction(AuthorizableAction action) {
actions.add(action);
}
+ @Nonnull
@Override
public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) {
return actions;
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java Tue Mar 31 12:41:32 2015
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.index.lucene;
+import javax.annotation.Nonnull;
+
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.TYPE_LUCENE;
import org.apache.felix.scr.annotations.Component;
@@ -41,7 +43,7 @@ public class LuceneIndexEditorProvider i
@Override
public Editor getIndexEditor(
- String type, NodeBuilder definition, NodeState root, IndexUpdateCallback callback)
+ @Nonnull String type, @Nonnull NodeBuilder definition, @Nonnull NodeState root, @Nonnull IndexUpdateCallback callback)
throws CommitFailedException {
if (TYPE_LUCENE.equals(type)) {
return new LuceneIndexEditor(root, definition, callback);
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java Tue Mar 31 12:41:32 2015
@@ -22,6 +22,8 @@ import static org.apache.jackrabbit.oak.
import java.util.Set;
+import javax.annotation.Nonnull;
+
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -76,7 +78,7 @@ public class LuceneInitializerHelper imp
}
@Override
- public void initialize(NodeBuilder builder) {
+ public void initialize(@Nonnull NodeBuilder builder) {
if (builder.hasChildNode(INDEX_DEFINITIONS_NAME)
&& builder.getChildNode(INDEX_DEFINITIONS_NAME).hasChildNode(name)) {
// do nothing
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java Tue Mar 31 12:41:32 2015
@@ -30,6 +30,7 @@ import static org.apache.jackrabbit.oak.
import java.util.Properties;
import java.util.Set;
+import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.oak.plugins.index.aggregate.NodeAggregator;
@@ -74,7 +75,7 @@ public class LuceneOakRepositoryStub ext
}
@Override
- public void initialize(NodeBuilder builder) {
+ public void initialize(@Nonnull NodeBuilder builder) {
if (builder.hasChildNode(INDEX_DEFINITIONS_NAME)
&& builder.getChildNode(INDEX_DEFINITIONS_NAME).hasChildNode(name)) {
// do nothing
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest2.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest2.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest2.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregationTest2.java Tue Mar 31 12:41:32 2015
@@ -88,7 +88,7 @@ public class LuceneIndexAggregationTest2
.with(new InitialContent() {
@Override
- public void initialize(NodeBuilder builder) {
+ public void initialize(@Nonnull NodeBuilder builder) {
super.initialize(builder);
// registering additional node types for wider testing
Modified: jackrabbit/oak/trunk/oak-pojosr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/pom.xml?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-pojosr/pom.xml Tue Mar 31 12:41:32 2015
@@ -150,6 +150,12 @@
<artifactId>logback-classic</artifactId>
</dependency>
+ <!-- Findbugs annotations -->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+
<!-- Pojo SR -->
<dependency>
<groupId>org.osgi</groupId>
Modified: jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-pojosr/src/test/java/org/apache/jackrabbit/oak/run/osgi/OakOSGiRepositoryFactoryTest.java Tue Mar 31 12:41:32 2015
@@ -27,6 +27,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import javax.jcr.Node;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
@@ -145,8 +147,9 @@ public class OakOSGiRepositoryFactoryTes
@Override
protected void postProcessRegistry(PojoServiceRegistry registry) {
registry.registerService(AuthorizableActionProvider.class.getName(), new AuthorizableActionProvider() {
+ @Nonnull
@Override
- public List<? extends AuthorizableAction> getAuthorizableActions(SecurityProvider securityProvider) {
+ public List<? extends AuthorizableAction> getAuthorizableActions(@Nonnull SecurityProvider securityProvider) {
return Collections.singletonList(new TestAction());
}
}, null);
@@ -156,8 +159,8 @@ public class OakOSGiRepositoryFactoryTes
private class TestAction extends AbstractAuthorizableAction {
@Override
- public void onPasswordChange(User user, String newPassword,
- Root root, NamePathMapper namePathMapper) throws RepositoryException {
+ public void onPasswordChange(@Nonnull User user, @Nullable String newPassword,
+ @Nonnull Root root, @Nonnull NamePathMapper namePathMapper) throws RepositoryException {
OakOSGiRepositoryFactoryTest.this.newPassword = newPassword;
}
}
Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java?rev=1670318&r1=1670317&r2=1670318&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java Tue Mar 31 12:41:32 2015
@@ -52,6 +52,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.annotation.Nonnull;
import javax.jcr.Binary;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -202,15 +203,16 @@ class JackrabbitNodeState extends Abstra
}
@Override
- public boolean hasProperty(String name) {
+ public boolean hasProperty(@Nonnull String name) {
return properties.containsKey(name);
}
@Override
- public PropertyState getProperty(String name) {
+ public PropertyState getProperty(@Nonnull String name) {
return properties.get(name);
}
+ @Nonnull
@Override
public Iterable<PropertyState> getProperties() {
return properties.values();
@@ -222,12 +224,13 @@ class JackrabbitNodeState extends Abstra
}
@Override
- public boolean hasChildNode(String name) {
+ public boolean hasChildNode(@Nonnull String name) {
return nodes.containsKey(name);
}
+ @Nonnull
@Override
- public NodeState getChildNode(String name) {
+ public NodeState getChildNode(@Nonnull String name) {
NodeId id = nodes.get(name);
if (id != null) {
try {
@@ -247,6 +250,7 @@ class JackrabbitNodeState extends Abstra
return nodes.keySet();
}
+ @Nonnull
@Override
public Iterable<MemoryChildNodeEntry> getChildNodeEntries() {
List<MemoryChildNodeEntry> entries = newArrayList();
@@ -263,6 +267,7 @@ class JackrabbitNodeState extends Abstra
return entries;
}
+ @Nonnull
@Override
public NodeBuilder builder() {
return new MemoryNodeBuilder(this);
@@ -529,6 +534,7 @@ class JackrabbitNodeState extends Abstra
return 0;
}
}
+ @Nonnull
@Override
public InputStream getNewStream() {
try {