Various code cleanup

Author: sebersole

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/Lockable.java

@@ -9,8 +9,6 @@
 import jakarta.persistence.Version;
 
 /**
- * TODO : javadoc
- *
  * @author Steve Ebersole
  */
 @Entity

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/OptimisticLockTests.java

@@ -0,0 +1,61 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.jpa.lock;
+
+import jakarta.persistence.LockModeType;
+import org.hibernate.engine.spi.ActionQueue;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.testing.jdbc.SQLStatementInspector;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Steve Ebersole
+ */
+@SuppressWarnings("JUnitMalformedDeclaration")
+@DomainModel(annotatedClasses = Lockable.class)
+@SessionFactory(useCollectingStatementInspector = true)
+public class OptimisticLockTests {
+	@Test
+	@JiraKey(value = "HHH-9419")
+	public void testNoVersionCheckAfterRemove(SessionFactoryScope sessions) {
+		final SQLStatementInspector sqlCollector = sessions.getCollectingStatementInspector();
+		sqlCollector.clear();
+
+		final Lockable created = sessions.fromTransaction( (session) -> {
+			final Lockable entity = new Lockable( "name" );
+			session.persist( entity );
+			return entity;
+		} );
+		assertThat( created.getVersion() ).isEqualTo( 0 );
+
+		final Lockable locked = sessions.fromTransaction( (session) -> {
+			final ActionQueue actionQueue = session.unwrap( SessionImplementor.class ).getActionQueue();
+			assertThat( actionQueue.hasBeforeTransactionActions() ).isFalse();
+
+			final Lockable loaded = session.createQuery( "from Lockable", Lockable.class )
+					.setLockMode( LockModeType.OPTIMISTIC )
+					.getSingleResult();
+			assertThat( loaded.getVersion() ).isEqualTo( 0 );
+			assertThat( actionQueue.hasBeforeTransactionActions() ).isTrue();
+
+			sqlCollector.clear();
+			session.remove( loaded );
+
+			return loaded;
+		} );
+
+		assertThat( locked.getVersion() ).isEqualTo( 0 );
+
+		// should be just the deletion
+		assertThat( sqlCollector.getSqlQueries() ).hasSize( 1 );
+		assertThat( sqlCollector.getSqlQueries().get( 0 ) ).startsWith( "delete from Lockable " );
+	}
+}

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/lock/QueryLockingTest.java

@@ -288,31 +288,6 @@ public void testOptimisticOverall() {
 		em.close();
 	}
 
-	@Test
-	@JiraKey(value = "HHH-9419")
-	public void testNoVersionCheckAfterRemove() {
-		EntityManager em = getOrCreateEntityManager();
-		em.getTransaction().begin();
-		Lockable lock = new Lockable( "name" );
-		em.persist( lock );
-		em.getTransaction().commit();
-		em.close();
-		Integer initial = lock.getVersion();
-		assertNotNull( initial );
-
-		em = getOrCreateEntityManager();
-		em.getTransaction().begin();
-		Lockable reread = em.createQuery( "from Lockable", Lockable.class )
-				.setLockMode( LockModeType.OPTIMISTIC )
-				.getSingleResult();
-		assertEquals( initial, reread.getVersion() );
-		assertTrue( em.unwrap( SessionImpl.class ).getActionQueue().hasBeforeTransactionActions() );
-		em.remove( reread );
-		em.getTransaction().commit();
-		em.close();
-		assertEquals( initial, reread.getVersion() );
-	}
-
 	@Test
 	public void testOptimisticSpecific() {
 		EntityManager em = getOrCreateEntityManager();