You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/06/25 08:52:05 UTC
[isis] 01/01: ISIS-2767: fixes mapping for JPA users/roles (?)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2767
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9f09ae0e0c1e54005b842065bebe6012fd20b549
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jun 25 09:50:55 2021 +0100
ISIS-2767: fixes mapping for JPA users/roles (?)
---
.../apache/isis/extensions/secman/jpa/role/dom/ApplicationRole.java | 5 ++++-
.../apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.java | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRole.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRole.java
index 514a4f5..2ee2fde 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRole.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/role/dom/ApplicationRole.java
@@ -21,11 +21,14 @@ package org.apache.isis.extensions.secman.jpa.role.dom;
import java.util.Set;
import java.util.TreeSet;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
@@ -118,7 +121,7 @@ public class ApplicationRole
// -- USERS
@Users
- @ManyToMany
+ @ManyToMany(mappedBy = "roles", cascade = {CascadeType.MERGE, CascadeType.PERSIST})
private Set<org.apache.isis.extensions.secman.jpa.user.dom.ApplicationUser> users = new TreeSet<>();
@Users
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.java
index 94fc23b..70ee2f3 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/user/dom/ApplicationUser.java
@@ -280,8 +280,9 @@ public class ApplicationUser
// ROLES
- @ManyToMany(mappedBy = "users", cascade = {CascadeType.MERGE, CascadeType.PERSIST})
+ @ManyToMany(cascade = {CascadeType.MERGE, CascadeType.PERSIST})
@JoinTable(
+ schema = "isisExtensionsSecman",
name = "ApplicationUserRoles",
joinColumns = {@JoinColumn(name = "userId")},
inverseJoinColumns = {@JoinColumn(name = "roleId")})