jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1432147 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security: OakConfiguration.java principal/PrincipalProviderImpl.java
Date Fri, 11 Jan 2013 16:54:08 GMT
Author: angela
Date: Fri Jan 11 16:54:08 2013
New Revision: 1432147

URL: http://svn.apache.org/viewvc?rev=1432147&view=rev
Log:
minor improvement

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/OakConfiguration.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/OakConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/OakConfiguration.java?rev=1432147&r1=1432146&r2=1432147&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/OakConfiguration.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/OakConfiguration.java
Fri Jan 11 16:54:08 2013
@@ -22,8 +22,6 @@ import javax.security.auth.login.Configu
 
 import org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl;
 import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * OakConfiguration... tmp solution missing repo-configuration in test-setup.
@@ -31,12 +29,7 @@ import org.slf4j.LoggerFactory;
  */
 public class OakConfiguration extends Configuration {
 
-    /**
-     * logger instance
-     */
-    private static final Logger log = LoggerFactory.getLogger(OakConfiguration.class);
-
-    ConfigurationParameters loginConfiguration;
+    private final ConfigurationParameters loginConfiguration;
 
     public OakConfiguration() {
         this(ConfigurationParameters.EMPTY);

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java?rev=1432147&r1=1432146&r2=1432147&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
Fri Jan 11 16:54:08 2013
@@ -160,7 +160,7 @@ public class PrincipalProviderImpl imple
         return groupPrincipals;
     }
 
-    private Iterator<Authorizable> findAuthorizables(final @Nullable String nameHint,
+    private Iterator<Authorizable> findAuthorizables(@Nullable final String nameHint,
                                                      final int searchType) throws RepositoryException
{
         Query userQuery = new Query() {
             @Override
@@ -211,7 +211,7 @@ public class PrincipalProviderImpl imple
      */
     private static final class AuthorizableToPrincipal implements Function<Authorizable,
Principal> {
         @Override
-        public Principal apply(Authorizable authorizable) {
+        public Principal apply(@Nullable Authorizable authorizable) {
             if (authorizable != null) {
                 try {
                     return authorizable.getPrincipal();
@@ -227,7 +227,7 @@ public class PrincipalProviderImpl imple
      * Predicate to make sure the everyone principal is only included once in
      * the result set.
      */
-    private final class EveryonePredicate implements Predicate<Principal> {
+    private static final class EveryonePredicate implements Predicate<Principal> {
         private boolean servedEveryone = false;
         @Override
         public boolean apply(@Nullable Principal principal) {



Mime
View raw message