From cdf31622e21b6e238e8abea63d77cedc99907d2f Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Fri, 23 Aug 2024 15:45:53 +0200 Subject: [PATCH] Fixes for eager loading (#1748) * fix * cleanups! * fix --------- Co-authored-by: a --- build.gradle | 2 +- src/main/java/stirling/software/SPDF/model/User.java | 2 +- test.sh | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 43c1b2e1..997c5b0c 100644 --- a/build.gradle +++ b/build.gradle @@ -144,7 +144,7 @@ dependencies { // Batik // TwelveMonkeys - runtimeOnly "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion" + implementation "com.twelvemonkeys.imageio:imageio-batik:$imageioVersion" runtimeOnly "com.twelvemonkeys.imageio:imageio-bmp:$imageioVersion" // implementation "com.twelvemonkeys.imageio:imageio-hdr:$imageioVersion" // implementation "com.twelvemonkeys.imageio:imageio-icns:$imageioVersion" diff --git a/src/main/java/stirling/software/SPDF/model/User.java b/src/main/java/stirling/software/SPDF/model/User.java index 2dadbe0f..bcccbd08 100644 --- a/src/main/java/stirling/software/SPDF/model/User.java +++ b/src/main/java/stirling/software/SPDF/model/User.java @@ -57,7 +57,7 @@ public class User implements Serializable { @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, mappedBy = "user") private Set authorities = new HashSet<>(); - @ElementCollection + @ElementCollection(fetch = FetchType.EAGER) @MapKeyColumn(name = "setting_key") @Lob @Column(name = "setting_value", columnDefinition = "CLOB") diff --git a/test.sh b/test.sh index 54d95ec9..62a3ff3b 100644 --- a/test.sh +++ b/test.sh @@ -73,8 +73,8 @@ main() { # Building Docker images - docker build --no-cache --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile . - docker build --no-cache --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite . + docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile . + docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite . # Test each configuration run_tests "Stirling-PDF-Ultra-Lite" "./exampleYmlFiles/docker-compose-latest-ultra-lite.yml" @@ -105,9 +105,9 @@ main() { # Building Docker images with security enabled - docker build --no-cache --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile . - docker build --no-cache --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite . - docker build --no-cache --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-fat -f ./Dockerfile-fat . + docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest -f ./Dockerfile . + docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-ultra-lite -f ./Dockerfile-ultra-lite . + docker build --no-cache --pull --build-arg VERSION_TAG=alpha -t frooodle/s-pdf:latest-fat -f ./Dockerfile-fat . # Test each configuration with security