Author: angela
Date: Thu Mar 26 18:18:28 2015
New Revision: 1669397
URL: http://svn.apache.org/r1669397
Log:
OAK-2674 : Fix FindBug Issues
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/PreAuthenticatedLogin.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalIteratorAdapter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserIdCredentials.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardRestrictionProvider.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java?rev=1669397&r1=1669396&r2=1669397&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
Thu Mar 26 18:18:28 2015
@@ -494,7 +494,7 @@ public abstract class AbstractLoginModul
}
}
- static protected void setAuthInfo(@Nonnull AuthInfo authInfo, @Nonnull
Subject subject) {
+ protected static void setAuthInfo(@Nonnull AuthInfo authInfo, @Nonnull
Subject subject) {
Set<AuthInfo> ais = subject.getPublicCredentials(AuthInfo.class);
if (!ais.isEmpty()) {
subject.getPublicCredentials().removeAll(ais);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/PreAuthenticatedLogin.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/PreAuthenticatedLogin.java?rev=1669397&r1=1669396&r2=1669397&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/PreAuthenticatedLogin.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/PreAuthenticatedLogin.java
Thu Mar 26 18:18:28 2015
@@ -23,7 +23,7 @@ import javax.jcr.Credentials;
* respective user is pre authenticated on an external system. Note that is
class is only used internally by the
* login modules and cannot be "abused" from outside.
*/
-final public class PreAuthenticatedLogin {
+public final class PreAuthenticatedLogin {
public static final Credentials PRE_AUTHENTICATED = new Credentials() { };
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProvider.java?rev=1669397&r1=1669396&r2=1669397&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProvider.java
Thu Mar 26 18:18:28 2015
@@ -40,7 +40,7 @@ import org.apache.jackrabbit.oak.spi.sec
* Aggregates of a collection of {@link RestrictionProvider} implementations
* into a single provider.
*/
-public class CompositeRestrictionProvider implements RestrictionProvider {
+public final class CompositeRestrictionProvider implements RestrictionProvider
{
private final Collection<? extends RestrictionProvider> providers;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalIteratorAdapter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalIteratorAdapter.java?rev=1669397&r1=1669396&r2=1669397&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalIteratorAdapter.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalIteratorAdapter.java
Thu Mar 26 18:18:28 2015
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.spi.se
import java.security.Principal;
import java.util.Collection;
import java.util.Iterator;
-import java.util.NoSuchElementException;
import org.apache.jackrabbit.api.security.principal.PrincipalIterator;
import org.apache.jackrabbit.commons.iterator.RangeIteratorAdapter;
@@ -61,10 +60,9 @@ public class PrincipalIteratorAdapter ex
* Returns the next policy.
*
* @return next policy.
- * @throws java.util.NoSuchElementException if there is no next policy.
*/
@Override
- public Principal nextPrincipal() throws NoSuchElementException {
+ public Principal nextPrincipal() {
return (Principal) next();
}
}
\ No newline at end of file
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java?rev=1669397&r1=1669396&r2=1669397&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java
Thu Mar 26 18:18:28 2015
@@ -508,7 +508,7 @@ public final class PrivilegeBits impleme
/**
* Base class for the internal privilege bits representation and handling.
*/
- private static abstract class Data {
+ private abstract static class Data {
abstract boolean isEmpty();
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserIdCredentials.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserIdCredentials.java?rev=1669397&r1=1669396&r2=1669397&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserIdCredentials.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/UserIdCredentials.java
Thu Mar 26 18:18:28 2015
@@ -19,9 +19,6 @@ package org.apache.jackrabbit.oak.spi.se
import javax.annotation.Nonnull;
import javax.jcr.Credentials;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Credentials implementation that only contains a {@code userId} but no
password.
* It can be used for {@link
org.apache.jackrabbit.api.security.user.User#getCredentials()},
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardRestrictionProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardRestrictionProvider.java?rev=1669397&r1=1669396&r2=1669397&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardRestrictionProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/WhiteboardRestrictionProvider.java
Thu Mar 26 18:18:28 2015
@@ -22,7 +22,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
-import javax.jcr.security.AccessControlException;
import org.apache.jackrabbit.oak.api.Tree;
import
org.apache.jackrabbit.oak.spi.security.authorization.restriction.CompositeRestrictionProvider;
@@ -51,13 +50,13 @@ public class WhiteboardRestrictionProvid
@Nonnull
@Override
- public Restriction createRestriction(@Nullable String oakPath, @Nonnull
String oakName, @Nonnull Value value) throws AccessControlException,
RepositoryException {
+ public Restriction createRestriction(@Nullable String oakPath, @Nonnull
String oakName, @Nonnull Value value) throws RepositoryException {
return getProvider().createRestriction(oakPath, oakName, value);
}
@Nonnull
@Override
- public Restriction createRestriction(@Nullable String oakPath, @Nonnull
String oakName, @Nonnull Value... values) throws AccessControlException,
RepositoryException {
+ public Restriction createRestriction(@Nullable String oakPath, @Nonnull
String oakName, @Nonnull Value... values) throws RepositoryException {
return getProvider().createRestriction(oakPath, oakName, values);
}
@@ -73,7 +72,7 @@ public class WhiteboardRestrictionProvid
}
@Override
- public void validateRestrictions(@Nullable String oakPath, @Nonnull Tree
aceTree) throws AccessControlException, RepositoryException {
+ public void validateRestrictions(@Nullable String oakPath, @Nonnull Tree
aceTree) throws RepositoryException {
getProvider().validateRestrictions(oakPath, aceTree);
}
