You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2022/01/10 14:05:02 UTC
[turbine-fulcrum-security] branch master updated (cacbef7 -> ac886f8)
This is an automated email from the ASF dual-hosted git repository.
gk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-fulcrum-security.git.
from cacbef7 site and dist fixes
new 14452e5 Remove duplicate custom/skin setting (since Turbone Parent 10
new f51f6dd Update: Use Java 8 streams and Method refs, update .gitignore
new ac886f8 Update Turbine Parent 11
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../dynamic/DynamicAccessControlListImpl.java | 55 +++++++---------------
.../turbine/TurbineAccessControlListImpl.java | 41 +++++-----------
api/src/site/site.xml | 11 -----
.../test/AbstractTurbineModelManagerTest.java | 15 +++---
hibernate/src/site/site.xml | 13 +----
pom.xml | 2 +-
src/site/site.xml | 13 +----
torque/src/site/site.xml | 13 +----
8 files changed, 37 insertions(+), 126 deletions(-)
[turbine-fulcrum-security] 03/03: Update Turbine Parent 11
Posted by gk...@apache.org.
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 ac886f890db858518ad2cddced1ebc3244d1a1fe
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Mon Jan 10 14:25:38 2022 +0100
Update Turbine Parent 11
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c236a2c..1149ce1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>10-SNAPSHOT</version>
+ <version>11</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
[turbine-fulcrum-security] 01/03: Remove duplicate custom/skin setting (since Turbone Parent 10
Posted by gk...@apache.org.
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 14452e5f13f497a56c6dc31a669cdaf8c6424a44
Author: Georg Kallidis <gk...@apache.org>
AuthorDate: Tue Dec 14 11:43:21 2021 +0100
Remove duplicate custom/skin setting (since Turbone Parent 10
---
api/src/site/site.xml | 11 -----------
hibernate/src/site/site.xml | 13 +------------
src/site/site.xml | 13 +------------
torque/src/site/site.xml | 13 +------------
4 files changed, 3 insertions(+), 47 deletions(-)
diff --git a/api/src/site/site.xml b/api/src/site/site.xml
index 78f58b8..1f4c489 100644
--- a/api/src/site/site.xml
+++ b/api/src/site/site.xml
@@ -19,20 +19,9 @@
-->
<project name="Fulcrum Security API">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>1.9</version>
- </skin>
<body>
</body>
- <custom>
- <fluidoSkin>
- <topBarEnabled>false</topBarEnabled>
- <sideBarEnabled>true</sideBarEnabled>
- </fluidoSkin>
- </custom>
</project>
diff --git a/hibernate/src/site/site.xml b/hibernate/src/site/site.xml
index fa156d8..1acd020 100644
--- a/hibernate/src/site/site.xml
+++ b/hibernate/src/site/site.xml
@@ -18,19 +18,8 @@
under the License.
-->
<project name="Fulcrum Security Hibernate Implementation">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>1.9</version>
- </skin>
<body>
</body>
-
-<custom>
- <fluidoSkin>
- <topBarEnabled>false</topBarEnabled>
- <sideBarEnabled>true</sideBarEnabled>
- </fluidoSkin>
- </custom>
+
</project>
diff --git a/src/site/site.xml b/src/site/site.xml
index 632001a..269b4d1 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -19,11 +19,6 @@
-->
<project name="Fulcrum Security">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>1.9</version>
- </skin>
<body>
<menu name="Overview" inherit="top">
@@ -37,12 +32,6 @@
<item name="Example" href="example.html"/>
<item name="Tasks" href="tasks.html"/>
</menu>
-</body>
-<custom>
- <fluidoSkin>
- <topBarEnabled>false</topBarEnabled>
- <sideBarEnabled>true</sideBarEnabled>
- </fluidoSkin>
- </custom>
+</body>
</project>
diff --git a/torque/src/site/site.xml b/torque/src/site/site.xml
index e8f43a7..d73349d 100644
--- a/torque/src/site/site.xml
+++ b/torque/src/site/site.xml
@@ -19,20 +19,9 @@
-->
<project name="Fulcrum Security Torque Implementation">
- <skin>
- <groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-fluido-skin</artifactId>
- <version>1.9</version>
- </skin>
<body>
</body>
-
-<custom>
- <fluidoSkin>
- <topBarEnabled>false</topBarEnabled>
- <sideBarEnabled>true</sideBarEnabled>
- </fluidoSkin>
- </custom>
+
</project>
[turbine-fulcrum-security] 02/03: Update: Use Java 8 streams and Method refs, update .gitignore
Posted by gk...@apache.org.
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 <gk...@apache.org>
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>