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/05 07:01:16 UTC
[isis] branch master updated: ISIS-2553: ApplicationFeatures:
simplify
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 039a2af ISIS-2553: ApplicationFeatures: simplify
039a2af is described below
commit 039a2af6fa4e990bd762a0c7e8222f4aff09c6ac
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Mar 5 08:01:04 2021 +0100
ISIS-2553: ApplicationFeatures: simplify
---
.../services/appfeat/ApplicationFeatureId.java | 4 ++--
.../services/appfeat/ApplicationFeature.java | 25 +++-------------------
.../ApplicationFeatureRepositoryDefault.java | 2 +-
.../services/appfeat/ApplicationFeatureTest.java | 6 +++---
4 files changed, 9 insertions(+), 28 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 abfa2a9..f9ab7ab 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
@@ -334,7 +334,7 @@ implements
private static final Comparator<ApplicationFeatureId> byMemberName =
comparing(ApplicationFeatureId::getMemberName, nullsFirst(naturalOrder()));
- private static final Comparator<ApplicationFeatureId> applicationFeatureIdOrdering =
+ private static final Comparator<ApplicationFeatureId> comparator =
Comparator.nullsFirst(bySort)
.thenComparing(byNamespace)
.thenComparing(byTypeSimpleName)
@@ -361,7 +361,7 @@ implements
@Override
public int compareTo(final ApplicationFeatureId other) {
- return applicationFeatureIdOrdering.compare(this, other);
+ return comparator.compare(this, other);
}
@Override
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java
index 0c930f3..9dfcc95 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeature.java
@@ -176,30 +176,11 @@ public class ApplicationFeature implements Comparable<ApplicationFeature> {
}
}
- // -- Functions
-
- @Vetoed @UtilityClass
- public static class Functions {
-
- public static final Function<ApplicationFeature, String> GET_FQN =
- (ApplicationFeature input)->input.getFeatureId().getFullyQualifiedName();
-
- }
-
- @Vetoed @UtilityClass
- public static class Predicates {
-
- public static Predicate<ApplicationFeature> packageContainingClasses(
- final ApplicationMemberSort memberSort,
- final ApplicationFeatureRepositoryDefault applicationFeatures) {
-
- return (final ApplicationFeature input) ->
- input.getContents().stream() // all the classes in this package
- .anyMatch(_Predicates.isLogicalTypeContaining(memberSort, applicationFeatures));
- }
+ public String getFullyQualifiedName() {
+ return getFeatureId().getFullyQualifiedName();
}
- // -- equals, hashCode, compareTo, toString
+ // -- OBJECT CONTRACT
private static final Comparator<ApplicationFeature> comparator =
Comparator.comparing(ApplicationFeature::getFeatureId);
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 70c9de4..8ba6a7f 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
@@ -470,7 +470,7 @@ implements ApplicationFeatureRepository {
public SortedSet<String> namespaceNames() {
initializeIfRequired();
return stream(allFeatures(ApplicationFeatureSort.NAMESPACE))
- .map(ApplicationFeature.Functions.GET_FQN)
+ .map(ApplicationFeature::getFullyQualifiedName)
.collect(_Sets.toUnmodifiableSorted());
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTest.java
index a30c156..cd848c8 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/appfeat/ApplicationFeatureTest.java
@@ -150,12 +150,12 @@ public class ApplicationFeatureTest {
}
- public static class FunctionsTest extends ApplicationFeatureTest {
+ public static class MethodsTest extends ApplicationFeatureTest {
@Test
- public void GET_FQN() throws Exception {
+ public void getFullyQualifiedName() throws Exception {
final ApplicationFeature input = new ApplicationFeature(ApplicationFeatureId.newMember("com.mycompany.Foo#bar"));
- assertThat(ApplicationFeature.Functions.GET_FQN.apply(input), is("com.mycompany.Foo#bar"));
+ assertThat(input.getFullyQualifiedName(), is("com.mycompany.Foo#bar"));
}
}