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 2022/09/08 12:39:46 UTC
[isis] branch master updated: ISIS-3206: fixes the bean sort of MMTreeAdapter
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 6c24ee7569 ISIS-3206: fixes the bean sort of MMTreeAdapter
6c24ee7569 is described below
commit 6c24ee7569121004908eb5c8592d6719d69b70ea
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Sep 8 14:39:38 2022 +0200
ISIS-3206: fixes the bean sort of MMTreeAdapter
---
.../apache/isis/applib/graph/tree/TreeAdapter.java | 21 +++++++++++++--------
.../core/metamodel/inspect/model/MMTreeAdapter.java | 2 --
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/graph/tree/TreeAdapter.java b/api/applib/src/main/java/org/apache/isis/applib/graph/tree/TreeAdapter.java
index abddb56c85..40cfdef70e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/graph/tree/TreeAdapter.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/graph/tree/TreeAdapter.java
@@ -21,32 +21,37 @@ package org.apache.isis.applib.graph.tree;
import java.util.Optional;
import java.util.stream.Stream;
+import org.apache.isis.applib.annotation.Domain;
+
/**
- * Provides the parent/child relationship information between pojos
- * to derive a tree-structure.
- *
+ * Provides the parent/child relationship information between pojos
+ * to derive a tree-structure.
+ *
* @param <T> type of the tree nodes that make up the tree structure
- *
+ *
* @since 2.0 {@index}
*/
public interface TreeAdapter<T> {
/**
- * @param value - tree-node (pojo)
+ * @param value - tree-node (pojo)
* @return the parent tree-node (pojo) of the specified {@code value} tree-node (pojo)
*/
- public Optional<T> parentOf(T value);
+ @Domain.Exclude
+ Optional<T> parentOf(T value);
/**
* @param value - tree-node (pojo)
* @return number of child tree-nodes of the specified {@code value} tree-node (pojo)
*/
- public int childCountOf(T value);
+ @Domain.Exclude
+ int childCountOf(T value);
/**
* @param value - tree-node (pojo)
* @return stream of child tree-nodes of the specified {@code value} tree-node (pojo)
*/
- public Stream<T> childrenOf(T value);
+ @Domain.Exclude
+ Stream<T> childrenOf(T value);
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMTreeAdapter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMTreeAdapter.java
index d38ee3efd0..bf3322f7fd 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMTreeAdapter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/inspect/model/MMTreeAdapter.java
@@ -21,11 +21,9 @@ package org.apache.isis.core.metamodel.inspect.model;
import java.util.Optional;
import java.util.stream.Stream;
-import org.apache.isis.applib.annotation.Domain;
import org.apache.isis.applib.graph.tree.TreeAdapter;
import org.apache.isis.commons.internal.base._NullSafe;
-@Domain.Exclude
public class MMTreeAdapter implements TreeAdapter<MMNode> {
@Override