Skip to content

Commit

Permalink
HSEARCH-3798 Fix obsolete lambda parameter names in FieldSearchSortIT
Browse files Browse the repository at this point in the history
  • Loading branch information
@yrodiere @fax4ever
yrodiere authored and fax4ever committed Jan 20, 2020
1 parent fd976cd commit 2833281
Showing 1 changed file with 44 additions and 44 deletions.
88 changes: 44 additions & 44 deletions .../java/org/hibernate/search/integrationtest/backend/tck/search/sort/FieldSearchSortIT.java
View file
Expand Up @@ -156,37 +156,37 @@ public void simple() {
String fieldPath = fieldModel.relativeFieldName;

// Default order
query = simpleQuery( b -> b.field( fieldPath ).missing().last() );
query = simpleQuery( f -> f.field( fieldPath ).missing().last() );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3, EMPTY );

// Explicit order with missing().last()
query = simpleQuery( b -> b.field( fieldPath ).asc().missing().last() );
query = simpleQuery( f -> f.field( fieldPath ).asc().missing().last() );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3, EMPTY );
query = simpleQuery( b -> b.field( fieldPath ).desc().missing().last() );
query = simpleQuery( f -> f.field( fieldPath ).desc().missing().last() );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_3, DOCUMENT_2, DOCUMENT_1, EMPTY );

// Explicit order with missing().first()
query = simpleQuery( b -> b.field( fieldPath ).asc().missing().first() );
query = simpleQuery( f -> f.field( fieldPath ).asc().missing().first() );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, EMPTY, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3 );
query = simpleQuery( b -> b.field( fieldPath ).desc().missing().first() );
query = simpleQuery( f -> f.field( fieldPath ).desc().missing().first() );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, EMPTY, DOCUMENT_3, DOCUMENT_2, DOCUMENT_1 );

// Explicit order with missing().use( ... )
query = simpleQuery( b -> b.field( fieldPath ).asc().missing().use( fieldModel.before1Value ) );
query = simpleQuery( f -> f.field( fieldPath ).asc().missing().use( fieldModel.before1Value ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, EMPTY, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3 );
query = simpleQuery( b -> b.field( fieldPath ).asc().missing().use( fieldModel.between1And2Value ) );
query = simpleQuery( f -> f.field( fieldPath ).asc().missing().use( fieldModel.between1And2Value ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, EMPTY, DOCUMENT_2, DOCUMENT_3 );
query = simpleQuery( b -> b.field( fieldPath ).asc().missing().use( fieldModel.between2And3Value ) );
query = simpleQuery( f -> f.field( fieldPath ).asc().missing().use( fieldModel.between2And3Value ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, DOCUMENT_2, EMPTY, DOCUMENT_3 );
query = simpleQuery( b -> b.field( fieldPath ).asc().missing().use( fieldModel.after3Value ) );
query = simpleQuery( f -> f.field( fieldPath ).asc().missing().use( fieldModel.after3Value ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3, EMPTY );
}
Expand All @@ -202,28 +202,28 @@ public void multipleEmpty_missingValue() {
String fieldPath = fieldModel.relativeFieldName;

// using before 1 value
docRefHits = simpleQuery( b -> b.field( fieldPath ).asc().missing().use( fieldModel.before1Value ), scope ).fetchAllHits();
docRefHits = simpleQuery( f -> f.field( fieldPath ).asc().missing().use( fieldModel.before1Value ), scope ).fetchAllHits();
assertThat( docRefHits ).ordinals( 0, 1, 2, 3 ).hasDocRefHitsAnyOrder( MULTIPLE_EMPTY_INDEX_NAME, EMPTY_1, EMPTY_2, EMPTY_3, EMPTY_4 );
assertThat( docRefHits ).ordinal( 4 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_1 );
assertThat( docRefHits ).ordinal( 5 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_2 );
assertThat( docRefHits ).ordinal( 6 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_3 );

// using between 1 and 2 value
docRefHits = simpleQuery( b -> b.field( fieldPath ).asc().missing().use( fieldModel.between1And2Value ), scope ).fetchAllHits();
docRefHits = simpleQuery( f -> f.field( fieldPath ).asc().missing().use( fieldModel.between1And2Value ), scope ).fetchAllHits();
assertThat( docRefHits ).ordinal( 0 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_1 );
assertThat( docRefHits ).ordinals( 1, 2, 3, 4 ).hasDocRefHitsAnyOrder( MULTIPLE_EMPTY_INDEX_NAME, EMPTY_1, EMPTY_2, EMPTY_3, EMPTY_4 );
assertThat( docRefHits ).ordinal( 5 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_2 );
assertThat( docRefHits ).ordinal( 6 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_3 );

// using between 2 and 3 value
docRefHits = simpleQuery( b -> b.field( fieldPath ).asc().missing().use( fieldModel.between2And3Value ), scope ).fetchAllHits();
docRefHits = simpleQuery( f -> f.field( fieldPath ).asc().missing().use( fieldModel.between2And3Value ), scope ).fetchAllHits();
assertThat( docRefHits ).ordinal( 0 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_1 );
assertThat( docRefHits ).ordinal( 1 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_2 );
assertThat( docRefHits ).ordinals( 2, 3, 4, 5 ).hasDocRefHitsAnyOrder( MULTIPLE_EMPTY_INDEX_NAME, EMPTY_1, EMPTY_2, EMPTY_3, EMPTY_4 );
assertThat( docRefHits ).ordinal( 6 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_3 );

// using after 3 value
docRefHits = simpleQuery( b -> b.field( fieldPath ).asc().missing().use( fieldModel.after3Value ), scope ).fetchAllHits();
docRefHits = simpleQuery( f -> f.field( fieldPath ).asc().missing().use( fieldModel.after3Value ), scope ).fetchAllHits();
assertThat( docRefHits ).ordinal( 0 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_1 );
assertThat( docRefHits ).ordinal( 1 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_2 );
assertThat( docRefHits ).ordinal( 2 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_3 );
Expand All @@ -245,19 +245,19 @@ public void multipleEmpty_alreadyExists_missingValue() {
Object docValue3 = normalizeIfNecessary( fieldModel.document3Value.indexedValue );

// using doc 1 value
docRefHits = simpleQuery( b -> b.field( fieldPath ).asc().missing().use( docValue1 ), scope ).fetchAllHits();
docRefHits = simpleQuery( f -> f.field( fieldPath ).asc().missing().use( docValue1 ), scope ).fetchAllHits();
assertThat( docRefHits ).ordinals( 0, 1, 2, 3, 4 ).hasDocRefHitsAnyOrder( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_1, EMPTY_1, EMPTY_2, EMPTY_3, EMPTY_4 );
assertThat( docRefHits ).ordinal( 5 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_2 );
assertThat( docRefHits ).ordinal( 6 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_3 );

// using doc 2 value
docRefHits = simpleQuery( b -> b.field( fieldPath ).asc().missing().use( docValue2 ), scope ).fetchAllHits();
docRefHits = simpleQuery( f -> f.field( fieldPath ).asc().missing().use( docValue2 ), scope ).fetchAllHits();
assertThat( docRefHits ).ordinal( 0 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_1 );
assertThat( docRefHits ).ordinals( 1, 2, 3, 4, 5 ).hasDocRefHitsAnyOrder( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_2, EMPTY_1, EMPTY_2, EMPTY_3, EMPTY_4 );
assertThat( docRefHits ).ordinal( 6 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_3 );

// using doc 3 value
docRefHits = simpleQuery( b -> b.field( fieldPath ).asc().missing().use( docValue3 ), scope ).fetchAllHits();
docRefHits = simpleQuery( f -> f.field( fieldPath ).asc().missing().use( docValue3 ), scope ).fetchAllHits();
assertThat( docRefHits ).ordinal( 0 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_1 );
assertThat( docRefHits ).ordinal( 1 ).isDocRefHit( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_2 );
assertThat( docRefHits ).ordinals( 2, 3, 4, 5, 6 ).hasDocRefHitsAnyOrder( MULTIPLE_EMPTY_INDEX_NAME, DOCUMENT_3, EMPTY_1, EMPTY_2, EMPTY_3, EMPTY_4 );
Expand All @@ -270,19 +270,19 @@ public void withDslConverters_dslConverterEnabled() {
SearchQuery<DocumentReference> query;
String fieldPath = fieldModel.relativeFieldName;

query = simpleQuery( b -> b.field( fieldPath ).asc().missing()
query = simpleQuery( f -> f.field( fieldPath ).asc().missing()
.use( new ValueWrapper<>( fieldModel.before1Value ) ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, EMPTY, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3 );
query = simpleQuery( b -> b.field( fieldPath ).asc().missing()
query = simpleQuery( f -> f.field( fieldPath ).asc().missing()
.use( new ValueWrapper<>( fieldModel.between1And2Value ) ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, EMPTY, DOCUMENT_2, DOCUMENT_3 );
query = simpleQuery( b -> b.field( fieldPath ).asc().missing()
query = simpleQuery( f -> f.field( fieldPath ).asc().missing()
.use( new ValueWrapper<>( fieldModel.between2And3Value ) ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, DOCUMENT_2, EMPTY, DOCUMENT_3 );
query = simpleQuery( b -> b.field( fieldPath ).asc().missing()
query = simpleQuery( f -> f.field( fieldPath ).asc().missing()
.use( new ValueWrapper<>( fieldModel.after3Value ) ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3, EMPTY );
Expand All @@ -295,19 +295,19 @@ public void withDslConverters_dslConverterDisabled() {
SearchQuery<DocumentReference> query;
String fieldPath = fieldModel.relativeFieldName;

query = simpleQuery( b -> b.field( fieldPath ).asc().missing()
query = simpleQuery( f -> f.field( fieldPath ).asc().missing()
.use( fieldModel.before1Value, ValueConvert.NO ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, EMPTY, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3 );
query = simpleQuery( b -> b.field( fieldPath ).asc().missing()
query = simpleQuery( f -> f.field( fieldPath ).asc().missing()
.use( fieldModel.between1And2Value, ValueConvert.NO ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, EMPTY, DOCUMENT_2, DOCUMENT_3 );
query = simpleQuery( b -> b.field( fieldPath ).asc().missing()
query = simpleQuery( f -> f.field( fieldPath ).asc().missing()
.use( fieldModel.between2And3Value, ValueConvert.NO ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, DOCUMENT_2, EMPTY, DOCUMENT_3 );
query = simpleQuery( b -> b.field( fieldPath ).asc().missing()
query = simpleQuery( f -> f.field( fieldPath ).asc().missing()
.use( fieldModel.after3Value, ValueConvert.NO ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3, EMPTY );
Expand All @@ -320,23 +320,23 @@ public void inFlattenedObject() {
SearchQuery<DocumentReference> query;
String fieldPath = indexMapping.flattenedObject.relativeFieldName + "." + fieldModel.relativeFieldName;

query = simpleQuery( b -> b.field( fieldPath ).missing().last() );
query = simpleQuery( f -> f.field( fieldPath ).missing().last() );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3, EMPTY );

query = simpleQuery( b -> b.field( fieldPath ).asc().missing().last() );
query = simpleQuery( f -> f.field( fieldPath ).asc().missing().last() );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3, EMPTY );

query = simpleQuery( b -> b.field( fieldPath ).desc().missing().last() );
query = simpleQuery( f -> f.field( fieldPath ).desc().missing().last() );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_3, DOCUMENT_2, DOCUMENT_1, EMPTY );

query = simpleQuery( b -> b.field( fieldPath ).asc().missing().first() );
query = simpleQuery( f -> f.field( fieldPath ).asc().missing().first() );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, EMPTY, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3 );

query = simpleQuery( b -> b.field( fieldPath ).desc().missing().first() );
query = simpleQuery( f -> f.field( fieldPath ).desc().missing().first() );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, EMPTY, DOCUMENT_3, DOCUMENT_2, DOCUMENT_1 );
}
Expand All @@ -349,37 +349,37 @@ public void byField_inNestedObject() {
SearchQuery<DocumentReference> query;
String fieldPath = indexMapping.nestedObject.relativeFieldName + "." + fieldModel.relativeFieldName;

query = simpleQuery( b -> b.field( fieldPath ).missing().last() );
query = simpleQuery( f -> f.field( fieldPath ).missing().last() );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3, EMPTY );

query = simpleQuery( b -> b.field( fieldPath ).asc().missing().last() );
query = simpleQuery( f -> f.field( fieldPath ).asc().missing().last() );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3, EMPTY );

query = simpleQuery( b -> b.field( fieldPath ).desc().missing().last() );
query = simpleQuery( f -> f.field( fieldPath ).desc().missing().last() );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_3, DOCUMENT_2, DOCUMENT_1, EMPTY );

query = simpleQuery( b -> b.field( fieldPath ).asc().missing().first() );
query = simpleQuery( f -> f.field( fieldPath ).asc().missing().first() );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, EMPTY, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3 );

query = simpleQuery( b -> b.field( fieldPath ).desc().missing().first() );
query = simpleQuery( f -> f.field( fieldPath ).desc().missing().first() );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, EMPTY, DOCUMENT_3, DOCUMENT_2, DOCUMENT_1 );

// Explicit order with onMissingValue().use( ... )
query = simpleQuery( b -> b.field( fieldPath ).asc().missing().use( fieldModel.before1Value ) );
query = simpleQuery( f -> f.field( fieldPath ).asc().missing().use( fieldModel.before1Value ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, EMPTY, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3 );
query = simpleQuery( b -> b.field( fieldPath ).asc().missing().use( fieldModel.between1And2Value ) );
query = simpleQuery( f -> f.field( fieldPath ).asc().missing().use( fieldModel.between1And2Value ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, EMPTY, DOCUMENT_2, DOCUMENT_3 );
query = simpleQuery( b -> b.field( fieldPath ).asc().missing().use( fieldModel.between2And3Value ) );
query = simpleQuery( f -> f.field( fieldPath ).asc().missing().use( fieldModel.between2And3Value ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, DOCUMENT_2, EMPTY, DOCUMENT_3 );
query = simpleQuery( b -> b.field( fieldPath ).asc().missing().use( fieldModel.after3Value ) );
query = simpleQuery( f -> f.field( fieldPath ).asc().missing().use( fieldModel.after3Value ) );
assertThat( query )
.hasDocRefHitsExactOrder( INDEX_NAME, DOCUMENT_1, DOCUMENT_2, DOCUMENT_3, EMPTY );
}
Expand Down Expand Up @@ -488,7 +488,7 @@ public void multiIndex_withCompatibleIndexManager_usingField() {
SearchQuery<DocumentReference> query;
String fieldPath = fieldModel.relativeFieldName;

query = simpleQuery( b -> b.field( fieldPath ).asc().missing()
query = simpleQuery( f -> f.field( fieldPath ).asc().missing()
.use( fieldModel.before1Value ), scope );

/*
Expand All @@ -515,7 +515,7 @@ public void multiIndex_withRawFieldCompatibleIndexManager_dslConverterEnabled()

SubTest.expectException(
() -> {
simpleQuery( b -> b.field( fieldPath ).asc().missing()
simpleQuery( f -> f.field( fieldPath ).asc().missing()
.use( new ValueWrapper<>( fieldModel.before1Value ) ), scope );
}
)
Expand All @@ -537,7 +537,7 @@ public void multiIndex_withRawFieldCompatibleIndexManager_dslConverterDisabled()
SearchQuery<DocumentReference> query;
String fieldPath = fieldModel.relativeFieldName;

query = simpleQuery( b -> b.field( fieldPath ).asc().missing()
query = simpleQuery( f -> f.field( fieldPath ).asc().missing()
.use( fieldModel.before1Value, ValueConvert.NO ), scope );

/*
Expand All @@ -564,7 +564,7 @@ public void multiIndex_withNoCompatibleIndexManager_dslConverterEnabled() {

SubTest.expectException(
() -> {
simpleQuery( b -> b.field( fieldPath ), scope );
simpleQuery( f -> f.field( fieldPath ), scope );
}
)
.assertThrown()
Expand All @@ -586,7 +586,7 @@ public void multiIndex_withNoCompatibleIndexManager_dslConverterDisabled() {

SubTest.expectException(
() -> {
simpleQuery( b -> b.field( fieldPath ), scope );
simpleQuery( f -> f.field( fieldPath ), scope );
}
)
.assertThrown()
Expand All @@ -606,7 +606,7 @@ public void multiIndex_incompatibleDecimalScale() {

SubTest.expectException(
() -> {
simpleQuery( b -> b.field( fieldPath ), scope );
simpleQuery( f -> f.field( fieldPath ), scope );
}
)
.assertThrown()
Expand Down

0 comments on commit 2833281

Please sign in to comment.