directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cp...@apache.org
Subject [01/43] directory-fortress-core git commit: changed constaints on userrole to list
Date Thu, 06 Oct 2016 17:49:18 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master cb34ef224 -> 33b49fe5f


changed constaints on userrole to list


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

Branch: refs/heads/master
Commit: e3a74de4a025b010b35723da7a7f8fbdaffbfa5e
Parents: b5886da
Author: clp207 <clp207@psu.edu>
Authored: Mon Feb 1 16:56:24 2016 -0500
Committer: clp207 <clp207@psu.edu>
Committed: Wed Mar 30 15:44:22 2016 -0400

----------------------------------------------------------------------
 .../directory/fortress/core/model/RoleConstraint.java    |  3 +--
 .../apache/directory/fortress/core/model/UserRole.java   | 11 ++++++-----
 .../directory/fortress/core/impl/ReviewMgrImplTest.java  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e3a74de4/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java b/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java
index 5b76178..b893e4a 100644
--- a/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/RoleConstraint.java
@@ -38,8 +38,7 @@ public class RoleConstraint {
 
 	public void setPaSetName(String paSetName) {
 		this.paSetName = paSetName;
-	}
-	
+	}	
 	
 	//BANK_USER$seq$0type$filter$ecomm.merchant.id$AccountId=12345&WithdrawLimit=500
 	public String getRawData(UserRole uRole){

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e3a74de4/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/model/UserRole.java b/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
index 11e4404..52d639d 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/UserRole.java
@@ -21,7 +21,8 @@ package org.apache.directory.fortress.core.model;
 
 
 import java.io.Serializable;
-import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -93,7 +94,7 @@ public class UserRole extends FortEntity implements Serializable, Constraint
     @XmlElement( nillable = true )
     private Set<String> parents;
     @XmlElement( nillable = true )
-    private Set<RoleConstraint> roleConstraints;
+    private List<RoleConstraint> roleConstraints;
 
     /**
      * Default constructor is used by internal Fortress classes.
@@ -644,15 +645,15 @@ public class UserRole extends FortEntity implements Serializable, Constraint
     }
 
 
-	public Set<RoleConstraint> getRoleConstraints() {
+	public List<RoleConstraint> getRoleConstraints() {
 		if(roleConstraints == null){
-			roleConstraints = new HashSet<RoleConstraint>();
+			roleConstraints = new ArrayList<RoleConstraint>();
 		}
 		return roleConstraints;
 	}
 
 
-	public void setRoleConstraints(Set<RoleConstraint> roleConstraints) {
+	public void setRoleConstraints(List<RoleConstraint> roleConstraints) {
 		this.roleConstraints = roleConstraints;
 	}
 }

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/e3a74de4/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
b/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
index b6371e5..d9a9c4d 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/ReviewMgrImplTest.java
@@ -1628,7 +1628,7 @@ public class ReviewMgrImplTest extends TestCase
     			if(ur.getName().equals(role.getName())){
     				uraFound = true;
     				
-    				Set<RoleConstraint> rcs = ur.getRoleConstraints();
+    				List<RoleConstraint> rcs = ur.getRoleConstraints();
     				for(RoleConstraint r : rcs){
     					if(r.getPaSetName().equals(rc.getPaSetName())){
     						urcFound = true;


Mime
View raw message