Skip to content

Commit dedebf4

Browse files
committed
Make CursorStrategy and default ScrollSubrange nullable
See gh-597
1 parent d485dcc commit dedebf4

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

spring-graphql/src/main/java/org/springframework/graphql/data/query/QueryByExampleDataFetcher.java

+10-11
Original file line numberDiff line numberDiff line change
@@ -195,18 +195,15 @@ public static <T> ReactiveBuilder<T, T> builder(ReactiveQueryByExampleExecutor<T
195195

196196
/**
197197
* Variation of {@link #autoRegistrationConfigurer(List, List, CursorStrategy, ScrollSubrange)}
198-
* that defaults to the following:
199-
* <ul>
200-
* <li>{@link ScrollPositionCursorStrategy} with Base64 encoding.
201-
* <li>{@link OffsetScrollPosition Offset}-based scrolling with 20 items at a time
202-
* </ul>
198+
* without a {@code CursorStrategy} and default {@link ScrollSubrange}.
199+
* For default values, see the respective methods on {@link Builder} and
200+
* {@link ReactiveBuilder}.
203201
*/
204202
public static RuntimeWiringConfigurer autoRegistrationConfigurer(
205203
List<QueryByExampleExecutor<?>> executors,
206204
List<ReactiveQueryByExampleExecutor<?>> reactiveExecutors) {
207205

208-
return autoRegistrationConfigurer(executors, reactiveExecutors,
209-
RepositoryUtils.defaultCursorStrategy(), RepositoryUtils.defaultScrollSubrange());
206+
return autoRegistrationConfigurer(executors, reactiveExecutors, null, null);
210207
}
211208

212209
/**
@@ -220,16 +217,18 @@ public static RuntimeWiringConfigurer autoRegistrationConfigurer(
220217
*
221218
* @param executors repositories to consider for registration
222219
* @param reactiveExecutors reactive repositories to consider for registration
223-
* @param cursorStrategy for decoding cursors in pagination requests
224-
* @param defaultScrollSubrange default parameters for scrolling
220+
* @param cursorStrategy for decoding cursors in pagination requests;
221+
* if {@code null}, then {@link Builder#cursorStrategy} defaults apply.
222+
* @param defaultScrollSubrange default parameters for scrolling;
223+
* if {@code null}, then {@link Builder#defaultScrollSubrange} defaults apply.
225224
* @return the created configurer
226225
* @since 1.2
227226
*/
228227
public static RuntimeWiringConfigurer autoRegistrationConfigurer(
229228
List<QueryByExampleExecutor<?>> executors,
230229
List<ReactiveQueryByExampleExecutor<?>> reactiveExecutors,
231-
CursorStrategy<ScrollPosition> cursorStrategy,
232-
ScrollSubrange defaultScrollSubrange) {
230+
@Nullable CursorStrategy<ScrollPosition> cursorStrategy,
231+
@Nullable ScrollSubrange defaultScrollSubrange) {
233232

234233
Map<String, DataFetcherFactory> factories = new HashMap<>();
235234

spring-graphql/src/main/java/org/springframework/graphql/data/query/QuerydslDataFetcher.java

+10-9
Original file line numberDiff line numberDiff line change
@@ -219,18 +219,15 @@ public static <T> ReactiveBuilder<T, T> builder(ReactiveQuerydslPredicateExecuto
219219

220220
/**
221221
* Variation of {@link #autoRegistrationConfigurer(List, List, CursorStrategy, ScrollSubrange)}
222-
* that defaults to the following:
223-
* <ul>
224-
* <li>{@link ScrollPositionCursorStrategy} with Base64 encoding.
225-
* <li>{@link OffsetScrollPosition Offset}-based scrolling with 20 items at a time
226-
* </ul>
222+
* without a {@code CursorStrategy} and default {@link ScrollSubrange}.
223+
* For default values, see the respective methods on {@link Builder} and
224+
* {@link ReactiveBuilder}.
227225
*/
228226
public static RuntimeWiringConfigurer autoRegistrationConfigurer(
229227
List<QuerydslPredicateExecutor<?>> executors,
230228
List<ReactiveQuerydslPredicateExecutor<?>> reactiveExecutors) {
231229

232-
return autoRegistrationConfigurer(executors, reactiveExecutors,
233-
RepositoryUtils.defaultCursorStrategy(), RepositoryUtils.defaultScrollSubrange());
230+
return autoRegistrationConfigurer(executors, reactiveExecutors, null, null);
234231
}
235232

236233
/**
@@ -247,15 +244,19 @@ public static RuntimeWiringConfigurer autoRegistrationConfigurer(
247244
*
248245
* @param executors repositories to consider for registration
249246
* @param reactiveExecutors reactive repositories to consider for registration
247+
* @param cursorStrategy for decoding cursors in pagination requests;
248+
* if {@code null}, then {@link Builder#cursorStrategy} defaults apply.
249+
* @param defaultScrollSubrange default parameters for scrolling;
250+
* if {@code null}, then {@link Builder#defaultScrollSubrange} defaults apply.
250251
* @return the created configurer
251252
* @since 1.2
252253
*/
253254
@SuppressWarnings({"unchecked", "rawtypes"})
254255
public static RuntimeWiringConfigurer autoRegistrationConfigurer(
255256
List<QuerydslPredicateExecutor<?>> executors,
256257
List<ReactiveQuerydslPredicateExecutor<?>> reactiveExecutors,
257-
CursorStrategy<ScrollPosition> cursorStrategy,
258-
ScrollSubrange defaultScrollSubrange) {
258+
@Nullable CursorStrategy<ScrollPosition> cursorStrategy,
259+
@Nullable ScrollSubrange defaultScrollSubrange) {
259260

260261
Map<String, DataFetcherFactory> factories = new HashMap<>();
261262

0 commit comments

Comments
 (0)