Skip to content

Commit 5875bf3

Browse files
committed
Polishing.
1 parent 33c4bb2 commit 5875bf3

File tree

1 file changed

+48
-32
lines changed

1 file changed

+48
-32
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
1+
/*
2+
* Copyright 2022 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
116
package org.springframework.data.elasticsearch.core.query;
217

3-
import static org.assertj.core.api.Assertions.assertThat;
18+
import static org.assertj.core.api.Assertions.*;
419

520
import java.util.List;
621

@@ -10,38 +25,39 @@
1025

1126
/**
1227
* @author owen.qq
28+
* @since 4.4
1329
*/
1430
public class NativeSearchQueryBuilderTests {
1531

16-
@Test // #2105
17-
void shouldContainEffectiveSearchAfterValue() {
18-
Long lastSortValue = 1L;
19-
List<Object> searchAfter = Lists.newArrayList(lastSortValue);
20-
21-
NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder();
22-
nativeSearchQueryBuilder.withSearchAfter(searchAfter);
23-
NativeSearchQuery nativeSearchQuery = nativeSearchQueryBuilder.build();
24-
25-
assertThat(nativeSearchQuery.getSearchAfter()).isNotNull();
26-
}
27-
28-
@Test // #2105
29-
void shouldIgnoreNullableSearchAfterValue() {
30-
List<Object> emptySearchValueByFirstSearch = null;
31-
NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder();
32-
nativeSearchQueryBuilder.withSearchAfter(emptySearchValueByFirstSearch);
33-
NativeSearchQuery nativeSearchQuery = nativeSearchQueryBuilder.build();
34-
35-
assertThat(nativeSearchQuery.getSearchAfter()).isNull();
36-
}
37-
38-
@Test // #2105
39-
void shouldIgnoreEmptySearchAfterValue() {
40-
List<Object> emptySearchValueByFirstSearch = Lists.newArrayList();
41-
NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder();
42-
nativeSearchQueryBuilder.withSearchAfter(emptySearchValueByFirstSearch);
43-
NativeSearchQuery nativeSearchQuery = nativeSearchQueryBuilder.build();
44-
45-
assertThat(nativeSearchQuery.getSearchAfter()).isNull();
46-
}
32+
@Test // #2105
33+
void shouldContainEffectiveSearchAfterValue() {
34+
Long lastSortValue = 1L;
35+
List<Object> searchAfter = Lists.newArrayList(lastSortValue);
36+
37+
NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder();
38+
nativeSearchQueryBuilder.withSearchAfter(searchAfter);
39+
NativeSearchQuery nativeSearchQuery = nativeSearchQueryBuilder.build();
40+
41+
assertThat(nativeSearchQuery.getSearchAfter()).isNotNull();
42+
}
43+
44+
@Test // #2105
45+
void shouldIgnoreNullableSearchAfterValue() {
46+
List<Object> emptySearchValueByFirstSearch = null;
47+
NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder();
48+
nativeSearchQueryBuilder.withSearchAfter(emptySearchValueByFirstSearch);
49+
NativeSearchQuery nativeSearchQuery = nativeSearchQueryBuilder.build();
50+
51+
assertThat(nativeSearchQuery.getSearchAfter()).isNull();
52+
}
53+
54+
@Test // #2105
55+
void shouldIgnoreEmptySearchAfterValue() {
56+
List<Object> emptySearchValueByFirstSearch = Lists.newArrayList();
57+
NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder();
58+
nativeSearchQueryBuilder.withSearchAfter(emptySearchValueByFirstSearch);
59+
NativeSearchQuery nativeSearchQuery = nativeSearchQueryBuilder.build();
60+
61+
assertThat(nativeSearchQuery.getSearchAfter()).isNull();
62+
}
4763
}

0 commit comments

Comments
 (0)