Author: angela
Date: Tue Apr 14 14:20:32 2015
New Revision: 1673432
URL: http://svn.apache.org/r1673432
Log:
OAK-2674 : Fix FindBug Issues
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncContext.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfig.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalIDPManagerImpl.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/SyncManagerImpl.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/SyncedIdentityImpl.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncContext.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncContext.java?rev=1673432&r1=1673431&r2=1673432&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncContext.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncContext.java
Tue Apr 14 14:20:32 2015
@@ -66,8 +66,9 @@ public interface SyncContext {
*
* @param identity the identity to sync.
* @return the result of the operation
- * @throws SyncException if an error occurrs
+ * @throws SyncException if an error occurs
*/
+ @Nonnull
SyncResult sync(@Nonnull ExternalIdentity identity) throws SyncException;
/**
@@ -78,6 +79,7 @@ public interface SyncContext {
* @return the result of the operation
* @throws SyncException if an error occurrs
*/
+ @Nonnull
SyncResult sync(@Nonnull String id) throws SyncException;
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfig.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfig.java?rev=1673432&r1=1673431&r2=1673432&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfig.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfig.java
Tue Apr 14 14:20:32 2015
@@ -268,7 +268,7 @@ public class DefaultSyncConfig {
public Authorizable setAutoMembership(String ... autoMembership) {
this.autoMembership = new HashSet<String>();
for (String groupName: autoMembership) {
- if (groupName.trim().length() > 0) {
+ if (!groupName.trim().isEmpty()) {
this.autoMembership.add(groupName.trim());
}
}
@@ -481,6 +481,7 @@ public class DefaultSyncConfig {
* Returns the sync configuration for users.
* @return the user sync configuration.
*/
+ @Nonnull
public User user() {
return user;
}
@@ -489,6 +490,7 @@ public class DefaultSyncConfig {
* Returns the sync configuration for groups.
* @return the group sync configuration.
*/
+ @Nonnull
public Group group() {
return group;
}
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java?rev=1673432&r1=1673431&r2=1673432&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
Tue Apr 14 14:20:32 2015
@@ -178,11 +178,11 @@ public class DefaultSyncHandler implemen
* Creates a synced identity from the given authorizable.
* @param auth the authorizable
* @return the id
- * @throws RepositoryException if an error occurrs
+ * @throws RepositoryException if an error occurs
*/
@CheckForNull
private static SyncedIdentityImpl createSyncedIdentity(@Nullable
Authorizable auth) throws RepositoryException {
- ExternalIdentityRef ref = auth == null ? null : getIdentityRef(auth);
+ ExternalIdentityRef ref = (auth == null) ? null : getIdentityRef(auth);
if (ref == null) {
return null;
} else {
@@ -288,6 +288,7 @@ public class DefaultSyncHandler implemen
/**
* {@inheritDoc}
*/
+ @Nonnull
@Override
public SyncResult sync(@Nonnull ExternalIdentity identity) throws
SyncException {
try {
@@ -332,6 +333,7 @@ public class DefaultSyncHandler implemen
/**
* {@inheritDoc}
*/
+ @Nonnull
@Override
public SyncResult sync(@Nonnull String id) throws SyncException {
try {
@@ -434,8 +436,8 @@ public class DefaultSyncHandler implemen
* @return the repository user
* @throws RepositoryException if an error occurs
*/
- @CheckForNull
- private User createUser(ExternalUser externalUser) throws
RepositoryException {
+ @Nonnull
+ private User createUser(@Nonnull ExternalUser externalUser) throws
RepositoryException {
Principal principal = new
PrincipalImpl(externalUser.getPrincipalName());
User user = userManager.createUser(
externalUser.getId(),
@@ -455,8 +457,8 @@ public class DefaultSyncHandler implemen
* @return the repository group
* @throws RepositoryException if an error occurs
*/
- @CheckForNull
- private Group createGroup(ExternalGroup externalGroup) throws
RepositoryException {
+ @Nonnull
+ private Group createGroup(@Nonnull ExternalGroup externalGroup) throws
RepositoryException {
Principal principal = new
PrincipalImpl(externalGroup.getPrincipalName());
Group group = userManager.createGroup(
externalGroup.getId(),
@@ -467,7 +469,7 @@ public class DefaultSyncHandler implemen
return group;
}
-
+ @Nonnull
private SyncResultImpl syncUser(@Nonnull ExternalUser external,
@Nonnull User user) throws RepositoryException {
// first check if user is expired
if (!forceUserSync && !isExpired(user,
config.user().getExpirationTime(), "Properties")) {
@@ -492,7 +494,8 @@ public class DefaultSyncHandler implemen
return new SyncResultImpl(syncId, SyncResult.Status.UPDATE);
}
- private SyncResultImpl syncGroup(ExternalGroup external, Group group)
throws RepositoryException {
+ @Nonnull
+ private SyncResultImpl syncGroup(@Nonnull ExternalGroup external,
@Nonnull Group group) throws RepositoryException {
// first check if user is expired
if (!forceGroupSync && !isExpired(group,
config.group().getExpirationTime(), "Properties")) {
SyncedIdentityImpl syncId = createSyncedIdentity(group);
@@ -550,7 +553,7 @@ public class DefaultSyncHandler implemen
}
timer.mark("reading");
- for (ExternalIdentityRef ref: externalGroups) {
+ for (ExternalIdentityRef ref : externalGroups) {
log.debug("- processing membership {}", ref.getId());
// get group
ExternalGroup extGroup;
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalIDPManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalIDPManagerImpl.java?rev=1673432&r1=1673431&r2=1673432&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalIDPManagerImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalIDPManagerImpl.java
Tue Apr 14 14:20:32 2015
@@ -41,6 +41,7 @@ public class ExternalIDPManagerImpl exte
/**
* Default constructor used by OSGi
*/
+ @SuppressWarnings("UnusedDeclaration")
public ExternalIDPManagerImpl() {
super(ExternalIdentityProvider.class);
}
@@ -54,11 +55,13 @@ public class ExternalIDPManagerImpl exte
start(whiteboard);
}
+ @SuppressWarnings("UnusedDeclaration")
@Activate
private void activate(ComponentContext ctx) {
start(new OsgiWhiteboard(ctx.getBundleContext()));
}
+ @SuppressWarnings("UnusedDeclaration")
@Deactivate
private void deactivate() {
stop();
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java?rev=1673432&r1=1673431&r2=1673432&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
Tue Apr 14 14:20:32 2015
@@ -132,7 +132,7 @@ public class ExternalLoginModule extends
}
String idpName = options.getConfigValue(PARAM_IDP_NAME, "");
- if (idpName.length() == 0) {
+ if (idpName.isEmpty()) {
log.error("External login module needs IPD name. Will not be used
for login.");
} else {
ExternalIdentityProviderManager idpMgr =
WhiteboardUtils.getService(whiteboard, ExternalIdentityProviderManager.class);
@@ -147,7 +147,7 @@ public class ExternalLoginModule extends
}
String syncHandlerName =
options.getConfigValue(PARAM_SYNC_HANDLER_NAME, "");
- if (syncHandlerName.length() == 0) {
+ if (syncHandlerName.isEmpty()) {
log.error("External login module needs SyncHandler name. Will not
be used for login.");
} else {
SyncManager syncMgr = WhiteboardUtils.getService(whiteboard,
SyncManager.class);
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/SyncManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/SyncManagerImpl.java?rev=1673432&r1=1673431&r2=1673432&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/SyncManagerImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/SyncManagerImpl.java
Tue Apr 14 14:20:32 2015
@@ -42,6 +42,7 @@ public class SyncManagerImpl extends Abs
/**
* Default constructor used by OSGi
*/
+ @SuppressWarnings("UnusedDeclaration")
public SyncManagerImpl() {
super(SyncHandler.class);
}
@@ -55,11 +56,13 @@ public class SyncManagerImpl extends Abs
start(whiteboard);
}
+ @SuppressWarnings("UnusedDeclaration")
@Activate
private void activate(ComponentContext ctx) {
start(new OsgiWhiteboard(ctx.getBundleContext()));
}
+ @SuppressWarnings("UnusedDeclaration")
@Deactivate
private void deactivate() {
stop();
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/SyncedIdentityImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/SyncedIdentityImpl.java?rev=1673432&r1=1673431&r2=1673432&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/SyncedIdentityImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/SyncedIdentityImpl.java
Tue Apr 14 14:20:32 2015
@@ -16,14 +16,13 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl;
+import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.SyncedIdentity;
-/**
-* {@code SyncedIdentityImpl}...
-*/
public class SyncedIdentityImpl implements SyncedIdentity {
private final String id;
@@ -34,7 +33,7 @@ public class SyncedIdentityImpl implemen
private final long lastSynced;
- public SyncedIdentityImpl(String id, ExternalIdentityRef ref, boolean
isGroup, long lastSynced) {
+ public SyncedIdentityImpl(@Nonnull String id, @Nullable
ExternalIdentityRef ref, boolean isGroup, long lastSynced) {
this.id = id;
this.ref = ref;
this.isGroup = isGroup;
@@ -47,6 +46,7 @@ public class SyncedIdentityImpl implemen
return id;
}
+ @CheckForNull
@Override
public ExternalIdentityRef getExternalIdRef() {
return ref;
