You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2016/12/04 15:01:34 UTC
[1/2] directory-fortress-core git commit: code cleanup (add
getRequest util)
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 03a56291c -> 40eb3b9c9
code cleanup (add getRequest util)
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/9619dfe6
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/9619dfe6
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/9619dfe6
Branch: refs/heads/master
Commit: 9619dfe6ffbd3e40218ebd58b7459f05779f7863
Parents: 755cdc4
Author: Shawn McKinney <sm...@apache.org>
Authored: Sat Dec 3 19:18:44 2016 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sat Dec 3 19:18:44 2016 -0600
----------------------------------------------------------------------
.../fortress/core/rest/AccessMgrRestImpl.java | 31 ++---
.../fortress/core/rest/AdminMgrRestImpl.java | 138 +++++++------------
.../fortress/core/rest/GroupMgrRestImpl.java | 15 +-
.../fortress/core/rest/PwPolicyMgrRestImpl.java | 21 +--
.../directory/fortress/core/rest/RestUtils.java | 12 ++
.../fortress/core/rest/ReviewMgrRestImpl.java | 3 +-
6 files changed, 81 insertions(+), 139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9619dfe6/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java
index 006e7c7..157f5b6 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/AccessMgrRestImpl.java
@@ -84,8 +84,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
VUtil.assertNotNullOrEmpty(userId, GlobalErrIds.USER_ID_NULL, CLS_NM + ".authenticate");
VUtil.assertNotNullOrEmpty(password, GlobalErrIds.USER_PW_NULL, ".authenticate");
Session retSession;
- FortRequest request = new FortRequest();
- request.setContextId(this.contextId);
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( new User( userId, password ) );
String szRequest = RestUtils.marshal(request);
String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_AUTHN);
@@ -110,8 +109,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
{
VUtil.assertNotNull(user, GlobalErrIds.USER_NULL, CLS_NM + ".createSession");
Session retSession;
- FortRequest request = new FortRequest();
- request.setContextId(this.contextId);
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity(user);
String szRequest = RestUtils.marshal(request);
String szResponse;
@@ -140,8 +138,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
{
VUtil.assertNotNull( group, GlobalErrIds.GROUP_NULL, CLS_NM + ".createSession" );
Session retSession;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( group );
String szRequest = RestUtils.marshal( request );
String szResponse = RestUtils.getInstance().post( szRequest, HttpIds.RBAC_CREATE_GROUP_SESSION );
@@ -167,8 +164,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
VUtil.assertNotNull(perm, GlobalErrIds.PERM_NULL, CLS_NM + ".checkAccess");
VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, CLS_NM + ".checkAccess");
boolean result;
- FortRequest request = new FortRequest();
- request.setContextId(this.contextId);
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setSession(session);
request.setEntity(perm);
String szRequest = RestUtils.marshal(request);
@@ -196,8 +192,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
{
VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, CLS_NM + ".sessionPermissions");
List<Permission> retPerms;
- FortRequest request = new FortRequest();
- request.setContextId(this.contextId);
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setSession(session);
String szRequest = RestUtils.marshal(request);
String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_PERMS);
@@ -224,8 +219,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
{
VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, CLS_NM + ".sessionRoles");
List<UserRole> retRoles;
- FortRequest request = new FortRequest();
- request.setContextId(this.contextId);
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setSession(session);
String szRequest = RestUtils.marshal(request);
String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_ROLES);
@@ -252,8 +246,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
{
VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, CLS_NM + ".sessionRoles");
Set<String> retRoleNames = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
- FortRequest request = new FortRequest();
- request.setContextId(this.contextId);
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setSession(session);
String szRequest = RestUtils.marshal(request);
String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_AUTHZ_ROLES);
@@ -283,8 +276,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
String fullMethodName = CLS_NM + ".addActiveRole";
VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, fullMethodName);
VUtil.assertNotNull(role, GlobalErrIds.ROLE_NULL, fullMethodName);
- FortRequest request = new FortRequest();
- request.setContextId(this.contextId);
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setSession(session);
request.setEntity(role);
String szRequest = RestUtils.marshal(request);
@@ -311,8 +303,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
String fullMethodName = ".dropActiveRole";
VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, CLS_NM + fullMethodName);
VUtil.assertNotNull(role, GlobalErrIds.ROLE_NULL, CLS_NM + fullMethodName);
- FortRequest request = new FortRequest();
- request.setContextId(this.contextId);
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setSession(session);
request.setEntity(role);
String szRequest = RestUtils.marshal(request);
@@ -338,8 +329,7 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
{
VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, CLS_NM + ".getUserId");
String userId;
- FortRequest request = new FortRequest();
- request.setContextId(this.contextId);
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setSession(session);
String szRequest = RestUtils.marshal(request);
String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_USERID);
@@ -368,7 +358,6 @@ public class AccessMgrRestImpl extends Manageable implements AccessMgr
VUtil.assertNotNull(session, GlobalErrIds.USER_SESS_NULL, CLS_NM + ".getUser");
User retUser;
FortRequest request = new FortRequest();
- request.setContextId(this.contextId);
request.setSession(session);
String szRequest = RestUtils.marshal(request);
String szResponse = RestUtils.getInstance().post(szRequest, HttpIds.RBAC_USER);
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9619dfe6/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
index b6bdf96..2eaef6f 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/AdminMgrRestImpl.java
@@ -90,8 +90,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( user, GlobalErrIds.USER_NULL, CLS_NM + ".addUser" );
User retUser;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( user );
if ( this.adminSess != null )
{
@@ -120,8 +119,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
throws SecurityException
{
VUtil.assertNotNull( user, GlobalErrIds.USER_NULL, CLS_NM + ".disableUser" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( user );
if ( this.adminSess != null )
{
@@ -145,8 +143,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
throws SecurityException
{
VUtil.assertNotNull( user, GlobalErrIds.USER_NULL, CLS_NM + ".deleteUser" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( user );
if ( this.adminSess != null )
{
@@ -171,8 +168,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( user, GlobalErrIds.USER_NULL, CLS_NM + ".updateUser" );
User retUser;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( user );
if ( this.adminSess != null )
{
@@ -202,8 +198,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( user, GlobalErrIds.USER_NULL, CLS_NM + ".changePassword" );
VUtil.assertNotNullOrEmpty( newPassword, GlobalErrIds.USER_PW_NULL, CLS_NM + ".changePassword" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
user.setNewPassword( newPassword );
request.setEntity( user );
if ( this.adminSess != null )
@@ -228,8 +223,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
throws SecurityException
{
VUtil.assertNotNull( user, GlobalErrIds.USER_NULL, CLS_NM + ".lockUserAccount" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( user );
if ( this.adminSess != null )
{
@@ -253,8 +247,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
throws SecurityException
{
VUtil.assertNotNull( user, GlobalErrIds.USER_NULL, CLS_NM + ".unlockUserAccount" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( user );
if ( this.adminSess != null )
{
@@ -279,8 +272,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( user, GlobalErrIds.USER_NULL, CLS_NM + ".resetPassword" );
VUtil.assertNotNullOrEmpty( newPassword, GlobalErrIds.USER_PW_NULL, CLS_NM + ".resetPassword" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
user.setNewPassword( newPassword );
request.setEntity( user );
if ( this.adminSess != null )
@@ -318,8 +310,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( role, GlobalErrIds.ROLE_NULL, CLS_NM + ".addRole" );
Role retRole;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( role );
if ( this.adminSess != null )
{
@@ -348,8 +339,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
throws SecurityException
{
VUtil.assertNotNull( role, GlobalErrIds.ROLE_NULL, CLS_NM + ".deleteRole" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( role );
if ( this.adminSess != null )
{
@@ -374,8 +364,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( role, GlobalErrIds.ROLE_NULL, CLS_NM + ".updateRole" );
Role retRole;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( role );
if ( this.adminSess != null )
{
@@ -404,8 +393,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
throws SecurityException
{
VUtil.assertNotNull( uRole, GlobalErrIds.URLE_NULL, CLS_NM + ".assignUser" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( uRole );
if ( this.adminSess != null )
{
@@ -429,8 +417,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
throws SecurityException
{
VUtil.assertNotNull( uRole, GlobalErrIds.URLE_NULL, CLS_NM + ".deassignUser" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( uRole );
if ( this.adminSess != null )
{
@@ -455,8 +442,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( perm, GlobalErrIds.PERM_OPERATION_NULL, CLS_NM + ".addPermission" );
Permission retPerm;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( perm );
if ( this.adminSess != null )
{
@@ -486,8 +472,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( perm, GlobalErrIds.PERM_OPERATION_NULL, CLS_NM + ".updatePermission" );
Permission retPerm;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( perm );
if ( this.adminSess != null )
{
@@ -516,8 +501,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
throws SecurityException
{
VUtil.assertNotNull( perm, GlobalErrIds.PERM_OPERATION_NULL, CLS_NM + ".deletePermission" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( perm );
if ( this.adminSess != null )
{
@@ -542,8 +526,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( pObj, GlobalErrIds.PERM_OBJECT_NULL, CLS_NM + ".addPermObj" );
PermObj retObj;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( pObj );
if ( this.adminSess != null )
{
@@ -573,8 +556,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( pObj, GlobalErrIds.PERM_OBJECT_NULL, CLS_NM + ".updatePermObj" );
PermObj retObj;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( pObj );
if ( this.adminSess != null )
{
@@ -603,8 +585,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
throws SecurityException
{
VUtil.assertNotNull( pObj, GlobalErrIds.PERM_OBJECT_NULL, CLS_NM + ".deletePermObj" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( pObj );
if ( this.adminSess != null )
{
@@ -629,8 +610,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( perm, GlobalErrIds.PERM_OPERATION_NULL, CLS_NM + ".grantPermission" );
VUtil.assertNotNull( role, GlobalErrIds.ROLE_NULL, CLS_NM + ".grantPermission" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
PermGrant permGrant = new PermGrant();
permGrant.setAdmin( perm.isAdmin() );
permGrant.setObjName( perm.getObjName() );
@@ -661,8 +641,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( perm, GlobalErrIds.PERM_OPERATION_NULL, CLS_NM + ".revokePermission" );
VUtil.assertNotNull( role, GlobalErrIds.ROLE_NULL, CLS_NM + ".revokePermission" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
PermGrant permGrant = new PermGrant();
permGrant.setAdmin( perm.isAdmin() );
permGrant.setObjName( perm.getObjName() );
@@ -693,8 +672,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( perm, GlobalErrIds.PERM_OPERATION_NULL, CLS_NM + ".grantPermissionUser" );
VUtil.assertNotNull( user, GlobalErrIds.USER_NULL, CLS_NM + ".grantPermissionUser" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
PermGrant permGrant = new PermGrant();
permGrant.setAdmin( perm.isAdmin() );
permGrant.setObjName( perm.getObjName() );
@@ -725,8 +703,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( perm, GlobalErrIds.PERM_OPERATION_NULL, CLS_NM + ".revokePermission" );
VUtil.assertNotNull( user, GlobalErrIds.USER_NULL, CLS_NM + ".revokePermission" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
PermGrant permGrant = new PermGrant();
permGrant.setAdmin( perm.isAdmin() );
permGrant.setObjName( perm.getObjName() );
@@ -757,8 +734,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( parentRole, GlobalErrIds.PARENT_ROLE_NULL, CLS_NM + ".addDescendant" );
VUtil.assertNotNull( childRole, GlobalErrIds.CHILD_ROLE_NULL, CLS_NM + ".addDescendant" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
RoleRelationship relationship = new RoleRelationship();
relationship.setParent( parentRole );
relationship.setChild( childRole );
@@ -786,8 +762,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( parentRole, GlobalErrIds.PARENT_ROLE_NULL, CLS_NM + ".addAscendant" );
VUtil.assertNotNull( childRole, GlobalErrIds.CHILD_ROLE_NULL, CLS_NM + ".addAscendant" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
RoleRelationship relationship = new RoleRelationship();
relationship.setParent( parentRole );
relationship.setChild( childRole );
@@ -815,8 +790,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( parentRole, GlobalErrIds.PARENT_ROLE_NULL, CLS_NM + ".addInheritance" );
VUtil.assertNotNull( childRole, GlobalErrIds.CHILD_ROLE_NULL, CLS_NM + ".addInheritance" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
RoleRelationship relationship = new RoleRelationship();
relationship.setParent( parentRole );
relationship.setChild( childRole );
@@ -844,8 +818,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( parentRole, GlobalErrIds.PARENT_ROLE_NULL, CLS_NM + ".deleteInheritance" );
VUtil.assertNotNull( childRole, GlobalErrIds.CHILD_ROLE_NULL, CLS_NM + ".deleteInheritance" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
RoleRelationship relationship = new RoleRelationship();
relationship.setParent( parentRole );
relationship.setChild( childRole );
@@ -873,8 +846,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( ssdSet, GlobalErrIds.SSD_NULL, CLS_NM + ".createSsdSet" );
SDSet retSet;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( ssdSet );
if ( this.adminSess != null )
{
@@ -903,8 +875,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( ssdSet, GlobalErrIds.SSD_NULL, CLS_NM + ".updateSsdSet" );
SDSet retSet;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( ssdSet );
if ( this.adminSess != null )
{
@@ -935,8 +906,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
VUtil.assertNotNull( ssdSet, GlobalErrIds.SSD_NULL, CLS_NM + ".addSsdRoleMember" );
VUtil.assertNotNull( role, GlobalErrIds.ROLE_NULL, CLS_NM + ".addSsdRoleMember" );
SDSet retSet;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( ssdSet );
request.setValue( role.getName() );
if ( this.adminSess != null )
@@ -968,8 +938,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
VUtil.assertNotNull( ssdSet, GlobalErrIds.SSD_NULL, CLS_NM + ".deleteSsdRoleMember" );
VUtil.assertNotNull( role, GlobalErrIds.ROLE_NULL, CLS_NM + ".deleteSsdRoleMember" );
SDSet retSet;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( ssdSet );
request.setValue( role.getName() );
if ( this.adminSess != null )
@@ -1000,8 +969,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( ssdSet, GlobalErrIds.SSD_NULL, CLS_NM + ".deleteSsdSet" );
SDSet retSet;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( ssdSet );
if ( this.adminSess != null )
{
@@ -1031,8 +999,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( ssdSet, GlobalErrIds.SSD_NULL, CLS_NM + ".setSsdSetCardinality" );
SDSet retSet;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
ssdSet.setCardinality( cardinality );
request.setEntity( ssdSet );
if ( this.adminSess != null )
@@ -1063,8 +1030,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( dsdSet, GlobalErrIds.SSD_NULL, CLS_NM + ".createDsdSet" );
SDSet retSet;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( dsdSet );
if ( this.adminSess != null )
{
@@ -1093,8 +1059,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( dsdSet, GlobalErrIds.SSD_NULL, CLS_NM + ".updateDsdSet" );
SDSet retSet;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( dsdSet );
if ( this.adminSess != null )
{
@@ -1125,8 +1090,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
VUtil.assertNotNull( dsdSet, GlobalErrIds.SSD_NULL, CLS_NM + ".addDsdRoleMember" );
VUtil.assertNotNull( role, GlobalErrIds.ROLE_NULL, CLS_NM + ".addDsdRoleMember" );
SDSet retSet;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( dsdSet );
request.setValue( role.getName() );
if ( this.adminSess != null )
@@ -1158,8 +1122,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
VUtil.assertNotNull( dsdSet, GlobalErrIds.SSD_NULL, CLS_NM + ".deleteDsdRoleMember" );
VUtil.assertNotNull( role, GlobalErrIds.ROLE_NULL, CLS_NM + ".deleteSsdRoleMember" );
SDSet retSet;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( dsdSet );
request.setValue( role.getName() );
if ( this.adminSess != null )
@@ -1190,8 +1153,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( dsdSet, GlobalErrIds.SSD_NULL, CLS_NM + ".deleteDsdSet" );
SDSet retSet;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( dsdSet );
if ( this.adminSess != null )
{
@@ -1221,8 +1183,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( dsdSet, GlobalErrIds.SSD_NULL, CLS_NM + ".setSsdSetCardinality" );
SDSet retSet;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
dsdSet.setCardinality( cardinality );
request.setEntity( dsdSet );
if ( this.adminSess != null )
@@ -1254,8 +1215,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
VUtil.assertNotNull( uRole, GlobalErrIds.URLE_NULL, CLS_NM + ".addRoleConstraint" );
VUtil.assertNotNull( roleConstraint, GlobalErrIds.RCON_NULL, CLS_NM + ".addRoleConstraint" );
RoleConstraint retCnst;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( uRole );
request.setEntity2( roleConstraint );
if ( this.adminSess != null )
@@ -1285,8 +1245,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( uRole, GlobalErrIds.URLE_NULL, CLS_NM + ".removeRoleConstraint" );
VUtil.assertNotNull( roleConstraint, GlobalErrIds.RCON_NULL, CLS_NM + ".removeRoleConstraint" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( uRole );
request.setEntity2( roleConstraint );
if ( this.adminSess != null )
@@ -1312,8 +1271,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( permAttributeSet, GlobalErrIds.PERM_ATTRIBUTE_SET_NULL, CLS_NM + ".addPermissionAttributeSet" );
PermissionAttributeSet retSet;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( permAttributeSet );
if ( this.adminSess != null )
{
@@ -1342,8 +1300,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
PermissionAttributeSet permAttributeSet) throws SecurityException
{
VUtil.assertNotNull( permAttributeSet, GlobalErrIds.PERM_ATTRIBUTE_SET_NULL, CLS_NM + ".deletePermissionAttributeSet" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( permAttributeSet );
if ( this.adminSess != null )
{
@@ -1369,8 +1326,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
VUtil.assertNotNull( permAttribute, GlobalErrIds.PERM_ATTRIBUTE_SET_NULL, CLS_NM + ".addPermissionAttributeToSet" );
VUtil.assertNotNull( attributeSetName, GlobalErrIds.PERM_ATTRIBUTE_SET_NM_NULL, CLS_NM + ".addPermissionAttributeToSet" );
PermissionAttribute retAttr;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( permAttribute );
request.setValue( attributeSetName );
if ( this.adminSess != null )
@@ -1401,8 +1357,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
{
VUtil.assertNotNull( permAttribute, GlobalErrIds.PERM_ATTRIBUTE_SET_NULL, CLS_NM + ".removePermissionAttributeFromSet" );
VUtil.assertNotNull( attributeSetName, GlobalErrIds.PERM_ATTRIBUTE_SET_NM_NULL, CLS_NM + ".removePermissionAttributeFromSet" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( permAttribute );
request.setValue( attributeSetName );
if ( this.adminSess != null )
@@ -1429,8 +1384,7 @@ public final class AdminMgrRestImpl extends Manageable implements AdminMgr
VUtil.assertNotNull( permAttribute, GlobalErrIds.PERM_ATTRIBUTE_SET_NULL, CLS_NM + ".updatePermissionAttributeInSet" );
VUtil.assertNotNull( attributeSetName, GlobalErrIds.PERM_ATTRIBUTE_SET_NM_NULL, CLS_NM + ".updatePermissionAttributeInSet" );
PermissionAttribute retAttr;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( permAttribute );
request.setValue( attributeSetName );
request.setIsFlag( replaceValidValues );
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9619dfe6/src/main/java/org/apache/directory/fortress/core/rest/GroupMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/GroupMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/GroupMgrRestImpl.java
index ebf0091..94b5e82 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/GroupMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/GroupMgrRestImpl.java
@@ -52,8 +52,7 @@ public class GroupMgrRestImpl extends Manageable implements GroupMgr
{
VUtil.assertNotNull( group, GlobalErrIds.GROUP_NULL, CLS_NM + ".add" );
Group retGroup;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( group );
if ( this.adminSess != null )
{
@@ -81,8 +80,7 @@ public class GroupMgrRestImpl extends Manageable implements GroupMgr
{
VUtil.assertNotNull( group, GlobalErrIds.GROUP_NULL, CLS_NM + ".update" );
Group retGroup;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( group );
if ( this.adminSess != null )
{
@@ -110,8 +108,7 @@ public class GroupMgrRestImpl extends Manageable implements GroupMgr
{
VUtil.assertNotNull( group, GlobalErrIds.GROUP_NULL, CLS_NM + ".delete" );
Group retGroup;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( group );
if ( this.adminSess != null )
{
@@ -261,8 +258,7 @@ public class GroupMgrRestImpl extends Manageable implements GroupMgr
VUtil.assertNotNull( group, GlobalErrIds.GROUP_NULL, CLS_NM + ".assign" );
VUtil.assertNotNull( member, GlobalErrIds.GROUP_MEMBER_NULL, CLS_NM + ".assign" );
Group retGroup;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( group );
request.setValue( member );
if ( this.adminSess != null )
@@ -292,8 +288,7 @@ public class GroupMgrRestImpl extends Manageable implements GroupMgr
VUtil.assertNotNull( group, GlobalErrIds.GROUP_NULL, CLS_NM + ".deassign" );
VUtil.assertNotNull( member, GlobalErrIds.GROUP_MEMBER_NULL, CLS_NM + ".deassign" );
Group retGroup;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( group );
request.setValue( member );
if ( this.adminSess != null )
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9619dfe6/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java
index fbb5de1..bca0ca2 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/PwPolicyMgrRestImpl.java
@@ -74,8 +74,7 @@ public class PwPolicyMgrRestImpl extends Manageable implements PwPolicyMgr
throws SecurityException
{
VUtil.assertNotNull( policy, GlobalErrIds.PSWD_PLCY_NULL, CLS_NM + ".add" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( policy );
if ( this.adminSess != null )
{
@@ -99,8 +98,7 @@ public class PwPolicyMgrRestImpl extends Manageable implements PwPolicyMgr
throws SecurityException
{
VUtil.assertNotNull( policy, GlobalErrIds.PSWD_PLCY_NULL, CLS_NM + ".update" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( policy );
if ( this.adminSess != null )
{
@@ -124,8 +122,7 @@ public class PwPolicyMgrRestImpl extends Manageable implements PwPolicyMgr
throws SecurityException
{
VUtil.assertNotNull( policy, GlobalErrIds.PSWD_NAME_NULL, CLS_NM + ".delete" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( policy );
if ( this.adminSess != null )
{
@@ -150,8 +147,7 @@ public class PwPolicyMgrRestImpl extends Manageable implements PwPolicyMgr
{
VUtil.assertNotNullOrEmpty( name, GlobalErrIds.PSWD_NAME_NULL, CLS_NM + ".read" );
PwPolicy retPolicy;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( new PwPolicy( name ) );
if ( this.adminSess != null )
{
@@ -181,8 +177,7 @@ public class PwPolicyMgrRestImpl extends Manageable implements PwPolicyMgr
{
VUtil.assertNotNull( searchVal, GlobalErrIds.PSWD_NAME_NULL, CLS_NM + ".search" );
List<PwPolicy> retPolicies;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( new PwPolicy( searchVal ) );
if ( this.adminSess != null )
{
@@ -213,8 +208,7 @@ public class PwPolicyMgrRestImpl extends Manageable implements PwPolicyMgr
String methodName = "updateUserPolicy";
VUtil.assertNotNullOrEmpty( userId, GlobalErrIds.USER_NULL, CLS_NM + "." + methodName );
VUtil.assertNotNullOrEmpty( name, GlobalErrIds.PSWD_NAME_NULL, CLS_NM + "." + methodName );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity( new PwPolicy( name ) );
request.setValue( userId );
if ( this.adminSess != null )
@@ -239,8 +233,7 @@ public class PwPolicyMgrRestImpl extends Manageable implements PwPolicyMgr
throws SecurityException
{
VUtil.assertNotNullOrEmpty( userId, GlobalErrIds.USER_NULL, CLS_NM + ".deletePasswordPolicy" );
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setValue( userId );
if ( this.adminSess != null )
{
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9619dfe6/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java b/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
index b7a93dd..fe8f967 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
@@ -93,6 +93,18 @@ public final class RestUtils
// These members contain the http coordinates to a running fortress-rest instance:
private String httpUid, httpPw, httpHost, httpPort, httpProtocol, fortressRestVersion, serviceName, uri;
+ /**
+ * create a new request and set its tenant id.
+ * @param szContextId contains the tenant id
+ * @return a brand new FortRequest
+ */
+ static FortRequest getRequest( String szContextId )
+ {
+ FortRequest request = new FortRequest();
+ request.setContextId(szContextId);
+ return request;
+ }
+
public static RestUtils getInstance()
{
if(sINSTANCE == null)
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/9619dfe6/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java b/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
index a175726..4e4b910 100755
--- a/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/ReviewMgrRestImpl.java
@@ -567,8 +567,7 @@ public class ReviewMgrRestImpl extends Manageable implements ReviewMgr
{
VUtil.assertNotNull(role, GlobalErrIds.ROLE_NULL, CLS_NM + ".assignedUsers");
List<User> retUsers;
- FortRequest request = new FortRequest();
- request.setContextId( this.contextId );
+ FortRequest request = RestUtils.getRequest( this.contextId );
request.setEntity(role);
if (this.adminSess != null)
{
[2/2] directory-fortress-core git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/directory-fortress-core
Posted by sm...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-fortress-core
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/40eb3b9c
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/40eb3b9c
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/40eb3b9c
Branch: refs/heads/master
Commit: 40eb3b9c99e362b99da321682a12d38838d9c490
Parents: 9619dfe 03a5629
Author: Shawn McKinney <sm...@apache.org>
Authored: Sat Dec 3 19:19:24 2016 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sat Dec 3 19:19:24 2016 -0600
----------------------------------------------------------------------
.../Dockerfile | 45 ++++++++
.../run-tests.sh | 58 ++++++++++
.../slapd.conf | 115 +++++++++++++++++++
3 files changed, 218 insertions(+)
----------------------------------------------------------------------