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/07 22:56:16 UTC
[isis] branch master updated: ISIS-2570: cleaning up
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 0793a86 ISIS-2570: cleaning up
0793a86 is described below
commit 0793a8625b81dcf264cc3b6623ba1bad8bccf9d2
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Mar 7 23:56:07 2021 +0100
ISIS-2570: cleaning up
---
.../ApplicationFeatureRepositoryDefault.java | 11 +++---
.../user/ApplicationUser_filterPermissions.java | 2 +-
.../dom/user/ApplicationUser_permissions.java | 2 +-
.../model/dom/user/UserPermissionViewModel.java | 41 ++++++++++------------
4 files changed, 24 insertions(+), 32 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
index c548b61..2c5f4c2 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureRepositoryDefault.java
@@ -155,9 +155,6 @@ implements ApplicationFeatureRepository {
return;
}
- if(spec.getCorrespondingClass().getName().startsWith("scinda.dom.smodel.composite.CompositeFood")) {
- System.out.println("got " + spec.getCorrespondingClass() + " -> " + spec.getLogicalTypeName());
- }
final String logicalTypeName = spec.getLogicalTypeName();
final ApplicationFeatureId typeFeatureId = ApplicationFeatureId.newType(logicalTypeName);
@@ -292,14 +289,14 @@ implements ApplicationFeatureRepository {
}
private void newMember(
- final ApplicationFeatureId classFeatureId,
+ final ApplicationFeatureId typeFeatureId,
final String memberId,
final @NonNull ApplicationMemberSort memberSort,
final @Nullable Class<?> returnType,
final Boolean derived,
final @Nullable Integer maxLength, final @Nullable Integer typicalLength,
final @Nullable SemanticsOf actionSemantics) {
- final ApplicationFeatureId featureId = ApplicationFeatureId.newMember(classFeatureId.getFullyQualifiedName(), memberId);
+ final ApplicationFeatureId featureId = ApplicationFeatureId.newMember(typeFeatureId.getFullyQualifiedName(), memberId);
final ApplicationFeatureDefault memberFeature =
(ApplicationFeatureDefault)newApplicationFeature(featureId);
@@ -316,8 +313,8 @@ implements ApplicationFeatureRepository {
// also cache per memberSort
featuresMapFor(memberSort).put(featureId, memberFeature);
- final ApplicationFeatureDefault classFeature = (ApplicationFeatureDefault)findLogicalType(classFeatureId);
- classFeature.addToMembers(featureId, memberSort);
+ final ApplicationFeatureDefault typeFeature = (ApplicationFeatureDefault)findLogicalType(typeFeatureId);
+ typeFeature.addToMembers(featureId, memberSort);
}
private SortedMap<ApplicationFeatureId, ApplicationFeature> featuresMapFor(final ApplicationMemberSort memberSort) {
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_filterPermissions.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_filterPermissions.java
index af07a22..bdf66d2 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_filterPermissions.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_filterPermissions.java
@@ -102,7 +102,7 @@ public class ApplicationUser_filterPermissions {
private List<UserPermissionViewModel> asViewModels(final Collection<ApplicationFeature> features) {
return _Lists.map(
features,
- UserPermissionViewModel.Functions.asViewModel(target, factory));
+ UserPermissionViewModel.asViewModel(target, factory));
}
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_permissions.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_permissions.java
index 1534b6f..321fd1f 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_permissions.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/ApplicationUser_permissions.java
@@ -62,7 +62,7 @@ public class ApplicationUser_permissions {
List<UserPermissionViewModel> asViewModels(final java.util.Collection<ApplicationFeature> features) {
return _Lists.map(
features,
- UserPermissionViewModel.Functions.asViewModel(target, factory));
+ UserPermissionViewModel.asViewModel(target, factory));
}
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.java
index 614a449..4c4e987 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/user/UserPermissionViewModel.java
@@ -387,29 +387,24 @@ public class UserPermissionViewModel implements ViewModel {
return toString.toString(this);
}
- // -- Functions
-
- public static final class Functions {
-
- private Functions(){}
-
- public static Function<ApplicationFeature, UserPermissionViewModel> asViewModel(
- final ApplicationUser user,
- final FactoryService factoryService) {
-
- return (final ApplicationFeature input) -> {
- val permissionSet = user.getPermissionSet();
- val changingEvaluation = permissionSet.evaluate(input.getFeatureId(), ApplicationPermissionMode.CHANGING);
- val viewingEvaluation = permissionSet.evaluate(input.getFeatureId(), ApplicationPermissionMode.VIEWING);
- return UserPermissionViewModel
- .newViewModel(
- input.getFeatureId(),
- user,
- viewingEvaluation,
- changingEvaluation,
- factoryService);
- };
- }
+ // -- Factory
+
+ public static Function<ApplicationFeature, UserPermissionViewModel> asViewModel(
+ final ApplicationUser user,
+ final FactoryService factoryService) {
+
+ return (final ApplicationFeature feature) -> {
+ val permissionSet = user.getPermissionSet();
+ val changingEvaluation = permissionSet.evaluate(feature.getFeatureId(), ApplicationPermissionMode.CHANGING);
+ val viewingEvaluation = permissionSet.evaluate(feature.getFeatureId(), ApplicationPermissionMode.VIEWING);
+ return UserPermissionViewModel
+ .newViewModel(
+ feature.getFeatureId(),
+ user,
+ viewingEvaluation,
+ changingEvaluation,
+ factoryService);
+ };
}