Quarkus3 branch sync no. 11

24.3.2023: * renamed imports from javax to jakarta as a part of the migration from JavaEE to JakartaEE * fixed the metadata field's Type annotation Signed-off-by: Peter Zaoral <pzaoral@redhat.com>
Pastor · Apr 27, 2023 · 181c8a5 · 181c8a5
1 parent bc43e4f
commit 181c8a5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/lock/JpaLockMapStorage.java b/model/map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/lock/JpaLockMapStorage.java
@@ -26,10 +26,10 @@
 import org.keycloak.models.map.storage.jpa.lock.delegate.JpaLockDelegateProvider;
 import org.keycloak.models.map.storage.jpa.lock.entity.JpaLockEntity;
 
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Selection;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.Selection;
 
 public class JpaLockMapStorage extends JpaMapStorage<JpaLockEntity, MapLockEntity, MapLockEntity> {
 

diff --git a/.../main/java/org/keycloak/models/map/storage/jpa/lock/delegate/JpaLockDelegateProvider.java b/.../main/java/org/keycloak/models/map/storage/jpa/lock/delegate/JpaLockDelegateProvider.java
@@ -23,7 +23,7 @@
 import org.keycloak.models.map.storage.jpa.JpaDelegateProvider;
 import org.keycloak.models.map.storage.jpa.lock.entity.JpaLockEntity;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.UUID;
 
 /**

diff --git a/.../map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/lock/entity/JpaLockEntity.java b/.../map-jpa/src/main/java/org/keycloak/models/map/storage/jpa/lock/entity/JpaLockEntity.java
@@ -18,17 +18,15 @@
 
 import java.util.Objects;
 import java.util.UUID;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-import javax.persistence.Version;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+import jakarta.persistence.Version;
 import org.hibernate.annotations.Type;
-import org.hibernate.annotations.TypeDef;
-import org.hibernate.annotations.TypeDefs;
 import org.keycloak.models.map.common.DeepCloner;
 import org.keycloak.models.map.common.UuidValidator;
 import org.keycloak.models.map.storage.jpa.JpaRootVersionedEntity;
@@ -45,7 +43,6 @@
  */
 @Entity
 @Table(name = "kc_lock", uniqueConstraints = {@UniqueConstraint(columnNames = {"name"})})
-@TypeDefs({@TypeDef(name = "jsonb", typeClass = JsonbType.class)})
 public class JpaLockEntity extends AbstractLockEntity implements JpaRootVersionedEntity {
 
     @Id
@@ -57,7 +54,7 @@ public class JpaLockEntity extends AbstractLockEntity implements JpaRootVersione
     @Column
     private int version;
 
-    @Type(type = "jsonb")
+    @Type(JsonbType.class)
     @Column(columnDefinition = "jsonb")
     private final JpaLockMetadata metadata;