You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/16 10:43:30 UTC
[isis] branch master updated: ISIS-2480: SecMan/JPA: converts
remaining named queries
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 6c27f9c ISIS-2480: SecMan/JPA: converts remaining named queries
6c27f9c is described below
commit 6c27f9c845b9532741e8da086dfc14edecceec49
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Jan 16 11:43:18 2021 +0100
ISIS-2480: SecMan/JPA: converts remaining named queries
---
.../secman/jpa/dom/role/ApplicationRole.java | 17 ++++----
.../secman/jpa/dom/tenancy/ApplicationTenancy.java | 24 ++++++------
.../secman/jpa/dom/user/ApplicationUser.java | 45 +++++++++-------------
3 files changed, 38 insertions(+), 48 deletions(-)
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java
index 36ec299..1e7ab5e 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java
@@ -73,15 +73,14 @@ import lombok.Setter;
@NamedQueries({
@NamedQuery(
name = NamedQueryNames.ROLE_BY_NAME,
- query = "SELECT x "
- + "FROM org.apache.isis.extensions.secman.jpa.dom.role.ApplicationRole x "
- + "WHERE x.name = :name"),
-//TODO not sure how to convert these
-// @NamedQuery(
-// name = NamedQueryNames.ROLE_BY_NAME_CONTAINING,
-// query = "SELECT x "
-// + "FROM org.apache.isis.extensions.secman.jpa.dom.role.ApplicationRole x "
-// + "WHERE x.name.matches(:nameRegex)"),
+ query = "SELECT r "
+ + "FROM org.apache.isis.extensions.secman.jpa.dom.role.ApplicationRole r "
+ + "WHERE r.name = :name"),
+ @NamedQuery(
+ name = NamedQueryNames.ROLE_BY_NAME_CONTAINING,
+ query = "SELECT r "
+ + "FROM org.apache.isis.extensions.secman.jpa.dom.role.ApplicationRole r "
+ + "WHERE r.name LIKE '%:nameRegex%'"),
})
@EntityListeners(JpaEntityInjectionPointResolver.class)
@DomainObject(
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancy.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancy.java
index ccca8d9..51c460c 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancy.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/tenancy/ApplicationTenancy.java
@@ -62,20 +62,20 @@ import lombok.Setter;
@NamedQueries({
@NamedQuery(
name = NamedQueryNames.TENANCY_BY_PATH,
- query = "SELECT x "
- + "FROM org.apache.isis.extensions.secman.jpa.dom.tenancy.ApplicationTenancy x "
- + "WHERE x.path = :path"),
+ query = "SELECT t "
+ + "FROM org.apache.isis.extensions.secman.jpa.dom.tenancy.ApplicationTenancy t "
+ + "WHERE t.path = :path"),
@NamedQuery(
name = NamedQueryNames.TENANCY_BY_NAME,
- query = "SELECT x "
- + "FROM org.apache.isis.extensions.secman.jpa.dom.tenancy.ApplicationTenancy x "
- + "WHERE x.name = :name"),
-//TODO not sure how to convert these
-// @NamedQuery(
-// name = NamedQueryNames.TENANCY_BY_NAME_OR_PATH_MATCHING,
-// query = "SELECT x "
-// + "FROM org.apache.isis.extensions.secman.jpa.dom.tenancy.ApplicationTenancy x "
-// + "WHERE x.name.matches(:regex) || x.path.matches(:regex)"),
+ query = "SELECT t "
+ + "FROM org.apache.isis.extensions.secman.jpa.dom.tenancy.ApplicationTenancy t "
+ + "WHERE t.name = :name"),
+ @NamedQuery(
+ name = NamedQueryNames.TENANCY_BY_NAME_OR_PATH_MATCHING,
+ query = "SELECT t "
+ + "FROM org.apache.isis.extensions.secman.jpa.dom.tenancy.ApplicationTenancy t "
+ + "WHERE t.name LIKE '%:regex%' "
+ + " OR t.path LIKE '%:regex%'"),
})
@DomainObject(
objectType = "isissecurity.ApplicationTenancy",
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java
index 8df5319..9ec2069 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java
@@ -83,37 +83,28 @@ import lombok.val;
@NamedQueries({
@NamedQuery(
name = NamedQueryNames.USER_BY_USERNAME,
- query = "SELECT x "
- + "FROM org.apache.isis.extensions.secman.jpa.dom.user.ApplicationUser x "
- + "WHERE x.username = :username"),
+ query = "SELECT u "
+ + "FROM org.apache.isis.extensions.secman.jpa.dom.user.ApplicationUser u "
+ + "WHERE u.username = :username"),
@NamedQuery(
name = NamedQueryNames.USER_BY_EMAIL,
- query = "SELECT x "
- + "FROM org.apache.isis.extensions.secman.jpa.dom.user.ApplicationUser x "
- + "WHERE x.emailAddress = :emailAddress"),
+ query = "SELECT u "
+ + "FROM org.apache.isis.extensions.secman.jpa.dom.user.ApplicationUser u "
+ + "WHERE u.emailAddress = :emailAddress"),
@NamedQuery(
name = NamedQueryNames.USER_BY_ATPATH,
- query = "SELECT x "
- + "FROM org.apache.isis.extensions.secman.jpa.dom.user.ApplicationUser x "
- + "WHERE x.atPath = :atPath"),
-//TODO not sure how to convert these
-// @NamedQuery(
-// name = NamedQueryNames.USER_BY_NAME,
-// query = "SELECT x "
-// + "FROM org.apache.isis.extensions.secman.jpa.dom.user.ApplicationUser x "
-// + "WHERE x.username.matches(:nameRegex)"
-// + " || x.familyName.matches(:nameRegex)"
-// + " || x.givenName.matches(:nameRegex)"
-// + " || x.knownAs.matches(:nameRegex)"),
-// @NamedQuery(
-// name = NamedQueryNames.USER_FIND,
-// query = "SELECT x "
-// + "FROM org.apache.isis.extensions.secman.jpa.dom.user.ApplicationUser x "
-// + "WHERE x.username.matches(:regex)"
-// + " || x.familyName.matches(:regex)"
-// + " || x.givenName.matches(:regex)"
-// + " || x.knownAs.matches(:regex)"
-// + " || x.emailAddress.matches(:regex)")
+ query = "SELECT u "
+ + "FROM org.apache.isis.extensions.secman.jpa.dom.user.ApplicationUser u "
+ + "WHERE u.atPath = :atPath"),
+ @NamedQuery(
+ name = NamedQueryNames.USER_FIND,
+ query = "SELECT u "
+ + "FROM org.apache.isis.extensions.secman.jpa.dom.user.ApplicationUser u "
+ + "WHERE u.username LIKE '%:regex%'"
+ + " OR u.familyName LIKE '%:regex%'"
+ + " OR u.givenName LIKE '%:regex%'"
+ + " OR u.knownAs LIKE '%:regex%'"
+ + " OR u.emailAddress LIKE '%:regex%'")
})
@EntityListeners(JpaEntityInjectionPointResolver.class)
@DomainObject(