Skip to content

Commit c069398

Browse files
sebersolesebersole
committed
Various code cleanup
1 parent fbbdf85 commit c069398

File tree

3 files changed

+60
-121
lines changed

3 files changed

+60
-121
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockExistingBytecodeProxyTest.java

Lines changed: 55 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44
*/
55
package org.hibernate.orm.test.locking;
66

7+
import jakarta.persistence.Entity;
8+
import jakarta.persistence.FetchType;
9+
import jakarta.persistence.Id;
10+
import jakarta.persistence.ManyToOne;
11+
import jakarta.persistence.Table;
12+
import jakarta.persistence.Version;
713
import org.hibernate.Hibernate;
8-
914
import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
1015
import org.hibernate.testing.orm.junit.DomainModel;
1116
import org.hibernate.testing.orm.junit.Jira;
@@ -15,24 +20,15 @@
1520
import org.junit.jupiter.api.BeforeEach;
1621
import org.junit.jupiter.api.Test;
1722

18-
import jakarta.persistence.Entity;
19-
import jakarta.persistence.FetchType;
20-
import jakarta.persistence.Id;
21-
import jakarta.persistence.LockModeType;
22-
import jakarta.persistence.ManyToOne;
23-
import jakarta.persistence.Version;
23+
import static jakarta.persistence.LockModeType.PESSIMISTIC_FORCE_INCREMENT;
24+
import static jakarta.persistence.LockModeType.PESSIMISTIC_WRITE;
25+
import static org.assertj.core.api.Assertions.assertThat;
2426

25-
import static org.junit.Assert.assertEquals;
26-
import static org.junit.Assert.assertFalse;
27-
import static org.junit.Assert.assertSame;
28-
import static org.junit.Assert.assertTrue;
29-
30-
@DomainModel(
31-
annotatedClasses = {
32-
LockExistingBytecodeProxyTest.MainEntity.class,
33-
LockExistingBytecodeProxyTest.ReferencedEntity.class,
34-
}
35-
)
27+
@SuppressWarnings("JUnitMalformedDeclaration")
28+
@DomainModel( annotatedClasses = {
29+
LockExistingBytecodeProxyTest.Book.class,
30+
LockExistingBytecodeProxyTest.Page.class
31+
})
3632
@SessionFactory
3733
@BytecodeEnhanced
3834
@Jira( "https://hibernate.atlassian.net/browse/HHH-17828" )
@@ -41,84 +37,77 @@ public class LockExistingBytecodeProxyTest {
4137
@Test
4238
public void testFindAndLockAfterFind(SessionFactoryScope scope) {
4339
scope.inTransaction( session -> {
44-
final MainEntity main = session.find( MainEntity.class, 1L );
45-
assertFalse( Hibernate.isInitialized( main.referenced ) );
46-
final ReferencedEntity lazyEntity = session.find( ReferencedEntity.class, 1L, LockModeType.PESSIMISTIC_WRITE );
47-
assertEquals( LockModeType.PESSIMISTIC_WRITE, session.getLockMode( lazyEntity ) );
48-
assertTrue( Hibernate.isInitialized( main.referenced ) );
49-
assertSame( lazyEntity, main.referenced );
40+
final Page page = session.find( Page.class, 1 );
41+
assertThat( Hibernate.isInitialized( page.book ) ).isFalse();
42+
43+
final Book book = session.find( Book.class, 1, PESSIMISTIC_WRITE );
44+
assertThat( book ).isSameAs( page.book );
45+
assertThat( session.getLockMode( book ) ).isEqualTo( PESSIMISTIC_WRITE );
46+
assertThat( Hibernate.isInitialized( book ) ).isTrue();
5047
} );
5148
}
5249

5350
@Test
5451
public void testLockAfterFind(SessionFactoryScope scope) {
5552
scope.inTransaction( session -> {
56-
final MainEntity main = session.find( MainEntity.class, 1L );
57-
assertFalse( Hibernate.isInitialized( main.referenced ) );
58-
session.lock( main.referenced, LockModeType.PESSIMISTIC_FORCE_INCREMENT );
59-
assertEquals( LockModeType.PESSIMISTIC_FORCE_INCREMENT, session.getLockMode( main.referenced ) );
60-
assertTrue( Hibernate.isInitialized( main.referenced ) );
53+
final Page page = session.find( Page.class, 1 );
54+
assertThat( Hibernate.isInitialized( page.book ) ).isFalse();
55+
56+
session.lock( page.book, PESSIMISTIC_FORCE_INCREMENT );
57+
assertThat( session.getLockMode( page.book ) ).isEqualTo( PESSIMISTIC_FORCE_INCREMENT );
58+
assertThat( Hibernate.isInitialized( page.book ) ).isTrue();
6159
} );
6260
}
6361

6462
@BeforeEach
65-
public void setUp(SessionFactoryScope scope) {
63+
public void createTestData(SessionFactoryScope scope) {
6664
scope.inTransaction( session -> {
67-
final ReferencedEntity e1 = new ReferencedEntity( 1L, "referenced" );
68-
session.persist( e1 );
69-
session.persist( new MainEntity( 1L, e1 ) );
65+
final Book book = new Book( 1, "My Story" );
66+
final Page page = new Page( 1, book );
67+
session.persist( book );
68+
session.persist( page );
7069
} );
7170
}
7271

7372
@AfterEach
74-
public void tearDown(SessionFactoryScope scope) {
75-
scope.inTransaction( session -> {
76-
session.createMutationQuery( "delete from MainEntity" ).executeUpdate();
77-
session.createMutationQuery( "delete from ReferencedEntity" ).executeUpdate();
78-
} );
73+
public void dropTestData(SessionFactoryScope scope) {
74+
scope.dropData();
7975
}
8076

81-
@Entity( name = "MainEntity" )
82-
public static class MainEntity {
77+
@Entity(name="Book")
78+
@Table(name="books")
79+
@SuppressWarnings({"FieldCanBeLocal", "unused"})
80+
public static class Book {
8381
@Id
84-
private Long id;
85-
86-
@ManyToOne( fetch = FetchType.LAZY )
87-
private ReferencedEntity referenced;
82+
private Integer id;
83+
private String name;
84+
@Version
85+
private Long version;
8886

89-
protected MainEntity() {
87+
public Book() {
9088
}
9189

92-
public MainEntity(long id, ReferencedEntity referenced) {
90+
public Book(Integer id, String name) {
9391
this.id = id;
94-
this.referenced = referenced;
95-
}
96-
97-
public ReferencedEntity getReferenced() {
98-
return referenced;
92+
this.name = name;
9993
}
10094
}
10195

102-
@Entity( name = "ReferencedEntity" )
103-
public static class ReferencedEntity {
96+
@Entity(name="Page")
97+
@Table(name="pages")
98+
@SuppressWarnings({"FieldCanBeLocal", "unused"})
99+
public static class Page {
104100
@Id
105-
private Long id;
106-
107-
@Version
108-
private Long version;
109-
110-
private String name;
101+
private Integer id;
102+
@ManyToOne( fetch = FetchType.LAZY )
103+
private Book book;
111104

112-
protected ReferencedEntity() {
105+
public Page() {
113106
}
114107

115-
public ReferencedEntity(long id, String name) {
108+
public Page(Integer id, Book book) {
116109
this.id = id;
117-
this.name = name;
118-
}
119-
120-
public long getVersion() {
121-
return version;
110+
this.book = book;
122111
}
123112
}
124113
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/ByteMappingTests.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
1414
import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
1515
import org.hibernate.persister.entity.EntityPersister;
16+
import org.hibernate.testing.orm.junit.JiraKey;
1617
import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
1718

1819
import org.hibernate.testing.orm.junit.DomainModel;
@@ -30,8 +31,10 @@
3031
*
3132
* @author Steve Ebersole
3233
*/
34+
@SuppressWarnings("JUnitMalformedDeclaration")
3335
@DomainModel(annotatedClasses = ByteMappingTests.EntityOfBytes.class)
3436
@SessionFactory
37+
@JiraKey(value = "HHH-14021")
3538
public class ByteMappingTests {
3639

3740
@Test
@@ -67,15 +70,13 @@ public void testMappings(SessionFactoryScope scope) {
6770
(session) -> session.persist(new EntityOfBytes(1, (byte) 3, (byte) 5))
6871
);
6972
scope.inTransaction(
70-
(session) -> session.get(EntityOfBytes.class, 1)
73+
(session) -> session.find(EntityOfBytes.class, 1)
7174
);
7275
}
7376

7477
@AfterEach
7578
public void dropData(SessionFactoryScope scope) {
76-
scope.inTransaction(
77-
(session) -> session.createMutationQuery("delete EntityOfBytes").executeUpdate()
78-
);
79+
scope.dropData();
7980
}
8081

8182
@Entity(name = "EntityOfBytes")

‎hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -399,48 +399,6 @@ public void testBasicTimestampUsage() {
399399
}
400400
}
401401

402-
@Test
403-
@JiraKey(value = "HHH-14021")
404-
public void testBasicByteUsage() {
405-
Configuration cfg = new Configuration();
406-
ServiceRegistryUtil.applySettings( cfg.getStandardServiceRegistryBuilder() );
407-
cfg.addAttributeConverter( EnumToByteConverter.class, false );
408-
cfg.addAnnotatedClass( Tester4.class );
409-
cfg.setProperty( AvailableSettings.HBM2DDL_AUTO, "create-drop" );
410-
cfg.setProperty( AvailableSettings.GENERATE_STATISTICS, "true" );
411-
412-
try (SessionFactory sf = cfg.buildSessionFactory()) {
413-
Session session = sf.openSession();
414-
session.beginTransaction();
415-
session.persist( new Tester4( 1L, "George", 150, ConvertibleEnum.DEFAULT ) );
416-
session.getTransaction().commit();
417-
session.close();
418-
419-
sf.getStatistics().clear();
420-
session = sf.openSession();
421-
session.beginTransaction();
422-
session.get( Tester4.class, 1L );
423-
session.getTransaction().commit();
424-
session.close();
425-
assertEquals( 0, sf.getStatistics().getEntityUpdateCount() );
426-
427-
session = sf.openSession();
428-
session.beginTransaction();
429-
Tester4 t4 = (Tester4) session.get( Tester4.class, 1L );
430-
t4.convertibleEnum = ConvertibleEnum.VALUE;
431-
session.getTransaction().commit();
432-
session.close();
433-
434-
session = sf.openSession();
435-
session.beginTransaction();
436-
t4 = session.get( Tester4.class, 1L );
437-
assertEquals( ConvertibleEnum.VALUE, t4.convertibleEnum );
438-
session.remove( t4 );
439-
session.getTransaction().commit();
440-
session.close();
441-
}
442-
}
443-
444402
@Test
445403
@JiraKey(value = "HHH-8866")
446404
public void testEnumConverter() {
@@ -562,8 +520,6 @@ public static class Tester4 {
562520
private String name;
563521
@Convert( converter = IntegerToVarcharConverter.class )
564522
private Integer code;
565-
@Convert( converter = EnumToByteConverter.class )
566-
private ConvertibleEnum convertibleEnum;
567523

568524
public Tester4() {
569525
}
@@ -573,13 +529,6 @@ public Tester4(Long id, String name, Integer code) {
573529
this.name = name;
574530
this.code = code;
575531
}
576-
577-
public Tester4(Long id, String name, Integer code, ConvertibleEnum convertibleEnum) {
578-
this.id = id;
579-
this.name = name;
580-
this.code = code;
581-
this.convertibleEnum = convertibleEnum;
582-
}
583532
}
584533

585534
@Entity(name = "T5")

0 commit comments

Comments
 (0)