From 96403edecb95aed6f19472fc8e8a4a04935595c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Fo=CC=88rtsch?= Date: Sun, 31 Mar 2019 16:34:47 +0200 Subject: [PATCH] add more components to contact model --- .../java/de/ul/swtp/modules/contactmanagement/Contact.java | 4 ---- .../modules/contactmanagement/contactdetails/Address.java | 3 ++- .../modules/contactmanagement/contactdetails/BankAccount.java | 3 ++- .../contactmanagement/contactdetails/VoluntaryDetails.java | 3 ++- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/ul/swtp/modules/contactmanagement/Contact.java b/src/main/java/de/ul/swtp/modules/contactmanagement/Contact.java index 4323e02..bf845a4 100644 --- a/src/main/java/de/ul/swtp/modules/contactmanagement/Contact.java +++ b/src/main/java/de/ul/swtp/modules/contactmanagement/Contact.java @@ -26,13 +26,10 @@ import java.util.List; resolver = ContactIdResolver.class) public class Contact implements Serializable { - //@Null may well not work here, if the validations are call on update as well as create - //@Null @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - // perhaps we need a @NotBlank here? Are emails obligatory? @Email(regexp = "^.*@.*\\..*") private String email; @@ -51,7 +48,6 @@ public class Contact implements Serializable { @Digits(integer = 16, fraction = 0) private String phone; - //@NotBlank @OneToOne private Address address; diff --git a/src/main/java/de/ul/swtp/modules/contactmanagement/contactdetails/Address.java b/src/main/java/de/ul/swtp/modules/contactmanagement/contactdetails/Address.java index 4aba7f2..680efbc 100644 --- a/src/main/java/de/ul/swtp/modules/contactmanagement/contactdetails/Address.java +++ b/src/main/java/de/ul/swtp/modules/contactmanagement/contactdetails/Address.java @@ -3,11 +3,12 @@ package de.ul.swtp.modules.contactmanagement.contactdetails; import lombok.Data; import javax.persistence.*; +import java.io.Serializable; @Entity @Table(name = "cm_address") @Data -public class Address { +public class Address implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/de/ul/swtp/modules/contactmanagement/contactdetails/BankAccount.java b/src/main/java/de/ul/swtp/modules/contactmanagement/contactdetails/BankAccount.java index 7c34015..11a8b6f 100644 --- a/src/main/java/de/ul/swtp/modules/contactmanagement/contactdetails/BankAccount.java +++ b/src/main/java/de/ul/swtp/modules/contactmanagement/contactdetails/BankAccount.java @@ -3,11 +3,12 @@ package de.ul.swtp.modules.contactmanagement.contactdetails; import lombok.Data; import javax.persistence.*; +import java.io.Serializable; @Entity @Table(name = "cm_bankdetails") @Data -public class BankAccount { +public class BankAccount implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/de/ul/swtp/modules/contactmanagement/contactdetails/VoluntaryDetails.java b/src/main/java/de/ul/swtp/modules/contactmanagement/contactdetails/VoluntaryDetails.java index 557ce9f..3a7b9e7 100644 --- a/src/main/java/de/ul/swtp/modules/contactmanagement/contactdetails/VoluntaryDetails.java +++ b/src/main/java/de/ul/swtp/modules/contactmanagement/contactdetails/VoluntaryDetails.java @@ -3,11 +3,12 @@ package de.ul.swtp.modules.contactmanagement.contactdetails; import lombok.Data; import javax.persistence.*; +import java.io.Serializable; @Entity @Table(name = "cm_voluntarydetails") @Data -public class VoluntaryDetails { +public class VoluntaryDetails implements Serializable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY)