Skip to content

Commit 5b0017a

Browse files
cigalycigaly
committed
HHH-18377 Additional tests
1 parent b6696d3 commit 5b0017a

File tree

4 files changed

+295
-0
lines changed

4 files changed

+295
-0
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/rfc9562/EntitySeven.java‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/*
2+
* Hibernate, Relational Persistence for Idiomatic Java
3+
*
4+
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
5+
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
6+
*/
7+
package org.hibernate.orm.test.id.uuid.rfc9562;
8+
9+
import java.util.UUID;
10+
11+
import org.hibernate.annotations.UuidGenerator;
12+
import org.hibernate.id.uuid.UuidV7ValueGenerator;
13+
14+
import jakarta.persistence.Basic;
15+
import jakarta.persistence.Entity;
16+
import jakarta.persistence.Id;
17+
import jakarta.persistence.Table;
18+
19+
@Entity(name = "EntitySeven")
20+
@Table(name = "entity_seven")
21+
public class EntitySeven {
22+
@Id
23+
@UuidGenerator(algorithm = UuidV7ValueGenerator.class)
24+
public UUID id;
25+
@Basic
26+
public String name;
27+
28+
private EntitySeven() {
29+
// for Hibernate use
30+
}
31+
32+
public EntitySeven(String name) {
33+
this.name = name;
34+
}
35+
36+
public UUID getId() {
37+
return id;
38+
}
39+
40+
public String getName() {
41+
return name;
42+
}
43+
44+
public void setName(String name) {
45+
this.name = name;
46+
}
47+
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/rfc9562/EntitySix.java‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/*
2+
* Hibernate, Relational Persistence for Idiomatic Java
3+
*
4+
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
5+
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html.
6+
*/
7+
package org.hibernate.orm.test.id.uuid.rfc9562;
8+
9+
import java.util.UUID;
10+
11+
import org.hibernate.annotations.UuidGenerator;
12+
import org.hibernate.id.uuid.UuidV6ValueGenerator;
13+
14+
import jakarta.persistence.Basic;
15+
import jakarta.persistence.Entity;
16+
import jakarta.persistence.GeneratedValue;
17+
import jakarta.persistence.Id;
18+
import jakarta.persistence.Table;
19+
20+
/**
21+
* @author Steve Ebersole
22+
*/
23+
@Table(name = "entity_six")
24+
@Entity
25+
public class EntitySix {
26+
@Id
27+
@GeneratedValue
28+
@UuidGenerator(algorithm = UuidV6ValueGenerator.class)
29+
private UUID id;
30+
@Basic
31+
private String name;
32+
33+
protected EntitySix() {
34+
// for Hibernate use
35+
}
36+
37+
public EntitySix(String name) {
38+
this.name = name;
39+
}
40+
41+
public UUID getId() {
42+
return id;
43+
}
44+
45+
public String getName() {
46+
return name;
47+
}
48+
49+
public void setName(String name) {
50+
this.name = name;
51+
}
52+
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/rfc9562/OtherEntitySeven.java‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
/*
2+
* Hibernate, Relational Persistence for Idiomatic Java
3+
*
4+
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
5+
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
6+
*/
7+
package org.hibernate.orm.test.id.uuid.rfc9562;
8+
9+
import java.util.UUID;
10+
11+
import org.hibernate.annotations.UuidGenerator;
12+
import org.hibernate.id.uuid.UuidV7ValueGenerator;
13+
14+
import jakarta.persistence.Basic;
15+
import jakarta.persistence.Entity;
16+
import jakarta.persistence.GeneratedValue;
17+
import jakarta.persistence.Id;
18+
import jakarta.persistence.Table;
19+
20+
@Entity(name = "OtherEntitySeven")
21+
@Table(name = "other_entity_seven")
22+
public class OtherEntitySeven {
23+
@Id
24+
@GeneratedValue
25+
public Long pk;
26+
27+
@UuidGenerator(algorithm = UuidV7ValueGenerator.class)
28+
public UUID id;
29+
30+
@Basic
31+
public String name;
32+
33+
private OtherEntitySeven() {
34+
// for Hibernate use
35+
}
36+
37+
public OtherEntitySeven(String name) {
38+
this.name = name;
39+
}
40+
41+
public UUID getId() {
42+
return id;
43+
}
44+
45+
public String getName() {
46+
return name;
47+
}
48+
49+
public void setName(String name) {
50+
this.name = name;
51+
}
52+
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/id/uuid/rfc9562/UuidGeneratorAnnotationTests.java‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
/*
2+
* Hibernate, Relational Persistence for Idiomatic Java
3+
*
4+
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
5+
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
6+
*/
7+
package org.hibernate.orm.test.id.uuid.rfc9562;
8+
9+
import java.time.Instant;
10+
import java.time.LocalDate;
11+
import java.time.ZoneId;
12+
import java.util.UUID;
13+
14+
import org.hibernate.dialect.SybaseDialect;
15+
import org.hibernate.generator.Generator;
16+
import org.hibernate.id.uuid.UuidGenerator;
17+
import org.hibernate.id.uuid.UuidV6ValueGenerator;
18+
import org.hibernate.id.uuid.UuidV7ValueGenerator;
19+
import org.hibernate.mapping.BasicValue;
20+
import org.hibernate.mapping.Property;
21+
22+
import org.hibernate.testing.orm.junit.DomainModel;
23+
import org.hibernate.testing.orm.junit.DomainModelScope;
24+
import org.hibernate.testing.orm.junit.SessionFactory;
25+
import org.hibernate.testing.orm.junit.SessionFactoryScope;
26+
import org.hibernate.testing.orm.junit.SkipForDialect;
27+
import org.hibernate.testing.util.uuid.IdGeneratorCreationContext;
28+
import org.junit.jupiter.api.AfterEach;
29+
import org.junit.jupiter.api.Test;
30+
31+
import static org.assertj.core.api.Assertions.assertThat;
32+
33+
@SuppressWarnings("JUnitMalformedDeclaration")
34+
@DomainModel(annotatedClasses = {
35+
EntitySeven.class, OtherEntitySeven.class, EntitySix.class
36+
})
37+
@SessionFactory
38+
@SkipForDialect(dialectClass = SybaseDialect.class, matchSubTypes = true,
39+
reason = "Skipped for Sybase to avoid problems with UUIDs potentially ending with a trailing 0 byte")
40+
public class UuidGeneratorAnnotationTests {
41+
@Test
42+
public void verifyUuidV7IdGeneratorModel(final DomainModelScope scope) {
43+
scope.withHierarchy( EntitySeven.class, descriptor -> {
44+
final Property idProperty = descriptor.getIdentifierProperty();
45+
final BasicValue value = (BasicValue) idProperty.getValue();
46+
47+
assertThat( value.getCustomIdGeneratorCreator() ).isNotNull();
48+
final Generator generator = value.getCustomIdGeneratorCreator()
49+
.createGenerator( new IdGeneratorCreationContext(
50+
scope.getDomainModel(),
51+
descriptor
52+
) );
53+
54+
assertThat( generator ).isInstanceOf( UuidGenerator.class );
55+
final UuidGenerator uuidGenerator = (UuidGenerator) generator;
56+
assertThat( uuidGenerator.getValueGenerator() ).isInstanceOf( UuidV7ValueGenerator.class );
57+
} );
58+
}
59+
60+
@Test
61+
public void verifyUuidV6IdGeneratorModel(final DomainModelScope scope) {
62+
scope.withHierarchy( EntitySix.class, descriptor -> {
63+
final Property idProperty = descriptor.getIdentifierProperty();
64+
final BasicValue value = (BasicValue) idProperty.getValue();
65+
66+
assertThat( value.getCustomIdGeneratorCreator() ).isNotNull();
67+
final Generator generator = value.getCustomIdGeneratorCreator()
68+
.createGenerator( new IdGeneratorCreationContext(
69+
scope.getDomainModel(),
70+
descriptor
71+
) );
72+
73+
assertThat( generator ).isInstanceOf( UuidGenerator.class );
74+
final UuidGenerator uuidGenerator = (UuidGenerator) generator;
75+
assertThat( uuidGenerator.getValueGenerator() ).isInstanceOf( UuidV6ValueGenerator.class );
76+
} );
77+
}
78+
79+
@Test
80+
public void basicUseTest(final SessionFactoryScope scope) {
81+
scope.inTransaction( session -> {
82+
final EntitySeven seven = new EntitySeven( "John Doe" );
83+
session.persist( seven );
84+
session.flush();
85+
assertThat( seven.id ).isNotNull();
86+
assertThat( seven.id.version() ).isEqualTo( 7 );
87+
} );
88+
}
89+
90+
@Test
91+
public void nonPkUseTest(final SessionFactoryScope scope) {
92+
scope.inTransaction( session -> {
93+
final Instant startTime = Instant.now();
94+
95+
final OtherEntitySeven seven = new OtherEntitySeven( "Dave Default" );
96+
session.persist( seven );
97+
session.flush();
98+
99+
final Instant endTime = Instant.now();
100+
assertThat( seven.id ).isNotNull();
101+
assertThat( seven.id.version() ).isEqualTo( 7 );
102+
103+
assertThat( Instant.ofEpochMilli( seven.id.getMostSignificantBits() >> 16 & 0xFFFF_FFFF_FFFFL ) )
104+
.isBetween( startTime, endTime );
105+
} );
106+
}
107+
108+
@Test
109+
void testUuidV6IdGenerator(final SessionFactoryScope sessionFactoryScope) {
110+
sessionFactoryScope.inTransaction( session -> {
111+
final Instant startTime = Instant.now();
112+
113+
final EntitySix six = new EntitySix( "Jane Doe" );
114+
session.persist( six );
115+
assertThat( six.getId() ).isNotNull();
116+
assertThat( six.getId().version() ).isEqualTo( 6 );
117+
118+
session.flush();
119+
final Instant endTime = Instant.now();
120+
assertThat( six.getId() ).isNotNull();
121+
assertThat( six.getId().version() ).isEqualTo( 6 );
122+
assertThat( uuid6Instant( six.getId() ) ).isBetween( startTime, endTime );
123+
} );
124+
}
125+
126+
@AfterEach
127+
void dropTestData(final SessionFactoryScope sessionFactoryScope) {
128+
sessionFactoryScope.inTransaction( session -> {
129+
session.createMutationQuery( "delete EntitySeven" ).executeUpdate();
130+
session.createMutationQuery( "delete OtherEntitySeven" ).executeUpdate();
131+
session.createMutationQuery( "delete EntitySix" ).executeUpdate();
132+
} );
133+
}
134+
135+
public static Instant uuid6Instant(final UUID uuid) {
136+
assert uuid.version() == 6;
137+
138+
final var msb = uuid.getMostSignificantBits();
139+
final var ts = msb >> 4 & 0x0FFF_FFFF_FFFF_F000L | msb & 0x0FFFL;
140+
return LocalDate.of( 1582, 10, 15 ).atStartOfDay( ZoneId.of( "UTC" ) ).toInstant()
141+
.plusSeconds( ts / 10_000_000 ).plusNanos( ts % 10_000_000 * 100 );
142+
}
143+
144+
}

0 commit comments

Comments
 (0)