From 164a3aa5f0f9ab5f34c8029f8c220926e4546185 Mon Sep 17 00:00:00 2001 From: Jesse Brault Date: Sat, 31 Jan 2026 16:43:37 -0600 Subject: [PATCH] MME-5 Remove @Lob annotations. --- src/main/java/app/mealsmadeeasy/api/job/Job.java | 11 +++++------ .../java/app/mealsmadeeasy/api/recipe/Recipe.java | 9 +++------ .../app/mealsmadeeasy/api/recipe/RecipeDraft.java | 2 ++ .../api/recipe/comment/RecipeComment.java | 8 ++++---- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/main/java/app/mealsmadeeasy/api/job/Job.java b/src/main/java/app/mealsmadeeasy/api/job/Job.java index 5a672fa..f9cf3da 100644 --- a/src/main/java/app/mealsmadeeasy/api/job/Job.java +++ b/src/main/java/app/mealsmadeeasy/api/job/Job.java @@ -5,6 +5,7 @@ import io.hypersistence.utils.hibernate.type.json.JsonBinaryType; import jakarta.persistence.*; import lombok.Data; import org.hibernate.annotations.Type; +import org.jetbrains.annotations.Nullable; import java.time.OffsetDateTime; import java.util.UUID; @@ -26,7 +27,7 @@ public class Job { @Column(nullable = false, updatable = false) private OffsetDateTime created; - private OffsetDateTime modified; + private @Nullable OffsetDateTime modified; @Column(nullable = false) @Enumerated(EnumType.STRING) @@ -48,13 +49,11 @@ public class Job { @Column(nullable = false) private OffsetDateTime runAfter; - private String lockedBy; + private @Nullable String lockedBy; - private OffsetDateTime lockedAt; + private @Nullable OffsetDateTime lockedAt; - @Lob @Column(columnDefinition = "TEXT") - @Basic(fetch = FetchType.LAZY) - private String lastError; + private @Nullable String lastError; } diff --git a/src/main/java/app/mealsmadeeasy/api/recipe/Recipe.java b/src/main/java/app/mealsmadeeasy/api/recipe/Recipe.java index 90eb63f..42e3964 100644 --- a/src/main/java/app/mealsmadeeasy/api/recipe/Recipe.java +++ b/src/main/java/app/mealsmadeeasy/api/recipe/Recipe.java @@ -41,14 +41,11 @@ public class Recipe { @Nullable private Integer totalTime; - @Lob - @Column(name = "raw_text", columnDefinition = "TEXT", nullable = false) - @Basic(fetch = FetchType.LAZY) + @Column(columnDefinition = "TEXT", nullable = false) private String rawText; - @Lob - @Column(name = "cached_rendered_text", columnDefinition = "TEXT") - @Basic(fetch = FetchType.LAZY) + @Column(columnDefinition = "TEXT") + @Nullable private String cachedRenderedText; @ManyToOne(optional = false) diff --git a/src/main/java/app/mealsmadeeasy/api/recipe/RecipeDraft.java b/src/main/java/app/mealsmadeeasy/api/recipe/RecipeDraft.java index efcfff3..982f327 100644 --- a/src/main/java/app/mealsmadeeasy/api/recipe/RecipeDraft.java +++ b/src/main/java/app/mealsmadeeasy/api/recipe/RecipeDraft.java @@ -53,6 +53,8 @@ public class RecipeDraft { private @Nullable Integer preparationTime; private @Nullable Integer cookingTime; private @Nullable Integer totalTime; + + @Column(columnDefinition = "TEXT") private @Nullable String rawText; @Type(JsonBinaryType.class) diff --git a/src/main/java/app/mealsmadeeasy/api/recipe/comment/RecipeComment.java b/src/main/java/app/mealsmadeeasy/api/recipe/comment/RecipeComment.java index d3a7747..29cbb2b 100644 --- a/src/main/java/app/mealsmadeeasy/api/recipe/comment/RecipeComment.java +++ b/src/main/java/app/mealsmadeeasy/api/recipe/comment/RecipeComment.java @@ -4,6 +4,7 @@ import app.mealsmadeeasy.api.recipe.Recipe; import app.mealsmadeeasy.api.user.User; import jakarta.persistence.*; import lombok.Data; +import org.jetbrains.annotations.Nullable; import java.time.OffsetDateTime; @@ -22,12 +23,11 @@ public final class RecipeComment { private OffsetDateTime modified; - @Lob - @Basic(fetch = FetchType.LAZY) + @Column(columnDefinition = "TEXT", nullable = false) private String rawText; - @Lob - @Basic(fetch = FetchType.LAZY) + @Column(columnDefinition = "TEXT") + @Nullable private String cachedRenderedText; @ManyToOne