Author: angela
Date: Tue May 28 09:54:30 2019
New Revision: 1860234
URL: http://svn.apache.org/viewvc?rev=1860234&view=rev
Log:
OAK-8354 : Fix/Add nullability annotations with o.a.j.oak.security.user package
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandler.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/SystemUserImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/TreeBasedPrincipal.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java?rev=1860234&r1=1860233&r2=1860234&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java
Tue May 28 09:54:30 2019
@@ -293,8 +293,8 @@ class AuthorizablePropertiesImpl impleme
}
@NotNull
- private String getOakPath(@Nullable String relPath) throws
RepositoryException {
- if (relPath == null || relPath.isEmpty() || relPath.charAt(0) == '/') {
+ private String getOakPath(@NotNull String relPath) throws
RepositoryException {
+ if (relPath.isEmpty() || relPath.charAt(0) == '/') {
throw new RepositoryException("Relative path expected. Found " +
relPath);
}
String oakPath = valueFactory.getNamePathMapper().getOakPath(relPath);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java?rev=1860234&r1=1860233&r2=1860234&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java
Tue May 28 09:54:30 2019
@@ -21,8 +21,6 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import javax.jcr.RepositoryException;
-
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import org.apache.jackrabbit.JcrConstants;
@@ -59,9 +57,8 @@ public class MembershipWriter {
* @param groupTree the group to add the member to
* @param memberContentId the id of the new member
* @return {@code true} if the member was added
- * @throws RepositoryException if an error occurs
*/
- boolean addMember(Tree groupTree, String memberContentId) {
+ boolean addMember(@NotNull Tree groupTree, @NotNull String
memberContentId) {
Map<String, String> m = Maps.newHashMapWithExpectedSize(1);
m.put(memberContentId, "-");
return addMembers(groupTree, m).isEmpty();
@@ -73,8 +70,8 @@ public class MembershipWriter {
* @param groupTree the group to add the member to
* @param memberIds the ids of the new members as map of
'contentId':'memberId'
* @return the set of member IDs that was not successfully processed.
- * @throws RepositoryException if an error occurs
*/
+ @NotNull
Set<String> addMembers(@NotNull Tree groupTree, @NotNull Map<String,
String> memberIds) {
// check all possible rep:members properties for the new member and
also find the one with the least values
Tree membersList = groupTree.getChild(UserConstants.REP_MEMBERS_LIST);
@@ -162,6 +159,7 @@ public class MembershipWriter {
return failed;
}
+ @NotNull
private static Tree createMemberRefTree(@NotNull Tree groupTree, @NotNull
Tree membersList) {
if (!membersList.exists()) {
membersList = groupTree.addChild(UserConstants.REP_MEMBERS_LIST);
@@ -172,6 +170,7 @@ public class MembershipWriter {
return refTree;
}
+ @NotNull
private static String nextRefNodeName(@NotNull Tree membersList) {
// keep node names linear
int i = 0;
@@ -202,6 +201,7 @@ public class MembershipWriter {
* @param memberIds Map of 'contentId':'memberId' of all members that need
to be removed.
* @return the set of member IDs that was not successfully processed.
*/
+ @NotNull
Set<String> removeMembers(@NotNull Tree groupTree, @NotNull Map<String,
String> memberIds) {
Tree membersList = groupTree.getChild(UserConstants.REP_MEMBERS_LIST);
Iterator<Tree> trees = Iterators.concat(
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandler.java?rev=1860234&r1=1860233&r2=1860234&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/RepMembersConflictHandler.java
Tue May 28 09:54:30 2019
@@ -153,7 +153,7 @@ class RepMembersConflictHandler implemen
//----------------------------< internal
>----------------------------------
- private static void mergeChange(NodeBuilder parent, PropertyState ours,
PropertyState theirs, Set<String> base) {
+ private static void mergeChange(@NotNull NodeBuilder parent, @NotNull
PropertyState ours, @NotNull PropertyState theirs, @NotNull Set<String> base) {
PropertyBuilder<String> merged =
PropertyBuilder.array(Type.WEAKREFERENCE);
merged.setName(UserConstants.REP_MEMBERS);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/SystemUserImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/SystemUserImpl.java?rev=1860234&r1=1860233&r2=1860234&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/SystemUserImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/SystemUserImpl.java
Tue May 28 09:54:30 2019
@@ -41,6 +41,7 @@ class SystemUserImpl extends UserImpl {
}
}
+ @NotNull
@Override
public Principal getPrincipal() throws RepositoryException {
if (isAdmin()) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/TreeBasedPrincipal.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/TreeBasedPrincipal.java?rev=1860234&r1=1860233&r2=1860234&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/TreeBasedPrincipal.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/TreeBasedPrincipal.java
Tue May 28 09:54:30 2019
@@ -20,6 +20,7 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
+import org.jetbrains.annotations.NotNull;
/**
* TreeBasedPrincipal...
@@ -29,11 +30,11 @@ class TreeBasedPrincipal extends Princip
private final String path;
private final NamePathMapper pathMapper;
- TreeBasedPrincipal(String principalName, Tree tree, NamePathMapper
pathMapper) {
+ TreeBasedPrincipal(@NotNull String principalName, @NotNull Tree tree,
@NotNull NamePathMapper pathMapper) {
this(principalName, tree.getPath(), pathMapper);
}
- TreeBasedPrincipal(String principalName, String oakPath, NamePathMapper
pathMapper) {
+ TreeBasedPrincipal(@NotNull String principalName, @NotNull String oakPath,
@NotNull NamePathMapper pathMapper) {
super(principalName);
this.pathMapper = pathMapper;
this.path = oakPath;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java?rev=1860234&r1=1860233&r2=1860234&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImpl.java
Tue May 28 09:54:30 2019
@@ -265,6 +265,7 @@ public class UserConfigurationImpl exten
//-----------------------------------------------------------< internal
>---
+ @NotNull
private BlobAccessProvider getBlobAccessProvider() {
BlobAccessProvider provider = blobAccessProvider;
if (provider == null) {
