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/03/04 12:04:48 UTC
[isis] 01/02: ISIS-2565: updates some mixin semantics
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
commit 986fb228c526c30852f0098edb55e0d3323f6fb0
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Mar 4 12:05:57 2021 +0100
ISIS-2565: updates some mixin semantics
---
.../model/dom/role/ApplicationRole_addAction.java | 21 +++++++++++----------
.../dom/role/ApplicationRole_addCollection.java | 20 ++++++++++----------
...ckage.java => ApplicationRole_addNamespace.java} | 8 ++++----
.../model/dom/role/ApplicationRole_addProperty.java | 20 ++++++++++----------
...e_addClass.java => ApplicationRole_addType.java} | 12 ++++++------
5 files changed, 41 insertions(+), 40 deletions(-)
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addAction.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addAction.java
index d61fb6c..84b3c36 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addAction.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addAction.java
@@ -61,14 +61,15 @@ public class ApplicationRole_addAction {
final ApplicationPermissionRule rule,
@ParameterLayout(named="Mode")
final ApplicationPermissionMode mode,
- @ParameterLayout(named="Package", typicalLength=ApplicationFeature.TYPICAL_LENGTH_PKG_FQN)
- final String packageFqn,
- @ParameterLayout(named="Class", typicalLength=ApplicationFeature.TYPICAL_LENGTH_CLS_NAME)
- final String className,
+ @ParameterLayout(named="Namespace", typicalLength=ApplicationFeature.TYPICAL_LENGTH_PKG_FQN)
+ final String namespace,
+ @ParameterLayout(named="Type", typicalLength=ApplicationFeature.TYPICAL_LENGTH_CLS_NAME)
+ final String logicalTypeSimpleName,
@ParameterLayout(named="Action", typicalLength = ApplicationFeature.TYPICAL_LENGTH_MEMBER_NAME)
final String memberName) {
- applicationPermissionRepository.newPermission(holder, rule, mode, packageFqn, className, memberName);
+ applicationPermissionRepository
+ .newPermission(holder, rule, mode, namespace, logicalTypeSimpleName, memberName);
return holder;
}
@@ -91,17 +92,17 @@ public class ApplicationRole_addAction {
public java.util.Collection<String> choices3Act(
final ApplicationPermissionRule rule,
final ApplicationPermissionMode mode,
- final String packageFqn) {
- return applicationFeatureRepository.classNamesContainedIn(packageFqn, ApplicationMemberSort.ACTION);
+ final String namespace) {
+ return applicationFeatureRepository.classNamesContainedIn(namespace, ApplicationMemberSort.ACTION);
}
@Model
public java.util.Collection<String> choices4Act(
final ApplicationPermissionRule rule,
final ApplicationPermissionMode mode,
- final String packageFqn,
- final String className) {
- return applicationFeatureRepository.memberNamesOf(packageFqn, className, ApplicationMemberSort.ACTION);
+ final String namespace,
+ final String logicalTypeSimpleName) {
+ return applicationFeatureRepository.memberNamesOf(namespace, logicalTypeSimpleName, ApplicationMemberSort.ACTION);
}
}
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addCollection.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addCollection.java
index ad9fa38..3c50a00 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addCollection.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addCollection.java
@@ -64,15 +64,15 @@ public class ApplicationRole_addCollection {
final ApplicationPermissionRule rule,
@ParameterLayout(named="Mode")
final ApplicationPermissionMode mode,
- @ParameterLayout(named="Package", typicalLength=ApplicationFeature.TYPICAL_LENGTH_PKG_FQN)
- final String packageFqn,
- @ParameterLayout(named="Class", typicalLength=ApplicationFeature.TYPICAL_LENGTH_CLS_NAME)
- final String className,
+ @ParameterLayout(named="Namespace", typicalLength=ApplicationFeature.TYPICAL_LENGTH_PKG_FQN)
+ final String namespace,
+ @ParameterLayout(named="Type", typicalLength=ApplicationFeature.TYPICAL_LENGTH_CLS_NAME)
+ final String logicalTypeSimpleName,
@ParameterLayout(named="Collection", typicalLength=ApplicationFeature.TYPICAL_LENGTH_MEMBER_NAME)
final String memberName) {
applicationPermissionRepository
- .newPermission(holder, rule, mode, packageFqn, className, memberName);
+ .newPermission(holder, rule, mode, namespace, logicalTypeSimpleName, memberName);
return holder;
}
@@ -95,17 +95,17 @@ public class ApplicationRole_addCollection {
public Collection<String> choices3Act(
final ApplicationPermissionRule rule,
final ApplicationPermissionMode mode,
- final String packageFqn) {
- return applicationFeatureRepository.classNamesContainedIn(packageFqn, ApplicationMemberSort.COLLECTION);
+ final String namespace) {
+ return applicationFeatureRepository.classNamesContainedIn(namespace, ApplicationMemberSort.COLLECTION);
}
@Model
public Collection<String> choices4Act(
final ApplicationPermissionRule rule,
final ApplicationPermissionMode mode,
- final String packageFqn,
- final String className) {
- return applicationFeatureRepository.memberNamesOf(packageFqn, className, ApplicationMemberSort.COLLECTION);
+ final String namespace,
+ final String logicalTypeSimpleName) {
+ return applicationFeatureRepository.memberNamesOf(namespace, logicalTypeSimpleName, ApplicationMemberSort.COLLECTION);
}
}
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPackage.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addNamespace.java
similarity index 93%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPackage.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addNamespace.java
index 88db573..339eecc 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPackage.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addNamespace.java
@@ -41,7 +41,7 @@ import lombok.RequiredArgsConstructor;
domainEvent = AddPermissionDomainEvent.class,
associateWith = "permissions")
@RequiredArgsConstructor
-public class ApplicationRole_addPackage {
+public class ApplicationRole_addNamespace {
@Inject private ApplicationFeatureRepository applicationFeatureRepository;
@Inject private ApplicationPermissionRepository<? extends ApplicationPermission> applicationPermissionRepository;
@@ -60,11 +60,11 @@ public class ApplicationRole_addPackage {
final ApplicationPermissionRule rule,
@ParameterLayout(named="Mode")
final ApplicationPermissionMode mode,
- @ParameterLayout(named="Package", typicalLength= ApplicationFeature.TYPICAL_LENGTH_PKG_FQN)
- final String packageFqn) {
+ @ParameterLayout(named="Namespace", typicalLength= ApplicationFeature.TYPICAL_LENGTH_PKG_FQN)
+ final String namespace) {
applicationPermissionRepository
- .newPermission(holder, rule, mode, ApplicationFeatureSort.NAMESPACE, packageFqn);
+ .newPermission(holder, rule, mode, ApplicationFeatureSort.NAMESPACE, namespace);
return holder;
}
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addProperty.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addProperty.java
index 4b822e7..8aeb81c 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addProperty.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addProperty.java
@@ -65,15 +65,15 @@ public class ApplicationRole_addProperty {
final ApplicationPermissionRule rule,
@ParameterLayout(named="Mode")
final ApplicationPermissionMode mode,
- @ParameterLayout(named="Package", typicalLength=ApplicationFeature.TYPICAL_LENGTH_PKG_FQN)
- final String packageFqn,
- @ParameterLayout(named="Class", typicalLength=ApplicationFeature.TYPICAL_LENGTH_CLS_NAME)
- final String className,
+ @ParameterLayout(named="Namespace", typicalLength=ApplicationFeature.TYPICAL_LENGTH_PKG_FQN)
+ final String namespace,
+ @ParameterLayout(named="Type", typicalLength=ApplicationFeature.TYPICAL_LENGTH_CLS_NAME)
+ final String logicalTypeSimpleName,
@ParameterLayout(named="Property", typicalLength=ApplicationFeature.TYPICAL_LENGTH_MEMBER_NAME)
final String memberName) {
applicationPermissionRepository
- .newPermission(holder, rule, mode, packageFqn, className, memberName);
+ .newPermission(holder, rule, mode, namespace, logicalTypeSimpleName, memberName);
return holder;
}
@@ -102,8 +102,8 @@ public class ApplicationRole_addProperty {
public Collection<String> choices3Act(
final ApplicationPermissionRule rule,
final ApplicationPermissionMode mode,
- final String packageFqn) {
- return applicationFeatureRepository.classNamesContainedIn(packageFqn, ApplicationMemberSort.PROPERTY);
+ final String namespace) {
+ return applicationFeatureRepository.classNamesContainedIn(namespace, ApplicationMemberSort.PROPERTY);
}
/**
@@ -113,9 +113,9 @@ public class ApplicationRole_addProperty {
public Collection<String> choices4Act(
final ApplicationPermissionRule rule,
final ApplicationPermissionMode mode,
- final String packageFqn,
- final String className) {
- return applicationFeatureRepository.memberNamesOf(packageFqn, className, ApplicationMemberSort.PROPERTY);
+ final String namespace,
+ final String logicalTypeSimpleName) {
+ return applicationFeatureRepository.memberNamesOf(namespace, logicalTypeSimpleName, ApplicationMemberSort.PROPERTY);
}
}
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addClass.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addType.java
similarity index 88%
rename from extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addClass.java
rename to extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addType.java
index a45c36b..2b5db48 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addClass.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addType.java
@@ -40,7 +40,7 @@ import lombok.RequiredArgsConstructor;
domainEvent = AddPermissionDomainEvent.class,
associateWith = "permissions")
@RequiredArgsConstructor
-public class ApplicationRole_addClass {
+public class ApplicationRole_addType {
@Inject private ApplicationPermissionRepository<? extends ApplicationPermission> applicationPermissionRepository;
@@ -57,14 +57,14 @@ public class ApplicationRole_addClass {
final ApplicationPermissionRule rule,
@ParameterLayout(named="Mode")
final ApplicationPermissionMode mode,
- @ParameterLayout(named="Package", typicalLength=ApplicationFeature.TYPICAL_LENGTH_PKG_FQN)
- final String packageFqn,
- @ParameterLayout(named="Class", typicalLength=ApplicationFeature.TYPICAL_LENGTH_CLS_NAME)
- final String className) {
+ @ParameterLayout(named="Namespace", typicalLength=ApplicationFeature.TYPICAL_LENGTH_PKG_FQN)
+ final String namespace,
+ @ParameterLayout(named="Type", typicalLength=ApplicationFeature.TYPICAL_LENGTH_CLS_NAME)
+ final String logicalTypeSimpleName) {
applicationPermissionRepository.newPermission(
holder, rule, mode, ApplicationFeatureSort.TYPE,
- packageFqn + "." + className);
+ namespace + "." + logicalTypeSimpleName);
return holder;
}