directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject [3/5] directory-fortress-core git commit: renamed set methods with same name in models
Date Sat, 09 Jan 2016 00:15:06 GMT
renamed set methods with same name in models


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/463c7912
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/463c7912
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/463c7912

Branch: refs/heads/master
Commit: 463c7912ae4428ca0b839be1cee1ce41cc8ae76e
Parents: af716a3
Author: clp207 <clp207@psu.edu>
Authored: Tue Jan 5 12:01:31 2016 -0500
Committer: clp207 <clp207@psu.edu>
Committed: Fri Jan 8 14:51:37 2016 -0500

----------------------------------------------------------------------
 .../directory/fortress/core/cli/Options.java     | 12 ++++++------
 .../fortress/core/impl/AdminRoleDAO.java         |  8 ++++----
 .../fortress/core/impl/DelAdminMgrImpl.java      | 12 ++++++------
 .../directory/fortress/core/impl/UserP.java      | 19 +++++++++----------
 .../directory/fortress/core/model/AdminRole.java |  4 ++--
 .../fortress/core/model/Administrator.java       |  4 ++--
 .../directory/fortress/core/model/User.java      |  4 ++--
 .../fortress/core/model/UserAdminRole.java       |  4 ++--
 8 files changed, 33 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/src/main/java/org/apache/directory/fortress/core/cli/Options.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/cli/Options.java b/src/main/java/org/apache/directory/fortress/core/cli/Options.java
index f229766..9990a8d 100755
--- a/src/main/java/org/apache/directory/fortress/core/cli/Options.java
+++ b/src/main/java/org/apache/directory/fortress/core/cli/Options.java
@@ -19,11 +19,14 @@
  */
 package org.apache.directory.fortress.core.cli;
 
+import java.util.Vector;
+
 import org.apache.commons.lang.StringUtils;
 import org.apache.directory.fortress.core.GlobalIds;
-import org.apache.directory.fortress.core.model.Group;
 import org.apache.directory.fortress.core.model.Address;
 import org.apache.directory.fortress.core.model.AdminRole;
+import org.apache.directory.fortress.core.model.Constraint;
+import org.apache.directory.fortress.core.model.Group;
 import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.model.PermObj;
 import org.apache.directory.fortress.core.model.Permission;
@@ -31,9 +34,6 @@ import org.apache.directory.fortress.core.model.Relationship;
 import org.apache.directory.fortress.core.model.Role;
 import org.apache.directory.fortress.core.model.SDSet;
 import org.apache.directory.fortress.core.model.User;
-import org.apache.directory.fortress.core.model.Constraint;
-
-import java.util.Vector;
 
 /**
  * This converts between Fortress entities and the JArg Options.  It contains attributes
passed from JArgs command interpreter.
@@ -411,7 +411,7 @@ public class Options implements java.io.Serializable
             for (Object raw : fractionValues)
             {
                 String szRaw = (String) raw;
-                user.setRole(szRaw);
+                user.setRoleName(szRaw);
             }
         }
     }
@@ -437,7 +437,7 @@ public class Options implements java.io.Serializable
             for (Object raw : fractionValues)
             {
                 String szRaw = (String) raw;
-                user.setAdminRole(szRaw);
+                user.setAdminRoleName(szRaw);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
index 999662f..49a3d17 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/AdminRoleDAO.java
@@ -41,13 +41,13 @@ import org.apache.directory.fortress.core.CreateException;
 import org.apache.directory.fortress.core.FinderException;
 import org.apache.directory.fortress.core.GlobalErrIds;
 import org.apache.directory.fortress.core.GlobalIds;
-import org.apache.directory.fortress.core.model.ConstraintUtil;
-import org.apache.directory.fortress.core.model.ObjectFactory;
 import org.apache.directory.fortress.core.RemoveException;
 import org.apache.directory.fortress.core.UpdateException;
 import org.apache.directory.fortress.core.ldap.ApacheDsDataProvider;
 import org.apache.directory.fortress.core.model.AdminRole;
+import org.apache.directory.fortress.core.model.ConstraintUtil;
 import org.apache.directory.fortress.core.model.Graphable;
+import org.apache.directory.fortress.core.model.ObjectFactory;
 import org.apache.directory.fortress.core.model.Role;
 import org.apache.directory.ldap.client.api.LdapConnection;
 
@@ -676,8 +676,8 @@ final class AdminRoleDAO extends ApacheDsDataProvider
         entity.setId( getAttribute( le, GlobalIds.FT_IID ) );
         entity.setDescription( getAttribute( le, SchemaConstants.DESCRIPTION_AT ) );
         entity.setOccupants( getAttributes( le, ROLE_OCCUPANT ) );
-        entity.setOsP( getAttributeSet( le, ROLE_OSP ) );
-        entity.setOsU( getAttributeSet( le, ROLE_OSU ) );
+        entity.setOsPs( getAttributeSet( le, ROLE_OSP ) );
+        entity.setOsUs( getAttributeSet( le, ROLE_OSU ) );
         entity.setName( getAttribute( le, SchemaConstants.CN_AT ) );
         unloadTemporal( le, entity );
         entity.setRoleRangeRaw( getAttribute( le, ROLE_RANGE ) );

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
index cf79a09..8a9e45c 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/DelAdminMgrImpl.java
@@ -19,12 +19,15 @@
  */
 package org.apache.directory.fortress.core.impl;
 
+import java.util.List;
+import java.util.Set;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.directory.fortress.core.AdminMgr;
 import org.apache.directory.fortress.core.AdminMgrFactory;
 import org.apache.directory.fortress.core.DelAdminMgr;
-import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.GlobalErrIds;
+import org.apache.directory.fortress.core.SecurityException;
 import org.apache.directory.fortress.core.model.AdminRole;
 import org.apache.directory.fortress.core.model.ConstraintUtil;
 import org.apache.directory.fortress.core.model.Hier;
@@ -36,9 +39,6 @@ import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.model.UserAdminRole;
 import org.apache.directory.fortress.core.util.VUtil;
 
-import java.util.List;
-import java.util.Set;
-
 /**
  * This class implements the ARBAC02 DelAdminMgr interface for performing policy administration
of Fortress ARBAC entities
  * that reside in LDAP directory.
@@ -146,8 +146,8 @@ public final class DelAdminMgrImpl extends Manageable implements DelAdminMgr
                 UserAdminRole chgRole = new UserAdminRole();
                 chgRole.setName(role.getName());
                 chgRole.setUserId(ue.getUserId());
-                chgRole.setOsP(role.getOsP());
-                chgRole.setOsU(role.getOsU());
+                chgRole.setOsPs(role.getOsP());
+                chgRole.setOsUs(role.getOsU());
                 uaRoles.remove(chgRole);
                 ConstraintUtil.copy( re, chgRole );
                 uaRoles.add(chgRole);

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
index b947879..0a1ce88 100755
--- a/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
+++ b/src/main/java/org/apache/directory/fortress/core/impl/UserP.java
@@ -27,9 +27,15 @@ import java.util.Set;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.directory.fortress.core.GlobalErrIds;
+import org.apache.directory.fortress.core.GlobalIds;
+import org.apache.directory.fortress.core.PasswordException;
+import org.apache.directory.fortress.core.SecurityException;
+import org.apache.directory.fortress.core.ValidationException;
 import org.apache.directory.fortress.core.model.AdminRole;
 import org.apache.directory.fortress.core.model.Administrator;
 import org.apache.directory.fortress.core.model.ConstraintUtil;
+import org.apache.directory.fortress.core.model.ObjectFactory;
 import org.apache.directory.fortress.core.model.OrgUnit;
 import org.apache.directory.fortress.core.model.PwPolicy;
 import org.apache.directory.fortress.core.model.Role;
@@ -37,17 +43,10 @@ import org.apache.directory.fortress.core.model.Session;
 import org.apache.directory.fortress.core.model.User;
 import org.apache.directory.fortress.core.model.UserAdminRole;
 import org.apache.directory.fortress.core.model.UserRole;
+import org.apache.directory.fortress.core.util.VUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.directory.fortress.core.GlobalErrIds;
-import org.apache.directory.fortress.core.GlobalIds;
-import org.apache.directory.fortress.core.model.ObjectFactory;
-import org.apache.directory.fortress.core.PasswordException;
-import org.apache.directory.fortress.core.SecurityException;
-import org.apache.directory.fortress.core.ValidationException;
-import org.apache.directory.fortress.core.util.VUtil;
-
 
 /**
  * Process module for the User entity.  This class performs data validations and error mapping.
 It is typically called
@@ -882,7 +881,7 @@ final class UserP
         trgR.setBeginRange(srcR.getBeginRange());
         trgR.setEndRange(srcR.getEndRange());
         // copy the user and perm pools:
-        trgR.setOsP(srcR.getOsP());
-        trgR.setOsU(srcR.getOsU());
+        trgR.setOsPs(srcR.getOsP());
+        trgR.setOsUs(srcR.getOsU());
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
index 7c64471..ad39bc8 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/AdminRole.java
@@ -313,7 +313,7 @@ public class AdminRole extends Role implements Administrator
      * @param osPs is a List of type String containing Perm OU.  This maps to 'ftOSP' attribute
on 'ftPools' aux object class.
      */
     @Override
-    public void setOsP( Set<String> osPs )
+    public void setOsPs( Set<String> osPs )
     {
         this.osPs = osPs;
     }
@@ -354,7 +354,7 @@ public class AdminRole extends Role implements Administrator
      * @param osUs is a List of type String containing User OU.  This maps to 'ftOSU' attribute
on 'ftPools' aux object class.
      */
     @Override
-    public void setOsU( Set<String> osUs )
+    public void setOsUs( Set<String> osUs )
     {
         this.osUs = osUs;
     }

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/Administrator.java b/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
index 4d9551d..55db8e8 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/Administrator.java
@@ -45,7 +45,7 @@ public interface Administrator
      *
      * @param osPs is a List of type String containing Perm OU.  This maps to 'ftOSP' attribute
on 'ftPools' aux object class.
      */
-    void setOsP( Set<String> osPs );
+    void setOsPs( Set<String> osPs );
 
 
     /**
@@ -69,7 +69,7 @@ public interface Administrator
      *
      * @param osUs is a List of type String containing User OU.  This maps to 'ftOSU' attribute
on 'ftPools' aux object class.
      */
-    void setOsU( Set<String> osUs );
+    void setOsUs( Set<String> osUs );
 
 
     /**

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/src/main/java/org/apache/directory/fortress/core/model/User.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/User.java b/src/main/java/org/apache/directory/fortress/core/model/User.java
index b69ab53..eb13b95 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/User.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/User.java
@@ -690,7 +690,7 @@ public class User extends FortEntity implements Constraint, Serializable
      *
      * @param roleName contains role name to target for activation into {@link org.apache.directory.fortress.core.model.Session}.
      */
-    public void setRole( String roleName )
+    public void setRoleName( String roleName )
     {
         if ( roles == null )
         {
@@ -764,7 +764,7 @@ public class User extends FortEntity implements Constraint, Serializable
      *
      * @param roleName contrains adminRole name.
      */
-    public void setAdminRole( String roleName )
+    public void setAdminRoleName( String roleName )
     {
         if ( adminRoles == null )
         {

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/463c7912/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
index a88e9a1..4bb60e4 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserAdminRole.java
@@ -425,7 +425,7 @@ public class UserAdminRole extends UserRole implements Administrator
      * @param osPs is a List of type String containing Perm OU.  This maps to 'ftARC' attribute
on 'ftUserAttrs' aux object class.
      */
     @Override
-    public void setOsP( Set<String> osPs )
+    public void setOsPs( Set<String> osPs )
     {
         this.osPs = osPs;
     }
@@ -466,7 +466,7 @@ public class UserAdminRole extends UserRole implements Administrator
      * @param osUs is a List of type String containing User OU.  This maps to 'ftARC' attribute
on 'ftUserAttrs' aux object class.
      */
     @Override
-    public void setOsU( Set<String> osUs )
+    public void setOsUs( Set<String> osUs )
     {
         this.osUs = osUs;
     }


Mime
View raw message