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/01/26 18:39:54 UTC
[isis] branch master updated: ISIS-2431: rename className ->
typeSimpleName
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 37f5100 ISIS-2431: rename className -> typeSimpleName
37f5100 is described below
commit 37f51009306c17b7bc7cae25f8b8338669abad70
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jan 26 19:39:42 2021 +0100
ISIS-2431: rename className -> typeSimpleName
---
.../services/appfeat/ApplicationFeatureId.java | 34 ++++++++++------------
.../services/appfeat/ApplicationFeatureType.java | 6 ++--
.../services/appfeat/ApplicationFeatureIdTest.java | 16 +++++-----
.../appfeat/ApplicationFeatureTypeTest.java | 6 ++--
.../api/permission/ApplicationPermission.java | 4 +--
.../app/feature/ApplicationFeatureViewModel.java | 2 +-
.../user/ApplicationUser_filterPermissions.java | 2 +-
7 files changed, 34 insertions(+), 36 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java
index 7133f6f..3c8ba8d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureId.java
@@ -47,7 +47,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
* <p>
* This value is {@link Comparable}, the implementation of which considers
* {@link #getType() (feature) type}, {@link #getPackageName() package name},
- * {@link #getClassName() class name} and {@link #getMemberName() member name}.
+ * {@link #getTypeSimpleName() class name} and {@link #getMemberName() member name}.
*/
@Value
public class ApplicationFeatureId
@@ -180,8 +180,8 @@ implements
public String getFullyQualifiedName() {
final StringBuilder buf = new StringBuilder();
buf.append(getNamespace());
- if(getClassName() != null) {
- buf.append(".").append(getClassName());
+ if(getTypeSimpleName() != null) {
+ buf.append(".").append(getTypeSimpleName());
}
if(getMemberName() != null) {
buf.append("#").append(getMemberName());
@@ -195,7 +195,7 @@ implements
@Programmatic
public ObjectSpecId getObjectSpecId() {
- if (getClassName() == null) {
+ if (getTypeSimpleName() == null) {
return null;
}
@@ -203,7 +203,7 @@ implements
if(!_Strings.isNullOrEmpty(getNamespace())) {
buf.append(getNamespace()).append(".");
}
- buf.append(getClassName());
+ buf.append(getTypeSimpleName());
return ObjectSpecId.of(buf.toString());
}
@@ -239,17 +239,15 @@ implements
// -- className (property, optional)
- private String className;
+ private String typeSimpleName;
- /** @deprecated with v2.0.0-M5 semantics changed: should be renamed to getTypeSimpleName() */
@Programmatic
- public String getClassName() {
- return className;
+ public String getTypeSimpleName() {
+ return typeSimpleName;
}
- /** @deprecated with v2.0.0-M5 semantics changed: should be renamed to setTypeSimpleName() */
- void setClassName(final String className) {
- this.className = className;
+ void setTypeSimpleName(final String className) {
+ this.typeSimpleName = className;
}
@@ -307,7 +305,7 @@ implements
*/
public ApplicationFeatureId getParentClassId() {
ApplicationFeatureType.ensureMember(this);
- final String classFqn = this.getNamespace() + "." + getClassName();
+ final String classFqn = this.getNamespace() + "." + getTypeSimpleName();
return newClass(classFqn);
}
@@ -336,7 +334,7 @@ implements
private Functions(){}
public static final Function<ApplicationFeatureId, String> GET_CLASS_NAME =
- ApplicationFeatureId::getClassName;
+ ApplicationFeatureId::getTypeSimpleName;
public static final Function<ApplicationFeatureId, String> GET_MEMBER_NAME =
ApplicationFeatureId::getMemberName;
@@ -435,7 +433,7 @@ implements
private static final Comparator<ApplicationFeatureId> byPackageName =
comparing(ApplicationFeatureId::getNamespace, nullsFirst(naturalOrder()));
private static final Comparator<ApplicationFeatureId> byClassName =
- comparing(ApplicationFeatureId::getClassName, nullsFirst(naturalOrder()));
+ comparing(ApplicationFeatureId::getTypeSimpleName, nullsFirst(naturalOrder()));
private static final Comparator<ApplicationFeatureId> byMemberName =
comparing(ApplicationFeatureId::getMemberName, nullsFirst(naturalOrder()));
@@ -448,19 +446,19 @@ implements
private static final Equality<ApplicationFeatureId> equality =
ObjectContracts.checkEquals(ApplicationFeatureId::getType)
.thenCheckEquals(ApplicationFeatureId::getNamespace)
- .thenCheckEquals(ApplicationFeatureId::getClassName)
+ .thenCheckEquals(ApplicationFeatureId::getTypeSimpleName)
.thenCheckEquals(ApplicationFeatureId::getMemberName);
private static final Hashing<ApplicationFeatureId> hashing =
ObjectContracts.hashing(ApplicationFeatureId::getType)
.thenHashing(ApplicationFeatureId::getNamespace)
- .thenHashing(ApplicationFeatureId::getClassName)
+ .thenHashing(ApplicationFeatureId::getTypeSimpleName)
.thenHashing(ApplicationFeatureId::getMemberName);
private static final ToString<ApplicationFeatureId> toString =
ObjectContracts.toString("type", ApplicationFeatureId::getType)
.thenToString("packageName", ApplicationFeatureId::getNamespace)
- .thenToStringOmitIfAbsent("className", ApplicationFeatureId::getClassName)
+ .thenToStringOmitIfAbsent("className", ApplicationFeatureId::getTypeSimpleName)
.thenToStringOmitIfAbsent("memberName", ApplicationFeatureId::getMemberName);
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureType.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureType.java
index 608b08a..6a7ef95 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureType.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureType.java
@@ -31,7 +31,7 @@ public enum ApplicationFeatureType {
@Override
void init(final ApplicationFeatureId feature, final String fullyQualifiedName) {
feature.setNamespace(fullyQualifiedName);
- feature.setClassName(null);
+ feature.setTypeSimpleName(null);
feature.setMemberName(null);
feature.type = this;
}
@@ -46,10 +46,10 @@ public enum ApplicationFeatureType {
final int i = fullyQualifiedName.lastIndexOf(".");
if(i != -1) {
feature.setNamespace(fullyQualifiedName.substring(0, i));
- feature.setClassName(fullyQualifiedName.substring(i+1));
+ feature.setTypeSimpleName(fullyQualifiedName.substring(i+1));
} else {
feature.setNamespace("");
- feature.setClassName(fullyQualifiedName);
+ feature.setTypeSimpleName(fullyQualifiedName);
}
feature.setMemberName(null);
feature.type = this;
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 2b26357..9f91565 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
@@ -69,7 +69,7 @@ public class ApplicationFeatureIdTest {
// then
assertThat(applicationFeatureId.getType(), is(ApplicationFeatureType.PACKAGE));
assertThat(applicationFeatureId.getNamespace(), is("com.mycompany"));
- assertThat(applicationFeatureId.getClassName(), is(nullValue()));
+ assertThat(applicationFeatureId.getTypeSimpleName(), is(nullValue()));
assertThat(applicationFeatureId.getMemberName(), is(nullValue()));
}
}
@@ -83,7 +83,7 @@ public class ApplicationFeatureIdTest {
// then
assertThat(applicationFeatureId.getType(), is(ApplicationFeatureType.CLASS));
assertThat(applicationFeatureId.getNamespace(), is("com.mycompany"));
- assertThat(applicationFeatureId.getClassName(), is("Bar"));
+ assertThat(applicationFeatureId.getTypeSimpleName(), is("Bar"));
assertThat(applicationFeatureId.getMemberName(), is(nullValue()));
}
}
@@ -97,7 +97,7 @@ public class ApplicationFeatureIdTest {
// then
assertThat(applicationFeatureId.getType(), is(ApplicationFeatureType.MEMBER));
assertThat(applicationFeatureId.getNamespace(), is("com.mycompany"));
- assertThat(applicationFeatureId.getClassName(), is("Bar"));
+ assertThat(applicationFeatureId.getTypeSimpleName(), is("Bar"));
assertThat(applicationFeatureId.getMemberName(), is("foo"));
}
@@ -108,7 +108,7 @@ public class ApplicationFeatureIdTest {
// then
assertThat(applicationFeatureId.getType(), is(ApplicationFeatureType.MEMBER));
assertThat(applicationFeatureId.getNamespace(), is("com.mycompany"));
- assertThat(applicationFeatureId.getClassName(), is("Bar"));
+ assertThat(applicationFeatureId.getTypeSimpleName(), is("Bar"));
assertThat(applicationFeatureId.getMemberName(), is("foo"));
}
@@ -286,7 +286,7 @@ public class ApplicationFeatureIdTest {
// then
assertThat(parentPackageId.getType(), is(ApplicationFeatureType.PACKAGE));
assertThat(parentPackageId.getNamespace(), is("com"));
- assertThat(parentPackageId.getClassName(), is(nullValue()));
+ assertThat(parentPackageId.getTypeSimpleName(), is(nullValue()));
assertThat(parentPackageId.getMemberName(), is(nullValue()));
}
@@ -321,7 +321,7 @@ public class ApplicationFeatureIdTest {
// then
assertThat(parentPackageId.getType(), is(ApplicationFeatureType.PACKAGE));
assertThat(parentPackageId.getNamespace(), is("com.mycompany"));
- assertThat(parentPackageId.getClassName(), is(nullValue()));
+ assertThat(parentPackageId.getTypeSimpleName(), is(nullValue()));
assertThat(parentPackageId.getMemberName(), is(nullValue()));
}
@@ -336,7 +336,7 @@ public class ApplicationFeatureIdTest {
// then
assertThat(parentPackageId.getType(), is(ApplicationFeatureType.PACKAGE));
assertThat(parentPackageId.getNamespace(), is(""));
- assertThat(parentPackageId.getClassName(), is(nullValue()));
+ assertThat(parentPackageId.getTypeSimpleName(), is(nullValue()));
assertThat(parentPackageId.getMemberName(), is(nullValue()));
}
@@ -368,7 +368,7 @@ public class ApplicationFeatureIdTest {
// then
assertThat(parentClassId.getType(), is(ApplicationFeatureType.CLASS));
assertThat(parentClassId.getNamespace(), is("com.mycompany"));
- assertThat(parentClassId.getClassName(), is("Bar"));
+ assertThat(parentClassId.getTypeSimpleName(), is("Bar"));
assertThat(parentClassId.getMemberName(), is(nullValue()));
}
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 e9fbad4..7398248 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
@@ -60,7 +60,7 @@ public class ApplicationFeatureTypeTest {
ApplicationFeatureType.PACKAGE.init(applicationFeatureId, "com.mycompany");
assertThat(applicationFeatureId.getNamespace(), is("com.mycompany"));
- assertThat(applicationFeatureId.getClassName(), is(nullValue()));
+ assertThat(applicationFeatureId.getTypeSimpleName(), is(nullValue()));
assertThat(applicationFeatureId.getMemberName(), is(nullValue()));
}
@@ -72,7 +72,7 @@ public class ApplicationFeatureTypeTest {
ApplicationFeatureType.CLASS.init(applicationFeatureId, "com.mycompany.Bar");
assertThat(applicationFeatureId.getNamespace(), is("com.mycompany"));
- assertThat(applicationFeatureId.getClassName(), is("Bar"));
+ assertThat(applicationFeatureId.getTypeSimpleName(), is("Bar"));
assertThat(applicationFeatureId.getMemberName(), is(nullValue()));
}
@@ -84,7 +84,7 @@ public class ApplicationFeatureTypeTest {
ApplicationFeatureType.MEMBER.init(applicationFeatureId, "com.mycompany.Bar#foo");
assertThat(applicationFeatureId.getNamespace(), is("com.mycompany"));
- assertThat(applicationFeatureId.getClassName(), is("Bar"));
+ assertThat(applicationFeatureId.getTypeSimpleName(), is("Bar"));
assertThat(applicationFeatureId.getMemberName(), is("foo"));
}
@Test
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
index e227a22..0856bc5 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/ApplicationPermission.java
@@ -96,11 +96,11 @@ public interface ApplicationPermission {
if(getFeatureFqn().length() < 30) {
buf.append(getFeatureFqn()); // com.mycompany.Bar
} else {
- buf.append(featureId.getClassName()); // Bar
+ buf.append(featureId.getTypeSimpleName()); // Bar
}
break;
case MEMBER:
- buf.append(featureId.getClassName())
+ buf.append(featureId.getTypeSimpleName())
.append("#")
.append(featureId.getMemberName()); // com.mycompany.Bar#foo
break;
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModel.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModel.java
index 9651c7a..caf319a 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModel.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/feature/ApplicationFeatureViewModel.java
@@ -195,7 +195,7 @@ public abstract class ApplicationFeatureViewModel implements ViewModel {
@PropertyLayout(typicalLength=ApplicationFeature.TYPICAL_LENGTH_CLS_NAME)
@MemberOrder(name="Id", sequence = "2.3")
public String getClassName() {
- return getFeatureId().getClassName();
+ return getFeatureId().getTypeSimpleName();
}
public boolean hideClassName() {
return getType().hideClassName();
diff --git a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_filterPermissions.java b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_filterPermissions.java
index 03c472c..6e07945 100644
--- a/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_filterPermissions.java
+++ b/extensions/security/secman/model/src/main/java/org/apache/isis/extensions/secman/model/app/user/ApplicationUser_filterPermissions.java
@@ -96,7 +96,7 @@ public class ApplicationUser_filterPermissions {
}
// match on class (if specified)
- return className == null || Objects.equals(inputFeatureId.getClassName(), className);
+ return className == null || Objects.equals(inputFeatureId.getTypeSimpleName(), className);
};
}