You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by da...@apache.org on 2023/06/01 09:09:33 UTC
[causeway] branch CAUSEWAY-2485 updated (be7601974d -> 3b5b81f129)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch CAUSEWAY-2485
in repository https://gitbox.apache.org/repos/asf/causeway.git
from be7601974d CAUSEWAY-2485: polishes demo app
add bb6541b7a2 CAUSEWAY-3472: align JdoEntityFacet with JPA variant:
add c7421bc698 CAUSEWAY-3324: fixes JDO entity lifecycle callbacks to always fire
add cd0f288059 CAUSEWAY-3472: demo adoc: remove outdated warning
add 1d74b8ded0 updates metamodel validation error, was slightly out-of-date
new 3b5b81f129 CAUSEWAY-2485: fixes bullets for complex number embedded types, jdo and jpa
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../commons/internal/assertions/_Assert.java | 18 ++++-
.../metamodel/facets/jaxb/JaxbFacetFactory.java | 2 +-
.../entitychange/EntityChangePublishingFacet.java | 3 +-
...ainObjectXxxLifecycleEventPage-description.adoc | 2 -
.../customvalues/ScalarValueTypeMenu.java | 2 +-
.../embeddedvalues/jdo/ComplexNumberJdo.java | 7 +-
.../jdo/EmbeddedTypePageJdo-description.adoc | 1 +
.../embeddedvalues/jpa/ComplexNumberJpa.java | 4 +-
.../demoapp/dom/progmodel/uihints/UiHintsMenu.java | 18 ++---
.../integtests/AuditTrail_IntegTestAbstract.java | 2 +-
.../changetracking/JdoLifecycleListener.java | 28 ++++----
.../entities/DnEntityStateProvider.java | 32 ++++-----
.../metamodel/facets/entity/JdoEntityFacet.java | 42 +++++++-----
.../applib/integration/CausewayEntityListener.java | 80 +++++++++++++---------
.../jpa/integration/entity/JpaEntityFacet.java | 26 ++-----
15 files changed, 145 insertions(+), 122 deletions(-)
[causeway] 01/01: CAUSEWAY-2485: fixes bullets for complex number embedded types, jdo and jpa
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch CAUSEWAY-2485
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit 3b5b81f129a2ea9e6bc236bd13d69a543a0f4878
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jun 1 10:09:26 2023 +0100
CAUSEWAY-2485: fixes bullets for complex number embedded types, jdo and jpa
---
.../customvaluetypes/customvalues/ScalarValueTypeMenu.java | 2 +-
.../customvaluetypes/embeddedvalues/jdo/ComplexNumberJdo.java | 7 +++----
.../embeddedvalues/jdo/EmbeddedTypePageJdo-description.adoc | 1 +
.../customvaluetypes/embeddedvalues/jpa/ComplexNumberJpa.java | 4 ++--
.../src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java | 6 +++---
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypeMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypeMenu.java
index f94c54c336..16974f076f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypeMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/customvalues/ScalarValueTypeMenu.java
@@ -39,7 +39,7 @@ public class ScalarValueTypeMenu {
private final FactoryService factoryService;
@Action
- @ActionLayout(cssClassFa="fa-cubes", describedAs = "Custom scalar value types")
+ @ActionLayout(cssClassFa="fa-cube", describedAs = "Custom scalar value types")
public ScalarValueTypePage scalarValueTypes(){
ScalarValueTypePage page = factoryService.viewModel(new ScalarValueTypePage());
page.setEmailAddress(EmailAddress.of("joe@bloggs.com"));
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/ComplexNumberJdo.java b/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/ComplexNumberJdo.java
index 4652a7a272..a062f14add 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/ComplexNumberJdo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/ComplexNumberJdo.java
@@ -27,14 +27,13 @@ import lombok.AccessLevel;
@Profile("demo-jdo")
//tag::class[]
-/* with presence of @EmbeddedOnly should not be required, but fails on launch if not provided */
-@javax.jdo.annotations.PersistenceCapable(embeddedOnly="true")
@javax.jdo.annotations.EmbeddedOnly // <.>
+@javax.jdo.annotations.PersistenceCapable(embeddedOnly="true") // <.>
@Value // <.>
@lombok.Getter // <.>
@lombok.Setter(AccessLevel.PRIVATE) // <.>
@lombok.AllArgsConstructor(staticName = "of")
-@lombok.NoArgsConstructor // <.>
+@lombok.NoArgsConstructor // <5>
public class ComplexNumberJdo
implements ComplexNumber {
@@ -42,6 +41,6 @@ public class ComplexNumberJdo
private double re; // <.>
@javax.jdo.annotations.Column(allowsNull = "false")
- private double im; // <.>
+ private double im; // <6>
}
//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/EmbeddedTypePageJdo-description.adoc b/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/EmbeddedTypePageJdo-description.adoc
index f6e384f796..fd58dded42 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/EmbeddedTypePageJdo-description.adoc
+++ b/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jdo/EmbeddedTypePageJdo-description.adoc
@@ -35,6 +35,7 @@ include::NumberConstantJdo.java[tags=class]
include::ComplexNumberJdo.java[tags=class]
----
<.> JDO `@EmbeddedOnly` annotation is the companion of `@Embedded` on the owning object
+<.> with presence of `@EmbeddedOnly` should not be required; but app fails on launch if not provided.
<.> Indicates to the framework that this is a value rather than an entity.
Accordingly, we will also need to provide a `ValueSemanticsProvider` implementation, discussed below.
<.> provides access the fields
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/ComplexNumberJpa.java b/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/ComplexNumberJpa.java
index 2538fe5d50..6e6e88f3d7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/ComplexNumberJpa.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/progmodel/customvaluetypes/embeddedvalues/jpa/ComplexNumberJpa.java
@@ -32,7 +32,7 @@ import lombok.AccessLevel;
@lombok.Getter // <.>
@lombok.Setter(AccessLevel.PRIVATE) // <.>
@lombok.AllArgsConstructor(staticName = "of")
-@lombok.NoArgsConstructor // <.>
+@lombok.NoArgsConstructor // <4>
public class ComplexNumberJpa
implements ComplexNumber {
@@ -40,6 +40,6 @@ public class ComplexNumberJpa
private double re; // <.>
@javax.persistence.Column(nullable = false)
- private double im; // <.>
+ private double im; // <5>
}
//end::class[]
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java b/examples/demo/domain/src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java
index 4a2bf11d62..a354bde2f7 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/progmodel/uihints/UiHintsMenu.java
@@ -34,7 +34,7 @@ import org.apache.causeway.applib.annotation.PriorityPrecedence;
public class UiHintsMenu {
@Action
- @ActionLayout(cssClassFa="fa-question-mark", describedAs="cssClass()")
+ @ActionLayout(cssClassFa="fa-css3", describedAs="cssClass()")
public Object cssClassSupportingMethod(){
return null;
}
@@ -43,7 +43,7 @@ public class UiHintsMenu {
}
@Action
- @ActionLayout(cssClassFa="fa-question-mark", describedAs="icon()")
+ @ActionLayout(cssClassFa="fa-icons", describedAs="icon()")
public Object iconSupportingMethod(){
return null;
}
@@ -52,7 +52,7 @@ public class UiHintsMenu {
}
@Action
- @ActionLayout(cssClassFa="fa-question-mark", describedAs="layout()")
+ @ActionLayout(cssClassFa="fa-border-all", describedAs="layout()")
public Object layoutSupportingMethod(){
return null;
}