From 30c2f4c45de4f4564d8cf5986740238ae344a9f6 Mon Sep 17 00:00:00 2001 From: _Bastler Date: Wed, 13 Dec 2023 11:37:48 +0100 Subject: [PATCH] fix @Lob --- application/pom.xml | 5 +++++ .../src/main/java/de/bstly/we/borrow/model/BorrowItem.java | 2 +- .../main/java/de/bstly/we/borrow/model/BorrowRequest.java | 4 ++-- core/src/main/java/de/bstly/we/model/UserProfileField.java | 2 +- invite/src/main/java/de/bstly/we/invite/model/Invite.java | 1 + jitsi/src/main/java/de/bstly/we/jitsi/model/JitsiRoom.java | 5 +++++ .../java/de/bstly/we/minetest/model/MinetestAccount.java | 2 +- .../main/java/de/bstly/we/partey/model/ParteyUserReport.java | 1 + .../java/de/bstly/we/partey/timeslot/model/Timeslot.java | 2 +- pom.xml | 2 +- .../java/de/bstly/we/urlshortener/model/ShortenedUrl.java | 2 ++ 11 files changed, 21 insertions(+), 7 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index 93aa76e..08176b0 100755 --- a/application/pom.xml +++ b/application/pom.xml @@ -87,6 +87,11 @@ webstly-wireguard ${revision} + + org.mariadb.jdbc + mariadb-java-client + runtime + diff --git a/borrow/src/main/java/de/bstly/we/borrow/model/BorrowItem.java b/borrow/src/main/java/de/bstly/we/borrow/model/BorrowItem.java index dff54bf..1afb65a 100644 --- a/borrow/src/main/java/de/bstly/we/borrow/model/BorrowItem.java +++ b/borrow/src/main/java/de/bstly/we/borrow/model/BorrowItem.java @@ -38,7 +38,7 @@ public class BorrowItem implements UserData { @Column(name = "name", nullable = false) private String name; @Lob - @Column(name = "description", nullable = true) + @Column(name = "description", nullable = true, length = 100000) private String description; @Column(name = "url", nullable = true) private String url; diff --git a/borrow/src/main/java/de/bstly/we/borrow/model/BorrowRequest.java b/borrow/src/main/java/de/bstly/we/borrow/model/BorrowRequest.java index c354cdd..b5fe235 100644 --- a/borrow/src/main/java/de/bstly/we/borrow/model/BorrowRequest.java +++ b/borrow/src/main/java/de/bstly/we/borrow/model/BorrowRequest.java @@ -41,10 +41,10 @@ public class BorrowRequest implements UserData { @Column(name = "ends", nullable = false) private Instant ends; @Lob - @Column(name = "reply", nullable = true) + @Column(name = "reply", nullable = true, length = 100000) private String reply; @Lob - @Column(name = "comment", nullable = true) + @Column(name = "comment", nullable = true, length = 100000) private String comment; @Transient private BorrowItem borrowItem; diff --git a/core/src/main/java/de/bstly/we/model/UserProfileField.java b/core/src/main/java/de/bstly/we/model/UserProfileField.java index 6540e1a..02f9992 100644 --- a/core/src/main/java/de/bstly/we/model/UserProfileField.java +++ b/core/src/main/java/de/bstly/we/model/UserProfileField.java @@ -32,7 +32,7 @@ public class UserProfileField implements UserData { @Column(name = "value", nullable = true) private String value; @Lob - @Column(name = "blob_value", nullable = true) + @Column(name = "blob_value", nullable = true, length = 100000) private String blob; @Column(name = "type", nullable = false) private ProfileFieldType type; diff --git a/invite/src/main/java/de/bstly/we/invite/model/Invite.java b/invite/src/main/java/de/bstly/we/invite/model/Invite.java index 5a5a2cc..c38526a 100644 --- a/invite/src/main/java/de/bstly/we/invite/model/Invite.java +++ b/invite/src/main/java/de/bstly/we/invite/model/Invite.java @@ -33,6 +33,7 @@ public class Invite implements UserData { private Instant starts; private Instant expires; @Lob + @Column(length = 100000) private String message; private String note; private boolean redeemed; diff --git a/jitsi/src/main/java/de/bstly/we/jitsi/model/JitsiRoom.java b/jitsi/src/main/java/de/bstly/we/jitsi/model/JitsiRoom.java index b9b7577..2ad565c 100644 --- a/jitsi/src/main/java/de/bstly/we/jitsi/model/JitsiRoom.java +++ b/jitsi/src/main/java/de/bstly/we/jitsi/model/JitsiRoom.java @@ -37,17 +37,22 @@ public class JitsiRoom implements UserData { private Instant expires; @Lob @JsonIgnore + @Column(length = 100000) private String token; @Lob @JsonIgnore + @Column(length = 100000) private String moderationToken; @Lob + @Column(length = 100000) private String url; @Lob + @Column(length = 100000) private String moderationUrl; @Reference private String code; @Lob + @Column(length = 100000) private String orgUrl; /** diff --git a/minetest/src/main/java/de/bstly/we/minetest/model/MinetestAccount.java b/minetest/src/main/java/de/bstly/we/minetest/model/MinetestAccount.java index fdf422d..1fbbd41 100644 --- a/minetest/src/main/java/de/bstly/we/minetest/model/MinetestAccount.java +++ b/minetest/src/main/java/de/bstly/we/minetest/model/MinetestAccount.java @@ -24,7 +24,7 @@ public class MinetestAccount implements UserData { @Column(name = "owner") private Long owner; @Lob - @Column(name = "skin") + @Column(name = "skin", length = 100000) private String skin; /** diff --git a/partey/src/main/java/de/bstly/we/partey/model/ParteyUserReport.java b/partey/src/main/java/de/bstly/we/partey/model/ParteyUserReport.java index abf7049..dad814e 100644 --- a/partey/src/main/java/de/bstly/we/partey/model/ParteyUserReport.java +++ b/partey/src/main/java/de/bstly/we/partey/model/ParteyUserReport.java @@ -25,6 +25,7 @@ public class ParteyUserReport { private Long reporter; private Long user; @Lob + @Column(length = 100000) private String comment; private String world; private Instant created; diff --git a/partey/src/main/java/de/bstly/we/partey/timeslot/model/Timeslot.java b/partey/src/main/java/de/bstly/we/partey/timeslot/model/Timeslot.java index a95ba23..423ca06 100644 --- a/partey/src/main/java/de/bstly/we/partey/timeslot/model/Timeslot.java +++ b/partey/src/main/java/de/bstly/we/partey/timeslot/model/Timeslot.java @@ -43,8 +43,8 @@ public class Timeslot implements UserData { private Visibility visibility; @Column(name = "title", nullable = true) private String title; - @Column(name = "description", nullable = true) @Lob + @Column(name = "description", nullable = true, length = 100000) private String description; @Column(name = "share", nullable = true) private String share; diff --git a/pom.xml b/pom.xml index c6957b9..56d6b50 100755 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ 17 5.0.0 9.37.3 - 3.0.0-SNAPSHOT + 3.0.1-SNAPSHOT diff --git a/urlshortener/src/main/java/de/bstly/we/urlshortener/model/ShortenedUrl.java b/urlshortener/src/main/java/de/bstly/we/urlshortener/model/ShortenedUrl.java index e5ad5a4..8595bac 100644 --- a/urlshortener/src/main/java/de/bstly/we/urlshortener/model/ShortenedUrl.java +++ b/urlshortener/src/main/java/de/bstly/we/urlshortener/model/ShortenedUrl.java @@ -34,6 +34,7 @@ public class ShortenedUrl implements UserData { private String code; private Long owner; @Lob + @Column(length = 100000) private String url; private Instant expires; @JsonIgnore @@ -41,6 +42,7 @@ public class ShortenedUrl implements UserData { private String passwordHash; private String link; @Lob + @Column(length = 100000) private String note; @Column(name = "addon", columnDefinition = "boolean default false") private boolean queryParameters;