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/05/25 17:54:16 UTC
[isis] branch master updated: ISIS-2631: rename
ApplicationFeatureId#memberLogicalName ->logicalMemberName
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 4cb268c ISIS-2631: rename ApplicationFeatureId#memberLogicalName ->logicalMemberName
4cb268c is described below
commit 4cb268c1845efe1b9049ee6b3c7a281317281ab6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue May 25 19:54:03 2021 +0200
ISIS-2631: rename ApplicationFeatureId#memberLogicalName
->logicalMemberName
---
.../services/appfeat/ApplicationFeatureId.java | 26 +++++++++++-----------
.../appfeatui/ApplicationFeatureViewModel.java | 2 +-
.../metamodel/MetaModelServiceDefault.java | 2 +-
.../services/appfeat/ApplicationFeatureIdTest.java | 16 ++++++-------
.../appfeat/ApplicationFeatureTypeTest.java | 6 ++---
.../api/permission/dom/ApplicationPermission.java | 2 +-
6 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java
index 3a8c67e..8a6c5b8 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeat/ApplicationFeatureId.java
@@ -52,9 +52,9 @@ import lombok.val;
* <p>
* This value is {@link Comparable}, the implementation of which considers
* {@link #getSort() (feature) sort}, {@link #getNamespace() namespace},
- * {@link #getTypeSimpleName() type simple name} and {@link #getMemberLogicalName() member-logical-name}.
+ * {@link #getTypeSimpleName() type simple name} and {@link #getLogicalMemberName() member-logical-name}.
* <p>
- * If the represented member is an <i>action</i>, then {@link #getMemberLogicalName() member-logical-name}
+ * If the represented member is an <i>action</i>, then {@link #getLogicalMemberName() member-logical-name}
* must <b>not</b> include any parameter list or parentheses.
* Consequently method overloading is not supported.
* <p>
@@ -122,7 +122,7 @@ implements
val featureId = new ApplicationFeatureId(ApplicationFeatureSort.NAMESPACE);
featureId.namespace = namespace;
featureId.typeSimpleName = null;
- featureId.memberLogicalName = null;
+ featureId.logicalMemberName = null;
return featureId;
}
@@ -170,11 +170,11 @@ implements
"fullyQualifiedName '%s' must include a non-empty namespace", fullyQualifiedName);
}
- featureId.memberLogicalName = null;
+ featureId.logicalMemberName = null;
}
private static void initMember(final ApplicationFeatureId featureId, final @Nullable String memberLogicalName) {
- featureId.memberLogicalName = stripOffParamsIfAny(memberLogicalName); // just in case
+ featureId.logicalMemberName = stripOffParamsIfAny(memberLogicalName); // just in case
}
private static String stripOffParamsIfAny(final @Nullable String name) {
@@ -237,7 +237,7 @@ implements
* {@code null} if not a member
*/
@Programmatic
- @Getter private String memberLogicalName;
+ @Getter private String logicalMemberName;
@Programmatic
public String getFullyQualifiedName() {
@@ -246,8 +246,8 @@ implements
if(getTypeSimpleName() != null) {
buf.append(".").append(getTypeSimpleName());
}
- if(getMemberLogicalName() != null) {
- buf.append("#").append(getMemberLogicalName());
+ if(getLogicalMemberName() != null) {
+ buf.append("#").append(getLogicalMemberName());
}
return buf.toString();
}
@@ -366,7 +366,7 @@ implements
private static final Comparator<ApplicationFeatureId> byTypeSimpleName =
comparing(ApplicationFeatureId::getTypeSimpleName, nullsFirst(naturalOrder()));
private static final Comparator<ApplicationFeatureId> byMemberName =
- comparing(ApplicationFeatureId::getMemberLogicalName, nullsFirst(naturalOrder()));
+ comparing(ApplicationFeatureId::getLogicalMemberName, nullsFirst(naturalOrder()));
private static final Comparator<ApplicationFeatureId> comparator =
Comparator.nullsFirst(bySort)
@@ -378,19 +378,19 @@ implements
ObjectContracts.checkEquals(ApplicationFeatureId::getSort)
.thenCheckEquals(ApplicationFeatureId::getNamespace)
.thenCheckEquals(ApplicationFeatureId::getTypeSimpleName)
- .thenCheckEquals(ApplicationFeatureId::getMemberLogicalName);
+ .thenCheckEquals(ApplicationFeatureId::getLogicalMemberName);
private static final Hashing<ApplicationFeatureId> hashing =
ObjectContracts.hashing(ApplicationFeatureId::getSort)
.thenHashing(ApplicationFeatureId::getNamespace)
.thenHashing(ApplicationFeatureId::getTypeSimpleName)
- .thenHashing(ApplicationFeatureId::getMemberLogicalName);
+ .thenHashing(ApplicationFeatureId::getLogicalMemberName);
private static final ToString<ApplicationFeatureId> toString =
ObjectContracts.toString("sort", ApplicationFeatureId::getSort)
.thenToString("namespace", ApplicationFeatureId::getNamespace)
.thenToStringOmitIfAbsent("typeSimpleName", ApplicationFeatureId::getTypeSimpleName)
- .thenToStringOmitIfAbsent("memberName", ApplicationFeatureId::getMemberLogicalName);
+ .thenToStringOmitIfAbsent("memberName", ApplicationFeatureId::getLogicalMemberName);
@Override
@@ -421,7 +421,7 @@ implements
* @param namespace
*/
public ApplicationFeatureId withNamespace(final @NonNull String namespace) {
- return newFeature(namespace, this.getTypeSimpleName(), this.getMemberLogicalName());
+ return newFeature(namespace, this.getTypeSimpleName(), this.getLogicalMemberName());
}
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java
index 85a5eab..2788721 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/appfeatui/ApplicationFeatureViewModel.java
@@ -284,7 +284,7 @@ public abstract class ApplicationFeatureViewModel implements ViewModel {
*/
@MemberName
public String getMemberName() {
- return getFeatureId().getMemberLogicalName();
+ return getFeatureId().getLogicalMemberName();
}
public boolean hideMemberName() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
index f43f33e..8c3863d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefault.java
@@ -211,7 +211,7 @@ public class MetaModelServiceDefault implements MetaModelService {
if(spec == null) {
return null;
}
- final ObjectMember objectMemberIfAny = spec.getMember(featureId.getMemberLogicalName()).orElse(null);
+ final ObjectMember objectMemberIfAny = spec.getMember(featureId.getLogicalMemberName()).orElse(null);
if (objectMemberIfAny == null) {
return null;
}
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 6332d6d..e8481db 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
@@ -70,7 +70,7 @@ public class ApplicationFeatureIdTest {
assertThat(applicationFeatureId.getSort(), is(ApplicationFeatureSort.NAMESPACE));
assertThat(applicationFeatureId.getNamespace(), is("com.mycompany"));
assertThat(applicationFeatureId.getTypeSimpleName(), is(nullValue()));
- assertThat(applicationFeatureId.getMemberLogicalName(), is(nullValue()));
+ assertThat(applicationFeatureId.getLogicalMemberName(), is(nullValue()));
}
}
@@ -84,7 +84,7 @@ public class ApplicationFeatureIdTest {
assertThat(applicationFeatureId.getSort(), is(ApplicationFeatureSort.TYPE));
assertThat(applicationFeatureId.getNamespace(), is("com.mycompany"));
assertThat(applicationFeatureId.getTypeSimpleName(), is("Bar"));
- assertThat(applicationFeatureId.getMemberLogicalName(), is(nullValue()));
+ assertThat(applicationFeatureId.getLogicalMemberName(), is(nullValue()));
}
}
@@ -98,7 +98,7 @@ public class ApplicationFeatureIdTest {
assertThat(applicationFeatureId.getSort(), is(ApplicationFeatureSort.MEMBER));
assertThat(applicationFeatureId.getNamespace(), is("com.mycompany"));
assertThat(applicationFeatureId.getTypeSimpleName(), is("Bar"));
- assertThat(applicationFeatureId.getMemberLogicalName(), is("foo"));
+ assertThat(applicationFeatureId.getLogicalMemberName(), is("foo"));
}
@Test
@@ -109,7 +109,7 @@ public class ApplicationFeatureIdTest {
assertThat(applicationFeatureId.getSort(), is(ApplicationFeatureSort.MEMBER));
assertThat(applicationFeatureId.getNamespace(), is("com.mycompany"));
assertThat(applicationFeatureId.getTypeSimpleName(), is("Bar"));
- assertThat(applicationFeatureId.getMemberLogicalName(), is("foo"));
+ assertThat(applicationFeatureId.getLogicalMemberName(), is("foo"));
}
}
@@ -265,7 +265,7 @@ public class ApplicationFeatureIdTest {
assertThat(parentPackageId.getSort(), is(ApplicationFeatureSort.NAMESPACE));
assertThat(parentPackageId.getNamespace(), is("com"));
assertThat(parentPackageId.getTypeSimpleName(), is(nullValue()));
- assertThat(parentPackageId.getMemberLogicalName(), is(nullValue()));
+ assertThat(parentPackageId.getLogicalMemberName(), is(nullValue()));
}
@Test
@@ -300,7 +300,7 @@ public class ApplicationFeatureIdTest {
assertThat(parentPackageId.getSort(), is(ApplicationFeatureSort.NAMESPACE));
assertThat(parentPackageId.getNamespace(), is("com.mycompany"));
assertThat(parentPackageId.getTypeSimpleName(), is(nullValue()));
- assertThat(parentPackageId.getMemberLogicalName(), is(nullValue()));
+ assertThat(parentPackageId.getLogicalMemberName(), is(nullValue()));
}
@Test
@@ -342,7 +342,7 @@ public class ApplicationFeatureIdTest {
assertThat(parentClassId.getSort(), is(ApplicationFeatureSort.TYPE));
assertThat(parentClassId.getNamespace(), is("com.mycompany"));
assertThat(parentClassId.getTypeSimpleName(), is("Bar"));
- assertThat(parentClassId.getMemberLogicalName(), is(nullValue()));
+ assertThat(parentClassId.getLogicalMemberName(), is(nullValue()));
}
@Test
@@ -549,7 +549,7 @@ public class ApplicationFeatureIdTest {
public static class GET_MEMBER_NAME extends FunctionsTest {
private Function<ApplicationFeatureId, String> func =
- ApplicationFeatureId::getMemberLogicalName;
+ ApplicationFeatureId::getLogicalMemberName;
@Test
public void whenNull() throws Exception {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java
index b1051aa..beebc61 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTypeTest.java
@@ -64,7 +64,7 @@ public class ApplicationFeatureTypeTest {
assertThat(applicationFeatureId.getNamespace(), is("com.mycompany"));
assertThat(applicationFeatureId.getTypeSimpleName(), is(nullValue()));
- assertThat(applicationFeatureId.getMemberLogicalName(), is(nullValue()));
+ assertThat(applicationFeatureId.getLogicalMemberName(), is(nullValue()));
}
@Test
@@ -74,7 +74,7 @@ public class ApplicationFeatureTypeTest {
assertThat(applicationFeatureId.getNamespace(), is("com.mycompany"));
assertThat(applicationFeatureId.getTypeSimpleName(), is("Bar"));
- assertThat(applicationFeatureId.getMemberLogicalName(), is(nullValue()));
+ assertThat(applicationFeatureId.getLogicalMemberName(), is(nullValue()));
}
@Test
@@ -84,7 +84,7 @@ public class ApplicationFeatureTypeTest {
assertThat(applicationFeatureId.getNamespace(), is("com.mycompany"));
assertThat(applicationFeatureId.getTypeSimpleName(), is("Bar"));
- assertThat(applicationFeatureId.getMemberLogicalName(), is("foo"));
+ assertThat(applicationFeatureId.getLogicalMemberName(), is("foo"));
}
@Test
public void givenMemberMalformed() throws Exception {
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/ApplicationPermission.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/ApplicationPermission.java
index 503bef8..86c7f19 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/ApplicationPermission.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/ApplicationPermission.java
@@ -128,7 +128,7 @@ public abstract class ApplicationPermission implements Comparable<ApplicationPer
case MEMBER:
buf.append(featureId.getTypeSimpleName())
.append("#")
- .append(featureId.getMemberLogicalName()); // com.mycompany.Bar#foo
+ .append(featureId.getLogicalMemberName()); // com.mycompany.Bar#foo
break;
}