zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Added IdGenerationRequestProcessor, fixed bugs in PersistenceManager

Browse Source 
* Removed get*ById queries
* Removed src/test/resources from pom.xml
This commit is contained in:
Kai S. K. Engelbart
2020-01-28 19:25:30 +01:00
parent 468558fa61
commit 6cd7964f9a
9 changed files with 75 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/envoy/server/data/User.java
View File

@ -3,18 +3,7 @@ package envoy.server.data;
import java.util.Date;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.*;
/**
* This class serves as a way to let Hibernate communicate with the server
@ -32,8 +21,7 @@ import javax.persistence.TemporalType;
@Entity
@Table(name = "users")
@NamedQueries(
{ @NamedQuery(query = "SELECT u FROM User u WHERE u.id = :id", name = "getUserById"),
@NamedQuery(query = "SELECT u FROM User u WHERE u.name = :name", name = "getUserByName"),
{ @NamedQuery(query = "SELECT u FROM User u WHERE u.name = :name", name = "getUserByName"),
@NamedQuery(query = "SELECT u.contacts FROM User u WHERE u = :user", name = "getContactsOfUser")// not tested
}
)
@ -49,7 +37,7 @@ public class User {
private Date lastSeen;
private envoy.data.User.UserStatus status;
@OneToMany(targetEntity = User.class, cascade = { CascadeType.ALL }, fetch = FetchType.LAZY, orphanRemoval = true)
@OneToMany(targetEntity = User.class, cascade = CascadeType.ALL, fetch = FetchType.LAZY, orphanRemoval = true)
private List<User> contacts;
/**
@ -76,7 +64,7 @@ public class User {
* @return a database {@link User} converted into an {@link envoy.data.User}
* @since Envoy Server Standalone v0.1-alpha
*/
public envoy.data.User toCommonUser() { return new envoy.data.User(this.id, this.name); }
public envoy.data.User toCommonUser() { return new envoy.data.User(id, name); }
/**
* @return the id of a {link envoy.data.User}
@ -98,7 +86,7 @@ public class User {
public String getName() { return name; }
/**
* @param name the username to set
* @param name the user name to set
* @since Envoy Server Standalone v0.1-alpha
* @see User#getName()
*/