sonar bugfixes

src/main/java/de/kreth/clubhelperbackend/google/GoogleBaseAdapter.java

@@ -5,6 +5,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.Charset;
 import java.security.GeneralSecurityException;
 import java.util.Arrays;
 import java.util.List;
@@ -22,6 +23,7 @@ import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.client.util.store.FileDataStoreFactory;
+import com.google.api.services.calendar.Calendar.Builder;
 import com.google.api.services.calendar.CalendarScopes;
 
 public abstract class GoogleBaseAdapter {
@@ -43,10 +45,10 @@ public abstract class GoogleBaseAdapter {
 	 */
 	static final List<String> SCOPES = Arrays.asList(CalendarScopes.CALENDAR);
 
-	protected static Credential credential;
+	private static Credential credential;
 
-	protected static final Logger log = LoggerFactory
+	protected final Logger log = LoggerFactory
-			.getLogger(GoogleBaseAdapter.class);
+			.getLogger(getClass());
 	/** Global instance of the {@link FileDataStoreFactory}. */
 	protected final FileDataStoreFactory DATA_STORE_FACTORY;
 	/** Global instance of the HTTP transport. */
@@ -56,7 +58,11 @@ public abstract class GoogleBaseAdapter {
 		super();
 		HTTP_TRANSPORT = GoogleNetHttpTransport.newTrustedTransport();
 		DATA_STORE_FACTORY = new FileDataStoreFactory(DATA_STORE_DIR);
-		DATA_STORE_DIR.mkdirs();
+		if (DATA_STORE_DIR.mkdirs()) {
+			log.info("created DATA_STORE_DIR: {}", DATA_STORE_DIR.getAbsolutePath());
+		} else {
+			log.trace("DATA_STORE_DIR already exists.");
+		}
 	}
 
 	protected void checkRefreshToken(String serverName) throws IOException {
@@ -80,6 +86,19 @@ public abstract class GoogleBaseAdapter {
 		}
 	}
 
+	public Builder createBuilder() {
+		if (credential == null) {
+			throw new IllegalStateException("credential is null, checkRefreshToken need to be called before.");
+		}
+		
+		return new com.google.api.services.calendar.Calendar.Builder(
+				HTTP_TRANSPORT, JSON_FACTORY, credential);
+	}
+	
+	public final boolean refreshToken() throws IOException {
+		return credential.refreshToken();
+	}
+
 	/**
 	 * Creates an authorized Credential object.
 	 * 
@@ -113,7 +132,7 @@ public abstract class GoogleBaseAdapter {
 			}
 		}
 		GoogleClientSecrets clientSecrets = GoogleClientSecrets
-				.load(JSON_FACTORY, new InputStreamReader(in));
+				.load(JSON_FACTORY, new InputStreamReader(in, Charset.defaultCharset()));
 		if (log.isTraceEnabled()) {
 			log.trace("client secret json resource loaded.");
 		}

src/main/java/de/kreth/clubhelperbackend/google/calendar/CalendarAdapter.java

@@ -39,9 +39,8 @@ public class CalendarAdapter extends GoogleBaseAdapter {
 			if (lock.tryLock(10, TimeUnit.SECONDS)) {
 				try {
 					super.checkRefreshToken(serverName);
-					if (service == null && credential != null) {
+					if (service == null) {
-						service = new com.google.api.services.calendar.Calendar.Builder(
+						service = createBuilder()
-								HTTP_TRANSPORT, JSON_FACTORY, credential)
 										.setApplicationName(APPLICATION_NAME)
 										.build();
 					}
@@ -125,7 +124,7 @@ public class CalendarAdapter extends GoogleBaseAdapter {
 				log.warn("Error fetching Calendar List, trying token refresh",
 						e);
 			}
-			credential.refreshToken();
+			refreshToken();
 			if (log.isInfoEnabled()) {
 				log.info("Successfully refreshed Google Security Token.");
 			}

src/main/java/de/kreth/clubhelperbackend/google/calendar/CalendarResource.java

@@ -46,10 +46,9 @@ public class CalendarResource {
 				case "name" :
 					conf.name = value;
 					break;
-
 				case "color" :
 					conf.color = value;
-
+					break;
 				default :
 					break;
 			}

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

@@ -2,7 +2,6 @@ package de.kreth.vaadin.clubhelper.vaadinclubhelper.data;
 
 import java.io.Serializable;
 import javax.persistence.*;
-import java.util.Date;
 
 
 /**
@@ -11,43 +10,24 @@ import java.util.Date;
  */
 @Entity
 @Table(name="adress")
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name="Adress.findAll", query="SELECT a FROM Adress a")
-public class Adress implements Serializable {
+public class Adress extends BaseEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
 
-	@Id
+	private static final long serialVersionUID = 8216273166570667412L;
-	@GeneratedValue(strategy=GenerationType.IDENTITY)
-	private int id;
 
 	private String adress1;
 
 	private String adress2;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date changed;
-
 	private String city;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date created;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date deleted;
-
 	private String plz;
 
 	//bi-directional many-to-one association to Person
 	@ManyToOne
 	private Person person;
 
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
 	public String getAdress1() {
 		return this.adress1;
 	}
@@ -64,14 +44,6 @@ public class Adress implements Serializable {
 		this.adress2 = adress2;
 	}
 
-	public Date getChanged() {
-		return new Date(this.changed.getTime());
-	}
-
-	public void setChanged(Date changed) {
-		this.changed = changed;
-	}
-
 	public String getCity() {
 		return this.city;
 	}
@@ -80,22 +52,6 @@ public class Adress implements Serializable {
 		this.city = city;
 	}
 
-	public Date getCreated() {
-		return new Date(this.created.getTime());
-	}
-
-	public void setCreated(Date created) {
-		this.created = created;
-	}
-
-	public Date getDeleted() {
-		return new Date(this.deleted.getTime());
-	}
-
-	public void setDeleted(Date deleted) {
-		this.deleted = deleted;
-	}
-
 	public String getPlz() {
 		return this.plz;
 	}

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

@@ -11,22 +11,11 @@ import java.util.Date;
  */
 @Entity
 @Table(name="attendance")
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name="Attendance.findAll", query="SELECT a FROM Attendance a")
-public class Attendance implements Serializable {
+public class Attendance extends BaseEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
 
-	@Id
+	private static final long serialVersionUID = 2385033161272078335L;
-	@GeneratedValue(strategy=GenerationType.IDENTITY)
-	private int id;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date changed;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date created;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date deleted;
 
 	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="on_date")
@@ -36,38 +25,6 @@ public class Attendance implements Serializable {
 	@ManyToOne
 	private Person person;
 
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public Date getChanged() {
-		return new Date(this.changed.getTime());
-	}
-
-	public void setChanged(Date changed) {
-		this.changed = changed;
-	}
-
-	public Date getCreated() {
-		return new Date(this.created.getTime());
-	}
-
-	public void setCreated(Date created) {
-		this.created = created;
-	}
-
-	public Date getDeleted() {
-		return new Date(this.deleted.getTime());
-	}
-
-	public void setDeleted(Date deleted) {
-		this.deleted = deleted;
-	}
-
 	public Date getOnDate() {
 		return new Date(this.onDate.getTime());
 	}

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

@@ -0,0 +1,100 @@
+package de.kreth.vaadin.clubhelper.vaadinclubhelper.data;
+
+import java.util.Date;
+
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@MappedSuperclass
+public abstract class BaseEntity {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private int id;
+	
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date changed;
+	
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date created;
+	
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date deleted;
+
+	public int getId() {
+		return this.id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public Date getChanged() {
+		return new Date(this.changed.getTime());
+	}
+
+	public void setChanged(Date changed) {
+		this.changed = changed;
+	}
+
+	public Date getCreated() {
+		return new Date(this.created.getTime());
+	}
+
+	public void setCreated(Date created) {
+		this.created = created;
+	}
+
+	public Date getDeleted() {
+		return new Date(this.deleted.getTime());
+	}
+
+	public void setDeleted(Date deleted) {
+		this.deleted = deleted;
+	}
+
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((changed == null) ? 0 : changed.hashCode());
+		result = prime * result + ((created == null) ? 0 : created.hashCode());
+		result = prime * result + ((deleted == null) ? 0 : deleted.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 (changed == null) {
+			if (other.changed != null)
+				return false;
+		} else if (!changed.equals(other.changed))
+			return false;
+		if (created == null) {
+			if (other.created != null)
+				return false;
+		} else if (!created.equals(other.created))
+			return false;
+		if (deleted == null) {
+			if (other.deleted != null)
+				return false;
+		} else if (!deleted.equals(other.deleted))
+			return false;
+		if (id != other.id)
+			return false;
+		return true;
+	}
+
+}

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

@@ -1,8 +1,13 @@
 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.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
 
 
 /**
@@ -11,22 +16,11 @@ import java.util.Date;
  */
 @Entity
 @Table(name="contact")
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name="Contact.findAll", query="SELECT c FROM Contact c")
-public class Contact implements Serializable {
+public class Contact extends BaseEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@GeneratedValue(strategy=GenerationType.IDENTITY)
-	private int id;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date changed;
 
-	@Temporal(TemporalType.TIMESTAMP)
+	private static final long serialVersionUID = -7631864028095077913L;
-	private Date created;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date deleted;
 
 	private String type;
 
@@ -39,38 +33,6 @@ public class Contact implements Serializable {
 	public Contact() {
 	}
 
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public Date getChanged() {
-		return new Date(this.changed.getTime());
-	}
-
-	public void setChanged(Date changed) {
-		this.changed = changed;
-	}
-
-	public Date getCreated() {
-		return new Date(this.created.getTime());
-	}
-
-	public void setCreated(Date created) {
-		this.created = created;
-	}
-
-	public Date getDeleted() {
-		return new Date(this.deleted.getTime());
-	}
-
-	public void setDeleted(Date deleted) {
-		this.deleted = deleted;
-	}
-
 	public String getType() {
 		return this.type;
 	}

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

@@ -1,8 +1,12 @@
 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.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
 
 
 /**
@@ -11,22 +15,11 @@ import java.util.Date;
  */
 @Entity
 @Table(name="deleted_entries")
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name="DeletedEntry.findAll", query="SELECT d FROM DeletedEntry d")
-public class DeletedEntry implements Serializable {
+public class DeletedEntry extends BaseEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@GeneratedValue(strategy=GenerationType.IDENTITY)
-	private int id;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date changed;
 
-	@Temporal(TemporalType.TIMESTAMP)
+	private static final long serialVersionUID = -4271189592258131845L;
-	private Date created;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date deleted;
 
 	private int entryId;
 
@@ -35,38 +28,6 @@ public class DeletedEntry implements Serializable {
 	public DeletedEntry() {
 	}
 
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public Date getChanged() {
-		return new Date(this.changed.getTime());
-	}
-
-	public void setChanged(Date changed) {
-		this.changed = changed;
-	}
-
-	public Date getCreated() {
-		return new Date(this.created.getTime());
-	}
-
-	public void setCreated(Date created) {
-		this.created = created;
-	}
-
-	public Date getDeleted() {
-		return new Date(this.deleted.getTime());
-	}
-
-	public void setDeleted(Date deleted) {
-		this.deleted = deleted;
-	}
-
 	public int getEntryId() {
 		return this.entryId;
 	}

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

@@ -1,21 +1,17 @@
 package de.kreth.vaadin.clubhelper.vaadinclubhelper.data;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
+import javax.persistence.Inheritance;
-import javax.persistence.GenerationType;
+import javax.persistence.InheritanceType;
-import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
 /**
  * The persistent class for the groupDef database table.
@@ -23,26 +19,14 @@ import javax.persistence.TemporalType;
  */
 @Entity(name = "groupDef")
 @Table(name = "groupDef")
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name = GroupDef.QUERY_FINDALL, query = "SELECT g FROM groupDef g")
-public class GroupDef implements Serializable {
+public class GroupDef extends BaseEntity implements Serializable {
 
 	public final static String QUERY_FINDALL = "GroupDef.findAll";
 
 	private static final long serialVersionUID = -2827542956463449518L;
 
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private int id;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date changed;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date created;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date deleted;
-
 	private String name;
 
 	@ManyToMany(fetch=FetchType.LAZY)
@@ -54,38 +38,6 @@ public class GroupDef implements Serializable {
 	public GroupDef() {
 	}
 
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public Date getChanged() {
-		return new Date(this.changed.getTime());
-	}
-
-	public void setChanged(Date changed) {
-		this.changed = changed;
-	}
-
-	public Date getCreated() {
-		return new Date(this.created.getTime());
-	}
-
-	public void setCreated(Date created) {
-		this.created = created;
-	}
-
-	public Date getDeleted() {
-		return new Date(this.deleted.getTime());
-	}
-
-	public void setDeleted(Date deleted) {
-		this.deleted = deleted;
-	}
-
 	public String getName() {
 		return this.name;
 	}
@@ -118,15 +70,15 @@ public class GroupDef implements Serializable {
 
 	@Override
 	public String toString() {
-		return "GroupDef [id=" + id + ", name=" + name + "]";
+		return "GroupDef [id=" + getId() + ", name=" + name + "]";
 	}
 
 	@Override
 	public int hashCode() {
 		final int prime = 31;
-		int result = 1;
+		int result = super.hashCode();
-		result = prime * result + id;
 		result = prime * result + ((name == null) ? 0 : name.hashCode());
+		result = prime * result + ((persongroups == null) ? 0 : persongroups.hashCode());
 		return result;
 	}
 
@@ -134,18 +86,21 @@ public class GroupDef implements Serializable {
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;
-		if (obj == null)
+		if (!super.equals(obj))
 			return false;
 		if (getClass() != obj.getClass())
 			return false;
 		GroupDef other = (GroupDef) obj;
-		if (id != other.id)
-			return false;
 		if (name == null) {
 			if (other.name != null)
 				return false;
 		} else if (!name.equals(other.name))
 			return false;
+		if (persongroups == null) {
+			if (other.persongroups != null)
+				return false;
+		} else if (!persongroups.equals(other.persongroups))
+			return false;
 		return true;
 	}
 

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

@@ -13,29 +13,17 @@ import javax.persistence.*;
  */
 @Entity
 @Table(name = "person")
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name = Person.QUERY_FINDALL, query = "SELECT p FROM Person p")
-public class Person implements Serializable {
+public class Person extends BaseEntity implements Serializable {
 
 	public final static String QUERY_FINDALL = "Person.findAll";
 
 	private static final long serialVersionUID = -8361264400619997123L;
 
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	private int id;
-
 	@Temporal(TemporalType.TIMESTAMP)
 	private Date birth;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date changed;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date created;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date deleted;
-
 	private String password;
 
 	private String prename;
@@ -83,17 +71,6 @@ public class Person implements Serializable {
 	    )
 	private Set<ClubEvent> events;
 	
-	public Person() {
-	}
-
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
 	public Date getBirth() {
 		return new Date(this.birth.getTime());
 	}
@@ -102,30 +79,6 @@ public class Person implements Serializable {
 		this.birth = birth;
 	}
 
-	public Date getChanged() {
-		return new Date(this.changed.getTime());
-	}
-
-	public void setChanged(Date changed) {
-		this.changed = changed;
-	}
-
-	public Date getCreated() {
-		return new Date(this.created.getTime());
-	}
-
-	public void setCreated(Date created) {
-		this.created = created;
-	}
-
-	public Date getDeleted() {
-		return new Date(this.deleted.getTime());
-	}
-
-	public void setDeleted(Date deleted) {
-		this.deleted = deleted;
-	}
-
 	public String getPassword() {
 		return this.password;
 	}
@@ -305,61 +258,9 @@ public class Person implements Serializable {
 		return startpaess;
 	}
 
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((created == null) ? 0 : created.hashCode());
-		result = prime * result + ((deleted == null) ? 0 : deleted.hashCode());
-		result = prime * result + id;
-		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 (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		Person other = (Person) obj;
-		if (created == null) {
-			if (other.created != null)
-				return false;
-		} else if (!created.equals(other.created))
-			return false;
-		if (deleted == null) {
-			if (other.deleted != null)
-				return false;
-		} else if (!deleted.equals(other.deleted))
-			return false;
-		if (id != other.id)
-			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=" + id + ", prename=" + prename + ", surname=" + surname + "]";
+		return "Person [id=" + getId() + ", prename=" + prename + ", surname=" + surname + "]";
 	}
 
 }

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

@@ -1,8 +1,14 @@
 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.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
 
 
 /**
@@ -11,22 +17,11 @@ import java.util.Date;
  */
 @Entity
 @Table(name="persongroup")
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name="Persongroup.findAll", query="SELECT p FROM Persongroup p")
-public class Persongroup implements Serializable {
+public class Persongroup extends BaseEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@GeneratedValue(strategy=GenerationType.IDENTITY)
-	private int id;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date changed;
 
-	@Temporal(TemporalType.TIMESTAMP)
+	private static final long serialVersionUID = -2466223964213904302L;
-	private Date created;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date deleted;
 
 	//bi-directional many-to-one association to Person
 	@ManyToOne
@@ -40,38 +35,6 @@ public class Persongroup implements Serializable {
 	public Persongroup() {
 	}
 
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public Date getChanged() {
-		return new Date(this.changed.getTime());
-	}
-
-	public void setChanged(Date changed) {
-		this.changed = changed;
-	}
-
-	public Date getCreated() {
-		return new Date(this.created.getTime());
-	}
-
-	public void setCreated(Date created) {
-		this.created = created;
-	}
-
-	public Date getDeleted() {
-		return new Date(this.deleted.getTime());
-	}
-
-	public void setDeleted(Date deleted) {
-		this.deleted = deleted;
-	}
-
 	public Person getPerson() {
 		return this.person;
 	}
@@ -91,10 +54,8 @@ public class Persongroup implements Serializable {
 	@Override
 	public int hashCode() {
 		final int prime = 31;
-		int result = 1;
+		int result = super.hashCode();
-		result = prime * result + ((deleted == null) ? 0 : deleted.hashCode());
 		result = prime * result + ((groupDef == null) ? 0 : groupDef.hashCode());
-		result = prime * result + id;
 		result = prime * result + ((person == null) ? 0 : person.hashCode());
 		return result;
 	}
@@ -103,23 +64,16 @@ public class Persongroup implements Serializable {
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;
-		if (obj == null)
+		if (!super.equals(obj))
 			return false;
 		if (getClass() != obj.getClass())
 			return false;
 		Persongroup other = (Persongroup) obj;
-		if (deleted == null) {
-			if (other.deleted != null)
-				return false;
-		} else if (!deleted.equals(other.deleted))
-			return false;
 		if (groupDef == null) {
 			if (other.groupDef != null)
 				return false;
 		} else if (!groupDef.equals(other.groupDef))
 			return false;
-		if (id != other.id)
-			return false;
 		if (person == null) {
 			if (other.person != null)
 				return false;

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

@@ -1,8 +1,15 @@
 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;
 
 
 /**
@@ -11,22 +18,11 @@ import java.util.Date;
  */
 @Entity
 @Table(name="relative")
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name="Relative.findAll", query="SELECT r FROM Relative r")
-public class Relative implements Serializable {
+public class Relative extends BaseEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@GeneratedValue(strategy=GenerationType.IDENTITY)
-	private int id;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date changed;
 
-	@Temporal(TemporalType.TIMESTAMP)
+	private static final long serialVersionUID = -1331008393583211773L;
-	private Date created;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date deleted;
 
 	@Column(name="TO_PERSON1_RELATION")
 	private String toPerson1Relation;
@@ -47,38 +43,6 @@ public class Relative implements Serializable {
 	public Relative() {
 	}
 
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public Date getChanged() {
-		return new Date(this.changed.getTime());
-	}
-
-	public void setChanged(Date changed) {
-		this.changed = changed;
-	}
-
-	public Date getCreated() {
-		return new Date(this.created.getTime());
-	}
-
-	public void setCreated(Date created) {
-		this.created = created;
-	}
-
-	public Date getDeleted() {
-		return new Date(this.deleted.getTime());
-	}
-
-	public void setDeleted(Date deleted) {
-		this.deleted = deleted;
-	}
-
 	public String getToPerson1Relation() {
 		return this.toPerson1Relation;
 	}
@@ -114,9 +78,7 @@ public class Relative implements Serializable {
 	@Override
 	public int hashCode() {
 		final int prime = 31;
-		int result = 1;
+		int result = super.hashCode();
-		result = prime * result + ((deleted == null) ? 0 : deleted.hashCode());
-		result = prime * result + id;
 		result = prime * result + ((person1Bean == null) ? 0 : person1Bean.hashCode());
 		result = prime * result + ((person2Bean == null) ? 0 : person2Bean.hashCode());
 		result = prime * result + ((toPerson1Relation == null) ? 0 : toPerson1Relation.hashCode());
@@ -128,18 +90,11 @@ public class Relative implements Serializable {
 	public boolean equals(Object obj) {
 		if (this == obj)
 			return true;
-		if (obj == null)
+		if (!super.equals(obj))
 			return false;
 		if (getClass() != obj.getClass())
 			return false;
 		Relative other = (Relative) obj;
-		if (deleted == null) {
-			if (other.deleted != null)
-				return false;
-		} else if (!deleted.equals(other.deleted))
-			return false;
-		if (id != other.id)
-			return false;
 		if (person1Bean == null) {
 			if (other.person1Bean != null)
 				return false;

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

@@ -1,10 +1,17 @@
 package de.kreth.vaadin.clubhelper.vaadinclubhelper.data;
 
 import java.io.Serializable;
-import javax.persistence.*;
-import java.util.Date;
 import java.util.List;
 
+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.OneToMany;
+import javax.persistence.Table;
+
 
 /**
  * The persistent class for the startpaesse database table.
@@ -12,22 +19,11 @@ import java.util.List;
  */
 @Entity
 @Table(name="startpaesse")
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name="Startpaesse.findAll", query="SELECT s FROM Startpaesse s")
-public class Startpaesse implements Serializable {
+public class Startpaesse extends BaseEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@GeneratedValue(strategy=GenerationType.IDENTITY)
-	private int id;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date changed;
 
-	@Temporal(TemporalType.TIMESTAMP)
+	private static final long serialVersionUID = 1464510869007022357L;
-	private Date created;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date deleted;
 
 	@Column(name="startpass_nr")
 	private String startpassNr;
@@ -43,38 +39,6 @@ public class Startpaesse implements Serializable {
 	public Startpaesse() {
 	}
 
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public Date getChanged() {
-		return new Date(this.changed.getTime());
-	}
-
-	public void setChanged(Date changed) {
-		this.changed = changed;
-	}
-
-	public Date getCreated() {
-		return new Date(this.created.getTime());
-	}
-
-	public void setCreated(Date created) {
-		this.created = created;
-	}
-
-	public Date getDeleted() {
-		return new Date(this.deleted.getTime());
-	}
-
-	public void setDeleted(Date deleted) {
-		this.deleted = deleted;
-	}
-
 	public String getStartpassNr() {
 		return this.startpassNr;
 	}
@@ -113,50 +77,4 @@ public class Startpaesse implements Serializable {
 		return startpassStartrechte;
 	}
 
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((deleted == null) ? 0 : deleted.hashCode());
-		result = prime * result + id;
-		result = prime * result + ((person == null) ? 0 : person.hashCode());
-		result = prime * result + ((startpassNr == null) ? 0 : startpassNr.hashCode());
-		result = prime * result + ((startpassStartrechtes == null) ? 0 : startpassStartrechtes.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;
-		Startpaesse other = (Startpaesse) obj;
-		if (deleted == null) {
-			if (other.deleted != null)
-				return false;
-		} else if (!deleted.equals(other.deleted))
-			return false;
-		if (id != other.id)
-			return false;
-		if (person == null) {
-			if (other.person != null)
-				return false;
-		} else if (!person.equals(other.person))
-			return false;
-		if (startpassNr == null) {
-			if (other.startpassNr != null)
-				return false;
-		} else if (!startpassNr.equals(other.startpassNr))
-			return false;
-		if (startpassStartrechtes == null) {
-			if (other.startpassStartrechtes != null)
-				return false;
-		} else if (!startpassStartrechtes.equals(other.startpassStartrechtes))
-			return false;
-		return true;
-	}
-
 }

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

@@ -11,22 +11,11 @@ import java.util.Date;
  */
 @Entity
 @Table(name="startpass_startrechte")
+@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 @NamedQuery(name="StartpassStartrechte.findAll", query="SELECT s FROM StartpassStartrechte s")
-public class StartpassStartrechte implements Serializable {
+public class StartpassStartrechte extends BaseEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
 
-	@Id
+	private static final long serialVersionUID = 292071407439270519L;
-	@GeneratedValue(strategy=GenerationType.IDENTITY)
-	private int id;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date changed;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date created;
-
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date deleted;
 
 	private String fachgebiet;
 
@@ -46,41 +35,6 @@ public class StartpassStartrechte implements Serializable {
 	@JoinColumn(name="startpass_id")
 	private Startpaesse startpaesse;
 
-	public StartpassStartrechte() {
-	}
-
-	public int getId() {
-		return this.id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public Date getChanged() {
-		return new Date(this.changed.getTime());
-	}
-
-	public void setChanged(Date changed) {
-		this.changed = changed;
-	}
-
-	public Date getCreated() {
-		return new Date(this.created.getTime());
-	}
-
-	public void setCreated(Date created) {
-		this.created = created;
-	}
-
-	public Date getDeleted() {
-		return new Date(this.deleted.getTime());
-	}
-
-	public void setDeleted(Date deleted) {
-		this.deleted = deleted;
-	}
-
 	public String getFachgebiet() {
 		return this.fachgebiet;
 	}

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

@@ -13,7 +13,8 @@ import java.util.Date;
 @Table(name="version")
 @NamedQuery(name="Version.findAll", query="SELECT v FROM Version v")
 public class Version implements Serializable {
-	private static final long serialVersionUID = 1L;
+
+	private static final long serialVersionUID = 1964331485558854626L;
 
 	@Id
 	@GeneratedValue(strategy=GenerationType.IDENTITY)