(causeway-app-referenceapp) branch master updated: upstream changes (tree adapter)

[ahuber]

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/causeway-app-referenceapp.git


The following commit(s) were added to refs/heads/master by this push:
     new 91f4ac3  upstream changes (tree adapter)
91f4ac3 is described below

commit 91f4ac383d9a9ed7b7b2f7e03ab10cc2439870b0
Author: andi-huber <ahu...@apache.org>
AuthorDate: Sat Mar 30 10:41:00 2024 +0100

    upstream changes (tree adapter)
---
 .../PropertyLayout/navigable/FileSystemTreeAdapter.java      | 11 -----------
 .../PropertyLayout/navigable/FileTreeNodeService.java        |  2 +-
 .../dom/types/causeway/treenode/FileSystemTreeAdapter.java   | 12 ------------
 .../dom/types/causeway/treenode/FileTreeNodeService.java     |  2 +-
 4 files changed, 2 insertions(+), 25 deletions(-)

diff --git 
a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileSystemTreeAdapter.java
 
b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileSystemTreeAdapter.java
index 1e42b27..71794d7 100644
--- 
a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileSystemTreeAdapter.java
+++ 
b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileSystemTreeAdapter.java
@@ -19,7 +19,6 @@
 package demoapp.dom.domain.properties.PropertyLayout.navigable;
 
 import java.io.File;
-import java.util.Optional;
 import java.util.stream.Stream;
 
 import org.apache.causeway.applib.graph.tree.TreeAdapter;
@@ -29,16 +28,6 @@ import lombok.val;
 //tag::class[]
 public class FileSystemTreeAdapter implements TreeAdapter<FileNodeVm> {
 
-    @Override
-    public Optional<FileNodeVm> parentOf(FileNodeVm fileNode) {
-        if(fileNode.getType() == FileNodeType.FILE_SYSTEM_ROOT) {
-            return Optional.empty();
-        }
-        val parentFolderIfAny = fileNode.asFile().getParentFile();
-        return Optional.ofNullable(parentFolderIfAny)
-                .map(FileNodeVm::new);
-    }
-
     @Override
     public int childCountOf(FileNodeVm value) {
         return (int) streamChildFiles(value).count();
diff --git 
a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileTreeNodeService.java
 
b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileTreeNodeService.java
index f763ccb..0ee5e7b 100644
--- 
a/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileTreeNodeService.java
+++ 
b/domain/src/main/java/demoapp/dom/domain/properties/PropertyLayout/navigable/FileTreeNodeService.java
@@ -60,7 +60,7 @@ public class FileTreeNodeService {
         TreeNode<FileNodeVm> tree;
         val rootFile = 
FileSystems.getDefault().getRootDirectories().iterator().next().toFile();
         val rootNode = new FileNodeVm(rootFile);
-        tree = TreeNode.lazy(rootNode, FileSystemTreeAdapter.class);
+        tree = TreeNode.root(rootNode, FileSystemTreeAdapter.class);
         tree.expand(TreePath.of(0)); // expand the root node
         return tree;
     }
diff --git 
a/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileSystemTreeAdapter.java
 
b/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileSystemTreeAdapter.java
index 1434e24..1775f53 100644
--- 
a/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileSystemTreeAdapter.java
+++ 
b/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileSystemTreeAdapter.java
@@ -19,7 +19,6 @@
 package demoapp.dom.types.causeway.treenode;
 
 import java.io.File;
-import java.util.Optional;
 import java.util.stream.Stream;
 
 import org.apache.causeway.applib.graph.tree.TreeAdapter;
@@ -29,17 +28,6 @@ import lombok.val;
 //tag::class[]
 public class FileSystemTreeAdapter implements TreeAdapter<FileNodeVm> {
 
-    @Override
-    public Optional<FileNodeVm> parentOf(FileNodeVm fileNode) {
-        if(fileNode.getType() == FileNodeType.FILE_SYSTEM_ROOT) {
-            return Optional.empty();
-        }
-        return Optional.ofNullable(fileNode.getPath())
-                .map(File::new)
-                .map(File::getParentFile)
-                .map(FileNodeVm::new);
-    }
-
     @Override
     public int childCountOf(FileNodeVm value) {
         return (int) streamChildFiles(value).count();
diff --git 
a/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileTreeNodeService.java
 
b/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileTreeNodeService.java
index 9a6f406..8f8670b 100644
--- 
a/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileTreeNodeService.java
+++ 
b/domain/src/main/java/demoapp/dom/types/causeway/treenode/FileTreeNodeService.java
@@ -60,7 +60,7 @@ public class FileTreeNodeService {
         TreeNode<FileNodeVm> tree;
         val rootFile = 
FileSystems.getDefault().getRootDirectories().iterator().next().toFile();
         val rootNode = new FileNodeVm(rootFile);
-        tree = TreeNode.lazy(rootNode, FileSystemTreeAdapter.class);
+        tree = TreeNode.root(rootNode, FileSystemTreeAdapter.class);
         tree.expand(TreePath.of(0)); // expand the root node
         return tree;
     }