Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 9e92470d by tkfftk
Options

somethin 

git-svn-id: https://dev.intra.insomnia.fi/svn/trunk@50 8cf89bec-f6a3-4178-919f-364fb3449fe5
1 parent abdfa866
Inline Side-by-side
Showing with 51 additions and 174 deletions
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant.java
...@@ -40,7 +40,7 @@ public class CompoEntryParticipant implements Serializable { ...@@ -40,7 +40,7 @@ public class CompoEntryParticipant implements Serializable {
private CompoEntry entriesId; private CompoEntry entriesId;
@JoinColumn(name = "users_id", referencedColumnName = "users_id", nullable = false) @JoinColumn(name = "users_id", referencedColumnName = "users_id", nullable = false)
@ManyToOne(optional = false) @ManyToOne(optional = false)
private User usersId; private User users;
@Version @Version
@Column(nullable = false) @Column(nullable = false)
...@@ -71,11 +71,11 @@ public class CompoEntryParticipant implements Serializable { ...@@ -71,11 +71,11 @@ public class CompoEntryParticipant implements Serializable {
} }
public User getUsersId() { public User getUsersId() {
return usersId; return users;
} }
public void setUsersId(User usersId) { public void setUsersId(User usersId) {
this.usersId = usersId; this.users = usersId;
} }
@Override @Override
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/RoleMembership.java deleted 100644 → 0
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
package fi.insomnia.bortal.model;
import java.io.Serializable;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import javax.persistence.Version;
/**
*
* @author jkj
*/
@Entity
@Table(name = "role_memberships", uniqueConstraints = {
@UniqueConstraint(columnNames = {"roles_id", "users_id"})})
@NamedQueries({
@NamedQuery(name = "RoleMembership.findAll", query = "SELECT r FROM RoleMembership r"),
@NamedQuery(name = "RoleMembership.findByRoleMembershipsId", query = "SELECT r FROM RoleMembership r WHERE r.roleMembershipsId = :roleMembershipsId")})
public class RoleMembership implements ModelInterface {
private static final long serialVersionUID = 1L;
@Id
@Basic(optional = false)
@Column(name = "role_memberships_id", nullable = false)
private Integer id;
@JoinColumn(name = "roles_id", referencedColumnName = "roles_id", nullable = false)
@ManyToOne(optional = false)
private Role rolesId;
@JoinColumn(name = "users_id", referencedColumnName = "users_id", nullable = false)
@ManyToOne(optional = false)
private User usersId;
@Version
@Column(nullable = false)
private int jpaVersionField;
public RoleMembership() {
}
public RoleMembership(Integer roleMembershipsId) {
this.id = roleMembershipsId;
}
public Role getRolesId() {
return rolesId;
}
public void setRolesId(Role rolesId) {
this.rolesId = rolesId;
}
public User getUsersId() {
return usersId;
}
public void setUsersId(User usersId) {
this.usersId = usersId;
}
@Override
public int hashCode() {
int hash = 0;
hash += (getId() != null ? getId().hashCode() : 0);
return hash;
}
@Override
public boolean equals(Object object) {
// TODO: Warning - this method won't work in the case the id fields are not set
if (!(object instanceof RoleMembership)) {
return false;
}
RoleMembership other = (RoleMembership) object;
if ((this.getId() == null && other.getId() != null) || (this.getId() != null && !this.id.equals(other.id))) {
return false;
}
return true;
}
@Override
public String toString() {
return "fi.insomnia.bortal.model.RoleMembership[roleMembershipsId=" + getId() + "]";
}
/**
* @return the id
*/
public Integer getId() {
return id;
}
/**
* @param id the id to set
*/
public void setId(Integer id) {
this.id = id;
}
/**
* @return the jpaVersionField
*/
public int getJpaVersionField() {
return jpaVersionField;
}
/**
* @param jpaVersionField the jpaVersionField to set
*/
public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField;
}
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/User.java
...@@ -50,22 +50,17 @@ public class User implements ModelInterface { ...@@ -50,22 +50,17 @@ public class User implements ModelInterface {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "users_id", nullable = false) @Column(name = "users_id", nullable = false)
private Integer id; private Integer id;
@Basic(optional = false)
@Column(name = "created", nullable = false) @Column(name = "created", nullable = false)
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date created; private Date created;
@Basic(optional = false)
@Column(name = "active", nullable = false) @Column(name = "active", nullable = false)
private boolean active; private boolean active;
@Column(name = "password", length = 2147483647) @Column(name = "password", length = 2147483647)
private String password; private String password;
@Basic(optional = false)
@Column(name = "lastname", nullable = false, length = 2147483647) @Column(name = "lastname", nullable = false, length = 2147483647)
private String lastname; private String lastname;
@Basic(optional = false)
@Column(name = "firstnames", nullable = false, length = 2147483647) @Column(name = "firstnames", nullable = false, length = 2147483647)
private String firstnames; private String firstnames;
@Column(name = "birthday") @Column(name = "birthday")
...@@ -87,13 +82,10 @@ public class User implements ModelInterface { ...@@ -87,13 +82,10 @@ public class User implements ModelInterface {
private String phone; private String phone;
@Column(name = "female") @Column(name = "female")
private Boolean female; private Boolean female;
@Lob
@Column(name = "gender")
private Object gender;
@Column(name = "login", length = 2147483647) @Column(name = "login", length = 2147483647)
private String login; private String login;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "usersId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "usersId")
private List<Vote> voteList; private List<Vote> votes;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "usersId") @OneToMany(cascade = CascadeType.ALL, mappedBy = "usersId")
private List<RoleMembership> roleMembershipList; private List<RoleMembership> roleMembershipList;
@OneToMany(mappedBy = "usersId") @OneToMany(mappedBy = "usersId")
...@@ -249,13 +241,6 @@ public class User implements ModelInterface { ...@@ -249,13 +241,6 @@ public class User implements ModelInterface {
this.female = female; this.female = female;
} }
public Object getGender() {
return gender;
}
public void setGender(Object gender) {
this.gender = gender;
}
public String getLogin() { public String getLogin() {
return login; return login;
...@@ -266,11 +251,11 @@ public class User implements ModelInterface { ...@@ -266,11 +251,11 @@ public class User implements ModelInterface {
} }
public List<Vote> getVoteList() { public List<Vote> getVoteList() {
return voteList; return votes;
} }
public void setVoteList(List<Vote> voteList) { public void setVoteList(List<Vote> voteList) {
this.voteList = voteList; this.votes = voteList;
} }
public List<RoleMembership> getRoleMembershipList() { public List<RoleMembership> getRoleMembershipList() {
......
code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserImage.java
...@@ -34,7 +34,6 @@ public class UserImage implements ModelInterface { ...@@ -34,7 +34,6 @@ public class UserImage implements ModelInterface {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "user_images_id", nullable = false) @Column(name = "user_images_id", nullable = false)
private Integer id; private Integer id;
@Column(name = "name", length = 2147483647) @Column(name = "name", length = 2147483647)
...@@ -48,7 +47,7 @@ public class UserImage implements ModelInterface { ...@@ -48,7 +47,7 @@ public class UserImage implements ModelInterface {
private byte[] imageData; private byte[] imageData;
@JoinColumn(name = "users_id", referencedColumnName = "users_id") @JoinColumn(name = "users_id", referencedColumnName = "users_id")
@ManyToOne @ManyToOne
private User usersId; private User user;
@Version @Version
@Column(nullable = false) @Column(nullable = false)
private int jpaVersionField; private int jpaVersionField;
...@@ -92,14 +91,6 @@ public class UserImage implements ModelInterface { ...@@ -92,14 +91,6 @@ public class UserImage implements ModelInterface {
this.imageData = imageData; this.imageData = imageData;
} }
public User getUsersId() {
return usersId;
}
public void setUsersId(User usersId) {
this.usersId = usersId;
}
@Override @Override
public int hashCode() { public int hashCode() {
int hash = 0; int hash = 0;
...@@ -152,4 +143,18 @@ public class UserImage implements ModelInterface { ...@@ -152,4 +143,18 @@ public class UserImage implements ModelInterface {
public void setJpaVersionField(int jpaVersionField) { public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField; this.jpaVersionField = jpaVersionField;
} }
/**
* @return the user
*/
public User getUser() {
return user;
}
/**
* @param user the user to set
*/
public void setUser(User user) {
this.user = user;
}
} }
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Vote.java
...@@ -37,21 +37,19 @@ public class Vote implements ModelInterface { ...@@ -37,21 +37,19 @@ public class Vote implements ModelInterface {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Id @Id
@Basic(optional = false)
@Column(name = "votes_id", nullable = false) @Column(name = "votes_id", nullable = false)
private Integer id; private Integer id;
@Column(name = "score") @Column(name = "score")
private Integer score; private Integer score;
@Basic(optional = false)
@Column(name = "vote_time", nullable = false) @Column(name = "vote_time", nullable = false)
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date voteTime; private Date voteTime;
@JoinColumn(name = "entries_id", referencedColumnName = "entries_id", nullable = false) @JoinColumn(name = "entries_id", referencedColumnName = "entries_id", nullable = false)
@ManyToOne(optional = false) @ManyToOne(optional = false)
private CompoEntry entriesId; private CompoEntry compoEntry;
@JoinColumn(name = "users_id", referencedColumnName = "users_id", nullable = false) @JoinColumn(name = "users_id", referencedColumnName = "users_id", nullable = false)
@ManyToOne(optional = false) @ManyToOne(optional = false)
private User usersId; private User voter;
@Version @Version
@Column(nullable = false) @Column(nullable = false)
private int jpaVersionField; private int jpaVersionField;
...@@ -92,22 +90,6 @@ public class Vote implements ModelInterface { ...@@ -92,22 +90,6 @@ public class Vote implements ModelInterface {
this.voteTime = voteTime; this.voteTime = voteTime;
} }
public CompoEntry getEntriesId() {
return entriesId;
}
public void setEntriesId(CompoEntry entriesId) {
this.entriesId = entriesId;
}
public User getUsersId() {
return usersId;
}
public void setUsersId(User usersId) {
this.usersId = usersId;
}
@Override @Override
public int hashCode() { public int hashCode() {
int hash = 0; int hash = 0;
...@@ -148,4 +130,32 @@ public class Vote implements ModelInterface { ...@@ -148,4 +130,32 @@ public class Vote implements ModelInterface {
public void setJpaVersionField(int jpaVersionField) { public void setJpaVersionField(int jpaVersionField) {
this.jpaVersionField = jpaVersionField; this.jpaVersionField = jpaVersionField;
} }
/**
* @return the compoEntry
*/
public CompoEntry getCompoEntry() {
return compoEntry;
}
/**
* @param compoEntry the compoEntry to set
*/
public void setCompoEntry(CompoEntry compoEntry) {
this.compoEntry = compoEntry;
}
/**
* @return the voter
*/
public User getVoter() {
return voter;
}
/**
* @param voter the voter to set
*/
public void setVoter(User voter) {
this.voter = voter;
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!