Skip to content

Commit 3c6e5c4

Browse files
sebersolesebersole
committed
HHH-17377 - Migrate to JPA 3.2
https://hibernate.atlassian.net/browse/HHH-17377
1 parent ab44396 commit 3c6e5c4

File tree

85 files changed

+1272
-329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1272
-329
lines changed

‎hibernate-core/src/main/java/org/hibernate/Session.java

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,20 @@
99
import java.util.List;
1010
import java.util.function.Consumer;
1111

12-
import jakarta.persistence.CacheRetrieveMode;
13-
import jakarta.persistence.CacheStoreMode;
14-
import jakarta.persistence.LockModeType;
15-
import jakarta.persistence.PessimisticLockScope;
1612
import org.hibernate.graph.RootGraph;
1713
import org.hibernate.jdbc.Work;
1814
import org.hibernate.query.Query;
1915
import org.hibernate.stat.SessionStatistics;
2016

17+
import jakarta.persistence.CacheRetrieveMode;
18+
import jakarta.persistence.CacheStoreMode;
19+
import jakarta.persistence.ConnectionConsumer;
20+
import jakarta.persistence.ConnectionFunction;
2121
import jakarta.persistence.EntityGraph;
2222
import jakarta.persistence.EntityManager;
2323
import jakarta.persistence.FlushModeType;
24+
import jakarta.persistence.LockModeType;
25+
import jakarta.persistence.PessimisticLockScope;
2426
import jakarta.persistence.criteria.CriteriaDelete;
2527
import jakarta.persistence.criteria.CriteriaQuery;
2628
import jakarta.persistence.criteria.CriteriaUpdate;
@@ -1599,4 +1601,32 @@ default LockRequest setLockScope(PessimisticLockScope scope) {
15991601
*/
16001602
@Override @Deprecated(since = "6.0") @SuppressWarnings("rawtypes")
16011603
Query createQuery(CriteriaUpdate updateQuery);
1604+
1605+
1606+
@Override
1607+
default <C> void runWithConnection(ConnectionConsumer<C> action) {
1608+
doWork( connection -> {
1609+
try {
1610+
//noinspection unchecked
1611+
action.accept( (C) connection );
1612+
}
1613+
catch (Exception e) {
1614+
throw new RuntimeException( e );
1615+
}
1616+
} );
1617+
}
1618+
1619+
@Override
1620+
default <C, T> T callWithConnection(ConnectionFunction<C, T> function) {
1621+
return doReturningWork( (connection) -> {
1622+
try {
1623+
//noinspection unchecked
1624+
return function.apply( (C) connection );
1625+
}
1626+
catch (Exception e) {
1627+
throw new RuntimeException( e );
1628+
}
1629+
} );
1630+
}
1631+
16021632
}

‎hibernate-core/src/main/java/org/hibernate/boot/internal/NamedProcedureCallDefinitionImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static class ParameterDefinition<T> {
178178
this.position = position;
179179
this.name = normalize( annotation.name() );
180180
this.parameterMode = annotation.mode();
181-
this.type = annotation.type();
181+
this.type = (Class<T>) annotation.type();
182182
}
183183

184184
public ParameterMemento toMemento(SessionFactoryImplementor sessionFactory) {

‎hibernate-core/src/main/java/org/hibernate/boot/model/IdentifierGeneratorDefinition.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,11 @@ public Index[] indexes() {
207207
return new Index[0];
208208
}
209209

210+
@Override
211+
public String options() {
212+
return "";
213+
}
214+
210215
@Override
211216
public Class<? extends Annotation> annotationType() {
212217
return TableGenerator.class;
@@ -252,6 +257,11 @@ public int allocationSize() {
252257
return 50;
253258
}
254259

260+
@Override
261+
public String options() {
262+
return "";
263+
}
264+
255265
@Override
256266
public Class<? extends Annotation> annotationType() {
257267
return SequenceGenerator.class;

‎hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractPropertyHolder.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import jakarta.persistence.AssociationOverrides;
3737
import jakarta.persistence.AttributeOverride;
3838
import jakarta.persistence.AttributeOverrides;
39+
import jakarta.persistence.CheckConstraint;
3940
import jakarta.persistence.Column;
4041
import jakarta.persistence.Embeddable;
4142
import jakarta.persistence.Entity;
@@ -707,6 +708,11 @@ public String columnDefinition() {
707708
return columnDefinition;
708709
}
709710

711+
@Override
712+
public String options() {
713+
return "";
714+
}
715+
710716
@Override
711717
public String table() {
712718
return table;
@@ -727,6 +733,16 @@ public int scale() {
727733
return 0;
728734
}
729735

736+
@Override
737+
public CheckConstraint[] check() {
738+
return new CheckConstraint[0];
739+
}
740+
741+
@Override
742+
public String comment() {
743+
return "";
744+
}
745+
730746
@Override
731747
public Class<? extends Annotation> annotationType() {
732748
return Column.class;

‎hibernate-core/src/main/java/org/hibernate/boot/model/internal/AttributeConversionInfo.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@ public class AttributeConversionInfo {
2727

2828
private final XAnnotatedElement source;
2929

30+
@SuppressWarnings({ "unchecked", "rawtypes" })
3031
public AttributeConversionInfo(
31-
Class<? extends AttributeConverter<?,?>> converterClass,
32+
Class<? extends AttributeConverter> converterClass,
3233
boolean conversionDisabled,
3334
String attributeName,
3435
XAnnotatedElement source) {
35-
this.converterClass = converterClass;
36+
this.converterClass = (Class<? extends AttributeConverter<?, ?>>) converterClass;
3637
this.conversionDisabled = conversionDisabled;
3738
this.attributeName = attributeName;
3839
this.source = source;

‎hibernate-core/src/main/java/org/hibernate/boot/model/internal/MapKeyColumnDelegator.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import java.lang.annotation.Annotation;
1010

11+
import jakarta.persistence.CheckConstraint;
1112
import jakarta.persistence.Column;
1213
import jakarta.persistence.MapKeyColumn;
1314

@@ -52,6 +53,11 @@ public String columnDefinition() {
5253
return column.columnDefinition();
5354
}
5455

56+
@Override
57+
public String options() {
58+
return column.options();
59+
}
60+
5561
@Override
5662
public String table() {
5763
return column.table();
@@ -72,6 +78,16 @@ public int scale() {
7278
return column.scale();
7379
}
7480

81+
@Override
82+
public CheckConstraint[] check() {
83+
return new CheckConstraint[0];
84+
}
85+
86+
@Override
87+
public String comment() {
88+
return "";
89+
}
90+
7591
@Override
7692
public Class<? extends Annotation> annotationType() {
7793
return Column.class;

‎hibernate-core/src/main/java/org/hibernate/boot/model/internal/MapKeyJoinColumnDelegator.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import java.lang.annotation.Annotation;
1010

11+
import jakarta.persistence.CheckConstraint;
1112
import jakarta.persistence.Column;
1213
import jakarta.persistence.ForeignKey;
1314
import jakarta.persistence.JoinColumn;
@@ -59,6 +60,11 @@ public String columnDefinition() {
5960
return column.columnDefinition();
6061
}
6162

63+
@Override
64+
public String options() {
65+
return column.options();
66+
}
67+
6268
@Override
6369
public String table() {
6470
return column.table();
@@ -69,6 +75,16 @@ public ForeignKey foreignKey() {
6975
return column.foreignKey();
7076
}
7177

78+
@Override
79+
public CheckConstraint[] check() {
80+
return new CheckConstraint[0];
81+
}
82+
83+
@Override
84+
public String comment() {
85+
return "";
86+
}
87+
7288
@Override
7389
public Class<? extends Annotation> annotationType() {
7490
return Column.class;

‎hibernate-core/src/main/java/org/hibernate/engine/spi/SessionDelegatorBaseImpl.java

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import java.util.TimeZone;
1313
import java.util.UUID;
1414

15-
import jakarta.persistence.CacheRetrieveMode;
16-
import jakarta.persistence.CacheStoreMode;
1715
import org.hibernate.CacheMode;
1816
import org.hibernate.Filter;
1917
import org.hibernate.FlushMode;
@@ -63,10 +61,15 @@
6361
import org.hibernate.resource.transaction.spi.TransactionCoordinator;
6462
import org.hibernate.stat.SessionStatistics;
6563

64+
import jakarta.persistence.CacheRetrieveMode;
65+
import jakarta.persistence.CacheStoreMode;
6666
import jakarta.persistence.EntityGraph;
6767
import jakarta.persistence.EntityManagerFactory;
68+
import jakarta.persistence.FindOption;
6869
import jakarta.persistence.FlushModeType;
6970
import jakarta.persistence.LockModeType;
71+
import jakarta.persistence.LockOption;
72+
import jakarta.persistence.RefreshOption;
7073
import jakarta.persistence.criteria.CriteriaDelete;
7174
import jakarta.persistence.criteria.CriteriaQuery;
7275
import jakarta.persistence.criteria.CriteriaUpdate;
@@ -308,6 +311,11 @@ public void lock(Object entity, LockModeType lockMode, Map<String, Object> prope
308311
delegate.lock( entity, lockMode, properties );
309312
}
310313

314+
@Override
315+
public void lock(Object entity, LockModeType lockMode, LockOption... options) {
316+
317+
}
318+
311319
@Override
312320
public void flush() {
313321
delegate.flush();
@@ -908,6 +916,16 @@ public void remove(Object entity) {
908916
return delegate.find( entityClass, primaryKey, lockMode, properties );
909917
}
910918

919+
@Override
920+
public <T> T find(Class<T> entityClass, Object primaryKey, FindOption... options) {
921+
return delegate.find( entityClass, primaryKey, options );
922+
}
923+
924+
@Override
925+
public <T> T find(EntityGraph<T> entityGraph, Object primaryKey, FindOption... options) {
926+
return delegate.find( entityGraph, primaryKey, options );
927+
}
928+
911929
@Override
912930
public <T> T getReference(Class<T> entityClass, Object id) {
913931
return delegate.getReference( entityClass, id );
@@ -978,6 +996,11 @@ public void refresh(Object entity, LockModeType lockMode, Map<String, Object> pr
978996
delegate.refresh( entity, lockMode, properties );
979997
}
980998

999+
@Override
1000+
public void refresh(Object entity, RefreshOption... options) {
1001+
delegate.refresh( entity, options );
1002+
}
1003+
9811004
@Override
9821005
public void refresh(String entityName, Object object) {
9831006
delegate.refresh( entityName, object );

‎hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@
1111
import java.util.List;
1212
import java.util.Map;
1313
import java.util.Set;
14+
import java.util.function.Consumer;
15+
import java.util.function.Function;
1416
import javax.naming.NamingException;
1517
import javax.naming.Reference;
1618
import jakarta.persistence.EntityGraph;
1719
import jakarta.persistence.EntityManager;
20+
import jakarta.persistence.PersistenceUnitTransactionType;
1821
import jakarta.persistence.PersistenceUnitUtil;
1922
import jakarta.persistence.Query;
2023
import jakarta.persistence.SynchronizationType;
@@ -146,6 +149,11 @@ public PersistenceUnitUtil getPersistenceUnitUtil() {
146149
return delegate.getPersistenceUnitUtil();
147150
}
148151

152+
@Override
153+
public PersistenceUnitTransactionType getTransactionType() {
154+
return delegate.getTransactionType();
155+
}
156+
149157
@Override
150158
public void addNamedQuery(String name, Query query) {
151159
delegate.addNamedQuery( name, query );
@@ -161,6 +169,16 @@ public <T> void addNamedEntityGraph(String graphName, EntityGraph<T> entityGraph
161169
delegate.addNamedEntityGraph( graphName, entityGraph );
162170
}
163171

172+
@Override
173+
public void runInTransaction(Consumer<EntityManager> work) {
174+
delegate.runInTransaction( work );
175+
}
176+
177+
@Override
178+
public <R> R callInTransaction(Function<EntityManager, R> work) {
179+
return delegate.callInTransaction( work );
180+
}
181+
164182
@Override
165183
public Set<String> getDefinedFilterNames() {
166184
return delegate.getDefinedFilterNames();

0 commit comments

Comments
 (0)