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 2024/05/26 08:22:43 UTC
(causeway-app-petclinic) 01/02: updates PetOwner#emailAddress to use new value type
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/causeway-app-petclinic.git
commit c9fbaad083208afca3727cc042cd3dcf647f89cf
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sun May 26 09:21:53 2024 +0100
updates PetOwner#emailAddress to use new value type
Changes optionality of EmailAddress
reorgs imports of PetOwner
---
.../modules/petowner/dom/petowner/PetOwner.java | 26 +++++++++-------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/module-petowner/src/main/java/domainapp/modules/petowner/dom/petowner/PetOwner.java b/module-petowner/src/main/java/domainapp/modules/petowner/dom/petowner/PetOwner.java
index 4cbe325..7628a8a 100644
--- a/module-petowner/src/main/java/domainapp/modules/petowner/dom/petowner/PetOwner.java
+++ b/module-petowner/src/main/java/domainapp/modules/petowner/dom/petowner/PetOwner.java
@@ -4,7 +4,6 @@ import java.time.LocalTime;
import java.time.ZoneOffset;
import java.time.temporal.ChronoUnit;
import java.util.Comparator;
-import java.util.Optional;
import javax.inject.Inject;
import javax.inject.Named;
@@ -25,10 +24,6 @@ import javax.persistence.UniqueConstraint;
import javax.persistence.Version;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-import org.apache.causeway.applib.annotation.ObjectSupport;
-
-import org.apache.causeway.applib.services.clock.ClockService;
-
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.annotation.Action;
@@ -38,14 +33,15 @@ import org.apache.causeway.applib.annotation.DomainObject;
import org.apache.causeway.applib.annotation.DomainObjectLayout;
import org.apache.causeway.applib.annotation.Editing;
import org.apache.causeway.applib.annotation.MemberSupport;
+import org.apache.causeway.applib.annotation.ObjectSupport;
import org.apache.causeway.applib.annotation.Optionality;
-import org.apache.causeway.applib.annotation.PromptStyle;
import org.apache.causeway.applib.annotation.Property;
import org.apache.causeway.applib.annotation.PropertyLayout;
import org.apache.causeway.applib.annotation.Publishing;
import org.apache.causeway.applib.annotation.TableDecorator;
import org.apache.causeway.applib.jaxb.PersistentEntityAdapter;
import org.apache.causeway.applib.layout.LayoutConstants;
+import org.apache.causeway.applib.services.clock.ClockService;
import org.apache.causeway.applib.services.message.MessageService;
import org.apache.causeway.applib.services.repository.RepositoryService;
import org.apache.causeway.applib.services.title.TitleService;
@@ -59,12 +55,6 @@ import org.apache.causeway.persistence.jpa.applib.types.BlobJpaEmbeddable;
import static org.apache.causeway.applib.annotation.SemanticsOf.IDEMPOTENT;
import static org.apache.causeway.applib.annotation.SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE;
-import domainapp.modules.petowner.PetOwnerModule;
-import domainapp.modules.petowner.types.Name;
-import domainapp.modules.petowner.types.Notes;
-
-import domainapp.modules.petowner.types.PhoneNumber;
-
import lombok.AccessLevel;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -72,6 +62,12 @@ import lombok.Setter;
import lombok.ToString;
import lombok.val;
+import domainapp.modules.petowner.PetOwnerModule;
+import domainapp.modules.petowner.types.Name;
+import domainapp.modules.petowner.types.Notes;
+import domainapp.modules.petowner.types.PhoneNumber;
+import domainapp.modules.petowner.value.EmailAddress;
+
@Entity
@Table(
@@ -147,11 +143,11 @@ public class PetOwner implements Comparable<PetOwner>, CalendarEventable {
@PropertyLayout(fieldSetId = "contact", sequence = "1.1")
private String telephoneNumber;
- @Column(length = 40, nullable = true, name = "emailAddress")
+ @javax.persistence.Embedded
@Getter @Setter
- @Property(editing = Editing.ENABLED)
+ @Property(editing = Editing.ENABLED, optionality = Optionality.OPTIONAL)
@PropertyLayout(fieldSetId = "contact", sequence = "1.2")
- private String emailAddress;
+ private EmailAddress emailAddress;
@Notes
@Column(length = Notes.MAX_LEN, nullable = true)