diff options
27 files changed, 174 insertions, 1569 deletions
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/Bookmark.java b/src/main/java/eu/mulk/mulkcms2/benki/Bookmark.java index efb81cb..220ebfa 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/Bookmark.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/Bookmark.java @@ -1,7 +1,7 @@ package eu.mulk.mulkcms2.benki; +import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import java.util.Collection; -import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; @@ -12,123 +12,28 @@ import javax.persistence.Table; @Entity @Table(name = "bookmarks", schema = "public", catalog = "benki") -public class Bookmark { - - private int id; - private Object date; - private String uri; - private String title; - private String description; - private Collection<BookmarkTag> tags; - private User owner; +public class Bookmark extends PanacheEntityBase { @Id @Column(name = "id", nullable = false) - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } + public int id; - @Basic @Column(name = "date", nullable = true) - public Object getDate() { - return date; - } + public Object date; - public void setDate(Object date) { - this.date = date; - } - - @Basic @Column(name = "uri", nullable = false, length = -1) - public String getUri() { - return uri; - } - - public void setUri(String uri) { - this.uri = uri; - } + public String uri; - @Basic @Column(name = "title", nullable = true, length = -1) - public String getTitle() { - return title; - } + public String title; - public void setTitle(String title) { - this.title = title; - } - - @Basic @Column(name = "description", nullable = true, length = -1) - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - Bookmark bookmark = (Bookmark) o; - - if (id != bookmark.id) { - return false; - } - if (date != null ? !date.equals(bookmark.date) : bookmark.date != null) { - return false; - } - if (uri != null ? !uri.equals(bookmark.uri) : bookmark.uri != null) { - return false; - } - if (title != null ? !title.equals(bookmark.title) : bookmark.title != null) { - return false; - } - if (description != null ? !description.equals(bookmark.description) - : bookmark.description != null) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - int result = id; - result = 31 * result + (date != null ? date.hashCode() : 0); - result = 31 * result + (uri != null ? uri.hashCode() : 0); - result = 31 * result + (title != null ? title.hashCode() : 0); - result = 31 * result + (description != null ? description.hashCode() : 0); - return result; - } + public String description; @OneToMany(mappedBy = "bookmark") - public Collection<BookmarkTag> getTags() { - return tags; - } - - public void setTags(Collection<BookmarkTag> tags) { - this.tags = tags; - } + public Collection<BookmarkTag> tags; @ManyToOne @JoinColumn(name = "owner", referencedColumnName = "id") - public User getOwner() { - return owner; - } - - public void setOwner(User owner) { - this.owner = owner; - } + public User owner; } diff --git a/src/main/java/eu/mulk/mulkcms2/benki/BookmarkTag.java b/src/main/java/eu/mulk/mulkcms2/benki/BookmarkTag.java index 1de1f36..6efa87e 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/BookmarkTag.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/BookmarkTag.java @@ -1,5 +1,6 @@ package eu.mulk.mulkcms2.benki; +import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; @@ -11,67 +12,17 @@ import javax.persistence.Table; @Entity @Table(name = "bookmark_tags", schema = "public", catalog = "benki") @IdClass(BookmarkTagPK.class) -public class BookmarkTag { - - private int bookmarkId; - private String tag; - private Bookmark bookmark; +public class BookmarkTag extends PanacheEntityBase { @Id @Column(name = "bookmark", nullable = false) - public int getBookmarkId() { - return bookmarkId; - } - - public void setBookmarkId(int bookmarkId) { - this.bookmarkId = bookmarkId; - } + public int bookmarkId; @Id @Column(name = "tag", nullable = false, length = -1) - public String getTag() { - return tag; - } - - public void setTag(String tag) { - this.tag = tag; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - BookmarkTag that = (BookmarkTag) o; - - if (bookmarkId != that.bookmarkId) { - return false; - } - if (tag != null ? !tag.equals(that.tag) : that.tag != null) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - int result = bookmarkId; - result = 31 * result + (tag != null ? tag.hashCode() : 0); - return result; - } + public String tag; @ManyToOne @JoinColumn(name = "bookmark", referencedColumnName = "id", nullable = false) - public Bookmark getBookmark() { - return bookmark; - } - - public void setBookmark(Bookmark bookmark) { - this.bookmark = bookmark; - } + public Bookmark bookmark; } diff --git a/src/main/java/eu/mulk/mulkcms2/benki/EffectiveRoleSubrole.java b/src/main/java/eu/mulk/mulkcms2/benki/EffectiveRoleSubrole.java index a72c9db..adc2a50 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/EffectiveRoleSubrole.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/EffectiveRoleSubrole.java @@ -1,62 +1,17 @@ package eu.mulk.mulkcms2.benki; -import javax.persistence.Basic; +import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @Entity @Table(name = "effective_role_subroles", schema = "public", catalog = "benki") -public class EffectiveRoleSubrole { +public class EffectiveRoleSubrole extends PanacheEntityBase { - private Integer superroleId; - private Integer subroleId; - - @Basic @Column(name = "superrole", nullable = true) - public Integer getSuperroleId() { - return superroleId; - } - - public void setSuperroleId(Integer superroleId) { - this.superroleId = superroleId; - } + public Integer superroleId; - @Basic @Column(name = "subrole", nullable = true) - public Integer getSubroleId() { - return subroleId; - } - - public void setSubroleId(Integer subroleId) { - this.subroleId = subroleId; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - EffectiveRoleSubrole that = (EffectiveRoleSubrole) o; - - if (superroleId != null ? !superroleId.equals(that.superroleId) : that.superroleId != null) { - return false; - } - if (subroleId != null ? !subroleId.equals(that.subroleId) : that.subroleId != null) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - int result = superroleId != null ? superroleId.hashCode() : 0; - result = 31 * result + (subroleId != null ? subroleId.hashCode() : 0); - return result; - } + public Integer subroleId; } diff --git a/src/main/java/eu/mulk/mulkcms2/benki/EffectiveUserRole.java b/src/main/java/eu/mulk/mulkcms2/benki/EffectiveUserRole.java index 00c5738..fc2e453 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/EffectiveUserRole.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/EffectiveUserRole.java @@ -1,62 +1,17 @@ package eu.mulk.mulkcms2.benki; -import javax.persistence.Basic; +import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; @Entity @Table(name = "effective_user_roles", schema = "public", catalog = "benki") -public class EffectiveUserRole { +public class EffectiveUserRole extends PanacheEntityBase { - private Integer userId; - private Integer roleId; - - @Basic @Column(name = "user", nullable = true) - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } + public Integer userId; - @Basic @Column(name = "role", nullable = true) - public Integer getRoleId() { - return roleId; - } - - public void setRoleId(Integer roleId) { - this.roleId = roleId; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - EffectiveUserRole that = (EffectiveUserRole) o; - - if (userId != null ? !userId.equals(that.userId) : that.userId != null) { - return false; - } - if (roleId != null ? !roleId.equals(that.roleId) : that.roleId != null) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - int result = userId != null ? userId.hashCode() : 0; - result = 31 * result + (roleId != null ? roleId.hashCode() : 0); - return result; - } + public Integer roleId; } diff --git a/src/main/java/eu/mulk/mulkcms2/benki/LazychatMessage.java b/src/main/java/eu/mulk/mulkcms2/benki/LazychatMessage.java index 97d3365..43363d2 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/LazychatMessage.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/LazychatMessage.java @@ -1,7 +1,7 @@ package eu.mulk.mulkcms2.benki; +import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import java.util.Collection; -import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; @@ -12,107 +12,25 @@ import javax.persistence.Table; @Entity @Table(name = "lazychat_messages", schema = "public", catalog = "benki") -public class LazychatMessage { - - private int id; - private Object date; - private String content; - private String format; - private User owner; - private Collection<LazychatReference> references; +public class LazychatMessage extends PanacheEntityBase { @Id @Column(name = "id", nullable = false) - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } + public int id; - @Basic @Column(name = "date", nullable = true) - public Object getDate() { - return date; - } - - public void setDate(Object date) { - this.date = date; - } + public Object date; - @Basic @Column(name = "content", nullable = true, length = -1) - public String getContent() { - return content; - } + public String content; - public void setContent(String content) { - this.content = content; - } - - @Basic @Column(name = "format", nullable = false, length = -1) - public String getFormat() { - return format; - } - - public void setFormat(String format) { - this.format = format; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - LazychatMessage that = (LazychatMessage) o; - - if (id != that.id) { - return false; - } - if (date != null ? !date.equals(that.date) : that.date != null) { - return false; - } - if (content != null ? !content.equals(that.content) : that.content != null) { - return false; - } - if (format != null ? !format.equals(that.format) : that.format != null) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - int result = id; - result = 31 * result + (date != null ? date.hashCode() : 0); - result = 31 * result + (content != null ? content.hashCode() : 0); - result = 31 * result + (format != null ? format.hashCode() : 0); - return result; - } + public String format; @ManyToOne @JoinColumn(name = "owner", referencedColumnName = "id") - public User getOwner() { - return owner; - } - - public void setOwner(User owner) { - this.owner = owner; - } + public User owner; @OneToMany(mappedBy = "referrer") - public Collection<LazychatReference> getReferences() { - return references; - } - - public void setReferences(Collection<LazychatReference> references) { - this.references = references; - } + public Collection<LazychatReference> references; } diff --git a/src/main/java/eu/mulk/mulkcms2/benki/LazychatReference.java b/src/main/java/eu/mulk/mulkcms2/benki/LazychatReference.java index 330e607..19803ba 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/LazychatReference.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/LazychatReference.java @@ -1,5 +1,6 @@ package eu.mulk.mulkcms2.benki; +import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; @@ -11,67 +12,21 @@ import javax.persistence.Table; @Entity @Table(name = "lazychat_references", schema = "public", catalog = "benki") @IdClass(LazychatReferencePK.class) -public class LazychatReference { - - private int referrerId; - private int refereeId; - private LazychatMessage referrer; +public class LazychatReference extends PanacheEntityBase { @Id @Column(name = "referrer", nullable = false) - public int getReferrerId() { - return referrerId; - } - - public void setReferrerId(int referrerId) { - this.referrerId = referrerId; - } + public int referrerId; @Id @Column(name = "referee", nullable = false) - public int getRefereeId() { - return refereeId; - } - - public void setRefereeId(int refereeId) { - this.refereeId = refereeId; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - LazychatReference that = (LazychatReference) o; - - if (referrerId != that.referrerId) { - return false; - } - if (refereeId != that.refereeId) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - int result = referrerId; - result = 31 * result + refereeId; - return result; - } + public int refereeId; @ManyToOne @JoinColumn(name = "referrer", referencedColumnName = "id", nullable = false) - public LazychatMessage getReferrer() { - return referrer; - } + public LazychatMessage referrer; - public void setReferrer(LazychatMessage referrer) { - this.referrer = referrer; - } + @ManyToOne + @JoinColumn(name = "referee", referencedColumnName = "id", nullable = false) + public LazychatMessage referee; } diff --git a/src/main/java/eu/mulk/mulkcms2/benki/Openids.java b/src/main/java/eu/mulk/mulkcms2/benki/Openids.java index c56fe4c..d0551e4 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/Openids.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/Openids.java @@ -1,5 +1,6 @@ package eu.mulk.mulkcms2.benki; +import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; @@ -7,51 +8,13 @@ import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; @Entity -public class Openids { - - private String openid; - private User user; +public class Openids extends PanacheEntityBase { @Id @Column(name = "openid", nullable = false, length = -1) - public String getOpenid() { - return openid; - } - - public void setOpenid(String openid) { - this.openid = openid; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - Openids openids = (Openids) o; - - if (openid != null ? !openid.equals(openids.openid) : openids.openid != null) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - return openid != null ? openid.hashCode() : 0; - } + public String openid; @ManyToOne @JoinColumn(name = "user", referencedColumnName = "id", nullable = false) - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } + public User user; } diff --git a/src/main/java/eu/mulk/mulkcms2/benki/PageKey.java b/src/main/java/eu/mulk/mulkcms2/benki/PageKey.java index 1423e00..26c1d57 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/PageKey.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/PageKey.java @@ -1,5 +1,6 @@ package eu.mulk.mulkcms2.benki; +import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import java.math.BigInteger; import javax.persistence.Column; import javax.persistence.Entity; @@ -12,67 +13,17 @@ import javax.persistence.Table; @Entity @Table(name = "page_keys", schema = "public", catalog = "benki") @IdClass(PageKeyPK.class) -public class PageKey { - - private String page; - private BigInteger key; - private User user; +public class PageKey extends PanacheEntityBase { @Id @Column(name = "page", nullable = false, length = -1) - public String getPage() { - return page; - } - - public void setPage(String page) { - this.page = page; - } + public String page; @Id @Column(name = "key", nullable = false, precision = 0) - public BigInteger getKey() { - return key; - } - - public void setKey(BigInteger key) { - this.key = key; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - PageKey pageKey = (PageKey) o; - - if (page != null ? !page.equals(pageKey.page) : pageKey.page != null) { - return false; - } - if (key != null ? !key.equals(pageKey.key) : pageKey.key != null) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - int result = page != null ? page.hashCode() : 0; - result = 31 * result + (key != null ? key.hashCode() : 0); - return result; - } + public BigInteger key; @ManyToOne @JoinColumn(name = "user", referencedColumnName = "id", nullable = false) - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } + public User user; } diff --git a/src/main/java/eu/mulk/mulkcms2/benki/Post.java b/src/main/java/eu/mulk/mulkcms2/benki/Post.java index ba448c6..2fc6b05 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/Post.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/Post.java @@ -1,6 +1,6 @@ package eu.mulk.mulkcms2.benki; -import javax.persistence.Basic; +import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; @@ -10,67 +10,16 @@ import javax.persistence.Table; @Entity @Table(name = "posts", schema = "public", catalog = "benki") -public class Post { - - private int id; - private Object date; - private User owner; +public class Post extends PanacheEntityBase { @Id @Column(name = "id", nullable = false) - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } + public int id; - @Basic @Column(name = "date", nullable = true) - public Object getDate() { - return date; - } - - public void setDate(Object date) { - this.date = date; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - Post post = (Post) o; - - if (id != post.id) { - return false; - } - if (date != null ? !date.equals(post.date) : post.date != null) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - int result = id; - result = 31 * result + (date != null ? date.hashCode() : 0); - return result; - } + public Object date; @ManyToOne @JoinColumn(name = "owner", referencedColumnName = "id") - public User getOwner() { - return owner; - } - - public void setOwner(User owner) { - this.owner = owner; - } + public User owner; } diff --git a/src/main/java/eu/mulk/mulkcms2/benki/PostTarget.java b/src/main/java/eu/mulk/mulkcms2/benki/PostTarget.java index 5a01cfa..d785d78 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/PostTarget.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/PostTarget.java @@ -1,5 +1,6 @@ package eu.mulk.mulkcms2.benki; +import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Id; @@ -11,67 +12,17 @@ import javax.persistence.Table; @Entity @Table(name = "post_targets", schema = "public", catalog = "benki") @IdClass(PostTargetPK.class) -public class PostTarget { - - private int message; - private int targetId; - private Role target; +public class PostTarget extends PanacheEntityBase { @Id @Column(name = "message", nullable = false) - public int getMessage() { - return message; - } - - public void setMessage(int message) { - this.message = message; - } + public int message; @Id @Column(name = "target", nullable = false) - public int getTargetId() { - return targetId; - } - - public void setTargetId(int targetId) { - this.targetId = targetId; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - PostTarget that = (PostTarget) o; - - if (message != that.message) { - return false; - } - if (targetId != that.targetId) { - return false; - } - - return true; - } - - @Override - public int hashCode() { - int result = message; - result = 31 * result + targetId; |