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/03/31 11:20:26 UTC
[isis] 01/01: ISIS-2592: sets secman schema to
'isisExtensionsSecman' for both JDO and JPA
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2592
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d8178a7341f353c61db18d2d088518506a939c79
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Mar 31 11:32:42 2021 +0100
ISIS-2592: sets secman schema to 'isisExtensionsSecman' for both JDO and JPA
---
.../jdo/dom/permission/ApplicationPermission.java | 30 +++++++-------
.../secman/jdo/dom/role/ApplicationRole.java | 2 +-
.../secman/jdo/dom/tenancy/ApplicationTenancy.java | 2 +-
.../secman/jdo/dom/user/ApplicationUser.java | 7 +---
.../jpa/dom/permission/ApplicationPermission.java | 47 +++++++++++-----------
.../secman/jpa/dom/role/ApplicationRole.java | 1 +
.../secman/jpa/dom/tenancy/ApplicationTenancy.java | 1 +
.../secman/jpa/dom/user/ApplicationUser.java | 1 +
8 files changed, 45 insertions(+), 46 deletions(-)
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
index 752ea8b..0af5371 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.java
@@ -57,7 +57,7 @@ import lombok.experimental.UtilityClass;
@javax.jdo.annotations.PersistenceCapable(
identityType = IdentityType.DATASTORE,
- schema = "isisSecman",
+ schema = "isisExtensionsSecman",
table = "ApplicationPermission")
@javax.jdo.annotations.Inheritance(
strategy = InheritanceStrategy.NEW_TABLE)
@@ -102,7 +102,7 @@ import lombok.experimental.UtilityClass;
})
@javax.jdo.annotations.Uniques({
@javax.jdo.annotations.Unique(
- name = "ApplicationPermission_role_feature_rule_UNQ",
+ name = "ApplicationPermission_role_feature_rule_UNQ",
members = { "role", "featureSort", "featureFqn", "rule" })
})
@DomainObject(
@@ -111,9 +111,9 @@ import lombok.experimental.UtilityClass;
@DomainObjectLayout(
bookmarking = BookmarkPolicy.AS_CHILD
)
-public class ApplicationPermission
-implements
- org.apache.isis.extensions.secman.api.permission.ApplicationPermission,
+public class ApplicationPermission
+implements
+ org.apache.isis.extensions.secman.api.permission.ApplicationPermission,
Comparable<ApplicationPermission> {
private static final int TYPICAL_LENGTH_TYPE = 7; // ApplicationFeatureType.PACKAGE is longest
@@ -130,9 +130,9 @@ implements
editing = Editing.DISABLED
)
@PropertyLayout(hidden = Where.REFERENCES_PARENT)
- @Getter(onMethod = @__(@Override))
+ @Getter(onMethod = @__(@Override))
private ApplicationRole role;
-
+
@Override
public void setRole(org.apache.isis.extensions.secman.api.role.ApplicationRole applicationRole) {
role = _Casts.<ApplicationRole>uncheckedCast(applicationRole);
@@ -147,7 +147,7 @@ implements
domainEvent = RuleDomainEvent.class,
editing = Editing.DISABLED
)
- @Getter(onMethod = @__(@Override))
+ @Getter(onMethod = @__(@Override))
@Setter(onMethod = @__(@Override))
private ApplicationPermissionRule rule;
@@ -161,7 +161,7 @@ implements
domainEvent = ModeDomainEvent.class,
editing = Editing.DISABLED
)
- @Getter(onMethod = @__(@Override))
+ @Getter(onMethod = @__(@Override))
@Setter(onMethod = @__(@Override))
private ApplicationPermissionMode mode;
@@ -186,8 +186,8 @@ implements
@PropertyLayout(typicalLength=ApplicationPermission.TYPICAL_LENGTH_TYPE)
@Override
public String getSort() {
- final Enum<?> e = getFeatureSort() != ApplicationFeatureSort.MEMBER
- ? getFeatureSort()
+ final Enum<?> e = getFeatureSort() != ApplicationFeatureSort.MEMBER
+ ? getFeatureSort()
: getMemberSort().orElse(null);
return e != null ? e.name(): null;
}
@@ -250,7 +250,7 @@ implements
// -- CONTRACT
- private static final ObjectContract<ApplicationPermission> contract =
+ private static final ObjectContract<ApplicationPermission> contract =
ObjectContracts.contract(ApplicationPermission.class)
.thenUse("role", ApplicationPermission::getRole)
.thenUse("featureSort", ApplicationPermission::getFeatureSort)
@@ -292,11 +292,11 @@ implements
@UtilityClass
public static final class Functions {
- public static final Function<ApplicationPermission, ApplicationPermissionValue> AS_VALUE =
+ public static final Function<ApplicationPermission, ApplicationPermissionValue> AS_VALUE =
(ApplicationPermission input) ->
new ApplicationPermissionValue(
- input.asFeatureId().orElseThrow(_Exceptions::noSuchElement),
- input.getRule(),
+ input.asFeatureId().orElseThrow(_Exceptions::noSuchElement),
+ input.getRule(),
input.getMode());
}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
index 408d981..ce4b75b 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
@@ -52,7 +52,7 @@ import lombok.Setter;
@javax.jdo.annotations.PersistenceCapable(
identityType = IdentityType.DATASTORE,
- schema = "isisSecman",
+ schema = "isisExtensionsSecman",
table = "ApplicationRole")
@javax.jdo.annotations.Inheritance(
strategy = InheritanceStrategy.NEW_TABLE)
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java
index c0f3c95..fe6ee08 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/tenancy/ApplicationTenancy.java
@@ -47,7 +47,7 @@ import lombok.Setter;
@javax.jdo.annotations.PersistenceCapable(
identityType = IdentityType.APPLICATION,
- schema = "isisSecman",
+ schema = "isisExtensionsSecman",
table = "ApplicationTenancy")
@javax.jdo.annotations.Inheritance(
strategy = InheritanceStrategy.NEW_TABLE)
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
index 2abbe37..a2e4199 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
@@ -64,7 +64,7 @@ import lombok.val;
@javax.jdo.annotations.PersistenceCapable(
identityType = IdentityType.DATASTORE,
- schema = "isisSecman",
+ schema = "isisExtensionsSecman",
table = "ApplicationUser")
@javax.jdo.annotations.Inheritance(
strategy = InheritanceStrategy.NEW_TABLE)
@@ -119,11 +119,6 @@ import lombok.val;
@DomainObjectLayout(
bookmarking = BookmarkPolicy.AS_ROOT
)
-//@MemberGroupLayout(columnSpans = {4,4,4,12},
-// left = {"Id", "Name", "Metadata"},
-// middle= {"Contact Details"},
-// right= {"Status", "AtPath"}
-//)
public class ApplicationUser implements Comparable<ApplicationUser>,
org.apache.isis.extensions.secman.api.user.ApplicationUser {
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 d1c9e54..757544a 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
@@ -67,15 +67,16 @@ import lombok.experimental.UtilityClass;
@Entity
@Table(
- name = "ApplicationPermission",
+ schema = "isisExtensionsSecman",
+ name = "ApplicationPermission",
uniqueConstraints=
@UniqueConstraint(
- name = "ApplicationPermission_role_feature_rule_UNQ",
+ name = "ApplicationPermission_role_feature_rule_UNQ",
columnNames={"roleId", "featureSort", "featureFqn", "rule"})
)
@NamedQueries({
@NamedQuery(
- name = NamedQueryNames.PERMISSION_BY_ROLE,
+ name = NamedQueryNames.PERMISSION_BY_ROLE,
query = "SELECT p "
+ "FROM org.apache.isis.extensions.secman.jpa.dom.permission.ApplicationPermission p "
+ "WHERE p.role = :role"),
@@ -88,13 +89,13 @@ import lombok.experimental.UtilityClass;
+ "WHERE u.username = :username"
+ " AND p.role MEMBER OF u.roles"),
@NamedQuery(
- name = NamedQueryNames.PERMISSION_BY_FEATURE,
+ name = NamedQueryNames.PERMISSION_BY_FEATURE,
query = "SELECT p "
+ "FROM org.apache.isis.extensions.secman.jpa.dom.permission.ApplicationPermission p "
+ "WHERE p.featureSort = :featureSort "
+ " AND p.featureFqn = :featureFqn"),
@NamedQuery(
- name = NamedQueryNames.PERMISSION_BY_ROLE_RULE_FEATURE_FQN,
+ name = NamedQueryNames.PERMISSION_BY_ROLE_RULE_FEATURE_FQN,
query = "SELECT p "
+ "FROM org.apache.isis.extensions.secman.jpa.dom.permission.ApplicationPermission p "
+ "WHERE p.role = :role "
@@ -102,7 +103,7 @@ import lombok.experimental.UtilityClass;
+ " AND p.featureSort = :featureSort "
+ " AND p.featureFqn = :featureFqn "),
@NamedQuery(
- name = NamedQueryNames.PERMISSION_BY_ROLE_RULE_FEATURE,
+ name = NamedQueryNames.PERMISSION_BY_ROLE_RULE_FEATURE,
query = "SELECT p "
+ "FROM org.apache.isis.extensions.secman.jpa.dom.permission.ApplicationPermission p "
+ "WHERE p.role = :role "
@@ -116,19 +117,19 @@ import lombok.experimental.UtilityClass;
@DomainObjectLayout(
bookmarking = BookmarkPolicy.AS_CHILD
)
-public class ApplicationPermission
-implements
- org.apache.isis.extensions.secman.api.permission.ApplicationPermission,
+public class ApplicationPermission
+implements
+ org.apache.isis.extensions.secman.api.permission.ApplicationPermission,
Comparable<ApplicationPermission> {
private static final int TYPICAL_LENGTH_TYPE = 7; // ApplicationFeatureType.PACKAGE is longest
-
+
@Inject private transient ApplicationFeatureRepository featureRepository;
-
+
@Id
@GeneratedValue
private Long id;
-
+
// -- role (property)
public static class RoleDomainEvent extends PropertyDomainEvent<ApplicationRole> {}
@@ -140,9 +141,9 @@ implements
editing = Editing.DISABLED
)
@PropertyLayout(hidden = Where.REFERENCES_PARENT)
- @Getter(onMethod = @__(@Override))
+ @Getter(onMethod = @__(@Override))
private ApplicationRole role;
-
+
@Override
public void setRole(org.apache.isis.extensions.secman.api.role.ApplicationRole applicationRole) {
role = _Casts.<ApplicationRole>uncheckedCast(applicationRole);
@@ -158,7 +159,7 @@ implements
domainEvent = RuleDomainEvent.class,
editing = Editing.DISABLED
)
- @Getter(onMethod = @__(@Override))
+ @Getter(onMethod = @__(@Override))
@Setter(onMethod = @__(@Override))
private ApplicationPermissionRule rule;
@@ -173,7 +174,7 @@ implements
domainEvent = ModeDomainEvent.class,
editing = Editing.DISABLED
)
- @Getter(onMethod = @__(@Override))
+ @Getter(onMethod = @__(@Override))
@Setter(onMethod = @__(@Override))
private ApplicationPermissionMode mode;
@@ -198,8 +199,8 @@ implements
@PropertyLayout(typicalLength=ApplicationPermission.TYPICAL_LENGTH_TYPE)
@Override
public String getSort() {
- final Enum<?> e = getFeatureSort() != ApplicationFeatureSort.MEMBER
- ? getFeatureSort()
+ final Enum<?> e = getFeatureSort() != ApplicationFeatureSort.MEMBER
+ ? getFeatureSort()
: getMemberSort().orElse(null);
return e != null ? e.name(): null;
}
@@ -263,7 +264,7 @@ implements
// -- CONTRACT
- private static final ObjectContract<ApplicationPermission> contract =
+ private static final ObjectContract<ApplicationPermission> contract =
ObjectContracts.contract(ApplicationPermission.class)
.thenUse("role", ApplicationPermission::getRole)
.thenUse("featureSort", ApplicationPermission::getFeatureSort)
@@ -305,15 +306,15 @@ implements
@UtilityClass
public static final class Functions {
- public static final Function<ApplicationPermission, ApplicationPermissionValue> AS_VALUE =
+ public static final Function<ApplicationPermission, ApplicationPermissionValue> AS_VALUE =
(ApplicationPermission input) ->
new ApplicationPermissionValue(
- input.asFeatureId().orElseThrow(_Exceptions::noSuchElement),
- input.getRule(),
+ input.asFeatureId().orElseThrow(_Exceptions::noSuchElement),
+ input.getRule(),
input.getMode());
}
-
+
}
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 2ccc99f..10ad66c 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
@@ -61,6 +61,7 @@ import lombok.Setter;
@Entity
@Table(
+ schema = "isisExtensionsSecman",
name = "ApplicationRole",
uniqueConstraints =
@UniqueConstraint(
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 ab3da81..c280f4a 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
@@ -53,6 +53,7 @@ import lombok.Setter;
@Entity
@Table(
+ schema = "isisExtensionsSecman",
name = "ApplicationTenancy",
uniqueConstraints =
@UniqueConstraint(
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 db9b816..b6afedc 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
@@ -77,6 +77,7 @@ import lombok.val;
@Entity
@Table(
+ schema = "isisExtensionsSecman",
name = "ApplicationUser",
uniqueConstraints =
@UniqueConstraint(