Skip to content

Prepare hibernate migration to v6 #3572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Prepare hibernate migration to v6 #3572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
12 changes: 6 additions & 6 deletions core/src/main/java/org/mapfish/print/servlet/job/HibernateAccountingEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobEntryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
14 changes: 7 additions & 7 deletions core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobResultImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
20 changes: 10 additions & 10 deletions core/src/main/java/org/mapfish/print/servlet/job/impl/PrintJobStatusImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/java/org/mapfish/print/servlet/job/impl/ThreadPoolJobManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
Expand Down
12 changes: 6 additions & 6 deletions core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobResultExtImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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. */
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/mapfish/print/servlet/job/impl/hibernate/PrintJobStatusExtImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down