Skip to content

Commit 7d19732

Browse files
jrenaatbeikov
jrenaat
authored and
beikov
committed
HHH-17187 - Disallow UUIDs with a trailing 0 byte in tests
Signed-off-by: Jan Schatteman <[email protected]>
1 parent b38bc76 commit 7d19732

File tree

50 files changed

+233
-111
lines changed

Some content is hidden

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

50 files changed

+233
-111
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/identity/AbstractEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
import java.io.Serializable;
1010
import java.util.Date;
11-
import java.util.UUID;
11+
12+
import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
13+
1214
import jakarta.persistence.Basic;
1315
import jakarta.persistence.Column;
1416
import jakarta.persistence.GeneratedValue;
@@ -32,7 +34,7 @@ public abstract class AbstractEntity implements Serializable {
3234

3335
public AbstractEntity() {
3436
super();
35-
uuid = UUID.randomUUID().toString();
37+
uuid = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
3638
created = new Date();
3739
}
3840

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/circle/sequence/AbstractEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
import java.io.Serializable;
1010
import java.util.Date;
11-
import java.util.UUID;
11+
12+
import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
13+
1214
import jakarta.persistence.Basic;
1315
import jakarta.persistence.Column;
1416
import jakarta.persistence.GeneratedValue;
@@ -32,7 +34,7 @@ public abstract class AbstractEntity implements Serializable {
3234

3335
public AbstractEntity() {
3436
super();
35-
uuid = UUID.randomUUID().toString();
37+
uuid = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
3638
created = new Date();
3739
}
3840

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/identity/AbstractEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
import java.io.Serializable;
1010
import java.util.Date;
11-
import java.util.UUID;
11+
12+
import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
13+
1214
import jakarta.persistence.Basic;
1315
import jakarta.persistence.Column;
1416
import jakarta.persistence.GeneratedValue;
@@ -30,7 +32,7 @@ public abstract class AbstractEntity implements Serializable {
3032

3133
public AbstractEntity() {
3234
super();
33-
uuid = UUID.randomUUID().toString();
35+
uuid = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
3436
created = new Date();
3537
}
3638

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/jpa/sequence/AbstractEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
import java.io.Serializable;
1010
import java.util.Date;
11-
import java.util.UUID;
11+
12+
import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
13+
1214
import jakarta.persistence.Basic;
1315
import jakarta.persistence.Column;
1416
import jakarta.persistence.GeneratedValue;
@@ -32,7 +34,7 @@ public abstract class AbstractEntity implements Serializable {
3234

3335
public AbstractEntity() {
3436
super();
35-
uuid = UUID.randomUUID().toString();
37+
uuid = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
3638
created = new Date();
3739
}
3840

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/identity/AbstractEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
import java.io.Serializable;
1010
import java.util.Date;
11-
import java.util.UUID;
11+
12+
import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
13+
1214
import jakarta.persistence.Basic;
1315
import jakarta.persistence.Column;
1416
import jakarta.persistence.GeneratedValue;
@@ -30,7 +32,7 @@ public abstract class AbstractEntity implements Serializable {
3032

3133
public AbstractEntity() {
3234
super();
33-
uuid = UUID.randomUUID().toString();
35+
uuid = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
3436
created = new Date();
3537
}
3638

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/cascade/multicircle/nonjpa/sequence/AbstractEntity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88

99
import java.io.Serializable;
1010
import java.util.Date;
11-
import java.util.UUID;
11+
12+
import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
13+
1214
import jakarta.persistence.Basic;
1315
import jakarta.persistence.Column;
1416
import jakarta.persistence.GeneratedValue;
@@ -32,7 +34,7 @@ public abstract class AbstractEntity implements Serializable {
3234

3335
public AbstractEntity() {
3436
super();
35-
uuid = UUID.randomUUID().toString();
37+
uuid = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
3638
created = new Date();
3739
}
3840

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/MapKeyEnumeratedTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ protected Class<?>[] getAnnotatedClasses() {
2525
public void testMapKeyEnumerated() {
2626
Session s = openSession();
2727
s.beginTransaction();
28-
User user = new User(SocialNetwork.STUB_NETWORK_NAME, "facebookId");
28+
User user = new User("User1", SocialNetwork.STUB_NETWORK_NAME, "facebookId");
2929
s.save( user );
3030
s.getTransaction().commit();
3131
s.close();

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/SocialNetworkProfile.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
@Table(name = "social_network_profile", uniqueConstraints = {@UniqueConstraint(columnNames = {"social_network", "network_id"})})
2525
public class SocialNetworkProfile {
2626
@jakarta.persistence.Id
27-
@jakarta.persistence.GeneratedValue(generator = "system-uuid")
28-
@org.hibernate.annotations.GenericGenerator(name = "system-uuid", strategy = "uuid2")
2927
@jakarta.persistence.Column(name = "id", unique = true)
3028
private String id;
3129

@@ -44,6 +42,7 @@ protected SocialNetworkProfile() {
4442
}
4543

4644
protected SocialNetworkProfile(User user, SocialNetwork socialNetworkType, String networkId) {
45+
this.id = "snp_" + networkId + "_" + user.getId();
4746
this.user = user;
4847
this.socialNetworkType = socialNetworkType;
4948
this.networkId = networkId;

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/mapkey/User.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
@Table( name = "USER_TABLE" )
2727
public class User {
2828
@jakarta.persistence.Id
29-
@jakarta.persistence.GeneratedValue(generator = "system-uuid")
30-
@org.hibernate.annotations.GenericGenerator(name = "system-uuid", strategy = "uuid2")
3129
@jakarta.persistence.Column(name = "id", unique = true)
3230
private String id;
3331

@@ -39,7 +37,8 @@ public class User {
3937
protected User() {
4038
}
4139

42-
public User(SocialNetwork sn, String socialNetworkId) {
40+
public User(String id, SocialNetwork sn, String socialNetworkId) {
41+
this.id = id;
4342
SocialNetworkProfile profile = new SocialNetworkProfile(this, sn, socialNetworkId);
4443
socialNetworkProfiles.put(sn, profile);
4544
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/UUIDGenerator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.hibernate.HibernateException;
1313
import org.hibernate.engine.spi.SharedSessionContractImplementor;
1414
import org.hibernate.id.IdentifierGenerator;
15+
import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
1516

1617
/**
1718
* Unlike Hibernate's UUID generator. This avoids
@@ -24,7 +25,7 @@
2425
public class UUIDGenerator implements IdentifierGenerator {
2526
@Override
2627
public Object generate(SharedSessionContractImplementor session, Object entity) throws HibernateException {
27-
UUID uuid = UUID.randomUUID();
28+
UUID uuid = SafeRandomUUIDGenerator.safeRandomUUID();
2829
String sud = uuid.toString();
2930
System.out.println("uuid="+uuid);
3031
sud = sud.replaceAll("-", "");

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/id/sequences/UUIDGenerator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.hibernate.HibernateException;
1313
import org.hibernate.engine.spi.SharedSessionContractImplementor;
1414
import org.hibernate.id.IdentifierGenerator;
15+
import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
1516

1617
/**
1718
* Unlike Hibernate's UUID generator. This avoids
@@ -24,7 +25,7 @@
2425
public class UUIDGenerator implements IdentifierGenerator {
2526
@Override
2627
public Object generate(SharedSessionContractImplementor session, Object entity) throws HibernateException {
27-
UUID uuid = UUID.randomUUID();
28+
UUID uuid = SafeRandomUUIDGenerator.safeRandomUUID();
2829
String sud = uuid.toString();
2930
System.out.println("uuid="+uuid);
3031
sud = sud.replaceAll("-", "");

‎hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/embedded/EmbeddedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import java.util.Collection;
1111
import java.util.List;
1212
import java.util.Set;
13-
import java.util.UUID;
1413

1514
import org.hibernate.Hibernate;
1615
import org.hibernate.Transaction;
1716
import org.hibernate.boot.spi.MetadataImplementor;
1817
import org.hibernate.cfg.AvailableSettings;
18+
import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
1919
import org.hibernate.orm.test.bootstrap.binding.annotations.embedded.FloatLeg.RateIndex;
2020
import org.hibernate.orm.test.bootstrap.binding.annotations.embedded.Leg.Frequency;
2121
import org.hibernate.query.Query;
@@ -772,7 +772,7 @@ public void testTransientMergeComponentParent(SessionFactoryScope scope) {
772772
scope.inTransaction(
773773
session -> {
774774
Book b = new Book();
775-
b.setIsbn( UUID.randomUUID().toString() );
775+
b.setIsbn( SafeRandomUUIDGenerator.safeRandomUUIDAsString() );
776776
b.setSummary( new Summary() );
777777
b = (Book) session.merge( b );
778778
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/association/OneToOneAssociationTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
import jakarta.persistence.Entity;
1616
import jakarta.persistence.Id;
1717
import jakarta.persistence.OneToOne;
18-
import java.util.UUID;
18+
19+
import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
1920

2021
/**
2122
* @author Luis Barreiro
@@ -26,7 +27,7 @@ public class OneToOneAssociationTest {
2627
@Test
2728
public void test() {
2829
User user = new User();
29-
user.setLogin( UUID.randomUUID().toString() );
30+
user.setLogin( SafeRandomUUIDGenerator.safeRandomUUIDAsString() );
3031

3132
Customer customer = new Customer();
3233
customer.setUser( user );
@@ -37,7 +38,7 @@ public void test() {
3738
EnhancerTestUtils.checkDirtyTracking( user, "login", "customer" );
3839

3940
User anotherUser = new User();
40-
anotherUser.setLogin( UUID.randomUUID().toString() );
41+
anotherUser.setLogin( SafeRandomUUIDGenerator.safeRandomUUIDAsString() );
4142

4243
customer.setUser( anotherUser );
4344

@@ -52,7 +53,7 @@ public void test() {
5253
@Test
5354
public void testSetNull() {
5455
User user = new User();
55-
user.setLogin( UUID.randomUUID().toString() );
56+
user.setLogin( SafeRandomUUIDGenerator.safeRandomUUIDAsString() );
5657

5758
Customer customer = new Customer();
5859
customer.setUser( user );

‎hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/ExtendedAssociationManagementTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
import jakarta.persistence.FetchType;
1717
import jakarta.persistence.Id;
1818
import jakarta.persistence.OneToOne;
19-
import java.util.UUID;
19+
20+
import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
2021

2122
import static org.hibernate.testing.bytecode.enhancement.EnhancerTestUtils.getFieldByReflection;
2223
import static org.junit.Assert.assertEquals;
@@ -30,7 +31,7 @@ public class ExtendedAssociationManagementTest {
3031
@Test
3132
public void test() {
3233
User user = new User();
33-
user.login = UUID.randomUUID().toString();
34+
user.login = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
3435

3536
Customer customer = new Customer();
3637
customer.user = user;
@@ -41,7 +42,7 @@ public void test() {
4142
EnhancerTestUtils.checkDirtyTracking( user, "login", "customer" );
4243

4344
User anotherUser = new User();
44-
anotherUser.login = UUID.randomUUID().toString();
45+
anotherUser.login = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
4546

4647
customer.user = anotherUser;
4748

‎hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/basic/FinalFieldEnhancementTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
import java.io.Serializable;
1212
import java.util.Objects;
13-
import java.util.UUID;
1413
import jakarta.persistence.Embeddable;
1514
import jakarta.persistence.Embedded;
1615
import jakarta.persistence.EmbeddedId;
@@ -19,6 +18,7 @@
1918
import jakarta.persistence.Id;
2019

2120
import org.hibernate.annotations.Immutable;
21+
import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
2222

2323
import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
2424
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@@ -172,7 +172,7 @@ public static class EntityWithEmbeddedIdWithFinalField {
172172
private String name;
173173

174174
public EntityWithEmbeddedIdWithFinalField() {
175-
this.id = EmbeddableId.of( UUID.randomUUID().toString() );
175+
this.id = EmbeddableId.of( SafeRandomUUIDGenerator.safeRandomUUIDAsString() );
176176
}
177177

178178
public EmbeddableId getId() {

‎hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/cascade/CascadeWithFkConstraintTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
import jakarta.persistence.Table;
2222
import java.util.HashSet;
2323
import java.util.Set;
24-
import java.util.UUID;
24+
25+
import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
2526

2627
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
2728

@@ -95,7 +96,7 @@ private static class Garage {
9596
Set<Car> cars = new HashSet<>();
9697

9798
Garage() {
98-
id = UUID.randomUUID().toString();
99+
id = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
99100
}
100101

101102
void insert(Car aCar) {
@@ -111,7 +112,7 @@ public static class Car {
111112
String id;
112113

113114
Car() {
114-
id = UUID.randomUUID().toString();
115+
id = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
115116
}
116117
}
117118
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/proxy/batch/AbstractBatchingTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77
package org.hibernate.orm.test.bytecode.enhancement.lazy.proxy.batch;
88

9-
import java.util.UUID;
109
import jakarta.persistence.CascadeType;
1110
import jakarta.persistence.Entity;
1211
import jakarta.persistence.FetchType;
@@ -19,6 +18,7 @@
1918
import org.hibernate.boot.MetadataSources;
2019
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
2120
import org.hibernate.cfg.AvailableSettings;
21+
import org.hibernate.testing.util.uuid.SafeRandomUUIDGenerator;
2222
import org.hibernate.stat.spi.StatisticsImplementor;
2323

2424
import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
@@ -40,7 +40,7 @@
4040
@RunWith(BytecodeEnhancerRunner.class)
4141
@CustomEnhancementContext({ NoDirtyCheckEnhancementContext.class })
4242
public abstract class AbstractBatchingTest extends BaseNonConfigCoreFunctionalTestCase {
43-
protected String childName = UUID.randomUUID().toString();
43+
protected String childName = SafeRandomUUIDGenerator.safeRandomUUIDAsString();
4444
protected Long parentId;
4545

4646
@Override

0 commit comments

Comments
 (0)