From f54e768fb15a86727da311f3ef0f259d3aa97056 Mon Sep 17 00:00:00 2001 From: Andreas Dinauer Date: Sat, 18 Apr 2026 13:54:26 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Quarkus=20update=203.34.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/de/tavolio/realm/user/UserEntity.java | 4 +++- src/main/java/de/tavolio/realm/user/UserRepo.java | 5 ----- src/main/java/de/tavolio/realm/user/UserService.java | 11 ++++------- src/main/resources/application.properties | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/main/java/de/tavolio/realm/user/UserEntity.java b/src/main/java/de/tavolio/realm/user/UserEntity.java index 4dcf59c..5bfebd9 100644 --- a/src/main/java/de/tavolio/realm/user/UserEntity.java +++ b/src/main/java/de/tavolio/realm/user/UserEntity.java @@ -4,6 +4,8 @@ import de.tavolio.realm.RealmScoped; import de.tavolio.realm.assignment.AssignmentEntity; import de.tavolio.realm.code.CodeEntity; import de.tavolio.realm.RealmEntity; +import io.quarkus.hibernate.orm.panache.PanacheEntity; +import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import jakarta.persistence.*; import java.util.List; @@ -11,7 +13,7 @@ import java.util.UUID; @Entity @Table(name = "user_regular") -public class UserEntity implements RealmScoped +public class UserEntity extends PanacheEntityBase implements RealmScoped { @Id private String id; diff --git a/src/main/java/de/tavolio/realm/user/UserRepo.java b/src/main/java/de/tavolio/realm/user/UserRepo.java index a006f7c..7e5a42f 100644 --- a/src/main/java/de/tavolio/realm/user/UserRepo.java +++ b/src/main/java/de/tavolio/realm/user/UserRepo.java @@ -16,11 +16,6 @@ public class UserRepo implements PanacheRepositoryBase return find("realm = :realm AND email = :email", Parameters.with("realm", realm).and("email", email)).firstResultOptional(); } - public List findByIds(List ids) - { - return list("id IN :ids", Parameters.with("ids", ids)); - } - public List findByRealm(RealmEntity realm) { return list("realm = :realm", Parameters.with("realm", realm)); diff --git a/src/main/java/de/tavolio/realm/user/UserService.java b/src/main/java/de/tavolio/realm/user/UserService.java index 7cc7148..7e2872c 100644 --- a/src/main/java/de/tavolio/realm/user/UserService.java +++ b/src/main/java/de/tavolio/realm/user/UserService.java @@ -7,6 +7,8 @@ import de.tavolio.realm.user.dto.UserCreation; import de.tavolio.realm.RealmEntity; import de.tavolio.realm.RealmRepo; import io.quarkus.elytron.security.common.BcryptUtil; +import io.quarkus.hibernate.orm.panache.PanacheEntity; +import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import io.quarkus.security.UnauthorizedException; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; @@ -21,18 +23,12 @@ import java.util.Map; @ApplicationScoped public class UserService { - @Inject - Logger LOG; - @Inject UserRepo userRepo; @Inject UserMapper userMapper; - @Inject - AuthenticationService authenticationService; - @Inject RealmRepo realmRepo; @@ -72,7 +68,8 @@ public class UserService public Map findByIds(List ids) { Map accounts = new HashMap<>(); - for (UserEntity userEntity : userRepo.findByIds(ids)) + List users = userRepo.findByIds(ids); + for (UserEntity userEntity : users) { accounts.put(userEntity.getId(), userMapper.map(userEntity)); } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 79a3011..340980c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -27,7 +27,7 @@ quarkus.flyway.migrate-at-start=true quarkus.http.auth.basic=false -%dev.io.verifoo.http.origin=http://localhost:8089 +%dev,test.io.verifoo.http.origin=http://localhost:8089 %dev.io.verifoo.bootstrap.config.location=/home/andreas/Documents/dev/iam-backend/src/main/resources/bootstrap.yaml %dev.io.verifoo.superuser.username=admin