From df849334c18522c7c0c70247502cb11d3143b61d Mon Sep 17 00:00:00 2001 From: sebr72 Date: Fri, 28 Feb 2025 13:48:21 +0100 Subject: [PATCH] Prepare hibernate migration --- core/build.gradle | 2 +- .../servlet/job/HibernateAccountingEntry.java | 12 +++++------ .../servlet/job/impl/PrintJobEntryImpl.java | 4 ++-- .../servlet/job/impl/PrintJobResultImpl.java | 14 ++++++------- .../servlet/job/impl/PrintJobStatusImpl.java | 20 +++++++++---------- .../job/impl/ThreadPoolJobManager.java | 3 ++- .../job/impl/hibernate/PrintJobDao.java | 12 +++++------ .../impl/hibernate/PrintJobResultExtImpl.java | 6 +++--- .../impl/hibernate/PrintJobStatusExtImpl.java | 4 ++-- 9 files changed, 39 insertions(+), 38 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 66f5097fcc..b20368a651 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -137,7 +137,7 @@ dependencies { 'org.springframework.security:spring-security-config:5.8.16', 'org.springframework.security:spring-security-web:5.8.16', 'com.thetransactioncompany:cors-filter:2.10', - 'org.hibernate:hibernate-core:5.6.15.Final', + 'org.hibernate:hibernate-core-jakarta:5.6.15.Final', 'org.postgresql:postgresql:42.7.5', 'com.vladmihalcea:hibernate-types-52:2.21.1', 'com.mchange:c3p0:0.10.2', diff --git a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java index 79f0388106..eec6a2f847 100644 --- a/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java +++ b/core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java @@ -2,13 +2,13 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.vladmihalcea.hibernate.type.json.JsonBinaryType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.Table; import org.hibernate.annotations.Type; import org.hibernate.annotations.TypeDef; import org.mapfish.print.Constants; diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java index 3cb616e415..3050ee6178 100644 --- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java +++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java @@ -1,8 +1,8 @@ package org.mapfish.print.servlet.job.impl; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Embeddable; import org.hibernate.annotations.Type; import org.mapfish.print.config.Configuration; import org.mapfish.print.config.Template; diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java index 906b0bdeea..3a3f109ce4 100644 --- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java +++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java @@ -1,14 +1,14 @@ package org.mapfish.print.servlet.job.impl; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import java.net.URI; import java.net.URISyntaxException; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; import org.hibernate.annotations.Type; diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java index 76608b34c0..851de94702 100644 --- a/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java +++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java @@ -1,16 +1,16 @@ package org.mapfish.print.servlet.job.impl; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import java.util.Date; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; import org.hibernate.annotations.Target; import org.hibernate.annotations.Type; import org.mapfish.print.config.access.AccessAssertion; diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java index a7e03e4c2a..d3a5818a81 100644 --- a/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java +++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java @@ -2,6 +2,7 @@ import com.codahale.metrics.MetricRegistry; import com.google.common.annotations.VisibleForTesting; +import jakarta.persistence.PessimisticLockException; import java.io.File; import java.io.IOException; import java.util.Collections; @@ -640,7 +641,7 @@ public void run() { } } } - } catch (javax.persistence.PessimisticLockException e) { + } catch (PessimisticLockException e) { // Ignore error on pessimistic locking unhealthyCountersHealthCheck.recordUnhealthyProblem( getClass().getSimpleName(), "ignoredPessimisticLockIssue"); diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java index 2264259f7d..96b39bad11 100644 --- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java +++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java @@ -1,17 +1,17 @@ package org.mapfish.print.servlet.job.impl.hibernate; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.CriteriaUpdate; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Root; import java.net.URI; import java.util.Arrays; import java.util.Collections; import java.util.List; import javax.annotation.Nullable; import javax.annotation.PostConstruct; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaDelete; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.CriteriaUpdate; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Root; import org.hibernate.LockMode; import org.hibernate.PessimisticLockException; import org.hibernate.Session; diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java index 97f54b1a15..c839af9466 100644 --- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java +++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java @@ -1,9 +1,9 @@ package org.mapfish.print.servlet.job.impl.hibernate; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; import java.net.URI; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; import org.mapfish.print.servlet.job.impl.PrintJobResultImpl; /** Extension of Print Job Result that holds data as BLOB. */ diff --git a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java index a8ddc080c6..20afdfa00c 100644 --- a/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java +++ b/core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java @@ -1,8 +1,8 @@ package org.mapfish.print.servlet.job.impl.hibernate; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; import javax.annotation.Nullable; -import javax.persistence.Column; -import javax.persistence.Entity; import org.mapfish.print.servlet.job.PrintJobEntry; import org.mapfish.print.servlet.job.impl.PrintJobStatusImpl;