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/02/23 17:01:57 UTC
[isis] branch master updated: ISIS-2542: switch entities to use
string based enum mappings
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 92957aa ISIS-2542: switch entities to use string based enum mappings
92957aa is described below
commit 92957aa5846d2c640dec4773c5a8106a2ac3d3d9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Feb 23 18:01:40 2021 +0100
ISIS-2542: switch entities to use string based enum mappings
(symmetry with JDO)
---
.../extensions/secman/jpa/dom/permission/ApplicationPermission.java | 5 +++++
.../apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java | 4 ++++
2 files changed, 9 insertions(+)
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.java
index 739c4ca..914f41f 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.java
@@ -27,6 +27,8 @@ import javax.inject.Inject;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
@@ -151,6 +153,7 @@ implements
@Column(nullable=false)
+ @Enumerated(EnumType.STRING)
@Property(
domainEvent = RuleDomainEvent.class,
editing = Editing.DISABLED
@@ -165,6 +168,7 @@ implements
@Column(nullable=false)
+ @Enumerated(EnumType.STRING)
@Property(
domainEvent = ModeDomainEvent.class,
editing = Editing.DISABLED
@@ -220,6 +224,7 @@ implements
* @see #getFeatureFqn()
*/
@Column(nullable=false)
+ @Enumerated(EnumType.STRING)
@Setter
private ApplicationFeatureType featureType;
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 6ad3afa..c0b8685 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
@@ -27,6 +27,8 @@ import javax.inject.Inject;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EntityListeners;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
@@ -301,6 +303,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
@Column(nullable=false)
+ @Enumerated(EnumType.STRING)
@Property(
domainEvent = AccountTypeDomainEvent.class,
editing = Editing.DISABLED
@@ -316,6 +319,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
@Column(nullable=false)
+ @Enumerated(EnumType.STRING)
@Property(
domainEvent = StatusDomainEvent.class,
editing = Editing.DISABLED