Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-16500 Remove unnecessary reflection from JpaStreamTest

This commit is contained in:
Christoph Dreis 2023-04-24 16:10:35 +02:00 committed by Christian Beikov
parent a8b1dfd7be
commit a5ae8737a6
1 changed files with 46 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
hibernate-core/src/test/java/org/hibernate/orm/test/stream/basic/JpaStreamTest.java
View File

@ -6,8 +6,6 @@
*/ */
package org.hibernate.orm.test.stream.basic; package org.hibernate.orm.test.stream.basic;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -22,7 +20,6 @@ import org.hibernate.Session;
import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.H2Dialect;
import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
import org.hibernate.engine.spi.SharedSessionContractImplementor; import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.resource.jdbc.ResourceRegistry; import org.hibernate.resource.jdbc.ResourceRegistry;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
@ -41,7 +38,6 @@ import static org.hibernate.testing.orm.junit.ExtraAssertions.assertTyping;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
/** /**
* @author Steve Ebersole * @author Steve Ebersole
@ -429,7 +425,7 @@ public class JpaStreamTest {
//Test call close explicitly //Test call close explicitly
scope.inTransaction( session -> { scope.inTransaction( session -> {
try (Stream<Long> stream = getLongStream( try (Stream<Integer> stream = getIntegerStream(
prepare, prepare,
session, session,
onCloseCallbacks, onCloseCallbacks,
@ -458,81 +454,67 @@ public class JpaStreamTest {
//Test Java 9 Stream methods //Test Java 9 Stream methods
scope.inTransaction( session -> { scope.inTransaction( session -> {
Method takeWhileMethod = ReflectHelper.getMethod( Stream.class, "takeWhile", Predicate.class ); try (Stream<Integer> stream = getIntegerStream(
prepare,
session,
onCloseCallbacks,
flatMapBefore,
flatMapAfter
)) {
if ( takeWhileMethod != null ) { ResourceRegistry resourceRegistry = resourceRegistry( session );
try (Stream<Long> stream = getLongStream( try {
prepare,
session,
onCloseCallbacks,
flatMapBefore,
flatMapAfter
)) {
ResourceRegistry resourceRegistry = resourceRegistry( session ); Predicate<Integer> predicate = id -> id <= 5;
try {
Predicate<Integer> predicate = id -> id <= 5; Stream<Integer> takeWhileStream = stream.takeWhile( predicate );
Stream<Integer> takeWhileStream = (Stream<Integer>) takeWhileMethod.invoke( stream, predicate ); List<Integer> result = takeWhileStream.collect( Collectors.toList() );
assertTrue( resourceRegistry.hasRegisteredResources() );
List<Integer> result = takeWhileStream.collect( Collectors.toList() ); assertEquals( 5, result.size() );
assertTrue( resourceRegistry.hasRegisteredResources() ); assertTrue( result.contains( 1 ) );
assertTrue( result.contains( 3 ) );
assertEquals( 5, result.size() ); assertTrue( result.contains( 5 ) );
assertTrue( result.contains( 1 ) );
assertTrue( result.contains( 3 ) );
assertTrue( result.contains( 5 ) );
}
finally {
stream.close();
assertFalse( resourceRegistry.hasRegisteredResources() );
}
onCloseAssertion.run();
} }
catch (IllegalAccessException | InvocationTargetException e) { finally {
fail( "Could not execute takeWhile because of " + e.getMessage() ); stream.close();
assertFalse( resourceRegistry.hasRegisteredResources() );
} }
onCloseAssertion.run();
} }
} ); } );
scope.inTransaction( session -> { scope.inTransaction( session -> {
Method dropWhileMethod = ReflectHelper.getMethod( Stream.class, "dropWhile", Predicate.class ); try (Stream<Integer> stream = getIntegerStream(
prepare,
session,
onCloseCallbacks,
flatMapBefore,
flatMapAfter
)) {
if ( dropWhileMethod != null ) { ResourceRegistry resourceRegistry = resourceRegistry( session );
try (Stream<Long> stream = getLongStream(
prepare,
session,
onCloseCallbacks,
flatMapBefore,
flatMapAfter
)) {
ResourceRegistry resourceRegistry = resourceRegistry( session ); Predicate<Integer> predicate = id -> id <= 5;
Predicate<Integer> predicate = id -> id <= 5; Stream<Integer> dropWhileStream = stream.dropWhile( predicate );
try {
List<Integer> result = dropWhileStream.collect( Collectors.toList() );
assertTrue( resourceRegistry.hasRegisteredResources() );
Stream<Integer> dropWhileStream = (Stream<Integer>) dropWhileMethod.invoke( stream, predicate ); assertEquals( 5, result.size() );
try { assertTrue( result.contains( 6 ) );
List<Integer> result = dropWhileStream.collect( Collectors.toList() ); assertTrue( result.contains( 8 ) );
assertTrue( resourceRegistry.hasRegisteredResources() ); assertTrue( result.contains( 10 ) );
assertEquals( 5, result.size() );
assertTrue( result.contains( 6 ) );
assertTrue( result.contains( 8 ) );
assertTrue( result.contains( 10 ) );
}
finally {
stream.close();
assertFalse( resourceRegistry.hasRegisteredResources() );
}
onCloseAssertion.run();
} }
catch (IllegalAccessException | InvocationTargetException e) { finally {
fail( "Could not execute takeWhile because of " + e.getMessage() ); stream.close();
assertFalse( resourceRegistry.hasRegisteredResources() );
} }
onCloseAssertion.run();
} }
} ); } );
} }
@ -553,7 +535,7 @@ public class JpaStreamTest {
); );
} }
private static Stream<Long> getLongStream( private static Stream<Integer> getIntegerStream(
Runnable prepare, Runnable prepare,
Session session, Session session,
List<Runnable> onCloseCallbacks, List<Runnable> onCloseCallbacks,