You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by mh...@apache.org on 2023/07/10 06:21:39 UTC
[causeway-app-simpleapp] branch CAUSEWAY-3522.treenode.hollow updated: Reproducing failed title in tree node
This is an automated email from the ASF dual-hosted git repository.
mhesse pushed a commit to branch CAUSEWAY-3522.treenode.hollow
in repository https://gitbox.apache.org/repos/asf/causeway-app-simpleapp.git
The following commit(s) were added to refs/heads/CAUSEWAY-3522.treenode.hollow by this push:
new bd77e3a Reproducing failed title in tree node
bd77e3a is described below
commit bd77e3aabdfa7753ead184fa57cf5c7200f940c5
Author: Martin Hesse <mw...@gmail.com>
AuthorDate: Mon Jul 10 08:14:06 2023 +0200
Reproducing failed title in tree node
---
.../domainapp/modules/simple/SimpleModule.java | 4 ++
.../domainapp/modules/simple/dom/tree/Author.java | 66 +++++++++++++++++++
.../domainapp/modules/simple/dom/tree/Authors.java | 43 ++++++++++++
.../domainapp/modules/simple/dom/tree/Book.java | 77 ++++++++++++++++++++++
.../modules/simple/dom/tree/BookNode.java | 11 ++++
.../simple/dom/tree/BookNodeTreeAdapter.java | 25 +++++++
.../modules/simple/dom/tree/BookView.java | 57 ++++++++++++++++
.../domainapp/modules/simple/dom/tree/Books.java | 49 ++++++++++++++
.../modules/simple/fixture/BookAuthorFixture.java | 20 ++++++
.../fixture/scenarios/DomainAppDemo.java | 4 +-
10 files changed, 355 insertions(+), 1 deletion(-)
diff --git a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
index 733031d..24fee98 100644
--- a/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
+++ b/module-simple/src/main/java/domainapp/modules/simple/SimpleModule.java
@@ -4,6 +4,8 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
+import com.github.javafaker.Book;
+
import org.apache.causeway.extensions.fullcalendar.applib.CausewayModuleExtFullCalendarApplib;
import org.apache.causeway.extensions.pdfjs.applib.CausewayModuleExtPdfjsApplib;
import org.apache.causeway.persistence.jdo.applib.CausewayModulePersistenceJdoApplib;
@@ -13,6 +15,8 @@ import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixtures;
import org.apache.causeway.testing.fixtures.applib.teardown.jdo.TeardownFixtureJdoAbstract;
import domainapp.modules.simple.dom.so.SimpleObject;
+import domainapp.modules.simple.dom.tree.Author;
+import domainapp.modules.simple.dom.tree.Authors;
@Configuration
@Import({
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/tree/Author.java b/module-simple/src/main/java/domainapp/modules/simple/dom/tree/Author.java
new file mode 100644
index 0000000..07328cc
--- /dev/null
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/tree/Author.java
@@ -0,0 +1,66 @@
+package domainapp.modules.simple.dom.tree;
+
+import java.util.Optional;
+import java.util.Set;
+
+import javax.inject.Named;
+import javax.jdo.annotations.Column;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Persistent;
+import javax.jdo.annotations.Version;
+import javax.jdo.annotations.VersionStrategy;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import org.apache.causeway.applib.annotation.BookmarkPolicy;
+import org.apache.causeway.applib.annotation.Bounding;
+import org.apache.causeway.applib.annotation.Collection;
+import org.apache.causeway.applib.annotation.DomainObject;
+import org.apache.causeway.applib.annotation.DomainObjectLayout;
+import org.apache.causeway.applib.annotation.Nature;
+import org.apache.causeway.applib.annotation.Programmatic;
+import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.applib.annotation.TableDecorator;
+import org.apache.causeway.applib.annotation.Title;
+import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
+
+import domainapp.modules.simple.SimpleModule;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@PersistenceCapable(
+ schema = SimpleModule.SCHEMA,
+ identityType=IdentityType.DATASTORE)
+@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="id")
+@Version(strategy= VersionStrategy.DATE_TIME, column="version")
+@DomainObjectLayout(
+ tableDecorator = TableDecorator.DatatablesNet.class,
+ bookmarking = BookmarkPolicy.AS_ROOT)
+@NoArgsConstructor(access = AccessLevel.PUBLIC)
+@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
+@ToString(onlyExplicitlyIncluded = true)
+@Named(SimpleModule.NAMESPACE + ".Author")
+@DomainObject(nature = Nature.ENTITY, bounding = Bounding.BOUNDED)
+public class Author {
+
+ public Author(String name) {
+ this.name = name;
+ }
+
+ @Property()
+ @Column(allowsNull = "false")
+ @Title
+ @Getter @Setter
+ private String name;
+
+ @Persistent(mappedBy = "author")
+ @Collection
+ @Getter @Setter
+ private Set<Book> books;
+
+}
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/tree/Authors.java b/module-simple/src/main/java/domainapp/modules/simple/dom/tree/Authors.java
new file mode 100644
index 0000000..fb14a96
--- /dev/null
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/tree/Authors.java
@@ -0,0 +1,43 @@
+package domainapp.modules.simple.dom.tree;
+
+import java.util.List;
+
+import javax.annotation.Priority;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.apache.causeway.applib.annotation.Action;
+import org.apache.causeway.applib.annotation.ActionLayout;
+import org.apache.causeway.applib.annotation.DomainService;
+import org.apache.causeway.applib.annotation.NatureOfService;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.annotation.PromptStyle;
+import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.persistence.jdo.applib.services.JdoSupportService;
+
+import domainapp.modules.simple.SimpleModule;
+import domainapp.modules.simple.types.Name;
+import lombok.RequiredArgsConstructor;
+
+@Named(SimpleModule.NAMESPACE + ".Authors")
+@DomainService(nature = NatureOfService.VIEW)
+@Priority(PriorityPrecedence.EARLY)
+@RequiredArgsConstructor(onConstructor_ = {@Inject} )
+public class Authors {
+
+ final RepositoryService repositoryService;
+ final JdoSupportService jdoSupportService;
+
+ @Action(semantics = SemanticsOf.NON_IDEMPOTENT)
+ @ActionLayout(promptStyle = PromptStyle.DIALOG_SIDEBAR)
+ public Author create(@Name final String name)
+ {
+ return repositoryService.persist(new Author(name));
+ }
+
+ @Action
+ public List<Author> listAllAuthors() {
+ return repositoryService.allInstances(Author.class);
+ }
+}
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/tree/Book.java b/module-simple/src/main/java/domainapp/modules/simple/dom/tree/Book.java
new file mode 100644
index 0000000..07e4f04
--- /dev/null
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/tree/Book.java
@@ -0,0 +1,77 @@
+package domainapp.modules.simple.dom.tree;
+
+import java.util.Optional;
+
+import javax.inject.Named;
+import javax.jdo.annotations.DatastoreIdentity;
+import javax.jdo.annotations.IdGeneratorStrategy;
+import javax.jdo.annotations.IdentityType;
+import javax.jdo.annotations.PersistenceCapable;
+import javax.jdo.annotations.Version;
+import javax.jdo.annotations.VersionStrategy;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import org.apache.causeway.applib.annotation.BookmarkPolicy;
+import org.apache.causeway.applib.annotation.DomainObject;
+import org.apache.causeway.applib.annotation.DomainObjectLayout;
+import org.apache.causeway.applib.annotation.Nature;
+import org.apache.causeway.applib.annotation.Programmatic;
+import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.applib.annotation.TableDecorator;
+import org.apache.causeway.applib.annotation.Title;
+import org.apache.causeway.applib.graph.tree.TreeNode;
+import org.apache.causeway.applib.graph.tree.TreePath;
+import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
+
+import domainapp.modules.simple.SimpleModule;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@PersistenceCapable(
+ schema = SimpleModule.SCHEMA,
+ identityType=IdentityType.DATASTORE)
+@DatastoreIdentity(strategy=IdGeneratorStrategy.IDENTITY, column="id")
+@Version(strategy= VersionStrategy.DATE_TIME, column="version")
+@DomainObjectLayout(
+ tableDecorator = TableDecorator.DatatablesNet.class,
+ bookmarking = BookmarkPolicy.AS_ROOT)
+@NoArgsConstructor(access = AccessLevel.PUBLIC)
+@AllArgsConstructor
+@XmlJavaTypeAdapter(PersistentEntityAdapter.class)
+@ToString(onlyExplicitlyIncluded = true)
+@Named(SimpleModule.NAMESPACE + ".Book")
+@DomainObject(nature = Nature.ENTITY)
+public class Book implements BookNode {
+
+ @Property()
+ @Title
+ @Getter @Setter
+ private String name;
+
+ @Property()
+ @Getter @Setter
+ private Author author;
+
+ @Programmatic
+ @Override
+ public Optional<BookNode> getParent() {
+ return Optional.of(new BookView(this));
+ }
+
+ @Programmatic
+ @Override
+ public Optional<BookNode> getChild() {
+ return Optional.empty();
+ }
+
+ @Property
+ public BookView getBookView() {
+ return new BookView(this);
+ }
+
+}
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/tree/BookNode.java b/module-simple/src/main/java/domainapp/modules/simple/dom/tree/BookNode.java
new file mode 100644
index 0000000..d952b9e
--- /dev/null
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/tree/BookNode.java
@@ -0,0 +1,11 @@
+package domainapp.modules.simple.dom.tree;
+
+import java.util.Optional;
+
+public interface BookNode {
+
+ Optional<BookNode> getParent();
+
+ Optional<BookNode> getChild();
+
+}
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/tree/BookNodeTreeAdapter.java b/module-simple/src/main/java/domainapp/modules/simple/dom/tree/BookNodeTreeAdapter.java
new file mode 100644
index 0000000..0c7e4af
--- /dev/null
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/tree/BookNodeTreeAdapter.java
@@ -0,0 +1,25 @@
+package domainapp.modules.simple.dom.tree;
+
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.apache.causeway.applib.graph.tree.TreeAdapter;
+
+public class BookNodeTreeAdapter implements TreeAdapter<BookNode> {
+
+ @Override
+ public Optional<BookNode> parentOf(BookNode value) {
+ return value.getParent();
+ }
+
+ @Override
+ public int childCountOf(BookNode value) {
+ return value.getChild().map(__ -> 1).orElse(0);
+ }
+
+ @Override
+ public Stream<BookNode> childrenOf(BookNode value) {
+ return value.getChild().stream();
+ }
+
+}
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/tree/BookView.java b/module-simple/src/main/java/domainapp/modules/simple/dom/tree/BookView.java
new file mode 100644
index 0000000..535230b
--- /dev/null
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/tree/BookView.java
@@ -0,0 +1,57 @@
+package domainapp.modules.simple.dom.tree;
+
+import java.util.Optional;
+
+import javax.inject.Named;
+
+import org.apache.causeway.applib.annotation.DomainObject;
+import org.apache.causeway.applib.annotation.Nature;
+import org.apache.causeway.applib.annotation.Programmatic;
+import org.apache.causeway.applib.annotation.Property;
+import org.apache.causeway.applib.annotation.PropertyLayout;
+import org.apache.causeway.applib.annotation.Title;
+import org.apache.causeway.applib.graph.tree.TreeNode;
+import org.apache.causeway.applib.graph.tree.TreePath;
+
+import domainapp.modules.simple.SimpleModule;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Named(SimpleModule.NAMESPACE + ".BookView")
+@DomainObject(nature = Nature.VIEW_MODEL)
+@NoArgsConstructor
+@AllArgsConstructor
+public class BookView implements BookNode {
+
+ @Title
+ public String title() {
+ return String.format("Book %s written by %s", getBook().getName(), getBook().getAuthor().getName());
+ }
+
+ @Property
+ @Getter @Setter
+ private Book book;
+
+ @Programmatic
+ @Override
+ public Optional<BookNode> getParent() {
+ return Optional.empty();
+ }
+
+ @Programmatic
+ @Override
+ public Optional<BookNode> getChild() {
+ return Optional.of(getBook());
+ }
+
+ @Property()
+ @PropertyLayout(named = "Book View")
+ public TreeNode<BookNode> getTree() {
+ TreeNode<BookNode> tree = TreeNode.lazy(this, BookNodeTreeAdapter.class);
+ tree.expand(TreePath.of(0));
+ return tree;
+ }
+
+}
diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/tree/Books.java b/module-simple/src/main/java/domainapp/modules/simple/dom/tree/Books.java
new file mode 100644
index 0000000..6d76e11
--- /dev/null
+++ b/module-simple/src/main/java/domainapp/modules/simple/dom/tree/Books.java
@@ -0,0 +1,49 @@
+package domainapp.modules.simple.dom.tree;
+
+import java.util.List;
+
+import javax.annotation.Priority;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import org.apache.causeway.applib.annotation.Action;
+import org.apache.causeway.applib.annotation.ActionLayout;
+import org.apache.causeway.applib.annotation.DomainService;
+import org.apache.causeway.applib.annotation.NatureOfService;
+import org.apache.causeway.applib.annotation.Optionality;
+import org.apache.causeway.applib.annotation.Parameter;
+import org.apache.causeway.applib.annotation.PriorityPrecedence;
+import org.apache.causeway.applib.annotation.PromptStyle;
+import org.apache.causeway.applib.annotation.SemanticsOf;
+import org.apache.causeway.applib.services.repository.RepositoryService;
+import org.apache.causeway.persistence.jdo.applib.services.JdoSupportService;
+
+import domainapp.modules.simple.SimpleModule;
+import domainapp.modules.simple.types.Name;
+import lombok.RequiredArgsConstructor;
+
+@Named(SimpleModule.NAMESPACE + ".Books")
+@DomainService(nature = NatureOfService.VIEW)
+@Priority(PriorityPrecedence.EARLY)
+@RequiredArgsConstructor(onConstructor_ = {@Inject} )
+public class Books {
+
+ final RepositoryService repositoryService;
+ final JdoSupportService jdoSupportService;
+
+ @Action(semantics = SemanticsOf.NON_IDEMPOTENT)
+ @ActionLayout(promptStyle = PromptStyle.DIALOG_SIDEBAR)
+ public Book create(
+ @Name final String name,
+ @Parameter(optionality = Optionality.MANDATORY) Author author)
+ {
+ return repositoryService.persist(new Book(name, author));
+ }
+
+ @Action
+ public List<Book> listAllBooks() {
+ return repositoryService.allInstances(Book.class);
+ }
+
+
+}
diff --git a/module-simple/src/main/java/domainapp/modules/simple/fixture/BookAuthorFixture.java b/module-simple/src/main/java/domainapp/modules/simple/fixture/BookAuthorFixture.java
new file mode 100644
index 0000000..6806852
--- /dev/null
+++ b/module-simple/src/main/java/domainapp/modules/simple/fixture/BookAuthorFixture.java
@@ -0,0 +1,20 @@
+package domainapp.modules.simple.fixture;
+
+import javax.inject.Inject;
+
+import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
+
+import domainapp.modules.simple.dom.tree.Authors;
+import domainapp.modules.simple.dom.tree.Books;
+
+public class BookAuthorFixture extends FixtureScript {
+
+ @Inject Authors authors;
+ @Inject Books books;
+
+ @Override
+ protected void execute(ExecutionContext executionContext) {
+ books.create("Book 1", authors.create("Author 1"));
+ }
+
+}
diff --git a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
index 28b603f..bba8700 100644
--- a/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
+++ b/webapp/src/main/java/domainapp/webapp/application/fixture/scenarios/DomainAppDemo.java
@@ -5,6 +5,7 @@ import javax.inject.Inject;
import org.apache.causeway.testing.fixtures.applib.fixturescripts.FixtureScript;
import org.apache.causeway.testing.fixtures.applib.modules.ModuleWithFixturesService;
+import domainapp.modules.simple.fixture.BookAuthorFixture;
import domainapp.modules.simple.fixture.SimpleObject_persona;
public class DomainAppDemo extends FixtureScript {
@@ -12,7 +13,8 @@ public class DomainAppDemo extends FixtureScript {
@Override
protected void execute(final ExecutionContext ec) {
ec.executeChildren(this, moduleWithFixturesService.getTeardownFixture());
- ec.executeChild(this, new SimpleObject_persona.PersistAll());
+ // ec.executeChild(this, new SimpleObject_persona.PersistAll());
+ ec.executeChild(this, new BookAuthorFixture());
}
@Inject ModuleWithFixturesService moduleWithFixturesService;