Version generation, lombok

.classpath

@@ -6,11 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="test" value="true"/>
@@ -35,9 +30,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="target/generated-resources/gwt">
+	<classpathentry kind="src" output="target/classes" path="target/generated-resources/gwt">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

.settings/com.vaadin.integration.eclipse.prefs

@@ -1,4 +1,4 @@
-com.vaadin.integration.eclipse.mavenLatestVersionsUpgrade=["8.6.3"]
+com.vaadin.integration.eclipse.mavenLatestVersionsUpgrade=["8.6.4","8.8.3"]
 com.vaadin.integration.eclipse.previousCompileAction=both
 com.vaadin.integration.eclipse.useLatestNightly=false
 com.vaadin.integration.eclipse.widgetsetDirty=true

.settings/org.eclipse.wst.common.component

@@ -8,28 +8,22 @@
     
     
     
-    <wb-module deploy-name="vaadin-clubhelper-1.1.1-SNAPSHOT">
-                                                                                
-        
-        
-        
     
+    <wb-module deploy-name="vaadin-clubhelper-1.1.1-SNAPSHOT">
                                                                                         
         
         
         
-        <wb-resource deploy-path="/" source-path="/WebContent"/>
         
         
         
         
         
         
+        <wb-resource deploy-path="/" source-path="/WebContent"/>
                                                                                         
         
         
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                
         
         
         
@@ -37,8 +31,8 @@
         
         
         
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
                                                                                         
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         
         
         
@@ -58,7 +52,9 @@
         
         
         
+        
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
+                
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-resources/gwt"/>
                                                                                         
         
@@ -69,6 +65,7 @@
         
         
         
+        
         <property name="context-root" value="vaadin-clubhelper"/>
                                                                                         
         
@@ -79,6 +76,7 @@
         
         
         
+        
         <property name="java-output-path" value="/vaadin-clubhelper/target/classes"/>
                                                                                     
     
@@ -89,6 +87,7 @@
     
     
     
+    
     </wb-module>
                                         
 
@@ -99,4 +98,5 @@
 
 
 
+
 </project-modules>

pom.xml

@@ -39,6 +39,8 @@
 		<sonar.jacoco.reportPath>${project.basedir}/target/jacoco.exec</sonar.jacoco.reportPath>
 		<sonar.exclusions>**/src/main/webapp/VAADIN/**/*</sonar.exclusions>
 
+		<timestamp>${maven.build.timestamp}</timestamp>
+		<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
 	</properties>
 
 	<dependencies>
@@ -120,6 +122,11 @@
 			<artifactId>libphonenumber</artifactId>
 			<version>8.10.4</version>
 		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.8</version>
+		</dependency>
 
 
 		<dependency>
@@ -276,6 +283,12 @@
 	</dependencyManagement>
 
 	<build>
+		<resources>
+			<resource>
+				<directory>src/packaging</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/Adress.java

@@ -9,6 +9,9 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * The persistent class for the adress database table.
  * 
@@ -17,7 +20,8 @@ import javax.persistence.Table;
 @Table(name = "adress")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name = "Adress.findAll", query = "SELECT a FROM Adress a")
-public class Adress extends BaseEntity implements Serializable {
+@EqualsAndHashCode(callSuper = true)
+public @Data class Adress extends BaseEntity implements Serializable {
 
 	private static final long serialVersionUID = 8216273166570667412L;
 
@@ -33,108 +37,6 @@ public class Adress extends BaseEntity implements Serializable {
 	@ManyToOne
 	private Person person;
 
-	public String getAdress1() {
-		return this.adress1;
-	}
-
-	public void setAdress1(String adress1) {
-		this.adress1 = adress1;
-	}
-
-	public String getAdress2() {
-		return this.adress2;
-	}
-
-	public void setAdress2(String adress2) {
-		this.adress2 = adress2;
-	}
-
-	public String getCity() {
-		return this.city;
-	}
-
-	public void setCity(String city) {
-		this.city = city;
-	}
-
-	public String getPlz() {
-		return this.plz;
-	}
-
-	public void setPlz(String plz) {
-		this.plz = plz;
-	}
-
-	public Person getPerson() {
-		return this.person;
-	}
-
-	public void setPerson(Person person) {
-		this.person = person;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = super.hashCode();
-		result = prime * result + ((adress1 == null) ? 0 : adress1.hashCode());
-		result = prime * result + ((adress2 == null) ? 0 : adress2.hashCode());
-		result = prime * result + ((city == null) ? 0 : city.hashCode());
-		result = prime * result + ((person == null) ? 0 : person.hashCode());
-		result = prime * result + ((plz == null) ? 0 : plz.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (!super.equals(obj)) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		Adress other = (Adress) obj;
-		if (adress1 == null) {
-			if (other.adress1 != null) {
-				return false;
-			}
-		} else if (!adress1.equals(other.adress1)) {
-			return false;
-		}
-		if (adress2 == null) {
-			if (other.adress2 != null) {
-				return false;
-			}
-		} else if (!adress2.equals(other.adress2)) {
-			return false;
-		}
-		if (city == null) {
-			if (other.city != null) {
-				return false;
-			}
-		} else if (!city.equals(other.city)) {
-			return false;
-		}
-		if (person == null) {
-			if (other.person != null) {
-				return false;
-			}
-		} else if (!person.equals(other.person)) {
-			return false;
-		}
-		if (plz == null) {
-			if (other.plz != null) {
-				return false;
-			}
-		} else if (!plz.equals(other.plz)) {
-			return false;
-		}
-		return true;
-	}
-
 	@Override
 	public String toString() {
 		return "Adress [adress1=" + adress1 + ", adress2=" + adress2 + ", plz=" + plz + ", city=" + city + "]";

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/Altersgruppe.java

@@ -12,109 +12,31 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 @Entity
 @Table(name = "altersgruppe")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name = "Altersgruppe.findAll", query = "SELECT a FROM Altersgruppe a")
-public class Altersgruppe extends BaseEntity implements Serializable {
+@EqualsAndHashCode(callSuper = true)
+public @Data class Altersgruppe extends BaseEntity implements Serializable {
 
 	private static final long serialVersionUID = 126215772910869273L;
+
 	private String bezeichnung;
+
 	private int start;
+
 	private int end;
 
 	@ManyToOne
 	private Pflicht pflicht;
+
 	@ManyToOne
 	@JoinColumn(name = "event_id")
 	private ClubEvent clubEvent;
 
-	public String getBezeichnung() {
-		return bezeichnung;
-	}
-
-	public void setBezeichnung(String bezeichnung) {
-		this.bezeichnung = bezeichnung;
-	}
-
-	public int getStart() {
-		return start;
-	}
-
-	public void setStart(int start) {
-		this.start = start;
-	}
-
-	public int getEnd() {
-		return end;
-	}
-
-	public void setEnd(int end) {
-		this.end = end;
-	}
-
-	public Pflicht getPflicht() {
-		return pflicht;
-	}
-
-	public void setPflicht(Pflicht pflicht) {
-		this.pflicht = pflicht;
-	}
-
-	public ClubEvent getClubEvent() {
-		return clubEvent;
-	}
-
-	public void setClubEvent(ClubEvent clubEvent) {
-		this.clubEvent = clubEvent;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = super.hashCode();
-		result = prime * result + ((bezeichnung == null) ? 0 : bezeichnung.hashCode());
-		result = prime * result + end;
-		result = prime * result + ((pflicht == null) ? 0 : pflicht.hashCode());
-		result = prime * result + start;
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (!super.equals(obj)) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		Altersgruppe other = (Altersgruppe) obj;
-		if (bezeichnung == null) {
-			if (other.bezeichnung != null) {
-				return false;
-			}
-		} else if (!bezeichnung.equals(other.bezeichnung)) {
-			return false;
-		}
-		if (end != other.end) {
-			return false;
-		}
-		if (pflicht == null) {
-			if (other.pflicht != null) {
-				return false;
-			}
-		} else if (!pflicht.equals(other.pflicht)) {
-			return false;
-		}
-		if (start != other.start) {
-			return false;
-		}
-		return true;
-	}
-
 	@Override
 	public String toString() {
 		return "Altersgruppe [bezeichnung=" + bezeichnung + ", pflicht=" + pflicht + ", jahre=" + start + " - " + end

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/Attendance.java

@@ -1,9 +1,20 @@
 package de.kreth.vaadin.clubhelper.vaadinclubhelper.data;
 
 import java.io.Serializable;
-import javax.persistence.*;
 import java.util.Date;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * The persistent class for the attendance database table.
@@ -13,7 +24,8 @@ import java.util.Date;
 @Table(name = "attendance")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name = "Attendance.findAll", query = "SELECT a FROM Attendance a")
-public class Attendance extends BaseEntity implements Serializable {
+@EqualsAndHashCode(callSuper = true)
+public @Data class Attendance extends BaseEntity implements Serializable {
 
 	private static final long serialVersionUID = 2385033161272078335L;
 
@@ -29,16 +41,4 @@ public class Attendance extends BaseEntity implements Serializable {
 		return new Date(this.onDate.getTime());
 	}
 
-	public void setOnDate(Date onDate) {
-		this.onDate = onDate;
-	}
-
-	public Person getPerson() {
-		return this.person;
-	}
-
-	public void setPerson(Person person) {
-		this.person = person;
-	}
-
 }

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/BaseEntity.java

@@ -9,8 +9,10 @@ import javax.persistence.MappedSuperclass;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
+import lombok.Data;
+
 @MappedSuperclass
-public abstract class BaseEntity implements EntityAccessor {
+public @Data abstract class BaseEntity implements EntityAccessor {
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -25,14 +27,6 @@ public abstract class BaseEntity implements EntityAccessor {
 	@Temporal(TemporalType.TIMESTAMP)
 	private Date deleted;
 
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
 	public Date getChanged() {
 		if (changed == null) {
 			return null;
@@ -73,38 +67,4 @@ public abstract class BaseEntity implements EntityAccessor {
 		return id > 0;
 	}
 
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((created == null) ? 0 : created.hashCode());
-		result = prime * result + id;
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		BaseEntity other = (BaseEntity) obj;
-		if (created == null) {
-			if (other.created != null) {
-				return false;
-			}
-		} else if (!created.equals(other.created)) {
-			return false;
-		}
-		if (id != other.id) {
-			return false;
-		}
-		return true;
-	}
-
 }

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/ClubEvent.java

@@ -18,6 +18,8 @@ import javax.persistence.Transient;
 import org.vaadin.addon.calendar.item.BasicItem;
 
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.CompetitionType.Type;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 // Entity must not be used, this class is persisted by ClubEvent.hbm.xml
 @Entity
@@ -26,7 +28,8 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.CompetitionType.Type;
  * @author markus
  *
  */
-public class ClubEvent extends BasicItem implements EntityAccessor {
+@EqualsAndHashCode(callSuper = true)
+public @Data class ClubEvent extends BasicItem implements EntityAccessor {
 
 	private static final long serialVersionUID = -3600971939167437577L;
 
@@ -49,25 +52,6 @@ public class ClubEvent extends BasicItem implements EntityAccessor {
 	@JoinColumn(name = "id", nullable = true)
 	private CompetitionType competitionType;
 
-	ClubEvent() {
-	}
-
-	public void setLocation(String location) {
-		this.location = location;
-	}
-
-	public void setiCalUID(String iCalUID) {
-		this.iCalUID = iCalUID;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public void setOrganizerDisplayName(String organizerDisplayName) {
-		this.organizerDisplayName = organizerDisplayName;
-	}
-
 	@Override
 	public String getCaption() {
 		return super.getCaption();
@@ -94,18 +78,6 @@ public class ClubEvent extends BasicItem implements EntityAccessor {
 		return super.isAllDay();
 	}
 
-	public String getLocation() {
-		return location;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public String getiCalUID() {
-		return iCalUID;
-	}
-
 	public Type getType() {
 		if (competitionType != null) {
 			return competitionType.getType();
@@ -115,10 +87,6 @@ public class ClubEvent extends BasicItem implements EntityAccessor {
 		}
 	}
 
-	public CompetitionType getCompetitionType() {
-		return competitionType;
-	}
-
 	public void setType(Type competitionType) {
 		if (this.competitionType == null) {
 			this.competitionType = new CompetitionType();
@@ -127,27 +95,11 @@ public class ClubEvent extends BasicItem implements EntityAccessor {
 		this.competitionType.setType(competitionType);
 	}
 
-	public void setCompetitionType(CompetitionType competitionType) {
-		this.competitionType = competitionType;
-	}
-
-	public String getOrganizerDisplayName() {
-		return organizerDisplayName;
-	}
-
 	@Override
 	public String getStyleName() {
 		return organizerDisplayName;
 	}
 
-	public Set<Person> getPersons() {
-		return persons;
-	}
-
-	public void setPersons(Set<Person> persons) {
-		this.persons = persons;
-	}
-
 	public void add(Person p) {
 		if (this.persons == null) {
 			this.persons = new HashSet<>();
@@ -164,14 +116,6 @@ public class ClubEvent extends BasicItem implements EntityAccessor {
 		person.remove(this);
 	}
 
-	public Set<Altersgruppe> getAltersgruppen() {
-		return altersgruppen;
-	}
-
-	public void setAltersgruppen(Set<Altersgruppe> altersgruppen) {
-		this.altersgruppen = altersgruppen;
-	}
-
 	@Transient
 	public String toDisplayString() {
 		return "ClubEvent [Caption=" + getCaption() + ", Start=" + getStart() + ", location=" + location + "]";
@@ -184,57 +128,6 @@ public class ClubEvent extends BasicItem implements EntityAccessor {
 				+ ", getEnd()=" + getEnd() + ", getStart()=" + getStart() + ", isAllDay()=" + isAllDay() + "]";
 	}
 
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 17;
-		result = prime * result + ((iCalUID == null) ? 0 : iCalUID.hashCode());
-		result = prime * result + ((id == null) ? 0 : id.hashCode());
-		result = prime * result + ((location == null) ? 0 : location.hashCode());
-		result = prime * result + ((organizerDisplayName == null) ? 0 : organizerDisplayName.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		ClubEvent other = (ClubEvent) obj;
-		if (iCalUID == null) {
-			if (other.iCalUID != null)
-				return false;
-		}
-		else if (!iCalUID.equals(other.iCalUID)) {
-			return false;
-		}
-		if (id == null) {
-			if (other.id != null)
-				return false;
-		}
-		else if (!id.equals(other.id)) {
-			return false;
-		}
-		if (location == null) {
-			if (other.location != null)
-				return false;
-		}
-		else if (!location.equals(other.location)) {
-			return false;
-		}
-		if (organizerDisplayName == null) {
-			if (other.organizerDisplayName != null)
-				return false;
-		}
-		else if (!organizerDisplayName.equals(other.organizerDisplayName)) {
-			return false;
-		}
-		return true;
-	}
-
 	public static ZonedDateTime toZoned(Date parse) {
 		if (parse != null) {
 			Instant instant = parse.toInstant();

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/ClubEventBuilder.java

@@ -26,7 +26,7 @@ public class ClubEventBuilder {
 	}
 
 	public ClubEventBuilder withiCalUID(String iCalUID) {
-		current.setiCalUID(iCalUID);
+		current.setICalUID(iCalUID);
 		return this;
 
 	}

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/ClubeventPersonId.java

@@ -5,8 +5,10 @@ import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 
+import lombok.Data;
+
 @Embeddable
-public class ClubeventPersonId implements Serializable {
+public @Data class ClubeventPersonId implements Serializable {
 
 	private static final long serialVersionUID = -7964369346971364916L;
 
@@ -16,54 +18,9 @@ public class ClubeventPersonId implements Serializable {
 	@Column(name = "person_id")
 	private int personId;
 
-	public String getClubEventId() {
-		return clubEventId;
-	}
-
-	public void setClubEventId(String clubEventId) {
-		this.clubEventId = clubEventId;
-	}
-
-	public int getPersonId() {
-		return personId;
-	}
-
-	public void setPersonId(int personId) {
-		this.personId = personId;
-	}
-
 	@Override
 	public String toString() {
 		return "ID [clubEventId=" + clubEventId + ", personId=" + personId + "]";
 	}
 
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((clubEventId == null) ? 0 : clubEventId.hashCode());
-		result = prime * result + personId;
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		ClubeventPersonId other = (ClubeventPersonId) obj;
-		if (clubEventId == null) {
-			if (other.clubEventId != null)
-				return false;
-		} else if (!clubEventId.equals(other.clubEventId)) {
-			return false;
-		}
-		if (personId != other.personId)
-			return false;
-		return true;
-	}
-
 }

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/CompetitionType.java

@@ -10,14 +10,17 @@ import javax.persistence.MapsId;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
+import lombok.Data;
+
 @Entity
 @Table(name = "clubevent_addon")
-public class CompetitionType implements Serializable {
+public @Data class CompetitionType implements Serializable {
 
 	private static final long serialVersionUID = -6198405472773618194L;
 
 	@Id
 	private String id;
+
 	@Column(name = "competition_type", nullable = false, length = 45)
 	private String type;
 
@@ -26,14 +29,6 @@ public class CompetitionType implements Serializable {
 	@MapsId
 	private ClubEvent clubEvent;
 
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
 	public Type getType() {
 		return Type.valueOf(type);
 	}
@@ -47,7 +42,11 @@ public class CompetitionType implements Serializable {
 	}
 
 	public static enum Type {
-		EINZEL, SYNCHRON, DOPPELMINI, MANNSCHAFT, LIGA
+		EINZEL,
+		SYNCHRON,
+		DOPPELMINI,
+		MANNSCHAFT,
+		LIGA
 	}
 
 	@Override

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/Contact.java

@@ -9,6 +9,9 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * The persistent class for the contact database table.
  * 
@@ -17,7 +20,8 @@ import javax.persistence.Table;
 @Table(name = "contact")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name = "Contact.findAll", query = "SELECT c FROM Contact c WHERE c.deleted is not null")
-public class Contact extends BaseEntity implements Serializable {
+@EqualsAndHashCode(callSuper = true)
+public @Data class Contact extends BaseEntity implements Serializable {
 
 	private static final long serialVersionUID = -7631864028095077913L;
 
@@ -29,79 +33,6 @@ public class Contact extends BaseEntity implements Serializable {
 	@ManyToOne
 	private Person person;
 
-	public Contact() {
-	}
-
-	public String getType() {
-		return this.type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getValue() {
-		return this.value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	public Person getPerson() {
-		return this.person;
-	}
-
-	public void setPerson(Person person) {
-		this.person = person;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = super.hashCode();
-		result = prime * result + ((person == null) ? 0 : person.hashCode());
-		result = prime * result + ((type == null) ? 0 : type.hashCode());
-		result = prime * result + ((value == null) ? 0 : value.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (!super.equals(obj)) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		Contact other = (Contact) obj;
-		if (person == null) {
-			if (other.person != null) {
-				return false;
-			}
-		} else if (!person.equals(other.person)) {
-			return false;
-		}
-		if (type == null) {
-			if (other.type != null) {
-				return false;
-			}
-		} else if (!type.equals(other.type)) {
-			return false;
-		}
-		if (value == null) {
-			if (other.value != null) {
-				return false;
-			}
-		} else if (!value.equals(other.value)) {
-			return false;
-		}
-		return true;
-	}
-
 	@Override
 	public String toString() {
 		return "Contact [type=" + type + ", value=" + value + "]";

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/DeletedEntry.java

@@ -8,6 +8,8 @@ import javax.persistence.InheritanceType;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * The persistent class for the deleted_entries database table.
@@ -17,7 +19,8 @@ import javax.persistence.Table;
 @Table(name = "deleted_entries")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name = "DeletedEntry.findAll", query = "SELECT d FROM DeletedEntry d")
-public class DeletedEntry extends BaseEntity implements Serializable {
+@EqualsAndHashCode(callSuper = true)
+public @Data class DeletedEntry extends BaseEntity implements Serializable {
 
 	private static final long serialVersionUID = -4271189592258131845L;
 
@@ -25,23 +28,4 @@ public class DeletedEntry extends BaseEntity implements Serializable {
 
 	private String tablename;
 
-	public DeletedEntry() {
-	}
-
-	public int getEntryId() {
-		return this.entryId;
-	}
-
-	public void setEntryId(int entryId) {
-		this.entryId = entryId;
-	}
-
-	public String getTablename() {
-		return this.tablename;
-	}
-
-	public void setTablename(String tablename) {
-		this.tablename = tablename;
-	}
-
 }

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/GroupDef.java

@@ -11,6 +11,9 @@ import javax.persistence.ManyToMany;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * The persistent class for the groupDef database table.
  * 
@@ -19,7 +22,8 @@ import javax.persistence.Table;
 @Table(name = "groupdef")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name = GroupDef.QUERY_FINDALL, query = "SELECT g FROM GroupDef g")
-public class GroupDef extends BaseEntity implements Serializable {
+@EqualsAndHashCode(callSuper = true)
+public @Data class GroupDef extends BaseEntity implements Serializable {
 
 	public final static String QUERY_FINDALL = "GroupDef.findAll";
 
@@ -30,25 +34,6 @@ public class GroupDef extends BaseEntity implements Serializable {
 	@ManyToMany(fetch = FetchType.LAZY, mappedBy = "groups")
 	private List<Person> persongroups;
 
-	public GroupDef() {
-	}
-
-	public String getName() {
-		return this.name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public List<Person> getPersongroups() {
-		return this.persongroups;
-	}
-
-	public void setPersongroups(List<Person> persongroups) {
-		this.persongroups = persongroups;
-	}
-
 	public void addPersongroup(Person persongroup) {
 		persongroups.add(persongroup);
 	}
@@ -62,34 +47,4 @@ public class GroupDef extends BaseEntity implements Serializable {
 		return "GroupDef [id=" + getId() + ", name=" + name + "]";
 	}
 
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = super.hashCode();
-		result = prime * result + ((name == null) ? 0 : name.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (!super.equals(obj)) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		GroupDef other = (GroupDef) obj;
-		if (name == null) {
-			if (other.name != null) {
-				return false;
-			}
-		} else if (!name.equals(other.name)) {
-			return false;
-		}
-		return true;
-	}
-
 }

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/Person.java

@@ -20,6 +20,9 @@ import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * The persistent class for the person database table.
  * 
@@ -30,7 +33,8 @@ import javax.persistence.Table;
 @NamedQuery(name = Person.QUERY_FINDALL, query = "SELECT p FROM Person p WHERE p.deleted is  null")
 @NamedQuery(name = Person.QUERY_FINDLOGIN, query = "FROM Person WHERE username = :username AND password = :password AND deleted is"
 		+ " null")
-public class Person extends BaseEntity implements Serializable {
+@EqualsAndHashCode(callSuper = true)
+public @Data class Person extends BaseEntity implements Serializable {
 
 	public static final String SESSION_LOGIN = "SESSION_LOGIN_USER";
 
@@ -84,46 +88,6 @@ public class Person extends BaseEntity implements Serializable {
 	@ManyToMany(fetch = FetchType.EAGER, mappedBy = "persons")
 	private Set<ClubEvent> events;
 
-	public LocalDate getBirth() {
-		return birth;
-	}
-
-	public void setBirth(LocalDate birth) {
-		this.birth = birth;
-	}
-
-	public String getPassword() {
-		return this.password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getPrename() {
-		return this.prename;
-	}
-
-	public void setPrename(String prename) {
-		this.prename = prename;
-	}
-
-	public String getSurname() {
-		return this.surname;
-	}
-
-	public void setSurname(String surname) {
-		this.surname = surname;
-	}
-
-	public String getUsername() {
-		return this.username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
 	public Gender getGender() {
 		if (gender == null) {
 			return null;
@@ -140,14 +104,6 @@ public class Person extends BaseEntity implements Serializable {
 		}
 	}
 
-	public Set<GroupDef> getGroups() {
-		return groups;
-	}
-
-	public void setGroups(Set<GroupDef> groups) {
-		this.groups = groups;
-	}
-
 	public void add(GroupDef group) {
 		if (this.groups == null) {
 			this.groups = new HashSet<>();
@@ -156,14 +112,6 @@ public class Person extends BaseEntity implements Serializable {
 		this.groups.add(group);
 	}
 
-	public Set<ClubEvent> getEvents() {
-		return events;
-	}
-
-	public void setEvents(Set<ClubEvent> events) {
-		this.events = events;
-	}
-
 	public void add(ClubEvent ev) {
 		if (this.events == null) {
 			this.events = new HashSet<>();
@@ -183,14 +131,6 @@ public class Person extends BaseEntity implements Serializable {
 		events.remove(clubEvent);
 	}
 
-	public List<Adress> getAdresses() {
-		return this.adresses;
-	}
-
-	public void setAdresses(List<Adress> adresses) {
-		this.adresses = adresses;
-	}
-
 	public Adress addAdress(Adress adress) {
 		getAdresses().add(adress);
 		adress.setPerson(this);
@@ -205,14 +145,6 @@ public class Person extends BaseEntity implements Serializable {
 		return adress;
 	}
 
-	public List<Attendance> getAttendances() {
-		return this.attendances;
-	}
-
-	public void setAttendances(List<Attendance> attendances) {
-		this.attendances = attendances;
-	}
-
 	public Attendance addAttendance(Attendance attendance) {
 		getAttendances().add(attendance);
 		attendance.setPerson(this);
@@ -227,14 +159,6 @@ public class Person extends BaseEntity implements Serializable {
 		return attendance;
 	}
 
-	public List<Contact> getContacts() {
-		return this.contacts;
-	}
-
-	public void setContacts(List<Contact> contacts) {
-		this.contacts = contacts;
-	}
-
 	public Contact addContact(Contact contact) {
 		getContacts().add(contact);
 		contact.setPerson(this);
@@ -249,10 +173,6 @@ public class Person extends BaseEntity implements Serializable {
 		return contact;
 	}
 
-	public Set<GroupDef> getPersongroups() {
-		return this.groups;
-	}
-
 	public void setPersongroups(Collection<GroupDef> persongroups) {
 		if (persongroups instanceof Set) {
 			this.groups = (Set<GroupDef>) persongroups;
@@ -275,14 +195,6 @@ public class Person extends BaseEntity implements Serializable {
 		}
 	}
 
-	public List<Relative> getRelatives1() {
-		return this.relatives1;
-	}
-
-	public void setRelatives1(List<Relative> relatives1) {
-		this.relatives1 = relatives1;
-	}
-
 	public Relative addRelatives1(Relative relatives1) {
 		getRelatives1().add(relatives1);
 		relatives1.setPerson1Bean(this);
@@ -297,14 +209,6 @@ public class Person extends BaseEntity implements Serializable {
 		return relatives1;
 	}
 
-	public List<Relative> getRelatives2() {
-		return this.relatives2;
-	}
-
-	public void setRelatives2(List<Relative> relatives2) {
-		this.relatives2 = relatives2;
-	}
-
 	public Relative addRelatives2(Relative relatives2) {
 		getRelatives2().add(relatives2);
 		relatives2.setPerson2Bean(this);
@@ -319,10 +223,6 @@ public class Person extends BaseEntity implements Serializable {
 		return relatives2;
 	}
 
-	public Startpass getStartpass() {
-		return startpass;
-	}
-
 	public void setStartpass(Startpass startpass) {
 		this.startpass = startpass;
 	}
@@ -338,82 +238,6 @@ public class Person extends BaseEntity implements Serializable {
 		this.startpass.setStartpassNr(startpass);
 	}
 
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = super.hashCode();
-		result = prime * result + ((birth == null) ? 0 : birth.hashCode());
-		result = prime * result + ((groups == null) ? 0 : groups.hashCode());
-		result = prime * result + ((password == null) ? 0 : password.hashCode());
-		result = prime * result + ((prename == null) ? 0 : prename.hashCode());
-		result = prime * result + ((surname == null) ? 0 : surname.hashCode());
-		result = prime * result + ((username == null) ? 0 : username.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (!super.equals(obj)) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		Person other = (Person) obj;
-		if (birth == null) {
-			if (other.birth != null) {
-				return false;
-			}
-		}
-		else if (!birth.equals(other.birth)) {
-			return false;
-		}
-		if (groups == null) {
-			if (other.groups != null) {
-				return false;
-			}
-		}
-		else if (!groups.equals(other.groups)) {
-			return false;
-		}
-		if (password == null) {
-			if (other.password != null) {
-				return false;
-			}
-		}
-		else if (!password.equals(other.password)) {
-			return false;
-		}
-		if (prename == null) {
-			if (other.prename != null) {
-				return false;
-			}
-		}
-		else if (!prename.equals(other.prename)) {
-			return false;
-		}
-		if (surname == null) {
-			if (other.surname != null) {
-				return false;
-			}
-		}
-		else if (!surname.equals(other.surname)) {
-			return false;
-		}
-		if (username == null) {
-			if (other.username != null) {
-				return false;
-			}
-		}
-		else if (!username.equals(other.username)) {
-			return false;
-		}
-		return true;
-	}
-
 	@Override
 	public String toString() {
 		return "Person [id=" + getId() + ", prename=" + prename + ", surname=" + surname + "]";

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/Persongroup.java

@@ -10,6 +10,9 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * The persistent class for the persongroup database table.
  * 
@@ -18,7 +21,8 @@ import javax.persistence.Table;
 @Table(name = "persongroup")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name = "Persongroup.findAll", query = "SELECT p FROM Persongroup p")
-public class Persongroup extends BaseEntity implements Serializable {
+@EqualsAndHashCode(callSuper = true)
+public @Data class Persongroup extends BaseEntity implements Serializable {
 
 	private static final long serialVersionUID = -2466223964213904302L;
 
@@ -31,54 +35,4 @@ public class Persongroup extends BaseEntity implements Serializable {
 	@JoinColumn(name = "group_id")
 	private GroupDef groupDef;
 
-	public Persongroup() {
-	}
-
-	public Person getPerson() {
-		return this.person;
-	}
-
-	public void setPerson(Person person) {
-		this.person = person;
-	}
-
-	public GroupDef getGroupDef() {
-		return this.groupDef;
-	}
-
-	public void setGroupDef(GroupDef groupDef) {
-		this.groupDef = groupDef;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = super.hashCode();
-		result = prime * result + ((groupDef == null) ? 0 : groupDef.hashCode());
-		result = prime * result + ((person == null) ? 0 : person.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (!super.equals(obj))
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		Persongroup other = (Persongroup) obj;
-		if (groupDef == null) {
-			if (other.groupDef != null)
-				return false;
-		} else if (!groupDef.equals(other.groupDef))
-			return false;
-		if (person == null) {
-			if (other.person != null)
-				return false;
-		} else if (!person.equals(other.person))
-			return false;
-		return true;
-	}
-
 }

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/Pflicht.java

@@ -8,17 +8,24 @@ import javax.persistence.InheritanceType;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 @Entity
 @Table(name = "pflichten")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name = "Pflicht.findAll", query = "SELECT p FROM Pflicht p")
-public class Pflicht extends BaseEntity implements Serializable, Comparable<Pflicht> {
+@EqualsAndHashCode(callSuper = true)
+public @Data class Pflicht extends BaseEntity implements Serializable, Comparable<Pflicht> {
 
 	private static final long serialVersionUID = -1309514158086518524L;
 
 	private String name;
+
 	private boolean fixed;
+
 	private int ordered;
+
 	private String comment;
 
 	public Pflicht() {
@@ -31,38 +38,6 @@ public class Pflicht extends BaseEntity implements Serializable, Comparable<Pfli
 		this.comment = comment;
 	}
 
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public boolean isFixed() {
-		return fixed;
-	}
-
-	public void setFixed(boolean fixed) {
-		this.fixed = fixed;
-	}
-
-	public int getOrdered() {
-		return ordered;
-	}
-
-	public void setOrdered(int order) {
-		this.ordered = order;
-	}
-
-	public String getComment() {
-		return comment;
-	}
-
-	public void setComment(String comment) {
-		this.comment = comment;
-	}
-
 	@Override
 	public String toString() {
 		return name;

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/Relation.java

@@ -1,9 +1,17 @@
 package de.kreth.vaadin.clubhelper.vaadinclubhelper.data;
 
+import lombok.Getter;
+import lombok.ToString;
+
+@Getter
+@ToString
 public class Relation {
 
 	public enum RelationType {
-		RELATIONSHIP("Partner"), SIBLINGS("Geschwister"), PARENT("Elternteil"), CHILD("Kind");
+		RELATIONSHIP("Partner"),
+		SIBLINGS("Geschwister"),
+		PARENT("Elternteil"),
+		CHILD("Kind");
 
 		private final String localized;
 
@@ -17,6 +25,7 @@ public class Relation {
 	}
 
 	private Person person;
+
 	private String relation;
 
 	public Relation(Person person, String relation) {
@@ -25,55 +34,8 @@ public class Relation {
 		this.relation = relation;
 	}
 
-	public Person getPerson() {
-		return person;
-	}
-
 	public RelationType getRelation() {
 		return RelationType.valueOf(relation);
 	}
 
-	@Override
-	public String toString() {
-		return "Relation [person=" + person + ", relation=" + relation + "]";
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((person == null) ? 0 : person.hashCode());
-		result = prime * result + ((relation == null) ? 0 : relation.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (getClass() != obj.getClass()) {
-			return false;
-		}
-		Relation other = (Relation) obj;
-		if (person == null) {
-			if (other.person != null) {
-				return false;
-			}
-		} else if (!person.equals(other.person)) {
-			return false;
-		}
-		if (relation == null) {
-			if (other.relation != null) {
-				return false;
-			}
-		} else if (!relation.equals(other.relation)) {
-			return false;
-		}
-		return true;
-	}
-
 }

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/Relative.java

@@ -11,6 +11,9 @@ import javax.persistence.ManyToOne;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * The persistent class for the relative database table.
  * 
@@ -19,9 +22,11 @@ import javax.persistence.Table;
 @Table(name = "relative")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name = Relative.QUERY_FINDALL, query = "SELECT r FROM Relative r")
-public class Relative extends BaseEntity implements Serializable {
+@EqualsAndHashCode(callSuper = false)
+public @Data class Relative extends BaseEntity implements Serializable {
 
 	public static final String QUERY_FINDALL = "Relative.findAll";
+
 	private static final long serialVersionUID = -1331008393583211773L;
 
 	@Column(name = "TO_PERSON1_RELATION")
@@ -40,95 +45,19 @@ public class Relative extends BaseEntity implements Serializable {
 	@JoinColumn(name = "person2")
 	private Person person2Bean;
 
-	public Relative() {
-	}
-
-	public String getToPerson1Relation() {
-		return this.toPerson1Relation;
-	}
-
-	public void setToPerson1Relation(String toPerson1Relation) {
-		this.toPerson1Relation = toPerson1Relation;
-	}
-
-	public String getToPerson2Relation() {
-		return this.toPerson2Relation;
-	}
-
-	public void setToPerson2Relation(String toPerson2Relation) {
-		this.toPerson2Relation = toPerson2Relation;
-	}
-
-	public Person getPerson1Bean() {
-		return this.person1Bean;
-	}
-
-	public void setPerson1Bean(Person person1Bean) {
-		this.person1Bean = person1Bean;
-	}
-
-	public Person getPerson2Bean() {
-		return this.person2Bean;
-	}
-
-	public void setPerson2Bean(Person person2Bean) {
-		this.person2Bean = person2Bean;
-	}
-
 	public Relation getRelationTo(Person person) {
 		if (person == null) {
 			return null;
 		}
 		if (person.equals(person1Bean)) {
 			return new Relation(person2Bean, toPerson2Relation);
-		} else if (person.equals(person2Bean)) {
-			return new Relation(person1Bean, toPerson1Relation);
-		} else {
-			return null;
 		}
+		else if (person.equals(person2Bean)) {
+			return new Relation(person1Bean, toPerson1Relation);
 		}
-
+		else {
-	@Override
+			return null;
-	public int hashCode() {
-		final int prime = 31;
-		int result = super.hashCode();
-		result = prime * result + ((person1Bean == null) ? 0 : person1Bean.hashCode());
-		result = prime * result + ((person2Bean == null) ? 0 : person2Bean.hashCode());
-		result = prime * result + ((toPerson1Relation == null) ? 0 : toPerson1Relation.hashCode());
-		result = prime * result + ((toPerson2Relation == null) ? 0 : toPerson2Relation.hashCode());
-		return result;
 		}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (!super.equals(obj))
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		Relative other = (Relative) obj;
-		if (person1Bean == null) {
-			if (other.person1Bean != null)
-				return false;
-		} else if (!person1Bean.equals(other.person1Bean))
-			return false;
-		if (person2Bean == null) {
-			if (other.person2Bean != null)
-				return false;
-		} else if (!person2Bean.equals(other.person2Bean))
-			return false;
-		if (toPerson1Relation == null) {
-			if (other.toPerson1Relation != null)
-				return false;
-		} else if (!toPerson1Relation.equals(other.toPerson1Relation))
-			return false;
-		if (toPerson2Relation == null) {
-			if (other.toPerson2Relation != null)
-				return false;
-		} else if (!toPerson2Relation.equals(other.toPerson2Relation))
-			return false;
-		return true;
 	}
 
 }

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/Startpass.java

@@ -1,6 +1,7 @@
 package de.kreth.vaadin.clubhelper.vaadinclubhelper.data;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -13,6 +14,9 @@ import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
  * The persistent class for the startpaesse database table.
  * 
@@ -21,7 +25,8 @@ import javax.persistence.Table;
 @Table(name = "startpaesse")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name = "Startpass.findAll", query = "SELECT s FROM Startpass s")
-public class Startpass extends BaseEntity implements Serializable {
+@EqualsAndHashCode(callSuper = true)
+public @Data class Startpass extends BaseEntity implements Serializable {
 
 	private static final long serialVersionUID = 1464510869007022357L;
 
@@ -34,44 +39,23 @@ public class Startpass extends BaseEntity implements Serializable {
 
 	// bi-directional many-to-one association to StartpassStartrechte
 	@OneToMany(mappedBy = "startpaesse")
-	private List<StartpassStartrechte> startpassStartrechtes;
+	private List<StartpassStartrechte> startpassStartrechte;
-
-	public Startpass() {
-	}
-
-	public String getStartpassNr() {
-		return this.startpassNr;
-	}
-
-	public void setStartpassNr(String startpassNr) {
-		this.startpassNr = startpassNr;
-	}
-
-	public Person getPerson() {
-		return this.person;
-	}
-
-	public void setPerson(Person person) {
-		this.person = person;
-	}
-
-	public List<StartpassStartrechte> getStartpassStartrechtes() {
-		return this.startpassStartrechtes;
-	}
-
-	public void setStartpassStartrechtes(List<StartpassStartrechte> startpassStartrechtes) {
-		this.startpassStartrechtes = startpassStartrechtes;
-	}
 
 	public StartpassStartrechte addStartpassStartrechte(StartpassStartrechte startpassStartrechte) {
-		getStartpassStartrechtes().add(startpassStartrechte);
+		if (this.startpassStartrechte == null) {
+			this.startpassStartrechte = new ArrayList<>();
+		}
+		this.startpassStartrechte.add(startpassStartrechte);
 		startpassStartrechte.setStartpaesse(this);
 
 		return startpassStartrechte;
 	}
 
 	public StartpassStartrechte removeStartpassStartrechte(StartpassStartrechte startpassStartrechte) {
-		getStartpassStartrechtes().remove(startpassStartrechte);
+		if (this.startpassStartrechte == null) {
+			this.startpassStartrechte = new ArrayList<>();
+		}
+		this.startpassStartrechte.remove(startpassStartrechte);
 		startpassStartrechte.setStartpaesse(null);
 
 		return startpassStartrechte;

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/StartpassStartrechte.java

@@ -1,9 +1,21 @@
 package de.kreth.vaadin.clubhelper.vaadinclubhelper.data;
 
 import java.io.Serializable;
-import javax.persistence.*;
 import java.util.Date;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * The persistent class for the startpass_startrechte database table.
@@ -13,7 +25,8 @@ import java.util.Date;
 @Table(name = "startpass_startrechte")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name = "StartpassStartrechte.findAll", query = "SELECT s FROM StartpassStartrechte s")
-public class StartpassStartrechte extends BaseEntity implements Serializable {
+@EqualsAndHashCode(callSuper = false)
+public @Data class StartpassStartrechte extends BaseEntity implements Serializable {
 
 	private static final long serialVersionUID = 292071407439270519L;
 
@@ -35,22 +48,10 @@ public class StartpassStartrechte extends BaseEntity implements Serializable {
 	@JoinColumn(name = "startpass_id")
 	private Startpass startpaesse;
 
-	public String getFachgebiet() {
-		return this.fachgebiet;
-	}
-
-	public void setFachgebiet(String fachgebiet) {
-		this.fachgebiet = fachgebiet;
-	}
-
 	public Date getStartrechtBeginn() {
 		return new Date(this.startrechtBeginn.getTime());
 	}
 
-	public void setStartrechtBeginn(Date startrechtBeginn) {
-		this.startrechtBeginn = startrechtBeginn;
-	}
-
 	public Date getStartrechtEnde() {
 		return new Date(this.startrechtEnde.getTime());
 	}
@@ -59,20 +60,4 @@ public class StartpassStartrechte extends BaseEntity implements Serializable {
 		this.startrechtEnde = startrechtEnde;
 	}
 
-	public String getVereinName() {
-		return this.vereinName;
-	}
-
-	public void setVereinName(String vereinName) {
-		this.vereinName = vereinName;
-	}
-
-	public Startpass getStartpaesse() {
-		return this.startpaesse;
-	}
-
-	public void setStartpaesse(Startpass startpaesse) {
-		this.startpaesse = startpaesse;
-	}
-
 }

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/Version.java

@@ -1,9 +1,18 @@
 package de.kreth.vaadin.clubhelper.vaadinclubhelper.data;
 
 import java.io.Serializable;
-import javax.persistence.*;
 import java.util.Date;
 
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import lombok.Data;
 
 /**
  * The persistent class for the version database table.
@@ -12,7 +21,7 @@ import java.util.Date;
 @Entity
 @Table(name = "version")
 @NamedQuery(name = "Version.findAll", query = "SELECT v FROM Version v")
-public class Version implements Serializable {
+public @Data class Version implements Serializable {
 
 	private static final long serialVersionUID = 1964331485558854626L;
 
@@ -25,31 +34,4 @@ public class Version implements Serializable {
 
 	private int version;
 
-	public Version() {
-	}
-
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public Date getDeleted() {
-		return new Date(this.deleted.getTime());
-	}
-
-	public void setDeleted(Date deleted) {
-		this.deleted = deleted;
-	}
-
-	public int getVersion() {
-		return this.version;
-	}
-
-	public void setVersion(int version) {
-		this.version = version;
-	}
-
 }

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonEditDetails.java

@@ -27,18 +27,25 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Startpass;
 public class PersonEditDetails extends HorizontalLayout {
 
 	private static final long serialVersionUID = 4692332924201974714L;
+
 	private final TextField textPrename;
+
 	private final TextField textSureName;
+
 	private final DateField birthday;
 
 	private final PersonDao dao;
 
 	private final Binder<Person> binder;
+
 	private Consumer<Person> personChangeHandler;
+
 	private Button okButton;
 
 	private ContactGrid contactLayout;
+
 	private RelationComponent relationshipLayout;
+
 	private AdressComponent adressLayout;
 
 	public PersonEditDetails(List<GroupDef> groups, PersonDao dao) {
@@ -79,7 +86,8 @@ public class PersonEditDetails extends HorizontalLayout {
 		Button close = new Button("Schließen");
 		if (showCloseButton) {
 			close.addClickListener(ev -> closeWithoutSave());
-		} else {
+		}
+		else {
 			close.setVisible(false);
 		}
 
@@ -95,7 +103,8 @@ public class PersonEditDetails extends HorizontalLayout {
 				contactLayout.setPerson(edited);
 				relationshipLayout.setPerson(edited);
 				adressLayout.setPerson(edited);
-			} else {
+			}
+			else {
 				List<ValidationResult> errors = validate.getBeanValidationErrors();
 				StringBuilder msg = new StringBuilder();
 				for (ValidationResult res : errors) {
@@ -157,6 +166,7 @@ public class PersonEditDetails extends HorizontalLayout {
 		setExpandRatio(layout, 1f);
 		setExpandRatio(sheet, 2f);
 
+		iterator().forEachRemaining(comp -> comp.setEnabled(false));
 	}
 
 	public Component createGroupPanel(List<GroupDef> groups) {
@@ -171,7 +181,8 @@ public class PersonEditDetails extends HorizontalLayout {
 			binder.forField(sw).bind(p -> p.getGroups().contains(g), (bean, fieldvalue) -> {
 				if (fieldvalue) {
 					bean.getGroups().add(g);
-				} else {
+				}
+				else {
 					bean.getGroups().remove(g);
 				}
 			});
@@ -191,9 +202,12 @@ public class PersonEditDetails extends HorizontalLayout {
 		adressLayout.setPerson(person);
 
 		if (person != null) {
+			iterator().forEachRemaining(comp -> comp.setEnabled(true));
 			binder.validate();
 			okButton.setEnabled(true);
-		} else {
+		}
+		else {
+			iterator().forEachRemaining(comp -> comp.setEnabled(false));
 			okButton.setEnabled(false);
 		}
 	}
@@ -218,8 +232,11 @@ public class PersonEditDetails extends HorizontalLayout {
 	}
 
 	public boolean hasChanges() {
-		return binder.hasChanges() || contactLayout.hasChanges() || relationshipLayout.hasChanges()
+		return binder.getBean() != null
-				|| adressLayout.hasChanges();
+				&& (binder.hasChanges()
+						|| contactLayout.hasChanges()
+						|| relationshipLayout.hasChanges()
+						|| adressLayout.hasChanges());
 	}
 
 }

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/HeadView.java

@@ -131,7 +131,7 @@ public class HeadView extends HorizontalLayout {
 			contextMenu.open(50, 50);
 			break;
 		case "head.user":
-			if (securityVerifier.getLoggedinPerson() != null) {
+			if (securityVerifier.isLoggedin()) {
 
 				contextMenu.addItem("Abmelden", ev1 -> {
 					securityVerifier.setLoggedinPerson(null);

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/navigation/MainViewMobile.java

@@ -4,6 +4,7 @@ import java.time.LocalDate;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;
+import java.util.List;
 import java.util.Optional;
 
 import org.basilbourque.timecolumnrenderers.ZonedDateTimeRenderer;
@@ -41,6 +42,8 @@ public class MainViewMobile extends MainView {
 
 	private HorizontalLayout eventButtonLayout;
 
+	ConfigurableFilterDataProvider<ClubEvent, Void, SerializablePredicate<ClubEvent>> eventDataProvider;
+
 	public MainViewMobile(PersonDao personDao, GroupDao groupDao, EventBusiness eventBusiness,
 			SecurityVerifier securityGroupVerifier) {
 		super(personDao, groupDao, eventBusiness, securityGroupVerifier);
@@ -76,8 +79,11 @@ public class MainViewMobile extends MainView {
 		eventGrid.addColumn(ClubEvent::getStart).setCaption("Start")
 				.setRenderer(new ZonedDateTimeRenderer(DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)))
 				.setSortable(true).setHidable(true);
-		ConfigurableFilterDataProvider<ClubEvent, Void, SerializablePredicate<ClubEvent>> eventDataProvider = DataProvider
+
-				.ofCollection(eventBusiness.loadEvents()).withConfigurableFilter();
+		List<ClubEvent> loadEvents = eventBusiness.loadEvents();
+//		loadEvents.clear();
+		eventDataProvider = DataProvider
+				.ofCollection(loadEvents).withConfigurableFilter();
 		eventDataProvider.setFilter(this::filter);
 		eventGrid.setDataProvider(eventDataProvider);
 

src/main/packaging/version.properties

@@ -0,0 +1,4 @@
+project.artifactId=${project.artifactId}
+project.version=${project.version}
+build.dateTime=${timestamp}
+package_name=${project.artifactId}-${project.version}.${project.packaging}