You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/11/24 12:16:02 UTC
[1/6] directory-fortress-enmasse git commit: o Inherits from the
AbstractImpl class o Added /* no qualifier */ for package protected methods o
Called the createResponse() and createError() method o Formatting the code o
Added some Javadoc
Repository: directory-fortress-enmasse
Updated Branches:
refs/heads/master c0cbc3563 -> 89c971e96
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/04e93834/src/main/java/org/apache/directory/fortress/rest/ConfigMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/ConfigMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/ConfigMgrImpl.java
index 0a0fe8d..3b35a5e 100644
--- a/src/main/java/org/apache/directory/fortress/rest/ConfigMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/ConfigMgrImpl.java
@@ -25,6 +25,7 @@ import org.apache.directory.fortress.core.rbac.Props;
import org.apache.directory.fortress.core.rest.FortRequest;
import org.apache.directory.fortress.core.rest.FortResponse;
import org.apache.directory.fortress.core.rest.RestUtils;
+import org.apache.directory.fortress.core.SecurityException;
import org.apache.log4j.Logger;
import java.util.Properties;
@@ -34,126 +35,127 @@ import java.util.Properties;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-class ConfigMgrImpl
+class ConfigMgrImpl extends AbstractImpl
{
- private static final String CLS_NM = ConfigMgrImpl.class.getName();
- private static final Logger log = Logger.getLogger(CLS_NM);
+ private static final Logger log = Logger.getLogger( ConfigMgrImpl.class.getName() );
/**
*
* @param request
* @return
*/
- FortResponse addConfig(FortRequest request)
+ /* No qualifier */ FortResponse addConfig(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
ConfigMgr configMgr = ConfigMgrFactory.createInstance();
- Properties inProperties = RestUtils.getProperties((Props)request.getEntity());
- Properties outProperties = configMgr.add(request.getValue(), inProperties);
- Props retProps = RestUtils.getProps(outProperties);
- if (retProps != null)
+ Properties inProperties = RestUtils.getProperties( (Props)request.getEntity() );
+ Properties outProperties = configMgr.add( request.getValue(), inProperties );
+ Props retProps = RestUtils.getProps( outProperties );
+
+ if ( retProps != null )
{
- response.setEntity(retProps);
- response.setErrorCode(0);
+ response.setEntity( retProps );
}
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
+
/**
*
* @param request
* @return
*/
- FortResponse updateConfig(FortRequest request)
+ /* No qualifier */ FortResponse updateConfig(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
ConfigMgr configMgr = ConfigMgrFactory.createInstance();
- Properties inProperties = RestUtils.getProperties((Props)request.getEntity());
- Properties outProperties = configMgr.update(request.getValue(), inProperties);
- Props retProps = RestUtils.getProps(outProperties);
- if (retProps != null)
+ Properties inProperties = RestUtils.getProperties( (Props)request.getEntity() );
+ Properties outProperties = configMgr.update( request.getValue(), inProperties );
+ Props retProps = RestUtils.getProps( outProperties );
+
+ if ( retProps != null )
{
- response.setEntity(retProps);
- response.setErrorCode(0);
+ response.setEntity( retProps );
}
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
+
/**
*
* @param request
* @return
*/
- FortResponse deleteConfig(FortRequest request)
+ /* No qualifier */ FortResponse deleteConfig(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
ConfigMgr configMgr = ConfigMgrFactory.createInstance();
- if(request.getEntity() == null)
+
+ if ( request.getEntity() == null )
{
- configMgr.delete(request.getValue());
+ configMgr.delete( request.getValue() );
}
else
{
- Properties inProperties = RestUtils.getProperties((Props)request.getEntity());
- configMgr.delete(request.getValue(), inProperties);
-
+ Properties inProperties = RestUtils.getProperties( (Props)request.getEntity() );
+ configMgr.delete( request.getValue(), inProperties );
}
- response.setErrorCode(0);
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
+
/**
*
* @param request
* @return
*/
- FortResponse readConfig(FortRequest request)
+ /* No qualifier */ FortResponse readConfig(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
ConfigMgr configMgr = ConfigMgrFactory.createInstance();
- Properties properties = configMgr.read(request.getValue());
- Props props = RestUtils.getProps(properties);
- if (properties != null)
+ Properties properties = configMgr.read( request.getValue() );
+ Props props = RestUtils.getProps( properties );
+
+ if ( properties != null )
{
- response.setEntity(props);
- response.setErrorCode(0);
+ response.setEntity( props );
}
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/04e93834/src/main/java/org/apache/directory/fortress/rest/DelegatedAccessMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/DelegatedAccessMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/DelegatedAccessMgrImpl.java
index eb105a0..01af49e 100644
--- a/src/main/java/org/apache/directory/fortress/rest/DelegatedAccessMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/DelegatedAccessMgrImpl.java
@@ -41,10 +41,10 @@ import java.util.Set;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-class DelegatedAccessMgrImpl
+class DelegatedAccessMgrImpl extends AbstractImpl
{
- private static final String CLS_NM = DelegatedAccessMgrImpl.class.getName();
- private static final Logger log = Logger.getLogger(CLS_NM);
+ /** A logger for this class */
+ private static final Logger LOG = Logger.getLogger( DelegatedAccessMgrImpl.class.getName() );
/**
* ************************************************************************************************************************************
@@ -52,218 +52,216 @@ class DelegatedAccessMgrImpl
* **************************************************************************************************************************************
*/
- FortResponse canAssign(FortRequest request)
+ /* No qualifier */ FortResponse canAssign(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
UserRole uRole = (UserRole) request.getEntity();
Session session = request.getSession();
- DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance(request.getContextId());
- boolean result = accessMgr.canAssign(session, new User(uRole.getUserId()), new Role(uRole.getName()));
- response.setSession(session);
- response.setAuthorized(result);
- response.setErrorCode(0);
+ DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance( request.getContextId() );
+ boolean result = accessMgr.canAssign( session, new User( uRole.getUserId() ), new Role( uRole.getName() ) );
+ response.setSession( session );
+ response.setAuthorized( result );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse canDeassign(FortRequest request)
+
+ /* No qualifier */ FortResponse canDeassign(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
UserRole uRole = (UserRole) request.getEntity();
Session session = request.getSession();
- DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance(request.getContextId());
- boolean result = accessMgr.canDeassign(session, new User(uRole.getUserId()), new Role(uRole.getName()));
- response.setSession(session);
- response.setAuthorized(result);
- response.setErrorCode(0);
+ DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance( request.getContextId() );
+ boolean result = accessMgr.canDeassign( session, new User( uRole.getUserId() ), new Role( uRole.getName() ) );
+ response.setSession( session );
+ response.setAuthorized( result );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse canGrant(FortRequest request)
+
+ /* No qualifier */ FortResponse canGrant(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
RolePerm context = (RolePerm) request.getEntity();
Session session = request.getSession();
- DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance(request.getContextId());
- boolean result = accessMgr.canGrant(session, new Role(context.getRole().getName()), context.getPerm());
- response.setSession(session);
- response.setAuthorized(result);
- response.setErrorCode(0);
+ DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance( request.getContextId() );
+ boolean result = accessMgr.canGrant( session, new Role( context.getRole().getName() ), context.getPerm() );
+ response.setSession( session );
+ response.setAuthorized( result );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse canRevoke(FortRequest request)
+
+ /* No qualifier */ FortResponse canRevoke(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
RolePerm context = (RolePerm) request.getEntity();
Session session = request.getSession();
- DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance(request.getContextId());
- boolean result = accessMgr.canRevoke(session, new Role(context.getRole().getName()), context.getPerm());
- response.setSession(session);
- response.setAuthorized(result);
- response.setErrorCode(0);
+ DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance( request.getContextId() );
+ boolean result = accessMgr.canRevoke( session, new Role( context.getRole().getName() ), context.getPerm() );
+ response.setSession( session );
+ response.setAuthorized( result );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
public FortResponse checkAdminAccess(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
Permission perm = (Permission) request.getEntity();
Session session = request.getSession();
- DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance(request.getContextId());
- perm.setAdmin(true);
- boolean result = accessMgr.checkAccess(session, perm);
- response.setSession(session);
- response.setAuthorized(result);
- response.setErrorCode(0);
+ DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance( request.getContextId() );
+ perm.setAdmin( true );
+ boolean result = accessMgr.checkAccess( session, perm );
+ response.setSession( session );
+ response.setAuthorized( result );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse addActiveAdminRole(FortRequest request)
+
+ /* No qualifier */ FortResponse addActiveAdminRole(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
UserAdminRole uAdminRole = (UserAdminRole) request.getEntity();
Session session = request.getSession();
- DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance(request.getContextId());
- accessMgr.addActiveRole(session, uAdminRole);
- response.setSession(session);
- response.setErrorCode(0);
+ DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance( request.getContextId() );
+ accessMgr.addActiveRole( session, uAdminRole );
+ response.setSession( session );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse dropActiveAdminRole(FortRequest request)
+
+ /* No qualifier */ FortResponse dropActiveAdminRole(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
UserAdminRole uAdminRole = (UserAdminRole) request.getEntity();
Session session = request.getSession();
- DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance(request.getContextId());
- accessMgr.dropActiveRole(session, uAdminRole);
- response.setSession(session);
- response.setErrorCode(0);
+ DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance( request.getContextId() );
+ accessMgr.dropActiveRole( session, uAdminRole );
+ response.setSession( session );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse sessionAdminRoles(FortRequest request)
+
+ /* No qualifier */ FortResponse sessionAdminRoles(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
Session session = request.getSession();
- DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance(request.getContextId());
- List<UserAdminRole> roles = accessMgr.sessionAdminRoles(session);
- response.setEntities(roles);
- response.setErrorCode(0);
+ DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance( request.getContextId() );
+ List<UserAdminRole> roles = accessMgr.sessionAdminRoles( session );
+ response.setEntities( roles );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse sessionAdminPermissions(FortRequest request)
+
+ /* No qualifier */ FortResponse sessionAdminPermissions(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance(request.getContextId());
+ DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance( request.getContextId() );
Session session = request.getSession();
- List<Permission> perms = accessMgr.sessionPermissions(session);
- response.setSession(session);
- response.setEntities(perms);
- response.setErrorCode(0);
+ List<Permission> perms = accessMgr.sessionPermissions( session );
+ response.setSession( session );
+ response.setEntities( perms );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse authorizedSessionRoles(FortRequest request)
+
+ /* No qualifier */ FortResponse authorizedSessionRoles(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance(request.getContextId());
+ DelAccessMgr accessMgr = DelAccessMgrFactory.createInstance( request.getContextId() );
Session session = request.getSession();
- Set<String> roles = accessMgr.authorizedAdminRoles(session);
- response.setValueSet(roles);
- response.setSession(session);
- response.setErrorCode(0);
+ Set<String> roles = accessMgr.authorizedAdminRoles( session );
+ response.setValueSet( roles );
+ response.setSession( session );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
}
\ No newline at end of file
[6/6] directory-fortress-enmasse git commit: Formatting
Posted by el...@apache.org.
Formatting
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/commit/89c971e9
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/tree/89c971e9
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/diff/89c971e9
Branch: refs/heads/master
Commit: 89c971e962e9bce3e6c1d946889ceac488211731
Parents: 5f2368e
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Nov 22 11:33:54 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Nov 22 11:33:54 2014 +0100
----------------------------------------------------------------------
.../fortress/rest/FortressInterceptor.java | 137 ++++---
.../fortress/rest/FortressService.java | 403 ++++++++++++-------
2 files changed, 343 insertions(+), 197 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/89c971e9/src/main/java/org/apache/directory/fortress/rest/FortressInterceptor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/FortressInterceptor.java b/src/main/java/org/apache/directory/fortress/rest/FortressInterceptor.java
index 95c52b1..3157f4c 100644
--- a/src/main/java/org/apache/directory/fortress/rest/FortressInterceptor.java
+++ b/src/main/java/org/apache/directory/fortress/rest/FortressInterceptor.java
@@ -31,6 +31,7 @@ import java.util.Set;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.util.ClassHelper;
import org.apache.cxf.interceptor.security.SimpleAuthorizingInterceptor;
+import org.apache.log4j.Logger;
/**
@@ -40,18 +41,20 @@ import org.apache.cxf.interceptor.security.SimpleAuthorizingInterceptor;
*/
public class FortressInterceptor extends SimpleAuthorizingInterceptor
{
- private static final String CLS_NM = FortressInterceptor.class.getName();
- private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(CLS_NM);
+ /** A logger for this class */
+ private static final Logger LOG = Logger.getLogger(FortressInterceptor.class.getName());
private static final String DEFAULT_ANNOTATION_CLASS_NAME = "javax.annotation.security.RolesAllowed";
+
+ /** The list of methods we want to skip */
private static final Set<String> SKIP_METHODS;
static
{
SKIP_METHODS = new HashSet<String>();
- SKIP_METHODS.addAll(Arrays.asList(
- new String[]{"wait", "notify", "notifyAll",
- "equals", "toString", "hashCode"}));
+ SKIP_METHODS.addAll( Arrays.asList(
+ new String[]{ "wait", "notify", "notifyAll",
+ "equals", "toString", "hashCode" } ) );
}
private String annotationClassName = DEFAULT_ANNOTATION_CLASS_NAME;
@@ -60,132 +63,160 @@ public class FortressInterceptor extends SimpleAuthorizingInterceptor
*
* @param name
*/
- public void setAnnotationClassName(String name)
+ public void setAnnotationClassName( String name )
{
try
{
- log.info(CLS_NM + ".setAnnotationClassName:" + name);
- ClassLoaderUtils.loadClass(name, FortressInterceptor.class);
+ LOG.info( "FortressInterceptor.setAnnotationClassName:" + name );
+ ClassLoaderUtils.loadClass( name, FortressInterceptor.class );
annotationClassName = name;
}
- catch (ClassNotFoundException ex)
+ catch ( ClassNotFoundException ex )
{
- String warning = CLS_NM + ".setAnnotationClassName caught ClassNotFoundException-" + ex;
- log.info((warning));
+ LOG.info( "FortressInterceptor.setAnnotationClassName caught ClassNotFoundException-" + ex );
}
}
+
/**
*
* @param object
*/
- public void setSecuredObject(Object object)
+ public void setSecuredObject( Object object )
{
- log.info(CLS_NM + ".setSecuredObject:" + object);
- Class<?> cls = ClassHelper.getRealClass(object);
+ LOG.info( "FortressInterceptor.setSecuredObject:" + object );
+ Class<?> cls = ClassHelper.getRealClass( object );
Map<String, String> rolesMap = new HashMap<String, String>();
- findRoles(cls, rolesMap);
- if (rolesMap.isEmpty())
+ findRoles( cls, rolesMap );
+
+ if ( rolesMap.isEmpty() )
{
- log.info(CLS_NM + ".setSecuredObject The roles map is empty, the service object is not protected");
+ LOG.info( "FortressInterceptor.setSecuredObject The roles map is empty, the service object is not protected" );
}
- else if (log.isDebugEnabled())
+ else if ( LOG.isDebugEnabled() )
{
- for (Map.Entry<String, String> entry : rolesMap.entrySet())
+ for ( Map.Entry<String, String> entry : rolesMap.entrySet() )
{
- log.debug(CLS_NM + ".setSecuredObject Method: " + entry.getKey() + ", roles: " + entry.getValue());
+ LOG.debug( "FortressInterceptor.setSecuredObject Method: " + entry.getKey() + ", roles: " + entry.getValue() );
}
}
- super.setMethodRolesMap(rolesMap);
+
+ super.setMethodRolesMap( rolesMap );
}
+
/**
- *
+ * Find the list of
* @param cls
* @param rolesMap
*/
- protected void findRoles(Class<?> cls, Map<String, String> rolesMap)
+ protected void findRoles( Class<?> cls, Map<String, String> rolesMap )
{
- log.info(CLS_NM + ".findRoles:" + rolesMap);
- if (cls == null || cls == Object.class)
+ LOG.info( "FortressInterceptor.findRoles:" + rolesMap );
+
+ if ( ( cls == null ) || ( cls == Object.class ) )
{
return;
}
- String classRolesAllowed = getRoles(cls.getAnnotations(), annotationClassName);
- for (Method m : cls.getMethods())
+
+ String classRolesAllowed = getRoles( cls.getAnnotations(), annotationClassName );
+
+ // Process all the methods for the given class itself
+ for ( Method m : cls.getMethods() )
{
- if (SKIP_METHODS.contains(m.getName()))
+ if ( SKIP_METHODS.contains( m.getName() ) )
{
continue;
}
- String methodRolesAllowed = getRoles(m.getAnnotations(), annotationClassName);
- String theRoles = methodRolesAllowed != null ? methodRolesAllowed : classRolesAllowed;
- if (theRoles != null)
+
+ String methodRolesAllowed = getRoles( m.getAnnotations(), annotationClassName );
+
+ if ( methodRolesAllowed != null )
+ {
+ rolesMap.put( m.getName(), methodRolesAllowed );
+ }
+ else if ( classRolesAllowed != null )
{
- rolesMap.put(m.getName(), theRoles);
+ rolesMap.put( m.getName(), classRolesAllowed );
}
}
- if (!rolesMap.isEmpty())
+
+ // We have found roles in the current class, get out
+ if ( !rolesMap.isEmpty() )
{
return;
}
- findRoles(cls.getSuperclass(), rolesMap);
+ // Chekc the super class now
+ findRoles( cls.getSuperclass(), rolesMap );
- if (!rolesMap.isEmpty())
+ // Get out if we have some roles
+ if ( !rolesMap.isEmpty() )
{
return;
}
- for (Class<?> interfaceCls : cls.getInterfaces())
+ // Still nothing ? let's check the interfaces
+ for ( Class<?> interfaceCls : cls.getInterfaces() )
{
- findRoles(interfaceCls, rolesMap);
+ findRoles( interfaceCls, rolesMap );
}
}
+
/**
*
* @param anns
* @param annName
* @return String roles
*/
- private String getRoles(Annotation[] anns, String annName)
+ private String getRoles( Annotation[] anns, String annName )
{
- log.debug(CLS_NM + ".getRoles:" + annName);
- for (Annotation ann : anns)
+ LOG.debug( "FortressInterceptor.getRoles:" + annName );
+
+ for ( Annotation ann : anns )
{
- if (ann.annotationType().getName().equals(annName))
+ if ( ann.annotationType().getName().equals( annName ) )
{
try
{
- Method valueMethod = ann.annotationType().getMethod("value", new Class[]{});
- String[] roles = (String[]) valueMethod.invoke(ann, new Object[]{});
+ Method valueMethod = ann.annotationType().getMethod( "value", new Class[]{} );
+ String[] roles = (String[]) valueMethod.invoke( ann, new Object[]{} );
StringBuilder sb = new StringBuilder();
- for (int i = 0; i < roles.length; i++)
+ boolean isFirst = false;
+
+ for ( String role : roles )
{
- sb.append(roles[i]);
- if (i + 1 < roles.length)
+ if ( isFirst )
+ {
+ isFirst = false;
+ }
+ else
{
- sb.append(" ");
+ sb.append( " " );
}
+
+ sb.append( role );
}
+
return sb.toString();
}
- catch (java.lang.NoSuchMethodException ex)
+ catch ( NoSuchMethodException ex )
{
- log.info(CLS_NM + ".getRoles annName=" + annName + ", caught NoSuchMethodException=" + ex);
+ LOG.info( "FortressInterceptor.getRoles annName=" + annName + ", caught NoSuchMethodException=" + ex );
}
- catch (java.lang.IllegalAccessException ex)
+ catch ( IllegalAccessException ex )
{
- log.info(CLS_NM + ".getRoles annName=" + annName + ", caught IllegalAccessException=" + ex);
+ LOG.info( "FortressInterceptor.getRoles annName=" + annName + ", caught IllegalAccessException=" + ex );
}
- catch (InvocationTargetException ex)
+ catch ( InvocationTargetException ex )
{
- log.info(CLS_NM + ".getRoles annName=" + annName + ", caught InvocationTargetException=" + ex);
+ LOG.info( "FortressInterceptor.getRoles annName=" + annName + ", caught InvocationTargetException=" + ex );
}
break;
}
}
+
return null;
}
}
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/89c971e9/src/main/java/org/apache/directory/fortress/rest/FortressService.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/FortressService.java b/src/main/java/org/apache/directory/fortress/rest/FortressService.java
index e158e31..1754a74 100644
--- a/src/main/java/org/apache/directory/fortress/rest/FortressService.java
+++ b/src/main/java/org/apache/directory/fortress/rest/FortressService.java
@@ -29,8 +29,7 @@ import org.apache.directory.fortress.core.rest.FortResponse;
*/
public interface FortressService
{
- // AdminMgr
-
+ //------------ AdminMgr -----------------------------------------------------------------------------------------------
/**
* This command creates a new RBAC user. The command is valid only if the new user is
* not already a member of the USERS data set. The USER data set is updated. The new user
@@ -76,8 +75,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addUser(FortRequest request);
+ public FortResponse addUser( FortRequest request );
+
/**
* This command deletes an existing user from the RBAC database. The command is valid
* if and only if the user to be deleted is a member of the USERS data set. The USERS and
@@ -101,8 +101,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse deleteUser(FortRequest request);
+ public FortResponse deleteUser( FortRequest request );
+
/**
* This command deletes an existing user from the RBAC database. The command is valid
* if and only if the user to be deleted is a member of the USERS data set. The USERS and
@@ -129,8 +130,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse disableUser(FortRequest request);
+ public FortResponse disableUser( FortRequest request );
+
/**
* This method performs an update on User entity in directory. Prior to making this call the entity must exist in
* directory.
@@ -175,8 +177,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse updateUser(FortRequest request);
+ public FortResponse updateUser( FortRequest request );
+
/**
* Method will change user's password. This method will evaluate user's password policies.
* <p/>
@@ -198,8 +201,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse changePassword(FortRequest request);
+ public FortResponse changePassword( FortRequest request );
+
/**
* Method will lock user's password which will prevent the user from authenticating with directory.
* <p/>
@@ -219,8 +223,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse lockUserAccount(FortRequest request);
+ public FortResponse lockUserAccount( FortRequest request );
+
/**
* Method will unlock user's password which will enable user to authenticate with directory.
* <p/>
@@ -240,8 +245,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse unlockUserAccount(FortRequest request);
+ public FortResponse unlockUserAccount( FortRequest request );
+
/**
* Method will reset user's password which will require user to change password before successful authentication with directory.
* This method will not evaluate password policies on the new user password as it must be changed before use.
@@ -263,8 +269,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse resetPassword(FortRequest request);
+ public FortResponse resetPassword( FortRequest request );
+
/**
* This command creates a new role. The command is valid if and only if the new role is not
* already a member of the ROLES data set. The ROLES data set is updated.
@@ -297,8 +304,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addRole(FortRequest request);
-
+ public FortResponse addRole( FortRequest request );
+
+
/**
* This command deletes an existing role from the RBAC database. The command is valid
* if and only if the role to be deleted is a member of the ROLES data set. This command will
@@ -320,8 +328,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse deleteRole(FortRequest request);
+ public FortResponse deleteRole( FortRequest request );
+
/**
* Method will update a Role entity in the directory. The role must exist in role container prior to this call. *
* <h4>required parameters</h4>
@@ -351,8 +360,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse updateRole(FortRequest request);
+ public FortResponse updateRole( FortRequest request );
+
/**
* This command assigns a user to a role.
* <p>
@@ -409,8 +419,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse assignUser(FortRequest request);
+ public FortResponse assignUser( FortRequest request );
+
/**
* This command deletes the assignment of the User from the Role entities. The command is
* valid if and only if the user is a member of the USERS data set, the role is a member of
@@ -437,8 +448,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse deassignUser(FortRequest request);
+ public FortResponse deassignUser( FortRequest request );
+
/**
* This method will add permission operation to an existing permission object which resides under {@code ou=Permissions,ou=RBAC,dc=yourHostName,dc=com} container in directory information tree.
* The perm operation entity may have {@link org.apache.directory.fortress.core.rbac.Role} or {@link org.apache.directory.fortress.core.rbac.User} associations. The target {@link org.apache.directory.fortress.core.rbac.Permission} must not exist prior to calling.
@@ -467,8 +479,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addPermission(FortRequest request);
+ public FortResponse addPermission( FortRequest request );
+
/**
* This method will update permission operation pre-existing in target directory under {@code ou=Permissions,ou=RBAC,dc=yourHostName,dc=com} container in directory information tree.
* The perm operation entity may also contain {@link org.apache.directory.fortress.core.rbac.Role} or {@link org.apache.directory.fortress.core.rbac.User} associations to add or remove using this function.
@@ -497,8 +510,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse updatePermission(FortRequest request);
+ public FortResponse updatePermission( FortRequest request );
+
/**
* This method will remove permission operation entity from permission object. A Fortress permission is (object->operation).
* The perm operation must exist before making this call.
@@ -519,8 +533,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse deletePermission(FortRequest request);
+ public FortResponse deletePermission( FortRequest request );
+
/**
* This method will add permission object to perms container in directory. The perm object must not exist before making this call.
* A {@link org.apache.directory.fortress.core.rbac.PermObj} instance exists in a hierarchical, one-many relationship between itself and children as stored in ldap tree: ({@link org.apache.directory.fortress.core.rbac.PermObj}*->{@link org.apache.directory.fortress.core.rbac.Permission}).
@@ -547,8 +562,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addPermObj(FortRequest request);
+ public FortResponse addPermObj( FortRequest request );
+
/**
* This method will update permission object in perms container in directory. The perm object must exist before making this call.
* A {@link org.apache.directory.fortress.core.rbac.PermObj} instance exists in a hierarchical, one-many relationship between itself and children as stored in ldap tree: ({@link org.apache.directory.fortress.core.rbac.PermObj}*->{@link org.apache.directory.fortress.core.rbac.Permission}).
@@ -575,8 +591,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse updatePermObj(FortRequest request);
+ public FortResponse updatePermObj( FortRequest request );
+
/**
* This method will remove permission object to perms container in directory. This method will also remove
* in associated permission objects that are attached to this object.
@@ -596,8 +613,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse deletePermObj(FortRequest request);
+ public FortResponse deletePermObj( FortRequest request );
+
/**
* This command grants a role the permission to perform an operation on an object to a role.
* The command is implemented by granting permission by setting the access control list of
@@ -626,8 +644,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse grant(FortRequest request);
+ public FortResponse grant( FortRequest request );
+
/**
* This command revokes the permission to perform an operation on an object from the set
* of permissions assigned to a role. The command is implemented by setting the access control
@@ -656,8 +675,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse revoke(FortRequest request);
+ public FortResponse revoke( FortRequest request );
+
/**
* This command grants a user the permission to perform an operation on an object to a role.
* The command is implemented by granting permission by setting the access control list of
@@ -686,8 +706,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse grantUser(FortRequest request);
+ public FortResponse grantUser( FortRequest request );
+
/**
* This command revokes the permission to perform an operation on an object from the set
* of permissions assigned to a user. The command is implemented by setting the access control
@@ -716,8 +737,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse revokeUser(FortRequest request);
+ public FortResponse revokeUser( FortRequest request );
+
/**
* This commands creates a new role childRole, and inserts it in the role hierarchy as an immediate descendant of
* the existing role parentRole.
@@ -761,8 +783,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addDescendant(FortRequest request);
+ public FortResponse addDescendant( FortRequest request );
+
/**
* This commands creates a new role parentRole, and inserts it in the role hierarchy as an immediate ascendant of
* the existing role childRole.
@@ -806,8 +829,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addAscendant(FortRequest request);
+ public FortResponse addAscendant( FortRequest request );
+
/**
* This commands establishes a new immediate inheritance relationship parentRole <<-- childRole between existing
* roles parentRole, childRole.
@@ -835,8 +859,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addInheritance(FortRequest request);
+ public FortResponse addInheritance( FortRequest request );
+
/**
* This command deletes an existing immediate inheritance relationship parentRole <<-- childRole.
* <p/>
@@ -864,8 +889,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse deleteInheritance(FortRequest request);
+ public FortResponse deleteInheritance( FortRequest request );
+
/**
* This command creates a named SSD set of roles and sets the cardinality n of its subsets
* that cannot have common users.
@@ -899,8 +925,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.SDSet}
*/
- public FortResponse createSsdSet(FortRequest request);
+ public FortResponse createSsdSet( FortRequest request );
+
/**
* This command updates existing SSD set of roles and sets the cardinality n of its subsets
* that cannot have common users.
@@ -934,8 +961,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.SDSet}
*/
- public FortResponse updateSsdSet(FortRequest request);
+ public FortResponse updateSsdSet( FortRequest request );
+
/**
* This command adds a role to a named SSD set of roles. The cardinality associated with the role set remains unchanged.
* <p/>
@@ -962,8 +990,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.SDSet}
*/
- public FortResponse addSsdRoleMember(FortRequest request);
+ public FortResponse addSsdRoleMember( FortRequest request );
+
/**
* This command removes a role from a named SSD set of roles. The cardinality associated with the role set remains unchanged.
* <p/>
@@ -991,8 +1020,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.SDSet}
*/
- public FortResponse deleteSsdRoleMember(FortRequest request);
+ public FortResponse deleteSsdRoleMember( FortRequest request );
+
/**
* This command deletes a SSD role set completely. The command is valid if and only if the SSD role set exists.
* <h4>required parameters</h4>
@@ -1011,8 +1041,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.SDSet}
*/
- public FortResponse deleteSsdSet(FortRequest request);
+ public FortResponse deleteSsdSet( FortRequest request );
+
/**
* This command sets the cardinality associated with a given SSD role set.
* <p/>
@@ -1039,8 +1070,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.SDSet}
*/
- public FortResponse setSsdSetCardinality(FortRequest request);
+ public FortResponse setSsdSetCardinality( FortRequest request );
+
/**
* This command creates a named DSD set of roles and sets the cardinality n of its subsets
* that cannot have common users.
@@ -1074,8 +1106,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.SDSet}
*/
- public FortResponse createDsdSet(FortRequest request);
+ public FortResponse createDsdSet( FortRequest request );
+
/**
* This command updates existing DSD set of roles and sets the cardinality n of its subsets
* that cannot have common users.
@@ -1109,8 +1142,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.SDSet}
*/
- public FortResponse updateDsdSet(FortRequest request);
+ public FortResponse updateDsdSet( FortRequest request );
+
/**
* This command adds a role to a named DSD set of roles. The cardinality associated with the role set remains unchanged.
* <p/>
@@ -1137,8 +1171,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.SDSet}
*/
- public FortResponse addDsdRoleMember(FortRequest request);
+ public FortResponse addDsdRoleMember( FortRequest request );
+
/**
* This command removes a role from a named DSD set of roles. The cardinality associated with the role set remains unchanged.
* <p/>
@@ -1166,8 +1201,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.SDSet}
*/
- public FortResponse deleteDsdRoleMember(FortRequest request);
+ public FortResponse deleteDsdRoleMember( FortRequest request );
+
/**
* This command deletes a DSD role set completely. The command is valid if and only if the DSD role set exists.
* <h4>required parameters</h4>
@@ -1186,8 +1222,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.SDSet}
*/
- public FortResponse deleteDsdSet(FortRequest request);
+ public FortResponse deleteDsdSet( FortRequest request );
+
/**
* This command sets the cardinality associated with a given DSD role set.
* <p/>
@@ -1214,10 +1251,10 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.SDSet}
*/
- public FortResponse setDsdSetCardinality(FortRequest request);
-
- // ReviewMgr
+ public FortResponse setDsdSetCardinality( FortRequest request );
+
+ //------------ ReviewMgr ----------------------------------------------------------------------------------------------
/**
* This method returns a matching permission entity to caller.
* <h4>required parameters</h4>
@@ -1237,8 +1274,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.Permission}
*/
- public FortResponse readPermission(FortRequest request);
+ public FortResponse readPermission( FortRequest request );
+
/**
* Method reads permission object from perm container in directory.
* <h4>required parameters</h4>
@@ -1257,8 +1295,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.PermObj}
*/
- public FortResponse readPermObj(FortRequest request);
+ public FortResponse readPermObj( FortRequest request );
+
/**
* Method returns a list of type Permission that match the perm object search string.
* <h4>required parameters</h4>
@@ -1278,8 +1317,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.Permission}
*/
- public FortResponse findPermissions(FortRequest request);
+ public FortResponse findPermissions( FortRequest request );
+
/**
* Method returns a list of type Permission that match the perm object search string.
* <h4>required parameters</h4>
@@ -1298,8 +1338,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.PermObj}
*/
- public FortResponse findPermObjs(FortRequest request);
+ public FortResponse findPermObjs( FortRequest request );
+
/**
* Method reads Role entity from the role container in directory.
* <h4>required parameters</h4>
@@ -1318,8 +1359,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.Role}
*/
- public FortResponse readRole(FortRequest request);
+ public FortResponse readRole( FortRequest request );
+
/**
* Method will return a list of type Role matching all or part of {@link org.apache.directory.fortress.core.rbac.Role#name}.
* <h4>required parameters</h4>
@@ -1334,8 +1376,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.Role}
*/
- public FortResponse findRoles(FortRequest request);
+ public FortResponse findRoles( FortRequest request );
+
/**
* Method returns matching User entity that is contained within the people container in the directory.
* <h4>required parameters</h4>
@@ -1354,8 +1397,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.User}
*/
- public FortResponse readUser(FortRequest request);
+ public FortResponse readUser( FortRequest request );
+
/**
* Return a list of type User of all users in the people container that match all or part of the {@link org.apache.directory.fortress.core.rbac.User#userId} or {@link org.apache.directory.fortress.core.rbac.User#ou} fields passed in User entity.
* <h4>required parameters</h4>
@@ -1375,8 +1419,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.User}
*/
- public FortResponse findUsers(FortRequest request);
+ public FortResponse findUsers( FortRequest request );
+
/**
* This method returns the data set of all users who are assigned the given role. This searches the User data set for
* Role relationship. This method does NOT search for hierarchical RBAC Roles relationships.
@@ -1396,8 +1441,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.User}
*/
- public FortResponse assignedUsers(FortRequest request);
+ public FortResponse assignedUsers( FortRequest request );
+
/**
* This function returns the set of roles assigned to a given user. The function is valid if and
* only if the user is a member of the USERS data set.
@@ -1417,8 +1463,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.UserRole}
*/
- public FortResponse assignedRoles(FortRequest request);
+ public FortResponse assignedRoles( FortRequest request );
+
/**
* This function returns the set of users authorized to a given role, i.e., the users that are assigned to a role that
* inherits the given role. The function is valid if and only if the given role is a member of the ROLES data set.
@@ -1438,8 +1485,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.User}
*/
- public FortResponse authorizedUsers(FortRequest request);
+ public FortResponse authorizedUsers( FortRequest request );
+
/**
* This function returns the set of roles authorized for a given user. The function is valid if
* and only if the user is a member of the USERS data set.
@@ -1459,8 +1507,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#values} contains a reference to a List of type String containing the User's authorized role names.
*/
- public FortResponse authorizedRoles(FortRequest request);
+ public FortResponse authorizedRoles( FortRequest request );
+
/**
* Return a list of type String of all roles that have granted a particular permission.
* <h4>required parameters</h4>
@@ -1480,8 +1529,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#values} contains a reference to a List of type String containing role names that permission has been granted to.
*/
- public FortResponse permissionRoles(FortRequest request);
+ public FortResponse permissionRoles( FortRequest request );
+
/**
* This function returns the set of all permissions (op, obj), granted to or inherited by a
* given role. The function is valid if and only if the role is a member of the ROLES data
@@ -1502,8 +1552,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.Permission} containing permissions for role.
*/
- public FortResponse rolePermissions(FortRequest request);
+ public FortResponse rolePermissions( FortRequest request );
+
/**
* This function returns the set of permissions a given user gets through his/her authorized
* roles. The function is valid if and only if the user is a member of the USERS data set.
@@ -1523,8 +1574,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.Permission} containing permissions for user.
*/
- public FortResponse userPermissions(FortRequest request);
+ public FortResponse userPermissions( FortRequest request );
+
/**
* Return all role names that have been authorized for a given permission. This will process role hierarchies to determine set of all Roles who have access to a given permission.
* <h4>required parameters</h4>
@@ -1544,8 +1596,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#values} contains a reference to a List of type String containing role names that permission has been granted to.
*/
- public FortResponse authorizedPermissionRoles(FortRequest request);
+ public FortResponse authorizedPermissionRoles( FortRequest request );
+
/**
* Return all userIds that have been granted (directly) a particular permission. This will not consider assigned or authorized Roles.
* <h4>required parameters</h4>
@@ -1565,8 +1618,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#values} contains a reference to a List of type String containing userIds that permission has been granted to.
*/
- public FortResponse permissionUsers(FortRequest request);
+ public FortResponse permissionUsers( FortRequest request );
+
/**
* Return all userIds that have been authorized for a given permission. This will process role hierarchies to determine set of all Users who have access to a given permission.
* <h4>required parameters</h4>
@@ -1587,8 +1641,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#values} contains a reference to a List of type String containing userIds that permission is authorized for.
*/
- public FortResponse authorizedPermissionUsers(FortRequest request);
+ public FortResponse authorizedPermissionUsers( FortRequest request );
+
/**
* This function returns the list of all SSD role sets that have a particular Role as member or Role's
* parent as a member. If the Role parameter is left blank, function will return all SSD role sets.
@@ -1608,8 +1663,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.SDSet} containing all matching SSD sets.
*/
- public FortResponse ssdRoleSets(FortRequest request);
+ public FortResponse ssdRoleSets( FortRequest request );
+
/**
* This function returns the SSD data set that matches a particular set name.
* <h4>required parameters</h4>
@@ -1628,8 +1684,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to an object of type {@link org.apache.directory.fortress.core.rbac.SDSet} containing matching SSD set.
*/
- public FortResponse ssdRoleSet(FortRequest request);
+ public FortResponse ssdRoleSet( FortRequest request );
+
/**
* This function returns the set of roles of a SSD role set. The function is valid if and only if the
* role set exists.
@@ -1649,8 +1706,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#values} contains a reference to a List of type String containing all member roles of SSD set.
*/
- public FortResponse ssdRoleSetRoles(FortRequest request);
+ public FortResponse ssdRoleSetRoles( FortRequest request );
+
/**
* This function returns the cardinality associated with a SSD role set. The function is valid if and only if the
* role set exists.
@@ -1662,8 +1720,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains the cardinality.
*/
- public FortResponse ssdRoleSetCardinality(FortRequest request);
+ public FortResponse ssdRoleSetCardinality( FortRequest request );
+
/**
* This function returns the list of all SSD sets that have a particular SSD set name.
* If the parameter is left blank, function will return all SSD sets.
@@ -1683,8 +1742,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.SDSet} containing all matching SSD sets.
*/
- public FortResponse ssdSets(FortRequest request);
+ public FortResponse ssdSets( FortRequest request );
+
/**
* This function returns the list of all DSD role sets that have a particular Role as member or Role's
* parent as a member. If the Role parameter is left blank, function will return all DSD role sets.
@@ -1704,8 +1764,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.SDSet} containing all matching DSD sets.
*/
- public FortResponse dsdRoleSets(FortRequest request);
+ public FortResponse dsdRoleSets( FortRequest request );
+
/**
* This function returns the DSD data set that matches a particular set name.
* <h4>required parameters</h4>
@@ -1724,8 +1785,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to an object of type {@link org.apache.directory.fortress.core.rbac.SDSet} containing matching DSD set.
*/
- public FortResponse dsdRoleSet(FortRequest request);
+ public FortResponse dsdRoleSet( FortRequest request );
+
/**
* This function returns the set of roles of a DSD role set. The function is valid if and only if the
* role set exists.
@@ -1745,8 +1807,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#values} contains a reference to a List of type String containing all member roles of DSD set.
*/
- public FortResponse dsdRoleSetRoles(FortRequest request);
+ public FortResponse dsdRoleSetRoles( FortRequest request );
+
/**
* This function returns the cardinality associated with a DSD role set. The function is valid if and only if the
* role set exists.
@@ -1758,8 +1821,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains the cardinality.
*/
- public FortResponse dsdRoleSetCardinality(FortRequest request);
+ public FortResponse dsdRoleSetCardinality( FortRequest request );
+
/**
* This function returns the list of all DSD sets that have a particular DSD set name.
* If the parameter is left blank, function will return all DSD sets.
@@ -1779,10 +1843,11 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.SDSet} containing all matching DSD sets.
*/
- public FortResponse dsdSets(FortRequest request);
+ public FortResponse dsdSets( FortRequest request );
- // AccessMgr
+
+ //------------ AccessMgr ----------------------------------------------------------------------------------------------
/**
* Perform user authentication only. It does not activate RBAC roles in session but will evaluate
* password policies.
@@ -1799,8 +1864,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#session} object will be returned if authentication successful. This will not contain user's roles.
*/
- public FortResponse authenticate(FortRequest request);
+ public FortResponse authenticate( FortRequest request );
+
/**
* Perform user authentication {@link org.apache.directory.fortress.core.rbac.User#password} and role activations.<br />
* This method must be called once per user prior to calling other methods within this class.
@@ -1850,8 +1916,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#session} object will contain authentication result code {@link org.apache.directory.fortress.core.rbac.Session#errorId}, RBAC role activations {@link org.apache.directory.fortress.core.rbac.Session#getRoles()}, Admin Role activations {@link org.apache.directory.fortress.core.rbac.Session#getAdminRoles()},OpenLDAP pw policy codes {@link org.apache.directory.fortress.core.rbac.Session#warningId}, {@link org.apache.directory.fortress.core.rbac.Session#expirationSeconds}, {@link org.apache.directory.fortress.core.rbac.Session#graceLogins} and more.
*/
- public FortResponse createSession(FortRequest request);
+ public FortResponse createSession( FortRequest request );
+
/**
* This service accepts userId for validation and returns RBAC session. This service will not check the password nor perform password policy validations.<br />
* The successful result is {@link org.apache.directory.fortress.core.rbac.Session} that contains target user's RBAC {@link org.apache.directory.fortress.core.rbac.User#roles} and Admin role {@link org.apache.directory.fortress.core.rbac.User#adminRoles}.<br />
@@ -1894,8 +1961,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#session} object will contain authentication result code {@link org.apache.directory.fortress.core.rbac.Session#errorId}, RBAC role activations {@link org.apache.directory.fortress.core.rbac.Session#getRoles()}, Admin Role activations {@link org.apache.directory.fortress.core.rbac.Session#getAdminRoles()},OpenLDAP pw policy codes {@link org.apache.directory.fortress.core.rbac.Session#warningId}, {@link org.apache.directory.fortress.core.rbac.Session#expirationSeconds}, {@link org.apache.directory.fortress.core.rbac.Session#graceLogins} and more.
*/
- public FortResponse createSessionTrusted(FortRequest request);
+ public FortResponse createSessionTrusted( FortRequest request );
+
/**
* Perform user RBAC authorization. This function returns a Boolean value meaning whether the subject of a given session is
* allowed or not to perform a given operation on a given object. The function is valid if and
@@ -1918,8 +1986,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#isAuthorized} boolean will be 'true' if User authorized, otherwise 'false'. Updated {@link FortResponse#session} will be included in response as well.
*/
- public FortResponse checkAccess(FortRequest request);
+ public FortResponse checkAccess( FortRequest request );
+
/**
* This function returns the permissions of the session, i.e., the permissions assigned
* to its authorized roles. The function is valid if and only if the session is a valid Fortress session.
@@ -1931,8 +2000,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} containing a List of type {@link org.apache.directory.fortress.core.rbac.Permission}. Updated {@link FortResponse#session} will be included in response as well.
*/
- public FortResponse sessionPermissions(FortRequest request);
+ public FortResponse sessionPermissions( FortRequest request );
+
/**
* This function returns the active roles associated with a session. The function is valid if
* and only if the session is a valid Fortress session.
@@ -1944,8 +2014,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} containing a List of type {@link org.apache.directory.fortress.core.rbac.UserRole}. Updated {@link FortResponse#session} will be included in response as well.
*/
- public FortResponse sessionRoles(FortRequest request);
+ public FortResponse sessionRoles( FortRequest request );
+
/**
* This function returns the authorized roles associated with a session based on hierarchical relationships. The function is valid if
* and only if the session is a valid Fortress session.
@@ -1957,8 +2028,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#valueSet} containing a Set of type String containing role names authorized for User. Updated {@link FortResponse#session} will be included in response as well.
*/
- public FortResponse authorizedSessionRoles(FortRequest request);
+ public FortResponse authorizedSessionRoles( FortRequest request );
+
/**
* This function adds a role as an active role of a session whose owner is a given user.
* <h4>required parameters</h4>
@@ -1984,8 +2056,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, Updated {@link FortResponse#session} will be included in response.
*/
- public FortResponse addActiveRole(FortRequest request);
+ public FortResponse addActiveRole( FortRequest request );
+
/**
* This function deletes a role from the active role set of a session owned by a given user.
* The function is valid if and only if the user is a member of the USERS data set, the
@@ -2004,8 +2077,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, Updated {@link FortResponse#session} will be included in response.
*/
- public FortResponse dropActiveRole(FortRequest request);
+ public FortResponse dropActiveRole( FortRequest request );
+
/**
* This function returns the userId value that is contained within the session object.
* The function is valid if and only if the session object contains a valid Fortress session.
@@ -2017,8 +2091,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains reference to {@link org.apache.directory.fortress.core.rbac.User#userId} only.
*/
- public FortResponse getUserId(FortRequest request);
+ public FortResponse getUserId( FortRequest request );
+
/**
* This function returns the user object that is contained within the session object.
* The function is valid if and only if the session object contains a valid Fortress session.
@@ -2030,10 +2105,10 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains reference to {@link org.apache.directory.fortress.core.rbac.User}.
*/
- public FortResponse getUser(FortRequest request);
+ public FortResponse getUser( FortRequest request );
- // DelegatedAdminMgrImpl
+ //------------ DelegatedAdminMgr --------------------------------------------------------------------------------------
/**
* This command creates a new admin role. The command is valid if and only if the new admin role is not
* already a member of the ADMIN ROLES data set. The ADMIN ROLES data set is updated.
@@ -2073,8 +2148,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to a {@link org.apache.directory.fortress.core.rbac.AdminRole}.
*/
- public FortResponse addAdminRole(FortRequest request);
+ public FortResponse addAdminRole( FortRequest request );
+
/**
* This command deletes an existing admin role from the ARBAC database. The command is valid
* if and only if the role to be deleted is a member of the ADMIN ROLES data set. This command will
@@ -2095,8 +2171,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to a {@link org.apache.directory.fortress.core.rbac.AdminRole}.
*/
- public FortResponse deleteAdminRole(FortRequest request);
+ public FortResponse deleteAdminRole( FortRequest request );
+
/**
* Method will update an AdminRole entity in the directory. The role must exist in directory prior to this call. *
* <h4>required parameters</h4>
@@ -2132,8 +2209,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to a {@link org.apache.directory.fortress.core.rbac.AdminRole}.
*/
- public FortResponse updateAdminRole(FortRequest request);
+ public FortResponse updateAdminRole( FortRequest request );
+
/**
* This command assigns a user to an administrative role.
* <p>
@@ -2189,8 +2267,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse assignAdminUser(FortRequest request);
+ public FortResponse assignAdminUser( FortRequest request );
+
/**
* This method removes assigned admin role from user entity. Both user and admin role entities must exist and have role relationship
* before calling this method.
@@ -2215,8 +2294,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse deassignAdminUser(FortRequest request);
+ public FortResponse deassignAdminUser( FortRequest request );
+
/**
* This commands creates a new role childRole, and inserts it in the role hierarchy as an immediate descendant of
* the existing role parentRole. The command is valid if and only if childRole is not a member of the ADMINROLES data set,
@@ -2260,8 +2340,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addAdminDescendant(FortRequest request);
+ public FortResponse addAdminDescendant( FortRequest request );
+
/**
* This commands creates a new role parentRole, and inserts it in the role hierarchy as an immediate ascendant of
* the existing role childRole. The command is valid if and only if parentRole is not a member of the ADMINROLES data set,
@@ -2305,8 +2386,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addAdminAscendant(FortRequest request);
+ public FortResponse addAdminAscendant( FortRequest request );
+
/**
* This commands establishes a new immediate inheritance relationship parentRole <<-- childRole between existing
* roles parentRole, childRole. The command is valid if and only if parentRole and childRole are members of the ADMINROLES data
@@ -2335,8 +2417,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addAdminInheritance(FortRequest request);
+ public FortResponse addAdminInheritance( FortRequest request );
+
/**
* This command deletes an existing immediate inheritance relationship parentRole <<-- childRole. The command is
* valid if and only if the adminRoles parentRole and childRole are members of the ADMINROLES data set, and parentRole is an
@@ -2366,8 +2449,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse deleteAdminInheritance(FortRequest request);
+ public FortResponse deleteAdminInheritance( FortRequest request );
+
/**
* Commands adds a new OrgUnit entity to OrgUnit dataset. The OrgUnit can be either User or Perm and is
* set by setting type attribute.
@@ -2392,8 +2476,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addOrg(FortRequest request);
+ public FortResponse addOrg( FortRequest request );
+
/**
* Commands updates existing OrgUnit entity to OrgUnit dataset. The OrgUnit can be either User or Perm and is
* set by setting type attribute.
@@ -2418,8 +2503,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse updateOrg(FortRequest request);
+ public FortResponse updateOrg( FortRequest request );
+
/**
* Commands deletes existing OrgUnit entity to OrgUnit dataset. The OrgUnit can be either User or Perm and is
* set by setting type attribute.
@@ -2440,8 +2526,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse deleteOrg(FortRequest request);
+ public FortResponse deleteOrg( FortRequest request );
+
/**
* This commands creates a new orgunit child, and inserts it in the orgunit hierarchy as an immediate descendant of
* the existing orgunit parent.
@@ -2478,8 +2565,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addOrgDescendant(FortRequest request);
+ public FortResponse addOrgDescendant( FortRequest request );
+
/**
* This commands creates a new orgunit parent, and inserts it in the orgunit hierarchy as an immediate ascendant of
* the existing child orgunit.
@@ -2516,8 +2604,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addOrgAscendant(FortRequest request);
+ public FortResponse addOrgAscendant( FortRequest request );
+
/**
* This commands establishes a new immediate inheritance relationship with parent orgunit <<-- child orgunit
* <h4>required parameters</h4>
@@ -2544,8 +2633,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addOrgInheritance(FortRequest request);
+ public FortResponse addOrgInheritance( FortRequest request );
+
/**
* This command deletes an existing immediate inheritance relationship parent <<-- child.
* <h4>required parameters</h4>
@@ -2573,10 +2663,10 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse deleteOrgInheritance(FortRequest request);
+ public FortResponse deleteOrgInheritance( FortRequest request );
- // DelegatedReviewMgr
+ //------------ DelegatedReviewtMgr ------------------------------------------------------------------------------------
/**
* Method reads Admin Role entity from the admin role container in directory.
* <h4>required parameters</h4>
@@ -2595,8 +2685,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.AdminRole}
*/
- public FortResponse readAdminRole(FortRequest request);
+ public FortResponse readAdminRole( FortRequest request );
+
/**
* Method will return a list of type AdminRole matching all or part of {@link org.apache.directory.fortress.core.rbac.AdminRole#name}.
* <h4>required parameters</h4>
@@ -2611,8 +2702,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.AdminRole}
*/
- public FortResponse findAdminRoles(FortRequest request);
+ public FortResponse findAdminRoles( FortRequest request );
+
/**
* This function returns the set of adminRoles assigned to a given user. The function is valid if and
* only if the user is a member of the USERS data set.
@@ -2632,8 +2724,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.UserAdminRole}
*/
- public FortResponse assignedAdminRoles(FortRequest request);
+ public FortResponse assignedAdminRoles( FortRequest request );
+
/**
* This method returns the data set of all users who are assigned the given admin role. This searches the User data set for
* AdminRole relationship. This method does NOT search for hierarchical AdminRoles relationships.
@@ -2653,8 +2746,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.User}
*/
- public FortResponse assignedAdminUsers(FortRequest request);
+ public FortResponse assignedAdminUsers( FortRequest request );
+
/**
* Commands reads existing OrgUnit entity from OrgUnit dataset. The OrgUnit can be either User or Perm and is
* set by setting type attribute.
@@ -2675,8 +2769,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.OrgUnit}
*/
- public FortResponse readOrg(FortRequest request);
+ public FortResponse readOrg( FortRequest request );
+
/**
* Commands searches existing OrgUnit entities from OrgUnit dataset. The OrgUnit can be either User or Perm and is
* set by setting type parameter on API.
@@ -2697,10 +2792,10 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to a List of type {@link org.apache.directory.fortress.core.rbac.OrgUnit}
*/
- public FortResponse searchOrg(FortRequest request);
-
- // DelegatedAccessMgr
+ public FortResponse searchOrg( FortRequest request );
+
+ //------------ DelegatedAccessMgr -------------------------------------------------------------------------------------
/**
* This function will determine if the user contains an AdminRole that is authorized assignment control over
* User-Role Assignment (URA). This adheres to the ARBAC02 functional specification for can-assign URA.
@@ -2718,8 +2813,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#isAuthorized} boolean will be 'true' if User authorized, otherwise 'false'. Updated {@link FortResponse#session} will be included in response as well.
*/
- public FortResponse canAssign(FortRequest request);
+ public FortResponse canAssign( FortRequest request );
+
/**
* This function will determine if the user contains an AdminRole that is authorized revoke control over
* User-Role Assignment (URA). This adheres to the ARBAC02 functional specification for can-revoke URA.
@@ -2737,8 +2833,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#isAuthorized} boolean will be 'true' if User authorized, otherwise 'false'. Updated {@link FortResponse#session} will be included in response as well.
*/
- public FortResponse canDeassign(FortRequest request);
+ public FortResponse canDeassign( FortRequest request );
+
/**
* This function will determine if the user contains an AdminRole that is authorized assignment control over
* Permission-Role Assignment (PRA). This adheres to the ARBAC02 functional specification for can-assign-p PRA.
@@ -2757,8 +2854,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#isAuthorized} boolean will be 'true' if User authorized, otherwise 'false'. Updated {@link FortResponse#session} will be included in response as well.
*/
- public FortResponse canGrant(FortRequest request);
+ public FortResponse canGrant( FortRequest request );
+
/**
* This function will determine if the user contains an AdminRole that is authorized revoke control over
* Permission-Role Assignment (PRA). This adheres to the ARBAC02 functional specification for can-revoke-p PRA.
@@ -2777,8 +2875,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#isAuthorized} boolean will be 'true' if User authorized, otherwise 'false'. Updated {@link FortResponse#session} will be included in response as well.
*/
- public FortResponse canRevoke(FortRequest request);
+ public FortResponse canRevoke( FortRequest request );
+
/**
* This function returns a Boolean value meaning whether the subject of a given session is
* allowed or not to perform a given operation on a given object. The function is valid if and
@@ -2801,8 +2900,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#isAuthorized} boolean will be 'true' if User authorized, otherwise 'false'. Updated {@link FortResponse#session} will be included in response as well.
*/
- public FortResponse checkAdminAccess(FortRequest request);
+ public FortResponse checkAdminAccess( FortRequest request );
+
/**
* This function adds an AdminRole as an active role of a session whose owner is a given user.
* <h4>required parameters</h4>
@@ -2827,8 +2927,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, Updated {@link FortResponse#session} will be included in response.
*/
- public FortResponse addActiveAdminRole(FortRequest request);
+ public FortResponse addActiveAdminRole( FortRequest request );
+
/**
* This function deletes an AdminRole from the active role set of a session owned by a given user.
* The function is valid if and only if the user is a member of the USERS data set, the
@@ -2847,8 +2948,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, Updated {@link FortResponse#session} will be included in response.
*/
- public FortResponse dropActiveAdminRole(FortRequest request);
+ public FortResponse dropActiveAdminRole( FortRequest request );
+
/**
* This function returns the active admin roles associated with a session. The function is valid if
* and only if the session is a valid Fortress session.
@@ -2860,8 +2962,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} containing a List of type {@link org.apache.directory.fortress.core.rbac.UserAdminRole}. Updated {@link FortResponse#session} will be included in response as well.
*/
- public FortResponse sessionAdminRoles(FortRequest request);
+ public FortResponse sessionAdminRoles( FortRequest request );
+
/**
* This function returns the ARBAC (administrative) permissions of the session, i.e., the admin permissions assigned
* to its authorized admin roles. The function is valid if and only if the session is a valid Fortress session.
@@ -2873,8 +2976,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} containing a List of type {@link org.apache.directory.fortress.core.rbac.Permission}. Updated {@link FortResponse#session} will be included in response as well.
*/
- public FortResponse sessionAdminPermissions(FortRequest request);
+ public FortResponse sessionAdminPermissions( FortRequest request );
+
/**
* This function returns the authorized ARBAC (administrative) roles associated with a session based on hierarchical relationships. The function is valid if
* and only if the session is a valid Fortress session.
@@ -2886,11 +2990,10 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#valueSet} containing a Set of type String containing role names authorized for User. Updated {@link FortResponse#session} will be included in response as well.
*/
- public FortResponse authorizedSessionAdminRoles(FortRequest request);
+ public FortResponse authorizedSessionAdminRoles( FortRequest request );
- // PswdPolicyMgr
-
+ //------------ PswdPolicyMgr ------------------------------------------------------------------------------------------
/**
* This method will add a new policy entry to the POLICIES data set. This command is valid
* if and only if the policy entry is not already present in the POLICIES data set.
@@ -2984,8 +3087,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addPolicy(FortRequest request);
+ public FortResponse addPolicy( FortRequest request );
+
/**
* This method will update an exiting policy entry to the POLICIES data set. This command is valid
* if and only if the policy entry is already present in the POLICIES data set.
@@ -3079,8 +3183,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse updatePolicy(FortRequest request);
+ public FortResponse updatePolicy( FortRequest request );
+
/**
* This method will delete exiting policy entry from the POLICIES data set. This command is valid
* if and only if the policy entry is already present in the POLICIES data set. Existing users that
@@ -3101,8 +3206,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse deletePolicy(FortRequest request);
+ public FortResponse deletePolicy( FortRequest request );
+
/**
* This method will return the password policy entity to the caller. This command is valid
* if and only if the policy entry is present in the POLICIES data set.
@@ -3122,8 +3228,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entity} contains a reference to {@link org.apache.directory.fortress.core.rbac.PwPolicy}
*/
- public FortResponse readPolicy(FortRequest request);
+ public FortResponse readPolicy( FortRequest request );
+
/**
* This method will return a list of all password policy entities that match a particular search string.
* This command will return an empty list of no matching entries are found.
@@ -3143,8 +3250,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to List of type {@link org.apache.directory.fortress.core.rbac.PwPolicy}
*/
- public FortResponse searchPolicy(FortRequest request);
+ public FortResponse searchPolicy( FortRequest request );
+
/**
* This method will associate a user entity with a password policy entity. This function is valid
* if and only if the user is a member of the USERS data set and the policyName refers to a
@@ -3166,8 +3274,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse updateUserPolicy(FortRequest request);
+ public FortResponse updateUserPolicy( FortRequest request );
+
/**
* This method will remove the pw policy assignment from a user entity. This function is valid
* if and only if the user is a member of the USERS data set and the policy attribute is assigned.
@@ -3185,11 +3294,10 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse deleteUserPolicy(FortRequest request);
-
- // AuditMgr
-
+ public FortResponse deleteUserPolicy( FortRequest request );
+
+ //------------ AuditMg ------------------------------------------------------------------------------------------------
/**
* This method returns a list of authentication audit events for a particular user {@link org.apache.directory.fortress.core.rbac.UserAudit#userId},
* and given timestamp field {@link org.apache.directory.fortress.core.rbac.UserAudit#beginDate}.<BR>
@@ -3211,7 +3319,8 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to List of type {@link org.apache.directory.fortress.core.rbac.Bind}
*/
- public FortResponse searchBinds(FortRequest request);
+ public FortResponse searchBinds( FortRequest request );
+
/**
* This method returns a list of authorization events for a particular user {@link org.apache.directory.fortress.core.rbac.UserAudit#userId}
@@ -3235,7 +3344,8 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to List of type {@link org.apache.directory.fortress.core.rbac.AuthZ}
*/
- public FortResponse getUserAuthZs(FortRequest request);
+ public FortResponse getUserAuthZs( FortRequest request );
+
/**
* This method returns a list of authorization events for a particular user {@link org.apache.directory.fortress.core.rbac.UserAudit#userId},
@@ -3258,7 +3368,8 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to List of type {@link org.apache.directory.fortress.core.rbac.AuthZ}
*/
- public FortResponse searchAuthZs(FortRequest request);
+ public FortResponse searchAuthZs( FortRequest request );
+
/**
* This method returns a list of sessions created for a given user {@link org.apache.directory.fortress.core.rbac.UserAudit#userId},
@@ -3283,7 +3394,8 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to List of type {@link org.apache.directory.fortress.core.rbac.Mod}
*/
- public FortResponse searchUserSessions(FortRequest request);
+ public FortResponse searchUserSessions( FortRequest request );
+
/**
* This method returns a list of admin operations events for a particular entity {@link org.apache.directory.fortress.core.rbac.UserAudit#dn},
@@ -3311,7 +3423,8 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to List of type {@link org.apache.directory.fortress.core.rbac.Mod}
*/
- public FortResponse searchAdminMods(FortRequest request);
+ public FortResponse searchAdminMods( FortRequest request );
+
/**
* This method returns a list of failed authentication attempts on behalf of an invalid identity {@link org.apache.directory.fortress.core.rbac.UserAudit#userId},
@@ -3338,11 +3451,10 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to List of type {@link org.apache.directory.fortress.core.rbac.AuthZ}
*/
- public FortResponse searchInvalidUsers(FortRequest request);
-
- // ConfigMgr
+ public FortResponse searchInvalidUsers( FortRequest request );
+ //------------ ConfigMgr ----------------------------------------------------------------------------------------------
/**
* Create a new configuration node with given name and properties. The name is required. If node already exists,
* a {@link org.apache.directory.fortress.core.SecurityException} with error {@link org.apache.directory.fortress.core.GlobalErrIds#FT_CONFIG_ALREADY_EXISTS} will be thrown.
@@ -3359,7 +3471,8 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse addConfig(FortRequest request);
+ public FortResponse addConfig( FortRequest request );
+
/**
* Update existing configuration node with additional properties, or, replace existing properties. The name is required. If node does not exist,
@@ -3377,7 +3490,8 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse updateConfig(FortRequest request);
+ public FortResponse updateConfig( FortRequest request );
+
/**
* This service will either completely remove named configuration node from the directory or specified properties depending on the arguments passed in.
@@ -3400,8 +3514,9 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}
*/
- public FortResponse deleteConfig(FortRequest request);
+ public FortResponse deleteConfig( FortRequest request );
+
/**
* Read an existing configuration node with given name and return to caller. The name is required. If node doesn't exist,
* a {@link org.apache.directory.fortress.core.SecurityException} with error {@link org.apache.directory.fortress.core.GlobalErrIds#FT_CONFIG_NOT_FOUND} will be thrown.
@@ -3417,5 +3532,5 @@ public interface FortressService
* @param request contains a reference to {@code FortRequest}
* @return reference to {@code FortResponse}, {@link FortResponse#entities} contains a reference to List of type {@link org.apache.directory.fortress.core.rbac.Props}
*/
- public FortResponse readConfig(FortRequest request);
+ public FortResponse readConfig( FortRequest request );
}
\ No newline at end of file
[4/6] directory-fortress-enmasse git commit: Same formating and
changes than for the other managers
Posted by el...@apache.org.
Same formating and changes than for the other managers
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/commit/f88d1abb
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/tree/f88d1abb
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/diff/f88d1abb
Branch: refs/heads/master
Commit: f88d1abbef29668935184af38f5340e1fa4e065e
Parents: f35bf52
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Nov 22 10:11:46 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Nov 22 11:03:59 2014 +0100
----------------------------------------------------------------------
.../fortress/rest/AbstractMgrImpl.java | 62 ++
.../directory/fortress/rest/AccessMgrImpl.java | 2 +-
.../directory/fortress/rest/AdminMgrImpl.java | 2 +-
.../directory/fortress/rest/AuditMgrImpl.java | 2 +-
.../directory/fortress/rest/ConfigMgrImpl.java | 2 +-
.../fortress/rest/DelegatedAccessMgrImpl.java | 2 +-
.../fortress/rest/DelegatedAdminMgrImpl.java | 343 +++++-----
.../fortress/rest/DelegatedReviewMgrImpl.java | 136 ++--
.../fortress/rest/PswdPolicyMgrImpl.java | 157 ++---
.../directory/fortress/rest/ReviewMgrImpl.java | 649 ++++++++++---------
10 files changed, 717 insertions(+), 640 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/f88d1abb/src/main/java/org/apache/directory/fortress/rest/AbstractMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/AbstractMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/AbstractMgrImpl.java
new file mode 100644
index 0000000..94ba1ac
--- /dev/null
+++ b/src/main/java/org/apache/directory/fortress/rest/AbstractMgrImpl.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.fortress.rest;
+
+import org.apache.log4j.Logger;
+import org.apache.directory.fortress.core.GlobalErrIds;
+import org.apache.directory.fortress.core.SecurityException;
+import org.apache.directory.fortress.core.rest.FortResponse;
+
+/**
+ * An abstract class containing some methods shared by all the implementations.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+
+ */
+abstract class AbstractMgrImpl
+{
+ /**
+ * Create an error message and log it.
+ *
+ * @param response The {@link FortResponse} instance in which we will store the error message and ID
+ * @param LOG The Logger
+ * @param se The exception
+ */
+ protected void createError( FortResponse response, Logger LOG, SecurityException se )
+ {
+ LOG.info( "Caught " + se );
+ response.setErrorCode( se.getErrorId() );
+ response.setErrorMessage( se.getMessage() );
+ }
+
+
+ /**
+ * Creates a {@link FortResponse} instance where the error code is set with a default value.
+ *
+ * @return The created instancd
+ */
+ protected FortResponse createResponse()
+ {
+ FortResponse response = new FortResponse();
+ response.setErrorCode( GlobalErrIds.NO_ERROR );
+
+ return response;
+ }
+}
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/f88d1abb/src/main/java/org/apache/directory/fortress/rest/AccessMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/AccessMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/AccessMgrImpl.java
index 9763f56..6665389 100644
--- a/src/main/java/org/apache/directory/fortress/rest/AccessMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/AccessMgrImpl.java
@@ -39,7 +39,7 @@ import java.util.Set;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-class AccessMgrImpl extends AbstractImpl
+class AccessMgrImpl extends AbstractMgrImpl
{
/** A logger for this class */
private static final Logger LOG = Logger.getLogger( AccessMgrImpl.class.getName() );
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/f88d1abb/src/main/java/org/apache/directory/fortress/rest/AdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/AdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/AdminMgrImpl.java
index a4c27bb..8856c5b 100644
--- a/src/main/java/org/apache/directory/fortress/rest/AdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/AdminMgrImpl.java
@@ -44,7 +44,7 @@ import org.apache.log4j.Logger;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-class AdminMgrImpl extends AbstractImpl
+class AdminMgrImpl extends AbstractMgrImpl
{
/** A logger for this class */
private static final Logger log = Logger.getLogger( AdminMgrImpl.class.getName() );
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/f88d1abb/src/main/java/org/apache/directory/fortress/rest/AuditMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/AuditMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/AuditMgrImpl.java
index 2f49506..0ef3230 100644
--- a/src/main/java/org/apache/directory/fortress/rest/AuditMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/AuditMgrImpl.java
@@ -37,7 +37,7 @@ import java.util.List;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-class AuditMgrImpl extends AbstractImpl
+class AuditMgrImpl extends AbstractMgrImpl
{
/** A logger for this class */
private static final Logger log = Logger.getLogger( AuditMgrImpl.class.getName() );
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/f88d1abb/src/main/java/org/apache/directory/fortress/rest/ConfigMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/ConfigMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/ConfigMgrImpl.java
index 3b35a5e..66ddcf6 100644
--- a/src/main/java/org/apache/directory/fortress/rest/ConfigMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/ConfigMgrImpl.java
@@ -35,7 +35,7 @@ import java.util.Properties;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-class ConfigMgrImpl extends AbstractImpl
+class ConfigMgrImpl extends AbstractMgrImpl
{
private static final Logger log = Logger.getLogger( ConfigMgrImpl.class.getName() );
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/f88d1abb/src/main/java/org/apache/directory/fortress/rest/DelegatedAccessMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/DelegatedAccessMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/DelegatedAccessMgrImpl.java
index 01af49e..2f63376 100644
--- a/src/main/java/org/apache/directory/fortress/rest/DelegatedAccessMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/DelegatedAccessMgrImpl.java
@@ -41,7 +41,7 @@ import java.util.Set;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-class DelegatedAccessMgrImpl extends AbstractImpl
+class DelegatedAccessMgrImpl extends AbstractMgrImpl
{
/** A logger for this class */
private static final Logger LOG = Logger.getLogger( DelegatedAccessMgrImpl.class.getName() );
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/f88d1abb/src/main/java/org/apache/directory/fortress/rest/DelegatedAdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/DelegatedAdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/DelegatedAdminMgrImpl.java
index 3debbbe..4615a4c 100644
--- a/src/main/java/org/apache/directory/fortress/rest/DelegatedAdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/DelegatedAdminMgrImpl.java
@@ -37,10 +37,10 @@ import org.apache.log4j.Logger;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-class DelegatedAdminMgrImpl
+class DelegatedAdminMgrImpl extends AbstractMgrImpl
{
- private static final String CLS_NM = DelegatedAdminMgrImpl.class.getName();
- private static final Logger log = Logger.getLogger(CLS_NM);
+ /** A logger for this class */
+ private static final Logger LOG = Logger.getLogger( DelegatedAdminMgrImpl.class.getName() );
/**
* ************************************************************************************************************************************
@@ -48,339 +48,342 @@ class DelegatedAdminMgrImpl
* **************************************************************************************************************************************
*/
- FortResponse addAdminRole(FortRequest request)
+ /* No qualifier */ FortResponse addAdminRole( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
AdminRole inRole = (AdminRole) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- AdminRole retRole = delegatedAdminMgr.addRole(inRole);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ AdminRole retRole = delegatedAdminMgr.addRole( inRole );
response.setEntity(retRole);
- response.setErrorCode(0);
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se + " warnId=" + se.getErrorId());
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ LOG.info( "Caught " + se + " warnId=" + se.getErrorId() );
+ response.setErrorCode( se.getErrorId() );
+ response.setErrorMessage( se.getMessage() );
}
+
return response;
}
- FortResponse deleteAdminRole(FortRequest request)
+
+ /* No qualifier */ FortResponse deleteAdminRole( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
AdminRole inRole = (AdminRole) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- delegatedAdminMgr.deleteRole(inRole);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ delegatedAdminMgr.deleteRole( inRole );
response.setEntity(inRole);
- response.setErrorCode(0);
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse updateAdminRole(FortRequest request)
+
+ /* No qualifier */ FortResponse updateAdminRole( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
AdminRole inRole = (AdminRole) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- AdminRole retRole = delegatedAdminMgr.updateRole(inRole);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ AdminRole retRole = delegatedAdminMgr.updateRole( inRole );
response.setEntity(retRole);
- response.setErrorCode(0);
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se + " errorId=" + se.getErrorId());
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ LOG.info( "Caught " + se + " errorId=" + se.getErrorId() );
+ response.setErrorCode( se.getErrorId() );
+ response.setErrorMessage( se.getMessage() );
}
+
return response;
}
- FortResponse assignAdminUser(FortRequest request)
+
+ /* No qualifier */ FortResponse assignAdminUser( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
UserAdminRole inRole = (UserAdminRole) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- delegatedAdminMgr.assignUser(inRole);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ delegatedAdminMgr.assignUser( inRole );
response.setEntity(inRole);
- response.setErrorCode(0);
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse deassignAdminUser(FortRequest request)
+
+ /* No qualifier */ FortResponse deassignAdminUser( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
UserAdminRole inRole = (UserAdminRole) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- delegatedAdminMgr.deassignUser(inRole);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ delegatedAdminMgr.deassignUser( inRole );
response.setEntity(inRole);
- response.setErrorCode(0);
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse addAdminDescendant(FortRequest request)
+
+ /* No qualifier */ FortResponse addAdminDescendant( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
AdminRoleRelationship relationship = (AdminRoleRelationship) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- delegatedAdminMgr.addDescendant(relationship.getParent(), relationship.getChild());
- response.setEntity(relationship);
- response.setErrorCode(0);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ delegatedAdminMgr.addDescendant( relationship.getParent(), relationship.getChild() );
+ response.setEntity( relationship );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse addAdminAscendant(FortRequest request)
+
+ /* No qualifier */ FortResponse addAdminAscendant( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
AdminRoleRelationship relationship = (AdminRoleRelationship) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- delegatedAdminMgr.addAscendant(relationship.getChild(), relationship.getParent());
- response.setEntity(relationship);
- response.setErrorCode(0);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ delegatedAdminMgr.addAscendant( relationship.getChild(), relationship.getParent() );
+ response.setEntity( relationship );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse addAdminInheritance(FortRequest request)
+
+ /* No qualifier */ FortResponse addAdminInheritance( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
AdminRoleRelationship relationship = (AdminRoleRelationship) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- delegatedAdminMgr.addInheritance(relationship.getParent(), relationship.getChild());
- response.setEntity(relationship);
- response.setErrorCode(0);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ delegatedAdminMgr.addInheritance( relationship.getParent(), relationship.getChild() );
+ response.setEntity( relationship );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse deleteAdminInheritance(FortRequest request)
+
+ /* No qualifier */ FortResponse deleteAdminInheritance( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
AdminRoleRelationship relationship = (AdminRoleRelationship) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- delegatedAdminMgr.deleteInheritance(relationship.getParent(), relationship.getChild());
- response.setEntity(relationship);
- response.setErrorCode(0);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ delegatedAdminMgr.deleteInheritance( relationship.getParent(), relationship.getChild() );
+ response.setEntity( relationship );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse addOrg(FortRequest request)
+
+ /* No qualifier */ FortResponse addOrg( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
OrgUnit inOrg = (OrgUnit) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- OrgUnit retOrg = delegatedAdminMgr.add(inOrg);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ OrgUnit retOrg = delegatedAdminMgr.add( inOrg );
response.setEntity(retOrg);
- response.setErrorCode(0);
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse updateOrg(FortRequest request)
+
+ /* No qualifier */ FortResponse updateOrg( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
OrgUnit inOrg = (OrgUnit) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- OrgUnit retOrg = delegatedAdminMgr.update(inOrg);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ OrgUnit retOrg = delegatedAdminMgr.update( inOrg );
response.setEntity(retOrg);
- response.setErrorCode(0);
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse deleteOrg(FortRequest request)
+
+ /* No qualifier */ FortResponse deleteOrg( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
OrgUnit inOrg = (OrgUnit) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- OrgUnit retOrg = delegatedAdminMgr.delete(inOrg);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ OrgUnit retOrg = delegatedAdminMgr.delete( inOrg );
response.setEntity(retOrg);
- response.setErrorCode(0);
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse addOrgDescendant(FortRequest request)
+
+ /* No qualifier */ FortResponse addOrgDescendant( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
OrgUnitRelationship relationship = (OrgUnitRelationship) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- delegatedAdminMgr.addDescendant(relationship.getParent(), relationship.getChild());
- response.setEntity(relationship);
- response.setErrorCode(0);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ delegatedAdminMgr.addDescendant( relationship.getParent(), relationship.getChild() );
+ response.setEntity( relationship );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse addOrgAscendant(FortRequest request)
+
+ /* No qualifier */ FortResponse addOrgAscendant( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
OrgUnitRelationship relationship = (OrgUnitRelationship) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- delegatedAdminMgr.addAscendant(relationship.getChild(), relationship.getParent());
- response.setEntity(relationship);
- response.setErrorCode(0);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ delegatedAdminMgr.addAscendant( relationship.getChild(), relationship.getParent() );
+ response.setEntity( relationship );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse addOrgInheritance(FortRequest request)
+
+ /* No qualifier */ FortResponse addOrgInheritance( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
OrgUnitRelationship relationship = (OrgUnitRelationship) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
delegatedAdminMgr.addInheritance(relationship.getParent(), relationship.getChild());
- response.setEntity(relationship);
- response.setErrorCode(0);
+ response.setEntity( relationship );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse deleteOrgInheritance(FortRequest request)
+
+ /* No qualifier */ FortResponse deleteOrgInheritance( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
OrgUnitRelationship relationship = (OrgUnitRelationship) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- delegatedAdminMgr.deleteInheritance(relationship.getParent(), relationship.getChild());
- response.setEntity(relationship);
- response.setErrorCode(0);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ delegatedAdminMgr.deleteInheritance( relationship.getParent(), relationship.getChild() );
+ response.setEntity( relationship );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/f88d1abb/src/main/java/org/apache/directory/fortress/rest/DelegatedReviewMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/DelegatedReviewMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/DelegatedReviewMgrImpl.java
index a228d72..dc3d8ae 100644
--- a/src/main/java/org/apache/directory/fortress/rest/DelegatedReviewMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/DelegatedReviewMgrImpl.java
@@ -37,10 +37,10 @@ import java.util.List;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-class DelegatedReviewMgrImpl
+class DelegatedReviewMgrImpl extends AbstractMgrImpl
{
- private static final String CLS_NM = DelegatedReviewMgrImpl.class.getName();
- private static final Logger log = Logger.getLogger(CLS_NM);
+ /** A logger for this class */
+ private static final Logger LOG = Logger.getLogger( DelegatedReviewMgrImpl.class.getName() );
/**
* ************************************************************************************************************************************
@@ -48,129 +48,127 @@ class DelegatedReviewMgrImpl
* **************************************************************************************************************************************
*/
- FortResponse readAdminRole(FortRequest request)
+ /* No qualifier */ FortResponse readAdminRole( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
AdminRole inRole = (AdminRole) request.getEntity();
- DelReviewMgr delegatedReviewMgr = DelReviewMgrFactory.createInstance(request.getContextId());
- AdminRole outRole = delegatedReviewMgr.readRole(inRole);
- response.setEntity(outRole);
- response.setErrorCode(0);
+ DelReviewMgr delegatedReviewMgr = DelReviewMgrFactory.createInstance( request.getContextId() );
+ AdminRole outRole = delegatedReviewMgr.readRole( inRole );
+ response.setEntity( outRole );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse findAdminRoles(FortRequest request)
+
+ /* No qualifier */ FortResponse findAdminRoles( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
String searchVal = request.getValue();
- DelReviewMgr delegatedReviewMgr = DelReviewMgrFactory.createInstance(request.getContextId());
- delegatedReviewMgr.setAdmin(request.getSession());
- List<AdminRole> outRoles = delegatedReviewMgr.findRoles(searchVal);
- response.setEntities(outRoles);
- response.setErrorCode(0);
-
+ DelReviewMgr delegatedReviewMgr = DelReviewMgrFactory.createInstance( request.getContextId() );
+ delegatedReviewMgr.setAdmin( request.getSession() );
+ List<AdminRole> outRoles = delegatedReviewMgr.findRoles( searchVal );
+ response.setEntities( outRoles );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse assignedAdminRoles(FortRequest request)
+
+ /* No qualifier */ FortResponse assignedAdminRoles( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
User inUser = (User)request.getEntity();
- DelReviewMgr delegatedReviewMgr = DelReviewMgrFactory.createInstance(request.getContextId());
- delegatedReviewMgr.setAdmin(request.getSession());
- List<UserAdminRole> uRoles = delegatedReviewMgr.assignedRoles(inUser);
- response.setEntities(uRoles);
- response.setErrorCode(0);
+ DelReviewMgr delegatedReviewMgr = DelReviewMgrFactory.createInstance( request.getContextId() );
+ delegatedReviewMgr.setAdmin( request.getSession() );
+ List<UserAdminRole> uRoles = delegatedReviewMgr.assignedRoles( inUser );
+ response.setEntities( uRoles );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse assignedAdminUsers(FortRequest request)
+
+ /* No qualifier */ FortResponse assignedAdminUsers( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
AdminRole inRole = (AdminRole) request.getEntity();
- DelReviewMgr delegatedReviewMgr = DelReviewMgrFactory.createInstance(request.getContextId());
- delegatedReviewMgr.setAdmin(request.getSession());
- List<User> users = delegatedReviewMgr.assignedUsers(inRole);
- response.setEntities(users);
- response.setErrorCode(0);
+ DelReviewMgr delegatedReviewMgr = DelReviewMgrFactory.createInstance( request.getContextId() );
+ delegatedReviewMgr.setAdmin( request.getSession() );
+ List<User> users = delegatedReviewMgr.assignedUsers( inRole );
+ response.setEntities( users );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse readOrg(FortRequest request)
+
+ /* No qualifier */ FortResponse readOrg( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
OrgUnit inOrg = (OrgUnit) request.getEntity();
- DelReviewMgr delegatedReviewMgr = DelReviewMgrFactory.createInstance(request.getContextId());
- delegatedReviewMgr.setAdmin(request.getSession());
- OrgUnit returnOrg = delegatedReviewMgr.read(inOrg);
- response.setEntity(returnOrg);
- response.setErrorCode(0);
+ DelReviewMgr delegatedReviewMgr = DelReviewMgrFactory.createInstance( request.getContextId() );
+ delegatedReviewMgr.setAdmin( request.getSession() );
+ OrgUnit returnOrg = delegatedReviewMgr.read( inOrg );
+ response.setEntity( returnOrg );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse searchOrg(FortRequest request)
+
+ /* No qualifier */ FortResponse searchOrg( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
OrgUnit inOrg = (OrgUnit) request.getEntity();
- DelReviewMgr delegatedReviewMgr = DelReviewMgrFactory.createInstance(request.getContextId());
- delegatedReviewMgr.setAdmin(request.getSession());
- List<OrgUnit> orgs = delegatedReviewMgr.search(inOrg.getType(), inOrg.getName());
- response.setEntities(orgs);
- response.setErrorCode(0);
+ DelReviewMgr delegatedReviewMgr = DelReviewMgrFactory.createInstance( request.getContextId() );
+ delegatedReviewMgr.setAdmin( request.getSession() );
+ List<OrgUnit> orgs = delegatedReviewMgr.search( inOrg.getType(), inOrg.getName() );
+ response.setEntities( orgs );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/f88d1abb/src/main/java/org/apache/directory/fortress/rest/PswdPolicyMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/PswdPolicyMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/PswdPolicyMgrImpl.java
index 183297e..5dce451 100644
--- a/src/main/java/org/apache/directory/fortress/rest/PswdPolicyMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/PswdPolicyMgrImpl.java
@@ -34,159 +34,162 @@ import java.util.List;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-class PswdPolicyMgrImpl
+class PswdPolicyMgrImpl extends AbstractMgrImpl
{
- private static final String CLS_NM = PswdPolicyMgrImpl.class.getName();
- private static final Logger log = Logger.getLogger(CLS_NM);
+ /** A logger for this class */
+ private static final Logger LOG = Logger.getLogger( PswdPolicyMgrImpl.class.getName() );
/**
* ************************************************************************************************************************************
* BEGIN PSWDPOLICYMGR
* **************************************************************************************************************************************
*/
- FortResponse addPolicy(FortRequest request)
+ /* No qualifier */ FortResponse addPolicy( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
PwPolicy inPolicy = (PwPolicy) request.getEntity();
- PwPolicyMgr policyMgr = PwPolicyMgrFactory.createInstance(request.getContextId());
- policyMgr.setAdmin(request.getSession());
- policyMgr.add(inPolicy);
- response.setEntity(inPolicy);
- response.setErrorCode(0);
+ PwPolicyMgr policyMgr = PwPolicyMgrFactory.createInstance( request.getContextId() );
+ policyMgr.setAdmin( request.getSession() );
+ policyMgr.add( inPolicy );
+ response.setEntity( inPolicy );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse updatePolicy(FortRequest request)
+
+ /* No qualifier */ FortResponse updatePolicy( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
PwPolicy inPolicy = (PwPolicy) request.getEntity();
- PwPolicyMgr policyMgr = PwPolicyMgrFactory.createInstance(request.getContextId());
- policyMgr.setAdmin(request.getSession());
- policyMgr.update(inPolicy);
- response.setEntity(inPolicy);
- response.setErrorCode(0);
+ PwPolicyMgr policyMgr = PwPolicyMgrFactory.createInstance( request.getContextId() );
+ policyMgr.setAdmin( request.getSession() );
+ policyMgr.update( inPolicy );
+ response.setEntity( inPolicy );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse deletePolicy(FortRequest request)
+
+ /* No qualifier */ FortResponse deletePolicy( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
PwPolicy inPolicy = (PwPolicy) request.getEntity();
- PwPolicyMgr policyMgr = PwPolicyMgrFactory.createInstance(request.getContextId());
- policyMgr.setAdmin(request.getSession());
- policyMgr.delete(inPolicy);
- response.setEntity(inPolicy);
- response.setErrorCode(0);
+ PwPolicyMgr policyMgr = PwPolicyMgrFactory.createInstance( request.getContextId() );
+ policyMgr.setAdmin( request.getSession() );
+ policyMgr.delete( inPolicy );
+ response.setEntity( inPolicy );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse readPolicy(FortRequest request)
+
+ /* No qualifier */ FortResponse readPolicy( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
PwPolicy outPolicy;
+
try
{
PwPolicy inPolicy = (PwPolicy) request.getEntity();
- PwPolicyMgr policyMgr = PwPolicyMgrFactory.createInstance(request.getContextId());
- policyMgr.setAdmin(request.getSession());
- outPolicy = policyMgr.read(inPolicy.getName());
- response.setEntity(outPolicy);
- response.setErrorCode(0);
+ PwPolicyMgr policyMgr = PwPolicyMgrFactory.createInstance( request.getContextId() );
+ policyMgr.setAdmin( request.getSession() );
+ outPolicy = policyMgr.read( inPolicy.getName() );
+ response.setEntity( outPolicy );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ response.setErrorCode( se.getErrorId() );
+ response.setErrorMessage( se.getMessage() );
}
+
return response;
}
- FortResponse searchPolicy(FortRequest request)
+
+ /* No qualifier */ FortResponse searchPolicy( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
List<PwPolicy> policyList;
+
try
{
PwPolicy inPolicy = (PwPolicy) request.getEntity();
- PwPolicyMgr policyMgr = PwPolicyMgrFactory.createInstance(request.getContextId());
- policyMgr.setAdmin(request.getSession());
- policyList = policyMgr.search(inPolicy.getName());
- response.setEntities(policyList);
- response.setErrorCode(0);
+ PwPolicyMgr policyMgr = PwPolicyMgrFactory.createInstance( request.getContextId() );
+ policyMgr.setAdmin( request.getSession() );
+ policyList = policyMgr.search( inPolicy.getName() );
+ response.setEntities( policyList );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ response.setErrorCode( se.getErrorId() );
+ response.setErrorMessage( se.getMessage() );
}
+
return response;
}
-
- FortResponse updateUserPolicy(FortRequest request)
+
+
+ /* No qualifier */ FortResponse updateUserPolicy( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
PwPolicy inPolicy = (PwPolicy) request.getEntity();
- PwPolicyMgr policyMgr = PwPolicyMgrFactory.createInstance(request.getContextId());
- policyMgr.setAdmin(request.getSession());
+ PwPolicyMgr policyMgr = PwPolicyMgrFactory.createInstance( request.getContextId() );
+ policyMgr.setAdmin( request.getSession() );
String userId = request.getValue();
- policyMgr.updateUserPolicy(userId, inPolicy.getName());
- response.setErrorCode(0);
+ policyMgr.updateUserPolicy( userId, inPolicy.getName() );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse deleteUserPolicy(FortRequest request)
+
+ /* No qualifier */ FortResponse deleteUserPolicy( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- PwPolicyMgr policyMgr = PwPolicyMgrFactory.createInstance(request.getContextId());
- policyMgr.setAdmin(request.getSession());
+ PwPolicyMgr policyMgr = PwPolicyMgrFactory.createInstance( request.getContextId() );
+ policyMgr.setAdmin( request.getSession() );
String userId = request.getValue();
- policyMgr.deletePasswordPolicy(userId);
- response.setErrorCode(0);
+ policyMgr.deletePasswordPolicy( userId );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/f88d1abb/src/main/java/org/apache/directory/fortress/rest/ReviewMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/ReviewMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/ReviewMgrImpl.java
index e6d98f8..40609b5 100644
--- a/src/main/java/org/apache/directory/fortress/rest/ReviewMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/ReviewMgrImpl.java
@@ -42,638 +42,649 @@ import java.util.Set;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-class ReviewMgrImpl
+class ReviewMgrImpl extends AbstractMgrImpl
{
- private static final String CLS_NM = ReviewMgrImpl.class.getName();
- private static final Logger log = Logger.getLogger(CLS_NM);
+ /** A logger for this class */
+ private static final Logger LOG = Logger.getLogger( ReviewMgrImpl.class.getName() );
- FortResponse readPermission(FortRequest request)
+ /* No qualifier */ FortResponse readPermission( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
Permission inPerm = (Permission) request.getEntity();
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
- Permission retPerm = reviewMgr.readPermission(inPerm);
- response.setEntity(retPerm);
- response.setErrorCode(0);
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
+ Permission retPerm = reviewMgr.readPermission( inPerm );
+ response.setEntity( retPerm );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse readPermObj(FortRequest request)
+
+ /* No qualifier */ FortResponse readPermObj( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
PermObj inObj = (PermObj) request.getEntity();
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
- PermObj retObj = reviewMgr.readPermObj(inObj);
- response.setEntity(retObj);
- response.setErrorCode(0);
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
+ PermObj retObj = reviewMgr.readPermObj( inObj );
+ response.setEntity( retObj );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse findPermissions(FortRequest request)
+
+ /* No qualifier */ FortResponse findPermissions( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
Permission inPerm = (Permission) request.getEntity();
- List<Permission> perms = reviewMgr.findPermissions(inPerm);
- response.setEntities(perms);
- response.setErrorCode(0);
+ List<Permission> perms = reviewMgr.findPermissions( inPerm );
+ response.setEntities( perms );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse findPermObjs(FortRequest request)
+
+ /* No qualifier */ FortResponse findPermObjs( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
PermObj inObj = (PermObj) request.getEntity();
List<PermObj> objs = null;
- if (VUtil.isNotNullOrEmpty(inObj.getOu()))
+
+ if ( VUtil.isNotNullOrEmpty( inObj.getOu() ) )
{
- objs = reviewMgr.findPermObjs(new OrgUnit(inObj.getOu(), OrgUnit.Type.PERM));
+ objs = reviewMgr.findPermObjs( new OrgUnit( inObj.getOu(), OrgUnit.Type.PERM ) );
}
else
{
- objs = reviewMgr.findPermObjs(inObj);
+ objs = reviewMgr.findPermObjs( inObj );
}
+
response.setEntities(objs);
- response.setErrorCode(0);
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse readRole(FortRequest request)
+
+ /* No qualifier */ FortResponse readRole( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
Role inRole = (Role) request.getEntity();
- Role outRole = reviewMgr.readRole(inRole);
- response.setEntity(outRole);
- response.setErrorCode(0);
+ Role outRole = reviewMgr.readRole( inRole );
+ response.setEntity( outRole );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse findRoles(FortRequest request)
+
+ /* No qualifier */ FortResponse findRoles( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
String searchValue = request.getValue();
- if (request.getLimit() != null)
+
+ if ( request.getLimit() != null )
{
- List<String> retRoles = reviewMgr.findRoles(searchValue, request.getLimit());
- response.setValues(retRoles);
+ List<String> retRoles = reviewMgr.findRoles( searchValue, request.getLimit() );
+ response.setValues( retRoles );
}
else
{
- List<Role> roles = reviewMgr.findRoles(searchValue);
- response.setEntities(roles);
+ List<Role> roles = reviewMgr.findRoles( searchValue );
+ response.setEntities( roles );
}
- response.setErrorCode(0);
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse readUserM(FortRequest request)
+
+ /* No qualifier */ FortResponse readUserM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
User inUser = (User) request.getEntity();
- User outUser = reviewMgr.readUser(inUser);
- response.setEntity(outUser);
- response.setErrorCode(0);
+ User outUser = reviewMgr.readUser( inUser );
+ response.setEntity( outUser );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse findUsersM(FortRequest request)
+
+ /* No qualifier */ FortResponse findUsersM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
User inUser = (User) request.getEntity();
- if (request.getLimit() != null)
+
+ if ( request.getLimit() != null )
{
- List<String> retUsers = reviewMgr.findUsers(inUser, request.getLimit());
- response.setValues(retUsers);
+ List<String> retUsers = reviewMgr.findUsers( inUser, request.getLimit() );
+ response.setValues( retUsers );
}
else
{
List<User> retUsers;
- if (VUtil.isNotNullOrEmpty(inUser.getOu()))
+
+ if ( VUtil.isNotNullOrEmpty( inUser.getOu() ) )
{
- retUsers = reviewMgr.findUsers(new OrgUnit(inUser.getOu(), OrgUnit.Type.USER));
+ retUsers = reviewMgr.findUsers( new OrgUnit( inUser.getOu(), OrgUnit.Type.USER ) );
}
else
{
- retUsers = reviewMgr.findUsers(inUser);
+ retUsers = reviewMgr.findUsers( inUser );
}
- response.setEntities(retUsers);
+
+ response.setEntities( retUsers );
}
- response.setErrorCode(0);
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse assignedUsersM(FortRequest request)
+
+ /* No qualifier */ FortResponse assignedUsersM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
Role inRole = (Role) request.getEntity();
- if (request.getLimit() != null)
+
+ if ( request.getLimit() != null )
{
- List<String> retUsers = reviewMgr.assignedUsers(inRole, request.getLimit());
- response.setValues(retUsers);
+ List<String> retUsers = reviewMgr.assignedUsers( inRole, request.getLimit() );
+ response.setValues( retUsers );
}
else
{
- List<User> users = reviewMgr.assignedUsers(inRole);
- response.setEntities(users);
- response.setEntities(users);
+ List<User> users = reviewMgr.assignedUsers( inRole );
+ response.setEntities( users );
+ response.setEntities( users );
}
- response.setErrorCode(0);
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse assignedRolesM(FortRequest request)
+
+ /* No qualifier */ FortResponse assignedRolesM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
- if (VUtil.isNotNullOrEmpty(request.getValue()))
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
+
+ if ( VUtil.isNotNullOrEmpty( request.getValue() ) )
{
String userId = request.getValue();
- List<String> retRoles = reviewMgr.assignedRoles(userId);
- response.setValues(retRoles);
+ List<String> retRoles = reviewMgr.assignedRoles( userId );
+ response.setValues( retRoles );
}
else
{
User inUser = (User) request.getEntity();
- List<UserRole> uRoles = reviewMgr.assignedRoles(inUser);
- response.setEntities(uRoles);
+ List<UserRole> uRoles = reviewMgr.assignedRoles( inUser );
+ response.setEntities( uRoles );
}
- response.setErrorCode(0);
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse authorizedUsersM(FortRequest request)
+
+ /* No qualifier */ FortResponse authorizedUsersM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
Role inRole = (Role) request.getEntity();
- List<User> users = reviewMgr.authorizedUsers(inRole);
- response.setEntities(users);
- response.setErrorCode(0);
+ List<User> users = reviewMgr.authorizedUsers( inRole );
+ response.setEntities( users );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse authorizedRoleM(FortRequest request)
+
+ /* No qualifier */ FortResponse authorizedRoleM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
User inUser = (User) request.getEntity();
- Set<String> outSet = reviewMgr.authorizedRoles(inUser);
- response.setValueSet(outSet);
- response.setErrorCode(0);
+ Set<String> outSet = reviewMgr.authorizedRoles( inUser );
+ response.setValueSet( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse permissionRolesM(FortRequest request)
+
+ /* No qualifier */ FortResponse permissionRolesM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
Permission inPerm = (Permission) request.getEntity();
- List<String> outList = reviewMgr.permissionRoles(inPerm);
- response.setValues(outList);
- response.setErrorCode(0);
+ List<String> outList = reviewMgr.permissionRoles( inPerm );
+ response.setValues( outList );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse authorizedPermissionRolesM(FortRequest request)
+
+ /* No qualifier */ FortResponse authorizedPermissionRolesM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
Permission inPerm = (Permission) request.getEntity();
- Set<String> outSet = reviewMgr.authorizedPermissionRoles(inPerm);
- response.setValueSet(outSet);
- response.setErrorCode(0);
+ Set<String> outSet = reviewMgr.authorizedPermissionRoles( inPerm );
+ response.setValueSet( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse permissionUsersM(FortRequest request)
+
+ /* No qualifier */ FortResponse permissionUsersM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
Permission inPerm = (Permission) request.getEntity();
- List<String> outList = reviewMgr.permissionUsers(inPerm);
- response.setValues(outList);
- response.setErrorCode(0);
+ List<String> outList = reviewMgr.permissionUsers( inPerm );
+ response.setValues( outList );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse authorizedPermissionUsersM(FortRequest request)
+
+ /* No qualifier */ FortResponse authorizedPermissionUsersM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
Permission inPerm = (Permission) request.getEntity();
- Set<String> outSet = reviewMgr.authorizedPermissionUsers(inPerm);
- response.setValueSet(outSet);
- response.setErrorCode(0);
+ Set<String> outSet = reviewMgr.authorizedPermissionUsers( inPerm );
+ response.setValueSet( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse userPermissionsM(FortRequest request)
+
+ /* No qualifier */ FortResponse userPermissionsM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
User inUser = (User) request.getEntity();
- List<Permission> perms = reviewMgr.userPermissions(inUser);
- response.setEntities(perms);
- response.setErrorCode(0);
+ List<Permission> perms = reviewMgr.userPermissions( inUser );
+ response.setEntities( perms );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse rolePermissionsM(FortRequest request)
+
+ /* No qualifier */ FortResponse rolePermissionsM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
Role inRole = (Role) request.getEntity();
- List<Permission> perms = reviewMgr.rolePermissions(inRole);
- response.setEntities(perms);
- response.setErrorCode(0);
+ List<Permission> perms = reviewMgr.rolePermissions( inRole );
+ response.setEntities( perms );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse ssdRoleSetsM(FortRequest request)
+
+ /* No qualifier */ FortResponse ssdRoleSetsM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
Role inRole = (Role) request.getEntity();
- List<SDSet> outSets = reviewMgr.ssdRoleSets(inRole);
- response.setEntities(outSets);
- response.setErrorCode(0);
+ List<SDSet> outSets = reviewMgr.ssdRoleSets( inRole );
+ response.setEntities( outSets );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse ssdRoleSetM(FortRequest request)
+
+ /* No qualifier */ FortResponse ssdRoleSetM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
SDSet inSet = (SDSet) request.getEntity();
- SDSet outSet = reviewMgr.ssdRoleSet(inSet);
- response.setEntity(outSet);
- response.setErrorCode(0);
+ SDSet outSet = reviewMgr.ssdRoleSet( inSet );
+ response.setEntity( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse ssdRoleSetRolesM(FortRequest request)
+
+ /* No qualifier */ FortResponse ssdRoleSetRolesM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
SDSet inSet = (SDSet) request.getEntity();
- Set<String> outSet = reviewMgr.ssdRoleSetRoles(inSet);
- response.setValueSet(outSet);
- response.setErrorCode(0);
+ Set<String> outSet = reviewMgr.ssdRoleSetRoles( inSet );
+ response.setValueSet( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse ssdRoleSetCardinalityM(FortRequest request)
+
+ /* No qualifier */ FortResponse ssdRoleSetCardinalityM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
SDSet inSet = (SDSet) request.getEntity();
- int cardinality = reviewMgr.ssdRoleSetCardinality(inSet);
- inSet.setCardinality(cardinality);
- response.setEntity(inSet);
- response.setErrorCode(0);
+ int cardinality = reviewMgr.ssdRoleSetCardinality( inSet );
+ inSet.setCardinality( cardinality );
+ response.setEntity( inSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
+ LOG.info( "Caught " + se );
}
+
return response;
}
- FortResponse ssdSetsM(FortRequest request)
+
+ /* No qualifier */ FortResponse ssdSetsM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
SDSet inSdSet = (SDSet) request.getEntity();
- List<SDSet> outSets = reviewMgr.ssdSets(inSdSet);
- response.setEntities(outSets);
- response.setErrorCode(0);
+ List<SDSet> outSets = reviewMgr.ssdSets( inSdSet );
+ response.setEntities( outSets );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse dsdRoleSetsM(FortRequest request)
+
+ /* No qualifier */ FortResponse dsdRoleSetsM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
Role inRole = (Role) request.getEntity();
- List<SDSet> outSets = reviewMgr.dsdRoleSets(inRole);
- response.setEntities(outSets);
- response.setErrorCode(0);
+ List<SDSet> outSets = reviewMgr.dsdRoleSets( inRole );
+ response.setEntities( outSets );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse dsdRoleSetM(FortRequest request)
+
+ /* No qualifier */ FortResponse dsdRoleSetM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
SDSet inSet = (SDSet) request.getEntity();
- SDSet outSet = reviewMgr.dsdRoleSet(inSet);
- response.setEntity(outSet);
- response.setErrorCode(0);
+ SDSet outSet = reviewMgr.dsdRoleSet( inSet );
+ response.setEntity( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse dsdRoleSetRolesM(FortRequest request)
+
+ /* No qualifier */ FortResponse dsdRoleSetRolesM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
SDSet inSet = (SDSet) request.getEntity();
- Set<String> outSet = reviewMgr.dsdRoleSetRoles(inSet);
- response.setValueSet(outSet);
- response.setErrorCode(0);
+ Set<String> outSet = reviewMgr.dsdRoleSetRoles( inSet );
+ response.setValueSet( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse dsdRoleSetCardinalityM(FortRequest request)
+
+ /* No qualifier */ FortResponse dsdRoleSetCardinalityM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
SDSet inSet = (SDSet) request.getEntity();
- int cardinality = reviewMgr.dsdRoleSetCardinality(inSet);
- inSet.setCardinality(cardinality);
- response.setEntity(inSet);
- response.setErrorCode(0);
+ int cardinality = reviewMgr.dsdRoleSetCardinality( inSet );
+ inSet.setCardinality( cardinality );
+ response.setEntity( inSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
+ LOG.info( "Caught " + se );
}
+
return response;
}
- FortResponse dsdSetsM(FortRequest request)
+
+ /* No qualifier */ FortResponse dsdSetsM( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- reviewMgr.setAdmin(request.getSession());
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ reviewMgr.setAdmin( request.getSession() );
SDSet inSdSet = (SDSet) request.getEntity();
- List<SDSet> outSets = reviewMgr.dsdSets(inSdSet);
- response.setEntities(outSets);
- response.setErrorCode(0);
+ List<SDSet> outSets = reviewMgr.dsdSets( inSdSet );
+ response.setEntities( outSets );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
}
\ No newline at end of file
[5/6] directory-fortress-enmasse git commit: The AbstractImpl class
has been renamed
Posted by el...@apache.org.
The AbstractImpl class has been renamed
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/commit/5f2368ea
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/tree/5f2368ea
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/diff/5f2368ea
Branch: refs/heads/master
Commit: 5f2368eaa6a15b5b5af709e7fcb01c9dbd88937e
Parents: f88d1ab
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Nov 22 11:04:18 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Nov 22 11:04:18 2014 +0100
----------------------------------------------------------------------
.../directory/fortress/rest/AbstractImpl.java | 62 --------------------
1 file changed, 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/5f2368ea/src/main/java/org/apache/directory/fortress/rest/AbstractImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/AbstractImpl.java b/src/main/java/org/apache/directory/fortress/rest/AbstractImpl.java
deleted file mode 100644
index 90f06d2..0000000
--- a/src/main/java/org/apache/directory/fortress/rest/AbstractImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.directory.fortress.rest;
-
-import org.apache.log4j.Logger;
-import org.apache.directory.fortress.core.GlobalErrIds;
-import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.rest.FortResponse;
-
-/**
- * An abstract class containing some methods shared by all the implementations.
- *
- * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
-
- */
-abstract class AbstractImpl
-{
- /**
- * Create an error message and log it.
- *
- * @param response The {@link FortResponse} instance in which we will store the error message and ID
- * @param LOG The Logger
- * @param se The exception
- */
- protected void createError( FortResponse response, Logger LOG, SecurityException se )
- {
- LOG.info( "Caught " + se );
- response.setErrorCode( se.getErrorId() );
- response.setErrorMessage( se.getMessage() );
- }
-
-
- /**
- * Creates a {@link FortResponse} instance where the error code is set with a default value.
- *
- * @return The created instancd
- */
- protected FortResponse createResponse()
- {
- FortResponse response = new FortResponse();
- response.setErrorCode( GlobalErrIds.NO_ERROR );
-
- return response;
- }
-}
[2/6] directory-fortress-enmasse git commit: o Inherits from the
AbstractImpl class o Added /* no qualifier */ for package protected methods o
Called the createResponse() and createError() method o Formatting the code o
Added some Javadoc
Posted by el...@apache.org.
o Inherits from the AbstractImpl class
o Added /* no qualifier */ for package protected methods
o Called the createResponse() and createError() method
o Formatting the code
o Added some Javadoc
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/commit/04e93834
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/tree/04e93834
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/diff/04e93834
Branch: refs/heads/master
Commit: 04e9383423b9ccf2079af76d242bde661d416709
Parents: c0cbc35
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Nov 22 10:09:58 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Nov 22 10:09:58 2014 +0100
----------------------------------------------------------------------
.../directory/fortress/rest/AccessMgrImpl.java | 283 ++---
.../directory/fortress/rest/AdminMgrImpl.java | 1039 +++++++++---------
.../directory/fortress/rest/AuditMgrImpl.java | 127 ++-
.../directory/fortress/rest/ConfigMgrImpl.java | 102 +-
.../fortress/rest/DelegatedAccessMgrImpl.java | 218 ++--
5 files changed, 920 insertions(+), 849 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/04e93834/src/main/java/org/apache/directory/fortress/rest/AccessMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/AccessMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/AccessMgrImpl.java
index f651408..9763f56 100644
--- a/src/main/java/org/apache/directory/fortress/rest/AccessMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/AccessMgrImpl.java
@@ -21,6 +21,7 @@ package org.apache.directory.fortress.rest;
import org.apache.directory.fortress.core.AccessMgr;
import org.apache.directory.fortress.core.AccessMgrFactory;
+import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.SecurityException;
import org.apache.directory.fortress.core.rbac.Permission;
import org.apache.directory.fortress.core.rbac.Session;
@@ -38,245 +39,267 @@ import java.util.Set;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-class AccessMgrImpl
+class AccessMgrImpl extends AbstractImpl
{
- private static final String CLS_NM = AccessMgrImpl.class.getName();
- private static final Logger log = Logger.getLogger(CLS_NM);
+ /** A logger for this class */
+ private static final Logger LOG = Logger.getLogger( AccessMgrImpl.class.getName() );
+
+ /** A flag for trusted sessions */
+ private static final boolean TRUSTED = true;
+
+ /** A flag for untrusted sessions */
+ private static final boolean UNTRUSTED = false;
/**
* ************************************************************************************************************************************
* BEGIN ACCESSMGR
* **************************************************************************************************************************************
*/
-
- FortResponse authenticate(FortRequest request)
+ /* No qualifier */ FortResponse authenticate( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- AccessMgr accessMgr = AccessMgrFactory.createInstance(request.getContextId());
+ AccessMgr accessMgr = AccessMgrFactory.createInstance( request.getContextId() );
User inUser = (User) request.getEntity();
- Session outSession = accessMgr.authenticate(inUser.getUserId(), inUser.getPassword());
- response.setSession(outSession);
- response.setErrorCode(0);
+ Session outSession = accessMgr.authenticate( inUser.getUserId(), inUser.getPassword() );
+ response.setSession( outSession );
+ response.setErrorCode( GlobalErrIds.NO_ERROR );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse createSession(FortRequest request)
+
+ /**
+ * Creates an untrusted session
+ *
+ * @param request The request We want to create a session for
+ * @return The created response
+ */
+ /* no qualifier*/ FortResponse createSession( FortRequest request )
{
- FortResponse response = new FortResponse();
- try
- {
- AccessMgr accessMgr = AccessMgrFactory.createInstance(request.getContextId());
- User inUser = (User) request.getEntity();
- Session outSession = accessMgr.createSession(inUser, false);
- response.setSession(outSession);
- response.setErrorCode(0);
- }
- catch (SecurityException se)
- {
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
- }
- return response;
+ return createSession( request, UNTRUSTED );
}
- FortResponse createSessionTrusted(FortRequest request)
+
+ /**
+ * Creates a trusted session
+ *
+ * @param request The request We want to create a session for
+ * @return The created response
+ */
+ /* no qualifier*/ FortResponse createSessionTrusted( FortRequest request )
+ {
+ return createSession( request, TRUSTED );
+ }
+
+
+ /**
+ * Creates a session, trusted or untrested
+ *
+ * @param request The request We want to create a session for
+ * @param trusted Is the session trusted or not
+ * @return The created response
+ */
+ private FortResponse createSession( FortRequest request, boolean trusted )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- AccessMgr accessMgr = AccessMgrFactory.createInstance(request.getContextId());
+ AccessMgr accessMgr = AccessMgrFactory.createInstance( request.getContextId() );
User inUser = (User) request.getEntity();
- Session outSession = accessMgr.createSession(inUser, true);
- response.setSession(outSession);
- response.setErrorCode(0);
+ Session outSession = accessMgr.createSession( inUser, trusted );
+ response.setSession( outSession );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
-
- FortResponse checkAccess(FortRequest request)
+
+
+ /**
+ * Perform user RBAC authorization.
+ *
+ * @param request The {@link FortressRequest} we have to check
+ * @return a {@link FortressResponse} containing the response
+ */
+ /* no qualifier*/ FortResponse checkAccess( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- AccessMgr accessMgr = AccessMgrFactory.createInstance(request.getContextId());
+ AccessMgr accessMgr = AccessMgrFactory.createInstance( request.getContextId() );
Permission perm = (Permission)request.getEntity();
- perm.setAdmin(false);
+ perm.setAdmin( false );
Session session = request.getSession();
- boolean result = accessMgr.checkAccess(session, perm);
- response.setSession(session);
- response.setAuthorized(result);
- response.setErrorCode(0);
+ boolean result = accessMgr.checkAccess( session, perm );
+ response.setSession( session );
+ response.setAuthorized( result );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse sessionPermissions(FortRequest request)
+
+ /* No qualifier */ FortResponse sessionPermissions( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- AccessMgr accessMgr = AccessMgrFactory.createInstance(request.getContextId());
+ AccessMgr accessMgr = AccessMgrFactory.createInstance( request.getContextId() );
Session session = request.getSession();
- List<Permission> perms = accessMgr.sessionPermissions(session);
- response.setSession(session);
- response.setEntities(perms);
- response.setErrorCode(0);
+ List<Permission> perms = accessMgr.sessionPermissions( session );
+ response.setSession( session );
+ response.setEntities( perms );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse sessionRoles(FortRequest request)
+
+ /* No qualifier */ FortResponse sessionRoles( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- AccessMgr accessMgr = AccessMgrFactory.createInstance(request.getContextId());
+ AccessMgr accessMgr = AccessMgrFactory.createInstance( request.getContextId() );
Session session = request.getSession();
- List<UserRole> roles = accessMgr.sessionRoles(session);
- response.setEntities(roles);
- response.setSession(session);
- response.setErrorCode(0);
+ List<UserRole> roles = accessMgr.sessionRoles( session );
+ response.setEntities( roles );
+ response.setSession( session );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse authorizedSessionRoles(FortRequest request)
+
+ /* No qualifier */ FortResponse authorizedSessionRoles( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- AccessMgr accessMgr = AccessMgrFactory.createInstance(request.getContextId());
+ AccessMgr accessMgr = AccessMgrFactory.createInstance( request.getContextId() );
Session session = request.getSession();
- Set<String> roles = accessMgr.authorizedRoles(session);
- response.setValueSet(roles);
- response.setSession(session);
- response.setErrorCode(0);
+ Set<String> roles = accessMgr.authorizedRoles( session );
+ response.setValueSet( roles );
+ response.setSession( session );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
+
- FortResponse addActiveRole(FortRequest request)
+ /* No qualifier */ FortResponse addActiveRole( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- AccessMgr accessMgr = AccessMgrFactory.createInstance(request.getContextId());
+ AccessMgr accessMgr = AccessMgrFactory.createInstance( request.getContextId() );
UserRole uRole = (UserRole)request.getEntity();
Session session = request.getSession();
- accessMgr.addActiveRole(session, uRole);
- response.setSession(session);
- response.setErrorCode(0);
+ accessMgr.addActiveRole( session, uRole );
+ response.setSession( session );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse dropActiveRole(FortRequest request)
+
+ /* No qualifier */ FortResponse dropActiveRole( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- AccessMgr accessMgr = AccessMgrFactory.createInstance(request.getContextId());
+ AccessMgr accessMgr = AccessMgrFactory.createInstance( request.getContextId() );
UserRole uRole = (UserRole)request.getEntity();
Session session = request.getSession();
- accessMgr.dropActiveRole(session, uRole);
- response.setSession(session);
- response.setErrorCode(0);
+ accessMgr.dropActiveRole( session, uRole );
+ response.setSession( session );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
+
- FortResponse getUserId(FortRequest request)
+ /* No qualifier */ FortResponse getUserId( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- AccessMgr accessMgr = AccessMgrFactory.createInstance(request.getContextId());
+ AccessMgr accessMgr = AccessMgrFactory.createInstance( request.getContextId() );
Session session = request.getSession();
- String userId = accessMgr.getUserId(session);
- User outUser = new User(userId);
- response.setSession(session);
- response.setEntity(outUser);
- response.setErrorCode(0);
+ String userId = accessMgr.getUserId( session );
+ User outUser = new User( userId );
+ response.setSession( session );
+ response.setEntity( outUser );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
- FortResponse getUser(FortRequest request)
+
+ /* No qualifier */ FortResponse getUser( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- AccessMgr accessMgr = AccessMgrFactory.createInstance(request.getContextId());
+ AccessMgr accessMgr = AccessMgrFactory.createInstance( request.getContextId() );
Session session = request.getSession();
- User outUser = accessMgr.getUser(session);
- response.setSession(session);
- response.setEntity(outUser);
- response.setErrorCode(0);
+ User outUser = accessMgr.getUser( session );
+ response.setSession( session );
+ response.setEntity( outUser );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, LOG, se );
}
+
return response;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/04e93834/src/main/java/org/apache/directory/fortress/rest/AdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/AdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/AdminMgrImpl.java
index 112e60a..a4c27bb 100644
--- a/src/main/java/org/apache/directory/fortress/rest/AdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/AdminMgrImpl.java
@@ -44,948 +44,997 @@ import org.apache.log4j.Logger;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-class AdminMgrImpl
+class AdminMgrImpl extends AbstractImpl
{
- private static final String CLS_NM = AdminMgrImpl.class.getName();
- private static final Logger log = Logger.getLogger(CLS_NM);
+ /** A logger for this class */
+ private static final Logger log = Logger.getLogger( AdminMgrImpl.class.getName() );
- FortResponse addUser(FortRequest request)
+
+ /* No qualifier */ FortResponse addUser( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
- User inUser = (User) request.getEntity();
- User outUser = adminMgr.addUser(inUser);
- response.setEntity(outUser);
- response.setErrorCode(0);
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
+ User inUser = (User)request.getEntity();
+ User outUser = adminMgr.addUser( inUser );
+ response.setEntity( outUser );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse deleteUser(FortRequest request)
+
+ /* No qualifier */ FortResponse deleteUser( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
- User inUser = (User) request.getEntity();
- adminMgr.deleteUser(inUser);
- response.setErrorCode(0);
- response.setEntity(inUser);
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
+ User inUser = (User)request.getEntity();
+ adminMgr.deleteUser( inUser );
+ response.setEntity( inUser );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse disableUser(FortRequest request)
+
+ /* No qualifier */ FortResponse disableUser( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
- User inUser = (User) request.getEntity();
- adminMgr.disableUser(inUser);
- response.setErrorCode(0);
- response.setEntity(inUser);
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
+ User inUser = (User)request.getEntity();
+ adminMgr.disableUser( inUser );
+ response.setEntity( inUser );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse updateUser(FortRequest request)
+
+ /* No qualifier */ FortResponse updateUser( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
User inUser = (User) request.getEntity();
- User outUser = adminMgr.updateUser(inUser);
- response.setEntity(outUser);
- response.setErrorCode(0);
+ User outUser = adminMgr.updateUser( inUser );
+ response.setEntity( outUser );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse changePassword(FortRequest request)
+
+ /* No qualifier */ FortResponse changePassword( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
User inUser = (User) request.getEntity();
adminMgr.changePassword(inUser, inUser.getNewPassword());
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- User outUser = reviewMgr.readUser(inUser);
- response.setEntity(outUser);
- response.setErrorCode(0);
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ User outUser = reviewMgr.readUser( inUser );
+ response.setEntity( outUser );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse lockUserAccount(FortRequest request)
+
+ /* No qualifier */ FortResponse lockUserAccount( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
User inUser = (User) request.getEntity();
- adminMgr.lockUserAccount(inUser);
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- User outUser = reviewMgr.readUser(inUser);
- response.setEntity(outUser);
- response.setErrorCode(0);
+ adminMgr.lockUserAccount( inUser );
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ User outUser = reviewMgr.readUser( inUser );
+ response.setEntity( outUser );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse unlockUserAccount(FortRequest request)
+
+ /* No qualifier */ FortResponse unlockUserAccount( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
User inUser = (User) request.getEntity();
- adminMgr.unlockUserAccount(inUser);
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- User outUser = reviewMgr.readUser(inUser);
- response.setEntity(outUser);
- response.setErrorCode(0);
+ adminMgr.unlockUserAccount( inUser );
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ User outUser = reviewMgr.readUser( inUser );
+ response.setEntity( outUser );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse resetPassword(FortRequest request)
+
+ /* No qualifier */ FortResponse resetPassword( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
User inUser = (User) request.getEntity();
adminMgr.resetPassword(inUser, inUser.getNewPassword());
- ReviewMgr reviewMgr = ReviewMgrFactory.createInstance(request.getContextId());
- User outUser = reviewMgr.readUser(inUser);
- response.setEntity(outUser);
- response.setErrorCode(0);
+ ReviewMgr reviewMgr = ReviewMgrFactory.createInstance( request.getContextId() );
+ User outUser = reviewMgr.readUser( inUser );
+ response.setEntity( outUser );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse addRole(FortRequest request)
+
+ /* No qualifier */ FortResponse addRole( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
Role inRole = (Role) request.getEntity();
- Role outRole = adminMgr.addRole(inRole);
- response.setEntity(outRole);
- response.setErrorCode(0);
+ Role outRole = adminMgr.addRole( inRole );
+ response.setEntity( outRole );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
-
- FortResponse deleteRole(FortRequest request)
+
+
+ /* No qualifier */ FortResponse deleteRole( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
Role inRole = (Role) request.getEntity();
- adminMgr.deleteRole(inRole);
- response.setEntity(inRole);
- response.setErrorCode(0);
+ adminMgr.deleteRole( inRole );
+ response.setEntity( inRole );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse updateRole(FortRequest request)
+
+ /* No qualifier */ FortResponse updateRole( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
Role inRole = (Role) request.getEntity();
- Role outRole = adminMgr.updateRole(inRole);
- response.setEntity(outRole);
- response.setErrorCode(0);
+ Role outRole = adminMgr.updateRole( inRole );
+ response.setEntity( outRole );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
-
- FortResponse assignUser(FortRequest request)
+
+
+ /* No qualifier */ FortResponse assignUser( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
UserRole inRole = (UserRole) request.getEntity();
- adminMgr.assignUser(inRole);
- response.setEntity(inRole);
- response.setErrorCode(0);
+ adminMgr.assignUser( inRole );
+ response.setEntity( inRole );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse deassignUser(FortRequest request)
+
+ /* No qualifier */ FortResponse deassignUser( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
UserRole inRole = (UserRole) request.getEntity();
- adminMgr.deassignUser(inRole);
- response.setEntity(inRole);
- response.setErrorCode(0);
+ adminMgr.deassignUser( inRole );
+ response.setEntity( inRole );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse addPermission(FortRequest request)
+
+ /* No qualifier */ FortResponse addPermission( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
Permission inPerm = (Permission) request.getEntity();
- Permission outPerm = adminMgr.addPermission(inPerm);
- response.setEntity(outPerm);
- response.setErrorCode(0);
+ Permission outPerm = adminMgr.addPermission( inPerm );
+ response.setEntity( outPerm );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse updatePermission(FortRequest request)
+
+ /* No qualifier */ FortResponse updatePermission( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
Permission inPerm = (Permission) request.getEntity();
- Permission outPerm = adminMgr.updatePermission(inPerm);
- response.setEntity(outPerm);
- response.setErrorCode(0);
+ Permission outPerm = adminMgr.updatePermission( inPerm );
+ response.setEntity( outPerm );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse deletePermission(FortRequest request)
+
+ /* No qualifier */ FortResponse deletePermission( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
Permission inPerm = (Permission) request.getEntity();
- adminMgr.deletePermission(inPerm);
- response.setEntity(inPerm);
- response.setErrorCode(0);
+ adminMgr.deletePermission( inPerm );
+ response.setEntity( inPerm );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse addPermObj(FortRequest request)
+
+ /* No qualifier */ FortResponse addPermObj( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
PermObj inObj = (PermObj) request.getEntity();
- PermObj outObj = adminMgr.addPermObj(inObj);
- response.setEntity(outObj);
- response.setErrorCode(0);
+ PermObj outObj = adminMgr.addPermObj( inObj );
+ response.setEntity( outObj );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse updatePermObj(FortRequest request)
+
+ /* No qualifier */ FortResponse updatePermObj( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
PermObj inObj = (PermObj) request.getEntity();
- PermObj outObj = adminMgr.updatePermObj(inObj);
- response.setEntity(outObj);
- response.setErrorCode(0);
+ PermObj outObj = adminMgr.updatePermObj( inObj );
+ response.setEntity( outObj );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse deletePermObj(FortRequest request)
+
+ /* No qualifier */ FortResponse deletePermObj( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
PermObj inObj = (PermObj) request.getEntity();
- adminMgr.deletePermObj(inObj);
- response.setEntity(inObj);
- response.setErrorCode(0);
+ adminMgr.deletePermObj( inObj );
+ response.setEntity( inObj );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- private void grantPerm(FortRequest request) throws SecurityException
+
+ private void grantPerm( FortRequest request ) throws SecurityException
{
PermGrant permGrant = (PermGrant) request.getEntity();
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
- Role role = new Role(permGrant.getRoleNm());
- Permission perm = new Permission(permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId());
- perm.setAdmin(false);
- adminMgr.grantPermission(perm, role);
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
+ Role role = new Role( permGrant.getRoleNm() );
+ Permission perm = new Permission( permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId() );
+ perm.setAdmin( false );
+ adminMgr.grantPermission( perm, role );
}
- private void grantAdminPerm(FortRequest request) throws SecurityException
+
+ private void grantAdminPerm( FortRequest request ) throws SecurityException
{
PermGrant permGrant = (PermGrant) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- AdminRole role = new AdminRole(permGrant.getRoleNm());
- Permission perm = new Permission(permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId());
- perm.setAdmin(true);
- delegatedAdminMgr.grantPermission(perm, role);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ AdminRole role = new AdminRole( permGrant.getRoleNm() );
+ Permission perm = new Permission( permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId() );
+ perm.setAdmin( true );
+ delegatedAdminMgr.grantPermission( perm, role );
}
- private void revokePerm(FortRequest request) throws SecurityException
+
+ private void revokePerm( FortRequest request ) throws SecurityException
{
PermGrant permGrant = (PermGrant) request.getEntity();
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
- Role role = new Role(permGrant.getRoleNm());
- Permission perm = new Permission(permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId());
- perm.setAdmin(false);
- adminMgr.revokePermission(perm, role);
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
+ Role role = new Role( permGrant.getRoleNm() );
+ Permission perm = new Permission( permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId() );
+ perm.setAdmin( false );
+ adminMgr.revokePermission( perm, role );
}
- private void revokeAdminPerm(FortRequest request) throws SecurityException
+
+ private void revokeAdminPerm( FortRequest request ) throws SecurityException
{
PermGrant permGrant = (PermGrant) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- AdminRole role = new AdminRole(permGrant.getRoleNm());
- Permission perm = new Permission(permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId());
- perm.setAdmin(true);
- delegatedAdminMgr.revokePermission(perm, role);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ AdminRole role = new AdminRole( permGrant.getRoleNm() );
+ Permission perm = new Permission( permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId() );
+ perm.setAdmin( true );
+ delegatedAdminMgr.revokePermission( perm, role );
}
- private void grantUserPerm(FortRequest request) throws SecurityException
+
+ private void grantUserPerm( FortRequest request ) throws SecurityException
{
PermGrant permGrant = (PermGrant) request.getEntity();
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
- User user = new User(permGrant.getUserId());
- Permission perm = new Permission(permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId());
- perm.setAdmin(false);
- adminMgr.grantPermission(perm, user);
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
+ User user = new User( permGrant.getUserId() );
+ Permission perm = new Permission( permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId() );
+ perm.setAdmin( false );
+ adminMgr.grantPermission( perm, user );
}
- private void grantAdminUserPerm(FortRequest request) throws SecurityException
+
+ private void grantAdminUserPerm( FortRequest request ) throws SecurityException
{
PermGrant permGrant = (PermGrant) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- User user = new User(permGrant.getUserId());
- Permission perm = new Permission(permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId());
- perm.setAdmin(true);
- delegatedAdminMgr.grantPermission(perm, user);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ User user = new User( permGrant.getUserId() );
+ Permission perm = new Permission( permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId() );
+ perm.setAdmin( true );
+ delegatedAdminMgr.grantPermission( perm, user );
}
- private void revokeUserPerm(FortRequest request) throws SecurityException
+
+ private void revokeUserPerm( FortRequest request ) throws SecurityException
{
PermGrant permGrant = (PermGrant) request.getEntity();
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
- User user = new User(permGrant.getUserId());
- Permission perm = new Permission(permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId());
- perm.setAdmin(false);
- adminMgr.revokePermission(perm, user);
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
+ User user = new User( permGrant.getUserId() );
+ Permission perm = new Permission( permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId() );
+ perm.setAdmin( false );
+ adminMgr.revokePermission( perm, user );
}
- private void revokeAdminUserPerm(FortRequest request) throws SecurityException
+
+ private void revokeAdminUserPerm( FortRequest request ) throws SecurityException
{
PermGrant permGrant = (PermGrant) request.getEntity();
- DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance(request.getContextId());
- delegatedAdminMgr.setAdmin(request.getSession());
- User user = new User(permGrant.getUserId());
- Permission perm = new Permission(permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId());
- perm.setAdmin(true);
- delegatedAdminMgr.revokePermission(perm, user);
+ DelAdminMgr delegatedAdminMgr = DelAdminMgrFactory.createInstance( request.getContextId() );
+ delegatedAdminMgr.setAdmin( request.getSession() );
+ User user = new User( permGrant.getUserId() );
+ Permission perm = new Permission( permGrant.getObjName(), permGrant.getOpName(), permGrant.getObjId() );
+ perm.setAdmin( true );
+ delegatedAdminMgr.revokePermission( perm, user );
}
- FortResponse grant(FortRequest request, FortressServiceImpl fortressService)
+
+ /* No qualifier */ FortResponse grant(FortRequest request, FortressServiceImpl fortressService)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
PermGrant permGrant = (PermGrant) request.getEntity();
- if (permGrant.isAdmin())
+
+ if ( permGrant.isAdmin() )
{
- grantAdminPerm(request);
+ grantAdminPerm( request );
}
else
{
- grantPerm(request);
+ grantPerm( request );
}
+
response.setEntity(permGrant);
- response.setErrorCode(0);
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse revoke(FortRequest request, FortressServiceImpl fortressService)
+
+ /* No qualifier */ FortResponse revoke(FortRequest request, FortressServiceImpl fortressService)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
PermGrant permGrant = (PermGrant) request.getEntity();
+
if (permGrant.isAdmin())
{
- revokeAdminPerm(request);
+ revokeAdminPerm( request );
}
else
{
- revokePerm(request);
+ revokePerm( request );
}
- response.setEntity(permGrant);
- response.setErrorCode(0);
+ response.setEntity( permGrant );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse grantUser(FortRequest request, FortressServiceImpl fortressService)
+
+ /* No qualifier */ FortResponse grantUser(FortRequest request, FortressServiceImpl fortressService)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
PermGrant permGrant = (PermGrant) request.getEntity();
- if (permGrant.isAdmin())
+
+ if ( permGrant.isAdmin() )
{
- grantAdminUserPerm(request);
+ grantAdminUserPerm( request );
}
else
{
- grantUserPerm(request);
+ grantUserPerm( request );
}
- response.setEntity(permGrant);
- response.setErrorCode(0);
+
+ response.setEntity( permGrant );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse revokeUser(FortRequest request, FortressServiceImpl fortressService)
+
+ /* No qualifier */ FortResponse revokeUser(FortRequest request, FortressServiceImpl fortressService)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
PermGrant permGrant = (PermGrant) request.getEntity();
- if (permGrant.isAdmin())
+
+ if ( permGrant.isAdmin() )
{
- revokeAdminUserPerm(request);
+ revokeAdminUserPerm( request );
}
else
{
- revokeUserPerm(request);
+ revokeUserPerm( request );
}
- response.setEntity(permGrant);
- response.setErrorCode(0);
+
+ response.setEntity( permGrant );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse addDescendant(FortRequest request)
+
+ /* No qualifier */ FortResponse addDescendant( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
RoleRelationship relationship = (RoleRelationship) request.getEntity();
adminMgr.addDescendant(relationship.getParent(), relationship.getChild());
- response.setEntity(relationship);
- response.setErrorCode(0);
+ response.setEntity( relationship );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse addAscendant(FortRequest request)
+
+ /* No qualifier */ FortResponse addAscendant( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
RoleRelationship relationship = (RoleRelationship) request.getEntity();
adminMgr.addAscendant(relationship.getChild(), relationship.getParent());
- response.setEntity(relationship);
- response.setErrorCode(0);
+ response.setEntity( relationship );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse addInheritance(FortRequest request)
+
+ /* No qualifier */ FortResponse addInheritance( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
RoleRelationship relationship = (RoleRelationship) request.getEntity();
adminMgr.addInheritance(relationship.getParent(), relationship.getChild());
- response.setEntity(relationship);
- response.setErrorCode(0);
+ response.setEntity( relationship );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse deleteInheritance(FortRequest request)
+
+ /* No qualifier */ FortResponse deleteInheritance( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
RoleRelationship relationship = (RoleRelationship) request.getEntity();
- adminMgr.deleteInheritance(relationship.getParent(), relationship.getChild());
- response.setEntity(relationship);
- response.setErrorCode(0);
+ adminMgr.deleteInheritance( relationship.getParent(), relationship.getChild() );
+ response.setEntity( relationship );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse createSsdSet(FortRequest request)
+
+ /* No qualifier */ FortResponse createSsdSet( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
SDSet inSet = (SDSet) request.getEntity();
- SDSet outSet = adminMgr.createSsdSet(inSet);
- response.setEntity(outSet);
- response.setErrorCode(0);
+ SDSet outSet = adminMgr.createSsdSet( inSet );
+ response.setEntity( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse updateSsdSet(FortRequest request)
+
+ /* No qualifier */ FortResponse updateSsdSet( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
SDSet inSet = (SDSet) request.getEntity();
- SDSet outSet = adminMgr.updateSsdSet(inSet);
- response.setEntity(outSet);
- response.setErrorCode(0);
+ SDSet outSet = adminMgr.updateSsdSet( inSet );
+ response.setEntity( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse addSsdRoleMember(FortRequest request)
+
+ /* No qualifier */ FortResponse addSsdRoleMember( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
SDSet inSet = (SDSet) request.getEntity();
- Role role = new Role(request.getValue());
- SDSet outSet = adminMgr.addSsdRoleMember(inSet, role);
- response.setEntity(outSet);
- response.setErrorCode(0);
+ Role role = new Role( request.getValue() );
+ SDSet outSet = adminMgr.addSsdRoleMember( inSet, role );
+ response.setEntity( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse deleteSsdRoleMember(FortRequest request)
+
+ /* No qualifier */ FortResponse deleteSsdRoleMember( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
SDSet inSet = (SDSet) request.getEntity();
- Role role = new Role(request.getValue());
- SDSet outSet = adminMgr.deleteSsdRoleMember(inSet, role);
+ Role role = new Role( request.getValue() );
+ SDSet outSet = adminMgr.deleteSsdRoleMember( inSet, role );
response.setEntity(outSet);
- response.setErrorCode(0);
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse deleteSsdSet(FortRequest request)
+
+ /* No qualifier */ FortResponse deleteSsdSet( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
SDSet inSet = (SDSet) request.getEntity();
- SDSet outSet = adminMgr.deleteSsdSet(inSet);
- response.setEntity(outSet);
- response.setErrorCode(0);
+ SDSet outSet = adminMgr.deleteSsdSet( inSet );
+ response.setEntity( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse setSsdSetCardinality(FortRequest request)
+
+ /* No qualifier */ FortResponse setSsdSetCardinality( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
SDSet inSet = (SDSet) request.getEntity();
- SDSet outSet = adminMgr.setSsdSetCardinality(inSet, inSet.getCardinality());
- response.setEntity(outSet);
- response.setErrorCode(0);
+ SDSet outSet = adminMgr.setSsdSetCardinality( inSet, inSet.getCardinality() );
+ response.setEntity( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse createDsdSet(FortRequest request)
+
+ /* No qualifier */ FortResponse createDsdSet( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
SDSet inSet = (SDSet) request.getEntity();
- SDSet outSet = adminMgr.createDsdSet(inSet);
- response.setEntity(outSet);
- response.setErrorCode(0);
+ SDSet outSet = adminMgr.createDsdSet( inSet );
+ response.setEntity( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse updateDsdSet(FortRequest request)
+
+ /* No qualifier */ FortResponse updateDsdSet( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
SDSet inSet = (SDSet) request.getEntity();
- SDSet outSet = adminMgr.updateDsdSet(inSet);
- response.setEntity(outSet);
- response.setErrorCode(0);
+ SDSet outSet = adminMgr.updateDsdSet( inSet );
+ response.setEntity( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse addDsdRoleMember(FortRequest request)
+
+ /* No qualifier */ FortResponse addDsdRoleMember( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
SDSet inSet = (SDSet) request.getEntity();
Role role = new Role(request.getValue());
- SDSet outSet = adminMgr.addDsdRoleMember(inSet, role);
- response.setEntity(outSet);
- response.setErrorCode(0);
+ SDSet outSet = adminMgr.addDsdRoleMember( inSet, role );
+ response.setEntity( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse deleteDsdRoleMember(FortRequest request)
+
+ /* No qualifier */ FortResponse deleteDsdRoleMember( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
SDSet inSet = (SDSet) request.getEntity();
Role role = new Role(request.getValue());
- SDSet outSet = adminMgr.deleteDsdRoleMember(inSet, role);
- response.setEntity(outSet);
- response.setErrorCode(0);
+ SDSet outSet = adminMgr.deleteDsdRoleMember( inSet, role );
+ response.setEntity( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse deleteDsdSet(FortRequest request)
+
+ /* No qualifier */ FortResponse deleteDsdSet( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
SDSet inSet = (SDSet) request.getEntity();
- SDSet outSet = adminMgr.deleteDsdSet(inSet);
- response.setEntity(outSet);
- response.setErrorCode(0);
+ SDSet outSet = adminMgr.deleteDsdSet( inSet );
+ response.setEntity( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse setDsdSetCardinality(FortRequest request)
+
+ /* No qualifier */ FortResponse setDsdSetCardinality( FortRequest request )
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
+
try
{
- AdminMgr adminMgr = AdminMgrFactory.createInstance(request.getContextId());
- adminMgr.setAdmin(request.getSession());
+ AdminMgr adminMgr = AdminMgrFactory.createInstance( request.getContextId() );
+ adminMgr.setAdmin( request.getSession() );
SDSet inSet = (SDSet) request.getEntity();
- SDSet outSet = adminMgr.setDsdSetCardinality(inSet, inSet.getCardinality());
- response.setEntity(outSet);
- response.setErrorCode(0);
+ SDSet outSet = adminMgr.setDsdSetCardinality( inSet, inSet.getCardinality() );
+ response.setEntity( outSet );
}
- catch (SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/04e93834/src/main/java/org/apache/directory/fortress/rest/AuditMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/AuditMgrImpl.java b/src/main/java/org/apache/directory/fortress/rest/AuditMgrImpl.java
index 9a70c2a..2f49506 100644
--- a/src/main/java/org/apache/directory/fortress/rest/AuditMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/rest/AuditMgrImpl.java
@@ -37,10 +37,10 @@ import java.util.List;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-class AuditMgrImpl
+class AuditMgrImpl extends AbstractImpl
{
- private static final String CLS_NM = AuditMgrImpl.class.getName();
- private static final Logger log = Logger.getLogger(CLS_NM);
+ /** A logger for this class */
+ private static final Logger log = Logger.getLogger( AuditMgrImpl.class.getName() );
/**
* ************************************************************************************************************************************
@@ -48,129 +48,128 @@ class AuditMgrImpl
* **************************************************************************************************************************************
*/
- FortResponse searchBinds(FortRequest request)
+ /* No qualifier */ FortResponse searchBinds(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
UserAudit inAudit = (UserAudit) request.getEntity();
- AuditMgr auditMgr = AuditMgrFactory.createInstance(request.getContextId());
- auditMgr.setAdmin(request.getSession());
- List<Bind> outAudit = auditMgr.searchBinds(inAudit);
- response.setEntities(outAudit);
- response.setErrorCode(0);
+ AuditMgr auditMgr = AuditMgrFactory.createInstance( request.getContextId() );
+ auditMgr.setAdmin( request.getSession() );
+ List<Bind> outAudit = auditMgr.searchBinds( inAudit );
+ response.setEntities( outAudit );
}
- catch (org.apache.directory.fortress.core.SecurityException se)
+ catch ( SecurityException se )
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse getUserAuthZs(FortRequest request)
+
+ /* No qualifier */ FortResponse getUserAuthZs(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
UserAudit inAudit = (UserAudit)request.getEntity();
- AuditMgr auditMgr = AuditMgrFactory.createInstance(request.getContextId());
- auditMgr.setAdmin(request.getSession());
- List<AuthZ> outAudit = auditMgr.getUserAuthZs(inAudit);
- response.setEntities(outAudit);
- response.setErrorCode(0);
+ AuditMgr auditMgr = AuditMgrFactory.createInstance( request.getContextId() );
+ auditMgr.setAdmin( request.getSession() );
+ List<AuthZ> outAudit = auditMgr.getUserAuthZs( inAudit );
+ response.setEntities( outAudit );
}
catch (SecurityException se)
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse searchAuthZs(FortRequest request)
+
+ /* No qualifier */ FortResponse searchAuthZs(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
UserAudit inAudit = (UserAudit)request.getEntity();
- AuditMgr auditMgr = AuditMgrFactory.createInstance(request.getContextId());
- auditMgr.setAdmin(request.getSession());
- List<AuthZ> outAudit = auditMgr.searchAuthZs(inAudit);
- response.setEntities(outAudit);
- response.setErrorCode(0);
+ AuditMgr auditMgr = AuditMgrFactory.createInstance( request.getContextId() );
+ auditMgr.setAdmin( request.getSession() );
+ List<AuthZ> outAudit = auditMgr.searchAuthZs( inAudit );
+ response.setEntities( outAudit );
}
catch (SecurityException se)
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse searchUserSessions(FortRequest request)
+
+ /* No qualifier */ FortResponse searchUserSessions(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
UserAudit inAudit = (UserAudit)request.getEntity();
- AuditMgr auditMgr = AuditMgrFactory.createInstance(request.getContextId());
- auditMgr.setAdmin(request.getSession());
- List<Mod> outAudit = auditMgr.searchUserSessions(inAudit);
- response.setEntities(outAudit);
- response.setErrorCode(0);
+ AuditMgr auditMgr = AuditMgrFactory.createInstance( request.getContextId() );
+ auditMgr.setAdmin( request.getSession() );
+ List<Mod> outAudit = auditMgr.searchUserSessions( inAudit );
+ response.setEntities( outAudit );
}
catch (SecurityException se)
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse searchAdminMods(FortRequest request)
+
+ /* No qualifier */ FortResponse searchAdminMods(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
UserAudit inAudit = (UserAudit)request.getEntity();
- AuditMgr auditMgr = AuditMgrFactory.createInstance(request.getContextId());
- auditMgr.setAdmin(request.getSession());
- List<Mod> outAudit = auditMgr.searchAdminMods(inAudit);
- response.setEntities(outAudit);
- response.setErrorCode(0);
+ AuditMgr auditMgr = AuditMgrFactory.createInstance( request.getContextId() );
+ auditMgr.setAdmin( request.getSession() );
+ List<Mod> outAudit = auditMgr.searchAdminMods( inAudit );
+ response.setEntities( outAudit );
}
catch (SecurityException se)
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
- FortResponse searchInvalidUsers(FortRequest request)
+
+ /* No qualifier */ FortResponse searchInvalidUsers(FortRequest request)
{
- FortResponse response = new FortResponse();
+ FortResponse response = createResponse();
+
try
{
UserAudit inAudit = (UserAudit)request.getEntity();
- AuditMgr auditMgr = AuditMgrFactory.createInstance(request.getContextId());
- auditMgr.setAdmin(request.getSession());
- List<AuthZ> outAudit = auditMgr.searchInvalidUsers(inAudit);
- response.setEntities(outAudit);
- response.setErrorCode(0);
+ AuditMgr auditMgr = AuditMgrFactory.createInstance( request.getContextId() );
+ auditMgr.setAdmin( request.getSession() );
+ List<AuthZ> outAudit = auditMgr.searchInvalidUsers( inAudit );
+ response.setEntities( outAudit );
}
catch (SecurityException se)
{
- log.info(CLS_NM + " caught " + se);
- response.setErrorCode(se.getErrorId());
- response.setErrorMessage(se.getMessage());
+ createError( response, log, se );
}
+
return response;
}
}
\ No newline at end of file
[3/6] directory-fortress-enmasse git commit: Added an abstract class
that is used by all the managers. It contains two methods used by all the
managers
Posted by el...@apache.org.
Added an abstract class that is used by all the managers. It contains
two methods used by all the managers
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/commit/f35bf521
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/tree/f35bf521
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/diff/f35bf521
Branch: refs/heads/master
Commit: f35bf52154fa8d3c5c1371951ae7cdfba94bb50a
Parents: 04e9383
Author: Emmanuel Lécharny <el...@symas.com>
Authored: Sat Nov 22 10:11:04 2014 +0100
Committer: Emmanuel Lécharny <el...@symas.com>
Committed: Sat Nov 22 10:11:04 2014 +0100
----------------------------------------------------------------------
.../directory/fortress/rest/AbstractImpl.java | 62 ++++++++++++++++++++
1 file changed, 62 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/f35bf521/src/main/java/org/apache/directory/fortress/rest/AbstractImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/rest/AbstractImpl.java b/src/main/java/org/apache/directory/fortress/rest/AbstractImpl.java
new file mode 100644
index 0000000..90f06d2
--- /dev/null
+++ b/src/main/java/org/apache/directory/fortress/rest/AbstractImpl.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.fortress.rest;
+
+import org.apache.log4j.Logger;
+import org.apache.directory.fortress.core.GlobalErrIds;
+import org.apache.directory.fortress.core.SecurityException;
+import org.apache.directory.fortress.core.rest.FortResponse;
+
+/**
+ * An abstract class containing some methods shared by all the implementations.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+
+ */
+abstract class AbstractImpl
+{
+ /**
+ * Create an error message and log it.
+ *
+ * @param response The {@link FortResponse} instance in which we will store the error message and ID
+ * @param LOG The Logger
+ * @param se The exception
+ */
+ protected void createError( FortResponse response, Logger LOG, SecurityException se )
+ {
+ LOG.info( "Caught " + se );
+ response.setErrorCode( se.getErrorId() );
+ response.setErrorMessage( se.getMessage() );
+ }
+
+
+ /**
+ * Creates a {@link FortResponse} instance where the error code is set with a default value.
+ *
+ * @return The created instancd
+ */
+ protected FortResponse createResponse()
+ {
+ FortResponse response = new FortResponse();
+ response.setErrorCode( GlobalErrIds.NO_ERROR );
+
+ return response;
+ }
+}