This is an automated email from the ASF dual-hosted git repository. gk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-security.git
commit f51f6dde7387d4f480671cbbab670b8978143a13 Author: Georg Kallidis <[email protected]> AuthorDate: Tue Dec 14 12:06:40 2021 +0100 Update: Use Java 8 streams and Method refs, update .gitignore --- .../dynamic/DynamicAccessControlListImpl.java | 55 +++++++--------------- .../turbine/TurbineAccessControlListImpl.java | 41 +++++----------- .../test/AbstractTurbineModelManagerTest.java | 15 +++--- pom.xml | 2 +- 4 files changed, 34 insertions(+), 79 deletions(-) diff --git a/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicAccessControlListImpl.java b/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicAccessControlListImpl.java index f24c0bf..5883da1 100644 --- a/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicAccessControlListImpl.java +++ b/api/src/java/org/apache/fulcrum/security/model/dynamic/DynamicAccessControlListImpl.java @@ -182,15 +182,9 @@ public class DynamicAccessControlListImpl implements DynamicAccessControlList return false; } - for (Group group : groupset) - { - RoleSet roles = getRoles(group); - if (roles != null && roles.contains(role)) - { - return true; - } - } - return false; + return groupset.stream() + .map(this::getRoles) + .anyMatch(roles -> roles != null && roles.contains(role)); } /** @@ -244,16 +238,10 @@ public class DynamicAccessControlListImpl implements DynamicAccessControlList { return false; } - - for (Group group : groupset) - { - RoleSet roles = getRoles(group); - if (roles != null && roles.contains(role)) - { - return true; - } - } - return false; + + return groupset.stream() + .map(this::getRoles) + .anyMatch(roles -> roles != null && roles.contains(role)); } /** @@ -315,16 +303,10 @@ public class DynamicAccessControlListImpl implements DynamicAccessControlList { return false; } - - for (Group group : groupset) - { - PermissionSet permissions = getPermissions(group); - if (permissions != null && permissions.contains(permission)) - { - return true; - } - } - return false; + + return groupset.stream() + .map(this::getPermissions) + .anyMatch(permissions -> permissions != null && permissions.contains(permission)); } /** @@ -387,16 +369,11 @@ public class DynamicAccessControlListImpl implements DynamicAccessControlList { return false; } - - for (Group group : groupset) - { - PermissionSet permissions = getPermissions(group); - if (permissions != null && permissions.contains(permission)) - { - return true; - } - } - return false; + + return groupset.stream() + .map(this::getPermissions) + .anyMatch(permissions -> permissions != null + && permissions.contains(permission)); } /** diff --git a/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineAccessControlListImpl.java b/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineAccessControlListImpl.java index 34b9957..3daf84a 100644 --- a/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineAccessControlListImpl.java +++ b/api/src/java/org/apache/fulcrum/security/model/turbine/TurbineAccessControlListImpl.java @@ -255,16 +255,9 @@ public class TurbineAccessControlListImpl return false; } - for (Group group : groupset) - { - RoleSet roles = getRoles(group); - if (roles != null && roles.contains(role)) - { - return true; - } - } - - return false; + return groupset.stream() + .map(this::getRoles) + .anyMatch(roles -> roles != null && roles.contains(role)); } /** @@ -375,16 +368,9 @@ public class TurbineAccessControlListImpl return false; } - for (Group group : groupset) - { - PermissionSet permissions = getPermissions(group); - if (permissions != null && permissions.contains(permission)) - { - return true; - } - } - - return false; + return groupset.stream() + .map(this::getPermissions) + .anyMatch(permissions -> permissions != null && permissions.contains(permission)); } /** @@ -453,16 +439,11 @@ public class TurbineAccessControlListImpl { return false; } - - for (Group group : groupset) - { - PermissionSet permissions = getPermissions(group); - if (permissions != null && permissions.contains(permission)) - { - return true; - } - } - return false; + + return groupset.stream() + .map(this::getPermissions) + .anyMatch(permissions -> permissions != null + && permissions.contains(permission)); } /** diff --git a/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java b/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java index 19b76fb..2fc585f 100644 --- a/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java +++ b/api/src/test/org/apache/fulcrum/security/model/turbine/test/AbstractTurbineModelManagerTest.java @@ -271,15 +271,12 @@ public abstract class AbstractTurbineModelManagerTest extends BaseUnit5Test roleManager.addRole(role); modelManager.grant(user, group, role); modelManager.revoke(user, group, role); - boolean ugrFound = false; - for (TurbineUserGroupRole ugr : ((TurbineUser) user).getUserGroupRoleSet()) - { - if (ugr.getUser().equals(user) && ugr.getGroup().equals(group) && ugr.getRole().equals(role)) - { - ugrFound = true; - break; - } - } + boolean ugrFound = ((TurbineUser) user) + .getUserGroupRoleSet().stream() + .anyMatch(ugr -> ugr.getUser().equals(user) + && ugr.getGroup().equals(group) + && ugr.getRole().equals(role)); + assertFalse(ugrFound); } diff --git a/pom.xml b/pom.xml index 7fa2219..c236a2c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>turbine-parent</artifactId> <groupId>org.apache.turbine</groupId> - <version>9</version> + <version>10-SNAPSHOT</version> <relativePath /> </parent> <modelVersion>4.0.0</modelVersion>
