Skip to content

Commit 9ae42c9

Browse files
dnestorodnestoro
authored
Merge pull request #72 from christophstrobl/hibernate-orm-id-generators
Add missing hibernate-orm hints for id generation.
2 parents a3f451b + b31327b commit 9ae42c9

File tree

5 files changed

+332
-21
lines changed

5 files changed

+332
-21
lines changed

‎metadata/org.hibernate.orm/hibernate-core/6.1.1.Final/reflect-config.json‎

Lines changed: 242 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,30 @@
383383
"typeReachable": "org.hibernate.id.enhanced.StandardNamingStrategy"
384384
}
385385
},
386+
{
387+
"condition": {
388+
"typeReachable": "org.hibernate.id.IdentifierGeneratorHelper$BasicHolder"
389+
},
390+
"name": "[Ljava.lang.Class;"
391+
},
392+
{
393+
"condition": {
394+
"typeReachable": "org.hibernate.id.SequenceMismatchStrategy"
395+
},
396+
"name": "[Ljava.lang.Class;"
397+
},
398+
{
399+
"condition": {
400+
"typeReachable": "org.hibernate.id.UUIDHexGenerator"
401+
},
402+
"name": "[Ljava.lang.Class;"
403+
},
404+
{
405+
"condition": {
406+
"typeReachable": "org.hibernate.id.enhanced.TableStructure"
407+
},
408+
"name": "[Ljava.lang.Class;"
409+
},
386410
{
387411
"name": "[Ljava.lang.Class;",
388412
"condition": {
@@ -11186,6 +11210,200 @@
1118611210
}
1118711211
]
1118811212
},
11213+
{
11214+
"condition": {
11215+
"typeReachable": "org.hibernate.id.ForeignGenerator"
11216+
},
11217+
"name": "org.hibernate.engine.jdbc.batch.internal.BatchBuilderImpl",
11218+
"queryAllPublicMethods": true
11219+
},
11220+
{
11221+
"condition": {
11222+
"typeReachable": "org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl"
11223+
},
11224+
"name": "org.hibernate.id.Assigned",
11225+
"methods": [
11226+
{
11227+
"name": "<init>",
11228+
"parameterTypes": []
11229+
}
11230+
]
11231+
},
11232+
{
11233+
"condition": {
11234+
"typeReachable": "org.hibernate.cfg.Configuration"
11235+
},
11236+
"name": "org.hibernate.id.IdentityGenerator",
11237+
"methods": [
11238+
{
11239+
"name": "<init>",
11240+
"parameterTypes": []
11241+
}
11242+
]
11243+
},
11244+
{
11245+
"condition": {
11246+
"typeReachable": "org.hibernate.id.factory.internal.StandardIdentifierGeneratorFactory"
11247+
},
11248+
"name": "org.hibernate.id.IdentityGenerator",
11249+
"methods": [
11250+
{
11251+
"name": "<init>",
11252+
"parameterTypes": []
11253+
}
11254+
]
11255+
},
11256+
{
11257+
"condition": {
11258+
"typeReachable": "org.hibernate.cfg.Configuration"
11259+
},
11260+
"name": "org.hibernate.id.SelectGenerator",
11261+
"methods": [
11262+
{
11263+
"name": "<init>",
11264+
"parameterTypes": []
11265+
}
11266+
]
11267+
},
11268+
{
11269+
"condition": {
11270+
"typeReachable": "org.hibernate.id.factory.internal.StandardIdentifierGeneratorFactory"
11271+
},
11272+
"name": "org.hibernate.id.SelectGenerator",
11273+
"methods": [
11274+
{
11275+
"name": "<init>",
11276+
"parameterTypes": []
11277+
}
11278+
]
11279+
},
11280+
{
11281+
"condition": {
11282+
"typeReachable": "org.hibernate.id.enhanced.TableGenerator"
11283+
},
11284+
"name": "org.hibernate.id.enhanced.LegacyNamingStrategy",
11285+
"methods": [
11286+
{
11287+
"name": "<init>",
11288+
"parameterTypes": []
11289+
}
11290+
]
11291+
},
11292+
{
11293+
"condition": {
11294+
"typeReachable": "org.hibernate.boot.MetadataSources"
11295+
},
11296+
"name": "org.hibernate.id.enhanced.NoopOptimizer",
11297+
"methods": [
11298+
{
11299+
"name": "<init>",
11300+
"parameterTypes": [
11301+
"int"
11302+
]
11303+
}
11304+
]
11305+
},
11306+
{
11307+
"condition": {
11308+
"typeReachable": "org.hibernate.id.enhanced.OptimizerFactory"
11309+
},
11310+
"name": "org.hibernate.id.enhanced.NoopOptimizer",
11311+
"methods": [
11312+
{
11313+
"name": "<init>",
11314+
"parameterTypes": [
11315+
"int"
11316+
]
11317+
}
11318+
]
11319+
},
11320+
{
11321+
"condition": {
11322+
"typeReachable": "org.hibernate.boot.MetadataSources"
11323+
},
11324+
"name": "org.hibernate.id.enhanced.SequenceStyleGenerator",
11325+
"methods": [
11326+
{
11327+
"name": "<init>",
11328+
"parameterTypes": []
11329+
}
11330+
]
11331+
},
11332+
{
11333+
"condition": {
11334+
"typeReachable": "org.hibernate.boot.internal.MetadataBuilderImpl"
11335+
},
11336+
"name": "org.hibernate.id.enhanced.SequenceStyleGenerator",
11337+
"methods": [
11338+
{
11339+
"name": "<init>",
11340+
"parameterTypes": []
11341+
}
11342+
]
11343+
},
11344+
{
11345+
"condition": {
11346+
"typeReachable": "org.hibernate.mapping.SimpleValue"
11347+
},
11348+
"name": "org.hibernate.id.enhanced.SequenceStyleGenerator",
11349+
"methods": [
11350+
{
11351+
"name": "<init>",
11352+
"parameterTypes": []
11353+
}
11354+
]
11355+
},
11356+
{
11357+
"condition": {
11358+
"typeReachable": "org.hibernate.id.enhanced.TableGenerator"
11359+
},
11360+
"name": "org.hibernate.id.enhanced.SingleNamingStrategy",
11361+
"methods": [
11362+
{
11363+
"name": "<init>",
11364+
"parameterTypes": []
11365+
}
11366+
]
11367+
},
11368+
{
11369+
"condition": {
11370+
"typeReachable": "org.hibernate.id.enhanced.TableGenerator"
11371+
},
11372+
"name": "org.hibernate.id.enhanced.StandardNamingStrategy",
11373+
"methods": [
11374+
{
11375+
"name": "<init>",
11376+
"parameterTypes": []
11377+
}
11378+
]
11379+
},
11380+
{
11381+
"condition": {
11382+
"typeReachable": "org.hibernate.id.UUIDGenerator"
11383+
},
11384+
"name": "org.hibernate.id.uuid.CustomVersionOneStrategy",
11385+
"methods": [
11386+
{
11387+
"name": "<init>",
11388+
"parameterTypes": []
11389+
}
11390+
]
11391+
},
11392+
{
11393+
"condition": {
11394+
"typeReachable": "org.hibernate.cfg.AnnotationBinder$CustomIdGeneratorCreator"
11395+
},
11396+
"name": "org.hibernate.id.uuid.UuidGenerator",
11397+
"methods": [
11398+
{
11399+
"name": "<init>",
11400+
"parameterTypes": [
11401+
"org.hibernate.annotations.UuidGenerator",
11402+
"org.hibernate.id.factory.spi.CustomIdGeneratorCreationContext"
11403+
]
11404+
}
11405+
]
11406+
},
1118911407
{
1119011408
"name": "org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy",
1119111409
"condition": {
@@ -12485,6 +12703,30 @@
1248512703
}
1248612704
]
1248712705
},
12706+
{
12707+
"name": "org.hibernate.id.UUIDHexGenerator",
12708+
"condition": {
12709+
"typeReachable": "jakarta.persistence.GeneratedValue"
12710+
},
12711+
"methods": [
12712+
{
12713+
"name": "<init>",
12714+
"parameterTypes": []
12715+
}
12716+
]
12717+
},
12718+
{
12719+
"name": "org.hibernate.id.UUIDHexGenerator",
12720+
"condition": {
12721+
"typeReachable": "org.hibernate.annotations.GenericGenerator"
12722+
},
12723+
"methods": [
12724+
{
12725+
"name": "<init>",
12726+
"parameterTypes": []
12727+
}
12728+
]
12729+
},
1248812730
{
1248912731
"name": "org.hibernate.cfg.beanvalidation.TypeSafeActivator",
1249012732
"allDeclaredMethods": true,

‎tests/src/org.hibernate.orm/hibernate-core/6.1.1.Final/src/test/java/org/hibernate/orm/HibernateOrmTest.java‎

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,7 @@ void jpaBootstrap() {
3535
@Test
3636
void hibernateBootstrap() {
3737

38-
Configuration config = new Configuration();
39-
40-
config.setProperty("hibernate.connection.driver_class", "org.h2.Driver");
41-
config.setProperty("hibernate.connection.url", "jdbc:h2:mem:test");
42-
config.setProperty("hibernate.connection.username", "");
43-
config.setProperty("hibernate.connection.password", "");
44-
config.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
45-
config.setProperty("hibernate.hbm2ddl.auto", "create-drop");
46-
47-
config.addAnnotatedClass(Event.class);
38+
Configuration config = h2Config(Event.class);
4839

4940
SessionFactory sessionFactory = config.buildSessionFactory();
5041
Session session = sessionFactory.openSession();
@@ -59,17 +50,7 @@ void hibernateBootstrap() {
5950
@Test
6051
void relations() {
6152

62-
Configuration config = new Configuration();
63-
64-
config.setProperty("hibernate.connection.driver_class", "org.h2.Driver");
65-
config.setProperty("hibernate.connection.url", "jdbc:h2:mem:test");
66-
config.setProperty("hibernate.connection.username", "");
67-
config.setProperty("hibernate.connection.password", "");
68-
config.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
69-
config.setProperty("hibernate.hbm2ddl.auto", "create-drop");
70-
71-
config.addAnnotatedClass(Cart.class);
72-
config.addAnnotatedClass(Item.class);
53+
Configuration config = h2Config(Cart.class, Item.class);
7354

7455
SessionFactory sessionFactory = config.buildSessionFactory();
7556
Session session = sessionFactory.openSession();
@@ -87,4 +68,40 @@ void relations() {
8768
session.close();
8869
sessionFactory.close();
8970
}
71+
72+
@Test
73+
void idGenerator() {
74+
75+
Configuration config = h2Config(User.class);
76+
77+
SessionFactory sessionFactory = config.buildSessionFactory();
78+
Session session = sessionFactory.openSession();
79+
80+
User user = new User();
81+
user.setUsername("u1");
82+
83+
session.persist(user);
84+
85+
User load = session.byId(User.class).load(user.getId());
86+
87+
session.close();
88+
sessionFactory.close();
89+
}
90+
91+
private static Configuration h2Config(Class<?>... entities) {
92+
93+
Configuration config = new Configuration();
94+
config.setProperty("hibernate.connection.driver_class", "org.h2.Driver");
95+
config.setProperty("hibernate.connection.url", "jdbc:h2:mem:test");
96+
config.setProperty("hibernate.connection.username", "");
97+
config.setProperty("hibernate.connection.password", "");
98+
config.setProperty("hibernate.dialect", "org.hibernate.dialect.H2Dialect");
99+
config.setProperty("hibernate.hbm2ddl.auto", "create-drop");
100+
101+
for (Class<?> type : entities) {
102+
config.addAnnotatedClass(type);
103+
}
104+
105+
return config;
106+
}
90107
}

‎tests/src/org.hibernate.orm/hibernate-core/6.1.1.Final/src/test/java/org/hibernate/orm/User.java‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
/*
2+
* Copyright and related rights waived via CC0
3+
*
4+
* You should have received a copy of the CC0 legalcode along with this
5+
* work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
6+
*/
7+
package org.hibernate.orm;
8+
9+
import jakarta.persistence.Column;
10+
import jakarta.persistence.Entity;
11+
import jakarta.persistence.GeneratedValue;
12+
import jakarta.persistence.Id;
13+
import jakarta.persistence.Table;
14+
import org.hibernate.annotations.GenericGenerator;
15+
16+
17+
@Entity
18+
@Table(name = "USER")
19+
public class User {
20+
21+
@Id
22+
@GeneratedValue(generator = "uuid")
23+
@GenericGenerator(name = "uuid", strategy = "uuid")
24+
@Column(columnDefinition = "CHAR(32)")
25+
private String id;
26+
27+
private String username;
28+
29+
public String getId() {
30+
return id;
31+
}
32+
33+
public void setId(String id) {
34+
this.id = id;
35+
}
36+
37+
public String getUsername() {
38+
return username;
39+
}
40+
41+
public void setUsername(String username) {
42+
this.username = username;
43+
}
44+
}

‎tests/src/org.hibernate.orm/hibernate-core/6.1.1.Final/src/test/resources/META-INF/native-image/dto-runtime-hints/reflect-config.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,10 @@
1313
"name": "org.hibernate.orm.Item",
1414
"allDeclaredFields": true,
1515
"allDeclaredConstructors": true
16+
},
17+
{
18+
"name": "org.hibernate.orm.User",
19+
"allDeclaredFields": true,
20+
"allDeclaredConstructors": true
1621
}
1722
]

0 commit comments

Comments
 (0)