You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/10/05 15:15:38 UTC
[isis-app-demo] branch main updated (32a1635 -> 91da056)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git.
discard 32a1635 adds visits schema for application.yml configuration
discard 35f5633 adds VisitRepository
discard ee90e13 updates teardown fixture for VisitsModule
discard a67a2f9 adds Visit entity
add ee7749a adds Visit entity
add eb36637 updates teardown fixture for VisitsModule
add 141acc8 adds VisitRepository
add 8654067 adds visits schema for application.yml configuration
new 2e7e4e6 adds Reason meta-annotation
new 91da056 adds reason property to Visit
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (32a1635)
\
N -- N -- N refs/heads/main (91da056)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 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:
.../java/petclinic/modules/visits/dom/visit/Visit.java | 11 +++++++++--
.../main/java/petclinic/modules/visits/types/Reason.java | 14 +++++++-------
2 files changed, 16 insertions(+), 9 deletions(-)
copy module-pets/src/main/java/petclinic/modules/pets/types/Notes.java => module-visits/src/main/java/petclinic/modules/visits/types/Reason.java (66%)
[isis-app-demo] 02/02: adds reason property to Visit
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git
commit 91da0568edb44210c5b36439cbff86f4bd88bcbd
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 5 15:54:40 2021 +0100
adds reason property to Visit
---
.../src/main/java/petclinic/modules/visits/dom/visit/Visit.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/module-visits/src/main/java/petclinic/modules/visits/dom/visit/Visit.java b/module-visits/src/main/java/petclinic/modules/visits/dom/visit/Visit.java
index bd3d3e2..9923aeb 100644
--- a/module-visits/src/main/java/petclinic/modules/visits/dom/visit/Visit.java
+++ b/module-visits/src/main/java/petclinic/modules/visits/dom/visit/Visit.java
@@ -42,6 +42,7 @@ import petclinic.modules.pets.dom.petowner.PetOwner;
import petclinic.modules.pets.types.FirstName;
import petclinic.modules.pets.types.Notes;
import petclinic.modules.pets.types.PetName;
+import petclinic.modules.visits.types.Reason;
@Entity
@@ -74,9 +75,10 @@ public class Visit implements Comparable<Visit> {
private long version;
- Visit(Pet pet, LocalDateTime visitAt) {
+ public Visit(Pet pet, LocalDateTime visitAt, String reason) {
this.pet = pet;
this.visitAt = visitAt;
+ this.reason = reason;
}
@@ -95,6 +97,11 @@ public class Visit implements Comparable<Visit> {
@PropertyLayout(fieldSetId = "name", sequence = "2")
private LocalDateTime visitAt;
+ @Reason
+ @Column(name = "reason", length = FirstName.MAX_LEN, nullable = false)
+ @Getter @Setter
+ @PropertyLayout(fieldSetId = "details", sequence = "1")
+ private String reason;
private final static Comparator<Visit> comparator =
Comparator.comparing(Visit::getPet).thenComparing(Visit::getVisitAt);
[isis-app-demo] 01/02: adds Reason meta-annotation
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git
commit 2e7e4e6e0deb303517999a8fc35051dd49423d1a
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 5 15:54:11 2021 +0100
adds Reason meta-annotation
---
.../petclinic/modules/visits/types/Reason.java | 25 ++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/module-visits/src/main/java/petclinic/modules/visits/types/Reason.java b/module-visits/src/main/java/petclinic/modules/visits/types/Reason.java
new file mode 100644
index 0000000..2df789c
--- /dev/null
+++ b/module-visits/src/main/java/petclinic/modules/visits/types/Reason.java
@@ -0,0 +1,25 @@
+package petclinic.modules.visits.types;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.apache.isis.applib.annotation.Editing;
+import org.apache.isis.applib.annotation.Parameter;
+import org.apache.isis.applib.annotation.ParameterLayout;
+import org.apache.isis.applib.annotation.Property;
+import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.Where;
+
+@Property(maxLength = Reason.MAX_LEN)
+@PropertyLayout(named = "Reason")
+@Parameter(maxLength = Reason.MAX_LEN)
+@ParameterLayout(named = "Reason")
+@Target({ ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Reason {
+
+ int MAX_LEN = 255;
+
+}