Author: angela
Date: Tue Nov 12 12:05:19 2013
New Revision: 1541018
URL: http://svn.apache.org/r1541018
Log:
minor improvement
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableWrapper.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/UserImpl.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableImpl.java?rev=1541018&r1=1541017&r2=1541018&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableImpl.java
Tue Nov 12 12:05:19 2013
@@ -19,21 +19,13 @@ package org.apache.jackrabbit.oak.securi
import java.security.Principal;
import java.util.Iterator;
import javax.jcr.RepositoryException;
-import javax.jcr.UnsupportedRepositoryOperationException;
import javax.jcr.Value;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
class AuthorizableImpl implements Authorizable {
- /**
- * logger instance
- */
- private static final Logger log =
LoggerFactory.getLogger(AuthorizableImpl.class);
-
final Authorizable dlg;
final AutoSaveEnabledManager mgr;
@@ -125,7 +117,7 @@ class AuthorizableImpl implements Author
}
@Override
- public String getPath() throws UnsupportedRepositoryOperationException,
RepositoryException {
+ public String getPath() throws RepositoryException {
return dlg.getPath();
}
}
\ No newline at end of file
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableWrapper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableWrapper.java?rev=1541018&r1=1541017&r2=1541018&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableWrapper.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableWrapper.java
Tue Nov 12 12:05:19 2013
@@ -23,7 +23,7 @@ import com.google.common.collect.Iterato
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
-class AuthorizableWrapper<T extends Authorizable> implements Function<T, T> {
+final class AuthorizableWrapper<T extends Authorizable> implements Function<T,
T> {
private final AutoSaveEnabledManager mgr;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java?rev=1541018&r1=1541017&r2=1541018&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java
Tue Nov 12 12:05:19 2013
@@ -22,10 +22,8 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.jcr.RepositoryException;
-import javax.jcr.UnsupportedRepositoryOperationException;
import org.apache.jackrabbit.api.security.user.Authorizable;
-import org.apache.jackrabbit.api.security.user.AuthorizableExistsException;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.Query;
import org.apache.jackrabbit.api.security.user.User;
@@ -67,8 +65,8 @@ public class AutoSaveEnabledManager impl
}
@Override
- public Authorizable getAuthorizable(String s) throws RepositoryException {
- return wrap(dlg.getAuthorizable(s));
+ public Authorizable getAuthorizable(String id) throws RepositoryException {
+ return wrap(dlg.getAuthorizable(id));
}
@Override
@@ -77,18 +75,18 @@ public class AutoSaveEnabledManager impl
}
@Override
- public Authorizable getAuthorizableByPath(String s) throws
UnsupportedRepositoryOperationException, RepositoryException {
- return wrap(dlg.getAuthorizableByPath(s));
+ public Authorizable getAuthorizableByPath(String path) throws
RepositoryException {
+ return wrap(dlg.getAuthorizableByPath(path));
}
@Override
- public Iterator<Authorizable> findAuthorizables(String s, String s1)
throws RepositoryException {
- return AuthorizableWrapper.createIterator(dlg.findAuthorizables(s,
s1), this);
+ public Iterator<Authorizable> findAuthorizables(String relPath, String
value) throws RepositoryException {
+ return
AuthorizableWrapper.createIterator(dlg.findAuthorizables(relPath, value), this);
}
@Override
- public Iterator<Authorizable> findAuthorizables(String s, String s1, int
i) throws RepositoryException {
- return AuthorizableWrapper.createIterator(dlg.findAuthorizables(s, s1,
i), this);
+ public Iterator<Authorizable> findAuthorizables(String relPath, String
value, int searchType) throws RepositoryException {
+ return
AuthorizableWrapper.createIterator(dlg.findAuthorizables(relPath, value,
searchType), this);
}
@Override
@@ -97,7 +95,7 @@ public class AutoSaveEnabledManager impl
}
@Override
- public User createUser(String userID, String password) throws
AuthorizableExistsException, RepositoryException {
+ public User createUser(String userID, String password) throws
RepositoryException {
try {
return wrap(dlg.createUser(userID, password));
} finally {
@@ -115,7 +113,7 @@ public class AutoSaveEnabledManager impl
}
@Override
- public Group createGroup(String groupId) throws
AuthorizableExistsException, RepositoryException {
+ public Group createGroup(String groupId) throws RepositoryException {
try {
return wrap(dlg.createGroup(groupId));
} finally {
@@ -124,7 +122,7 @@ public class AutoSaveEnabledManager impl
}
@Override
- public Group createGroup(Principal principal) throws
AuthorizableExistsException, RepositoryException {
+ public Group createGroup(Principal principal) throws RepositoryException {
try {
return wrap(dlg.createGroup(principal));
} finally {
@@ -133,7 +131,7 @@ public class AutoSaveEnabledManager impl
}
@Override
- public Group createGroup(Principal principal, String groupId) throws
AuthorizableExistsException, RepositoryException {
+ public Group createGroup(Principal principal, String groupId) throws
RepositoryException {
try {
return wrap(dlg.createGroup(principal, groupId));
} finally {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/UserImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/UserImpl.java?rev=1541018&r1=1541017&r2=1541018&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/UserImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/UserImpl.java
Tue Nov 12 12:05:19 2013
@@ -88,7 +88,7 @@ class UserImpl extends AuthorizableImpl
return getDelegate().getDisabledReason();
}
- private class ImpersonationImpl implements Impersonation {
+ private final class ImpersonationImpl implements Impersonation {
private final Impersonation dlg;
