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 10:55:46 UTC
[isis] branch master updated: ISIS-2565: polishing
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 d6a9804 ISIS-2565: polishing
d6a9804 is described below
commit d6a980450b6ded3c7d9c3694b51a8372f859116f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Mar 4 11:55:33 2021 +0100
ISIS-2565: polishing
---
.../appfeat/ApplicationFeatureRepositoryDefault.java | 18 +++++++++---------
.../services/appfeat/ApplicationFeatureIdTest.java | 2 +-
.../model/dom/role/ApplicationRole_addPermission.java | 3 ---
.../jdo/dom/permission/ApplicationPermission.java | 2 +-
.../dom/permission/ApplicationPermission.layout.xml | 2 +-
.../jpa/dom/permission/ApplicationPermission.java | 2 +-
.../dom/permission/ApplicationPermission.layout.xml | 2 +-
7 files changed, 14 insertions(+), 17 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 e779a95..b568f10 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
@@ -277,7 +277,7 @@ implements ApplicationFeatureRepository {
private boolean newMember(
final ApplicationFeatureId classFeatureId,
final ObjectMember objectMember,
- final ApplicationMemberSort memberType,
+ final ApplicationMemberSort memberSort,
final Class<?> returnType,
final Boolean derived,
final Integer maxLength,
@@ -286,7 +286,7 @@ implements ApplicationFeatureRepository {
if (objectMember.isAlwaysHidden()) {
return false;
}
- newMember(classFeatureId, objectMember.getId(), memberType, returnType, derived, maxLength, typicalLength, actionSemantics);
+ newMember(classFeatureId, objectMember.getId(), memberSort, returnType, derived, maxLength, typicalLength, actionSemantics);
return true;
}
@@ -311,7 +311,7 @@ implements ApplicationFeatureRepository {
memberFeatures.put(featureId, memberFeature);
- // also cache per memberType
+ // also cache per memberSort
featuresMapFor(memberSort).put(featureId, memberFeature);
final ApplicationFeature classFeature = findClass(classFeatureId);
@@ -475,18 +475,18 @@ implements ApplicationFeatureRepository {
}
@Override
- public SortedSet<String> packageNamesContainingClasses(final ApplicationMemberSort memberType) {
+ public SortedSet<String> packageNamesContainingClasses(final ApplicationMemberSort memberSort) {
initializeIfRequired();
final Collection<ApplicationFeature> packages = allFeatures(ApplicationFeatureSort.NAMESPACE);
return stream(packages)
- .filter(ApplicationFeature.Predicates.packageContainingClasses(memberType, this))
+ .filter(ApplicationFeature.Predicates.packageContainingClasses(memberSort, this))
.map(ApplicationFeature.Functions.GET_FQN)
.collect(_Sets.toUnmodifiableSorted());
}
@Override
- public SortedSet<String> classNamesContainedIn(final String packageFqn, final ApplicationMemberSort memberType) {
+ public SortedSet<String> classNamesContainedIn(final String packageFqn, final ApplicationMemberSort memberSort) {
initializeIfRequired();
final ApplicationFeatureId packageId = ApplicationFeatureId.newNamespace(packageFqn);
final ApplicationFeature pkg = findPackage(packageId);
@@ -495,7 +495,7 @@ implements ApplicationFeatureRepository {
}
final SortedSet<ApplicationFeatureId> contents = pkg.getContents();
return contents.stream()
- .filter(_Predicates.isLogicalTypeContaining(memberType, this))
+ .filter(_Predicates.isLogicalTypeContaining(memberSort, this))
.map(ApplicationFeatureId::getTypeSimpleName)
.collect(_Sets.toUnmodifiableSorted());
}
@@ -519,14 +519,14 @@ implements ApplicationFeatureRepository {
public SortedSet<String> memberNamesOf(
final String packageFqn,
final String className,
- final ApplicationMemberSort memberType) {
+ final ApplicationMemberSort memberSort) {
initializeIfRequired();
final ApplicationFeatureId classId = ApplicationFeatureId.newType(packageFqn + "." + className);
final ApplicationFeature cls = findClass(classId);
if (cls == null) {
return Collections.emptySortedSet();
}
- final SortedSet<ApplicationFeatureId> featureIds = cls.membersOf(memberType);
+ final SortedSet<ApplicationFeatureId> featureIds = cls.membersOf(memberSort);
return featureIds.stream()
.map(ApplicationFeatureId::getMemberName)
.collect(_Sets.toUnmodifiableSorted());
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
index 5ba6693..a816a38 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureIdTest.java
@@ -590,7 +590,7 @@ public class ApplicationFeatureIdTest {
public static class IsClassContaining extends PredicatesTest {
@SuppressWarnings("unused")
- private ApplicationMemberSort memberType;
+ private ApplicationMemberSort memberSort;
@Mock
private ApplicationFeatureRepositoryDefault mockApplicationFeatureRepository;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPermission.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPermission.java
index c976830..27f42f8 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPermission.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/dom/role/ApplicationRole_addPermission.java
@@ -28,7 +28,6 @@ import javax.inject.Inject;
import org.apache.isis.applib.ViewModel;
import org.apache.isis.applib.annotation.Action;
-import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.MinLength;
@@ -36,7 +35,6 @@ import org.apache.isis.applib.annotation.Nature;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
import org.apache.isis.applib.annotation.ParameterLayout;
-import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
import org.apache.isis.applib.services.appfeat.ApplicationFeatureRepository;
@@ -60,7 +58,6 @@ import lombok.experimental.Accessors;
@Action(
domainEvent = AddPermissionDomainEvent.class,
associateWith = "permissions")
-@ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
@RequiredArgsConstructor
public class ApplicationRole_addPermission {
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 401fd42..a1f2492 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
@@ -169,7 +169,7 @@ public class ApplicationPermission implements org.apache.isis.extensions.secman.
.map(featureId -> applicationFeatureRepository.findFeature(featureId));
}
- // region > type (derived, memberType of associated feature)
+ // region > type (derived, memberSort of associated feature)
public static class TypeDomainEvent extends PropertyDomainEvent<String> {}
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.layout.xml b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.layout.xml
index edf5db3..a99e4fd 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.layout.xml
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/permission/ApplicationPermission.layout.xml
@@ -47,7 +47,7 @@ under the License.
</bs3:col>
<bs3:col span="6">
<cpt:fieldSet name="Feature" id="feature">
- <cpt:property id="type"/>
+ <cpt:property id="sort"/>
<cpt:property id="featureFqn"/>
</cpt:fieldSet>
</bs3:col>
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 438046f..1377179 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
@@ -184,7 +184,7 @@ implements
.map(featureId -> applicationFeatureRepository.findFeature(featureId));
}
- // region > type (derived, memberType of associated feature)
+ // region > type (derived, memberSort of associated feature)
public static class TypeDomainEvent extends PropertyDomainEvent<String> {}
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.layout.xml b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.layout.xml
index edf5db3..a99e4fd 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.layout.xml
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/permission/ApplicationPermission.layout.xml
@@ -47,7 +47,7 @@ under the License.
</bs3:col>
<bs3:col span="6">
<cpt:fieldSet name="Feature" id="feature">
- <cpt:property id="type"/>
+ <cpt:property id="sort"/>
<cpt:property id="featureFqn"/>
</cpt:fieldSet>
</bs3:col>