This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 3888ced ISIS-2619: SecMan/JDO: fixes broken named queries
3888ced is described below
commit 3888ced34d838ffda52b4a5e29f46a2cafad88a0
Author: [email protected] <[email protected]@luna>
AuthorDate: Fri May 14 15:59:37 2021 +0200
ISIS-2619: SecMan/JDO: fixes broken named queries
---
.../secman/jdo/permission/dom/ApplicationPermission.java | 10 +++++-----
.../isis/extensions/secman/jdo/role/dom/ApplicationRole.java | 4 ++--
.../extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java | 6 +++---
.../isis/extensions/secman/jdo/user/dom/ApplicationUser.java | 8 ++++----
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/permission/dom/ApplicationPermission.java
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/permission/dom/ApplicationPermission.java
index 39136b4..74fd5ce 100644
---
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/permission/dom/ApplicationPermission.java
+++
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/permission/dom/ApplicationPermission.java
@@ -64,24 +64,24 @@ import
org.apache.isis.extensions.secman.api.role.dom.ApplicationRole;
name =
org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermission.NAMED_QUERY_FIND_BY_ROLE,
value = "SELECT "
+ "FROM " + ApplicationPermission.FQCN
- + "WHERE role == :role"),
+ + " WHERE role == :role"),
@Query(
name =
org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermission.NAMED_QUERY_FIND_BY_USER,
value = "SELECT "
+ "FROM " + ApplicationPermission.FQCN
- + "WHERE (u.roles.contains(role) && u.username ==
:username) "
+ + " WHERE (u.roles.contains(role) && u.username ==
:username) "
+ "VARIABLES
org.apache.isis.extensions.secman.jdo.user.dom.ApplicationUser u"),
@Query(
name =
org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermission.NAMED_QUERY_FIND_BY_FEATURE,
value = "SELECT "
+ "FROM " + ApplicationPermission.FQCN
- + "WHERE featureSort == :featureSort "
+ + " WHERE featureSort == :featureSort "
+ " && featureFqn == :featureFqn"),
@Query(
name =
org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermission.NAMED_QUERY_FIND_BY_ROLE_RULE_FEATURE_FQN,
value = "SELECT "
+ "FROM " + ApplicationPermission.FQCN
- + "WHERE role == :role "
+ + " WHERE role == :role "
+ " && rule == :rule "
+ " && featureSort == :featureSort "
+ " && featureFqn == :featureFqn "),
@@ -89,7 +89,7 @@ import
org.apache.isis.extensions.secman.api.role.dom.ApplicationRole;
name =
org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermission.NAMED_QUERY_FIND_BY_ROLE_RULE_FEATURE,
value = "SELECT "
+ "FROM " + ApplicationPermission.FQCN
- + "WHERE role == :role "
+ + " WHERE role == :role "
+ " && rule == :rule "
+ " && featureSort == :featureSort "),
})
diff --git
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/role/dom/ApplicationRole.java
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/role/dom/ApplicationRole.java
index debf380..f30fee0 100644
---
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/role/dom/ApplicationRole.java
+++
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/role/dom/ApplicationRole.java
@@ -67,12 +67,12 @@ import
org.apache.isis.extensions.secman.jdo.permission.dom.ApplicationPermissio
name =
org.apache.isis.extensions.secman.api.role.dom.ApplicationRole.NAMED_QUERY_FIND_BY_NAME,
value = "SELECT "
+ "FROM " + ApplicationRole.FQCN
- + "WHERE name == :name"),
+ + " WHERE name == :name"),
@Query(
name =
org.apache.isis.extensions.secman.api.role.dom.ApplicationRole.NAMED_QUERY_FIND_BY_NAME_CONTAINING,
value = "SELECT "
+ "FROM " + ApplicationRole.FQCN
- + "WHERE name.matches(:regex) ")
+ + " WHERE name.matches(:regex) ")
})
@DomainObject(
bounding = Bounding.BOUNDED,
diff --git
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
index a14a8da..deb3383 100644
---
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
+++
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/tenancy/dom/ApplicationTenancy.java
@@ -68,17 +68,17 @@ import org.apache.isis.commons.internal.base._Casts;
name =
org.apache.isis.extensions.secman.api.tenancy.dom.ApplicationTenancy.NAMED_QUERY_FIND_BY_PATH,
value = "SELECT "
+ "FROM " + ApplicationTenancy.FQCN
- + "WHERE path == :path"),
+ + " WHERE path == :path"),
@Query(
name =
org.apache.isis.extensions.secman.api.tenancy.dom.ApplicationTenancy.NAMED_QUERY_FIND_BY_NAME,
value = "SELECT "
+ "FROM " + ApplicationTenancy.FQCN
- + "WHERE name == :name"),
+ + " WHERE name == :name"),
@Query(
name =
org.apache.isis.extensions.secman.api.tenancy.dom.ApplicationTenancy.NAMED_QUERY_FIND_BY_NAME_OR_PATH_MATCHING,
value = "SELECT "
+ "FROM " + ApplicationTenancy.FQCN
- + "WHERE name.matches(:regex) || path.matches(:regex) ")})
+ + " WHERE name.matches(:regex) || path.matches(:regex) ")})
@DomainObject(
objectType = ApplicationTenancy.OBJECT_TYPE,
autoCompleteRepository = ApplicationTenancyRepository.class,
diff --git
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/user/dom/ApplicationUser.java
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/user/dom/ApplicationUser.java
index b3cb706..648f2ca 100644
---
a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/user/dom/ApplicationUser.java
+++
b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/user/dom/ApplicationUser.java
@@ -83,22 +83,22 @@ import lombok.val;
name =
org.apache.isis.extensions.secman.api.user.dom.ApplicationUser.NAMED_QUERY_FIND_BY_USERNAME,
value = "SELECT "
+ "FROM " + ApplicationUser.FQCN
- + "WHERE username == :username"),
+ + " WHERE username == :username"),
@Query(
name =
org.apache.isis.extensions.secman.api.user.dom.ApplicationUser.NAMED_QUERY_FIND_BY_EMAIL_ADDRESS,
value = "SELECT "
+ "FROM " + ApplicationUser.FQCN
- + "WHERE emailAddress == :emailAddress"),
+ + " WHERE emailAddress == :emailAddress"),
@Query(
name =
org.apache.isis.extensions.secman.api.user.dom.ApplicationUser.NAMED_QUERY_FIND_BY_ATPATH,
value = "SELECT "
+ "FROM " + ApplicationUser.FQCN
- + "WHERE atPath == :atPath"),
+ + " WHERE atPath == :atPath"),
@Query(
name =
org.apache.isis.extensions.secman.api.user.dom.ApplicationUser.NAMED_QUERY_FIND,
value = "SELECT "
+ "FROM " + ApplicationUser.FQCN
- + "WHERE username.matches(:regex)"
+ + " WHERE username.matches(:regex)"
+ " || familyName.matches(:regex)"
+ " || givenName.matches(:regex)"
+ " || knownAs.matches(:regex)"
