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/03 18:39:07 UTC
[isis] 02/09: ISIS-2553: simplify static functions
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
commit ec7c553f66c3a7f34f89d78e8a9758d4424699e7
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Mar 3 15:11:26 2021 +0100
ISIS-2553: simplify static functions
---
.../applib/services/appfeat/ApplicationFeatureId.java | 18 ------------------
.../appfeat/ApplicationFeatureRepositoryDefault.java | 6 +++---
.../services/appfeat/ApplicationFeatureIdTest.java | 5 +++--
3 files changed, 6 insertions(+), 23 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 f465792..4d728b1 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
@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
-import java.util.function.Function;
import static java.util.Comparator.comparing;
import static java.util.Comparator.naturalOrder;
@@ -267,23 +266,6 @@ implements
// //////////////////////////////////////
- // -- Functions
-
- public static class Functions {
-
- private Functions(){}
-
- public static final Function<ApplicationFeatureId, String> GET_CLASS_NAME =
- ApplicationFeatureId::getTypeSimpleName;
-
- public static final Function<ApplicationFeatureId, String> GET_MEMBER_NAME =
- ApplicationFeatureId::getMemberName;
-
- }
-
-
- // //////////////////////////////////////
-
// -- Comparators
public static final class Comparators {
private Comparators(){}
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 b718d1d..f4e6738 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
@@ -495,7 +495,7 @@ implements ApplicationFeatureRepository {
final SortedSet<ApplicationFeatureId> contents = pkg.getContents();
return contents.stream()
.filter(_Predicates.isClassContaining(memberType, this))
- .map(ApplicationFeatureId.Functions.GET_CLASS_NAME)
+ .map(ApplicationFeatureId::getTypeSimpleName)
.collect(_Sets.toUnmodifiableSorted());
}
@@ -510,7 +510,7 @@ implements ApplicationFeatureRepository {
final Set<ApplicationFeatureId> classIds = this.classFeatures.keySet();
return classIds.stream()
.filter(_Predicates.isClassRecursivelyWithin(packageId))
- .map(ApplicationFeatureId.Functions.GET_CLASS_NAME)
+ .map(ApplicationFeatureId::getTypeSimpleName)
.collect(_Sets.toUnmodifiableSorted());
}
@@ -527,7 +527,7 @@ implements ApplicationFeatureRepository {
}
final SortedSet<ApplicationFeatureId> featureIds = cls.membersOf(memberType);
return featureIds.stream()
- .map(ApplicationFeatureId.Functions.GET_MEMBER_NAME)
+ .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 7c319c4..38526f5 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
@@ -547,7 +547,7 @@ public class ApplicationFeatureIdTest {
public static class GET_CLASS_NAME extends FunctionsTest {
- private Function<ApplicationFeatureId, String> func = ApplicationFeatureId.Functions.GET_CLASS_NAME;
+ private Function<ApplicationFeatureId, String> func = ApplicationFeatureId::getTypeSimpleName;
@Test
public void whenNull() throws Exception {
@@ -574,7 +574,8 @@ public class ApplicationFeatureIdTest {
public static class GET_MEMBER_NAME extends FunctionsTest {
- private Function<ApplicationFeatureId, String> func = ApplicationFeatureId.Functions.GET_MEMBER_NAME;
+ private Function<ApplicationFeatureId, String> func =
+ ApplicationFeatureId::getMemberName;
@Test
public void whenNull() throws Exception {