diff options
Diffstat (limited to 'src')
3 files changed, 7 insertions, 11 deletions
diff --git a/src/main/java/eu/mulk/mulkcms2/benki/accesscontrol/Role.java b/src/main/java/eu/mulk/mulkcms2/benki/accesscontrol/Role.java index e07765a..9b73084 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/accesscontrol/Role.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/accesscontrol/Role.java @@ -22,8 +22,6 @@ import java.util.Collection; import java.util.Objects; import java.util.Set; import javax.annotation.CheckForNull; -import org.hibernate.annotations.LazyToOne; -import org.hibernate.annotations.LazyToOneOption; @Entity @Table(name = "roles", schema = "benki") @@ -70,7 +68,6 @@ public class Role extends PanacheEntityBase { public Collection<UserRole> directUsers; @OneToOne(mappedBy = "ownedRole", fetch = FetchType.LAZY) - @LazyToOne(LazyToOneOption.NO_PROXY) public User owningUsers; @ManyToMany(mappedBy = "effectiveRoles", fetch = FetchType.LAZY) diff --git a/src/main/java/eu/mulk/mulkcms2/benki/posts/Post.java b/src/main/java/eu/mulk/mulkcms2/benki/posts/Post.java index 6264671..e757972 100644 --- a/src/main/java/eu/mulk/mulkcms2/benki/posts/Post.java +++ b/src/main/java/eu/mulk/mulkcms2/benki/posts/Post.java @@ -9,7 +9,8 @@ import eu.mulk.mulkcms2.benki.bookmarks.Bookmark; import eu.mulk.mulkcms2.benki.lazychat.LazychatMessage; import eu.mulk.mulkcms2.benki.newsletter.Newsletter; import eu.mulk.mulkcms2.benki.users.User; -import io.hypersistence.utils.hibernate.type.basic.PostgreSQLEnumType; +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import jakarta.annotation.Nullable; import jakarta.json.bind.annotation.JsonbTransient; @@ -49,7 +50,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import javax.annotation.CheckForNull; import org.hibernate.annotations.Type; -import org.hibernate.annotations.Where; +import org.hibernate.annotations.SQLRestriction; @Entity @Table(name = "posts", schema = "benki") @@ -79,7 +80,7 @@ public abstract class Post<Text extends PostText<?>> extends PanacheEntityBase { @Column(nullable = false, columnDefinition = "benki.post_scope") @Enumerated(EnumType.STRING) - @Type(PostgreSQLEnumType.class) + @JdbcTypeCode(SqlTypes.NAMED_ENUM) public Scope scope = Scope.top_level; @ManyToOne(fetch = FetchType.LAZY) @@ -118,7 +119,7 @@ public abstract class Post<Text extends PostText<?>> extends PanacheEntityBase { @ManyToMany(mappedBy = "referees") @OrderBy("date ASC") - @Where(clause = "scope = 'comment'") + @SQLRestriction("scope = 'comment'") @JsonbTransient public Collection<LazychatMessage> comments; diff --git a/src/main/java/eu/mulk/mulkcms2/cms/comments/CommentRevision.java b/src/main/java/eu/mulk/mulkcms2/cms/comments/CommentRevision.java index 038141e..add3cd6 100644 --- a/src/main/java/eu/mulk/mulkcms2/cms/comments/CommentRevision.java +++ b/src/main/java/eu/mulk/mulkcms2/cms/comments/CommentRevision.java @@ -1,8 +1,7 @@ package eu.mulk.mulkcms2.cms.comments; import eu.mulk.mulkcms2.cms.users.User; -import io.hypersistence.utils.hibernate.type.basic.Inet; -import io.hypersistence.utils.hibernate.type.basic.PostgreSQLInetType; +import java.net.InetAddress; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -44,9 +43,8 @@ public class CommentRevision extends PanacheEntityBase { public Integer articleRevision; @Column(name = "submitter_ip", nullable = true, columnDefinition = "inet") - @Type(PostgreSQLInetType.class) @CheckForNull - public Inet submitterIp; + public InetAddress submitterIp; @Column(name = "submitter_user_agent", nullable = true, length = -1) @CheckForNull |