Skip to content

Commit

Permalink
HSEARCH-3277 Avoid raw ScrollableResults
Browse files Browse the repository at this point in the history 
We can't use an actual type for now, just a wildcard, because ORM
returns a raw type.

Signed-off-by: Yoann Rodière <yoann@hibernate.org>
  • Loading branch information
@yrodiere
yrodiere committed Oct 6, 2022
1 parent 99843de commit 02c0a8e
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
38 changes: 19 additions & 19 deletions ...search/integrationtest/mapper/orm/hibernateormapis/ToHibernateOrmScrollableResultsIT.java
View file
Expand Up @@ -85,7 +85,7 @@ public void initData() {
public void next() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll() ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll() ) {
backendMock.verifyExpectationsMet();

assertThat( scroll.getRowNumber() ).isEqualTo( -1 );
Expand Down Expand Up @@ -129,7 +129,7 @@ public void next() {
public void previous() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll() ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll() ) {
backendMock.verifyExpectationsMet();

assertThat( scroll.getRowNumber() ).isEqualTo( -1 );
Expand Down Expand Up @@ -184,7 +184,7 @@ public void previous() {
public void scrollMode_forwardsOnly() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll( ScrollMode.FORWARD_ONLY ) ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll( ScrollMode.FORWARD_ONLY ) ) {
backendMock.verifyExpectationsMet();
for ( int i = 0; i < ENTITY_COUNT; i++ ) {
expectScrollNextIfNecessary( i, DEFAULT_FETCH_SIZE, ENTITY_COUNT );
Expand Down Expand Up @@ -223,7 +223,7 @@ public void fetchSize() {
int customFetchSize = 10;
backendMock.expectScrollObjects( Collections.singletonList( IndexedEntity.NAME ),
customFetchSize, b -> { } );
try ( ScrollableResults scroll = Search.toOrmQuery( Search.session( session )
try ( ScrollableResults<?> scroll = Search.toOrmQuery( Search.session( session )
.search( IndexedEntity.class )
.where( f -> f.matchAll() )
.loading( o -> o.fetchSize( customFetchSize ) )
Expand Down Expand Up @@ -269,7 +269,7 @@ public void maxResults() {
.toQuery() );
query.setMaxResults( maxResults );
expectScrollCreate();
try ( ScrollableResults scroll = query.scroll() ) {
try ( ScrollableResults<?> scroll = query.scroll() ) {
backendMock.verifyExpectationsMet();

assertThat( scroll.getRowNumber() ).isEqualTo( -1 );
Expand Down Expand Up @@ -304,7 +304,7 @@ public void maxResults() {
public void scroll() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll() ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll() ) {
backendMock.verifyExpectationsMet();

assertThat( scroll.getRowNumber() ).isEqualTo( -1 );
Expand Down Expand Up @@ -413,7 +413,7 @@ public void scroll() {
public void scroll_backwards() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll() ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll() ) {
backendMock.verifyExpectationsMet();

assertThat( scroll.getRowNumber() ).isEqualTo( -1 );
Expand Down Expand Up @@ -468,7 +468,7 @@ public void scroll_backwards() {
public void setRowNumber() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll() ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll() ) {
backendMock.verifyExpectationsMet();

assertThat( scroll.getRowNumber() ).isEqualTo( -1 );
Expand Down Expand Up @@ -552,7 +552,7 @@ public void setRowNumber() {
public void setRowNumber_backwards() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll() ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll() ) {
backendMock.verifyExpectationsMet();

assertThat( scroll.getRowNumber() ).isEqualTo( -1 );
Expand Down Expand Up @@ -594,7 +594,7 @@ public void setRowNumber_backwards() {
public void setRowNumber_relativeToEnd() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll() ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll() ) {
backendMock.verifyExpectationsMet();

assertThat( scroll.getRowNumber() ).isEqualTo( -1 );
Expand Down Expand Up @@ -804,7 +804,7 @@ public void position_relativeToEnd() {
public void beforeFirst_fromBeforeFirst() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll() ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll() ) {
backendMock.verifyExpectationsMet();

assertThat( scroll.getRowNumber() ).isEqualTo( -1 );
Expand Down Expand Up @@ -841,7 +841,7 @@ public void beforeFirst_fromBeforeFirst() {
public void beforeFirst_fromFirstOrAfter() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll() ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll() ) {
backendMock.verifyExpectationsMet();

assertThat( scroll.getRowNumber() ).isEqualTo( -1 );
Expand Down Expand Up @@ -877,7 +877,7 @@ public void beforeFirst_fromFirstOrAfter() {
public void first() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll() ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll() ) {
backendMock.verifyExpectationsMet();

assertThat( scroll.getRowNumber() ).isEqualTo( -1 );
Expand Down Expand Up @@ -931,7 +931,7 @@ public void first() {
public void first_fromAfterFirst() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll() ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll() ) {
backendMock.verifyExpectationsMet();

backendMock.expectNextScroll( Collections.singletonList( IndexedEntity.NAME ),
Expand Down Expand Up @@ -962,7 +962,7 @@ public void first_fromAfterFirst() {
public void last() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll() ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll() ) {
backendMock.verifyExpectationsMet();

backendMock.expectNextScroll( Collections.singletonList( IndexedEntity.NAME ),
Expand Down Expand Up @@ -1039,7 +1039,7 @@ public void last() {
public void afterLast_fromLastOrBefore() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll() ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll() ) {
backendMock.verifyExpectationsMet();

backendMock.expectNextScroll( Collections.singletonList( IndexedEntity.NAME ),
Expand Down Expand Up @@ -1069,7 +1069,7 @@ public void afterLast_fromLastOrBefore() {
public void afterLast_fromAfterLast() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll() ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll() ) {
backendMock.verifyExpectationsMet();

backendMock.expectNextScroll( Collections.singletonList( IndexedEntity.NAME ),
Expand Down Expand Up @@ -1129,7 +1129,7 @@ public void afterLast_fromAfterLast() {
public void close() {
setupHolder.runInTransaction( session -> {
expectScrollCreate();
try ( ScrollableResults scroll = createSimpleQuery( session ).scroll() ) {
try ( ScrollableResults<?> scroll = createSimpleQuery( session ).scroll() ) {
backendMock.verifyExpectationsMet();

ScrollableResultsImplementor implementor = (ScrollableResultsImplementor) scroll;
Expand Down Expand Up @@ -1171,7 +1171,7 @@ public void timeout() {
setupHolder.runInTransaction( session -> {
backendMock.expectScrollObjects( Collections.singletonList( IndexedEntity.NAME ),
DEFAULT_FETCH_SIZE, b -> b.failAfter( 200, TimeUnit.MILLISECONDS ) );
try ( ScrollableResults scroll = createSimpleQuery( session )
try ( ScrollableResults<?> scroll = createSimpleQuery( session )
.setHint( "jakarta.persistence.query.timeout", 200 )
.scroll() ) {
backendMock.verifyExpectationsMet();
Expand Down
2 changes: 1 addition & 1 deletion ...rnate/search/batch/jsr352/core/massindexing/step/impl/HibernateSearchPartitionMapper.java
View file
Expand Up @@ -236,7 +236,7 @@ private List<PartitionBound> buildPartitionUnitsFrom(EntityManagerFactory emf, S
query.setMaxResults( maxResults );
}

try ( ScrollableResults scroll = query.scroll( ScrollMode.SCROLL_SENSITIVE ) ) {
try ( ScrollableResults<?> scroll = query.scroll( ScrollMode.SCROLL_SENSITIVE ) ) {
/*
* The scroll results are originally positioned *before* the first element,
* so we need to scroll rowsPerPartition + 1 positions to advanced to the
Expand Down
4 changes: 2 additions & 2 deletions .../main/java/org/hibernate/search/batch/jsr352/core/massindexing/step/spi/EntityReader.java
View file
Expand Up @@ -400,7 +400,7 @@ else if ( lowerBound != null ) {

private interface FetchingStrategy {

ScrollableResults createScroll(Session session, CheckpointInfo lastCheckpointInfo);
ScrollableResults<?> createScroll(Session session, CheckpointInfo lastCheckpointInfo);

}

Expand All @@ -411,7 +411,7 @@ private static class ChunkState implements AutoCloseable {
private final int clearInterval;

private Session session;
private ScrollableResults scroll;
private ScrollableResults<?> scroll;

private CheckpointInfo lastCheckpointInfo;
private int processedEntityCount = 0;
Expand Down
4 changes: 2 additions & 2 deletions ...ava/org/hibernate/search/mapper/orm/search/query/impl/HibernateOrmSearchQueryAdapter.java
View file
Expand Up @@ -156,12 +156,12 @@ protected void applyEntityGraphQueryHint(String hintName, RootGraphImplementor<?
}

@Override
public ScrollableResultsImplementor scroll() {
public ScrollableResultsImplementor<R> scroll() {
return scroll( ScrollMode.FORWARD_ONLY );
}

@Override
public ScrollableResultsImplementor scroll(ScrollMode scrollMode) {
public ScrollableResultsImplementor<R> scroll(ScrollMode scrollMode) {
if ( !ScrollMode.FORWARD_ONLY.equals( scrollMode ) ) {
throw log.canOnlyUseScrollWithScrollModeForwardsOnly( scrollMode );
}
Expand Down

0 comments on commit 02c0a8e

Please sign in to comment.