Spring/spring-graphql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure DataLoaderOptions are per request

Browse Source 
See gh-212
This commit is contained in:
Rossen Stoyanchev
2021-12-07 20:56:18 +00:00
parent b78808d54d
commit e6453ef9b0
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
spring-graphql/src/main/java/org/springframework/graphql/execution/DefaultBatchLoaderRegistry.java
View File

@@ -68,13 +68,14 @@ public class DefaultBatchLoaderRegistry implements BatchLoaderRegistry {
@Override
public void registerDataLoaders(DataLoaderRegistry registry, GraphQLContext context) {
BatchLoaderContextProvider contextProvider = () -> context;
DataLoaderOptions defaultOptions = DataLoaderOptions.newOptions().setBatchLoaderContextProvider(contextProvider);
for (ReactorBatchLoader<?, ?> loader : this.loaders) {
DataLoaderOptions options = loader.getOptions().setBatchLoaderContextProvider(contextProvider);
DataLoaderOptions options = loader.getOptionsOrDefault(contextProvider, defaultOptions);
DataLoader<?, ?> dataLoader = DataLoaderFactory.newDataLoader(loader, options);
registerDataLoader(loader.getName(), dataLoader, registry);
}
for (ReactorMappedBatchLoader<?, ?> loader : this.mappedLoaders) {
DataLoaderOptions options = loader.getOptions().setBatchLoaderContextProvider(contextProvider);
DataLoaderOptions options = loader.getOptionsOrDefault(contextProvider, defaultOptions);
DataLoader<?, ?> dataLoader = DataLoaderFactory.newMappedDataLoader(loader, options);
registerDataLoader(loader.getName(), dataLoader, registry);
}
@@ -96,7 +97,8 @@ public class DefaultBatchLoaderRegistry implements BatchLoaderRegistry {
@Nullable
private String name;
private DataLoaderOptions options = DataLoaderOptions.newOptions();
@Nullable
private DataLoaderOptions options;
public DefaultRegistrationSpec(Class<V> valueType) {
this.valueType = valueType;
@@ -115,6 +117,7 @@ public class DefaultBatchLoaderRegistry implements BatchLoaderRegistry {
@Override
public RegistrationSpec<K, V> withOptions(Consumer<DataLoaderOptions> optionsConsumer) {
this.options = (this.options != null ? this.options : DataLoaderOptions.newOptions());
optionsConsumer.accept(this.options);
return this;
}
@@ -157,11 +160,12 @@ public class DefaultBatchLoaderRegistry implements BatchLoaderRegistry {
private final BiFunction<List<K>, BatchLoaderEnvironment, Flux<V>> loader;
@Nullable
private final DataLoaderOptions options;
private ReactorBatchLoader(String name,
BiFunction<List<K>, BatchLoaderEnvironment, Flux<V>> loader,
DataLoaderOptions options) {
@Nullable DataLoaderOptions options) {
this.name = name;
this.loader = loader;
@@ -172,8 +176,14 @@ public class DefaultBatchLoaderRegistry implements BatchLoaderRegistry {
return this.name;
}
public DataLoaderOptions getOptions() {
return this.options;
public DataLoaderOptions getOptionsOrDefault(
BatchLoaderContextProvider provider, DataLoaderOptions defaultOptions) {
if (this.options != null) {
return new DataLoaderOptions(this.options).setBatchLoaderContextProvider(provider);
}
return defaultOptions;
}
@Override
@@ -201,11 +211,12 @@ public class DefaultBatchLoaderRegistry implements BatchLoaderRegistry {
private final BiFunction<Set<K>, BatchLoaderEnvironment, Mono<Map<K, V>>> loader;
@Nullable
private final DataLoaderOptions options;
private ReactorMappedBatchLoader(String name,
BiFunction<Set<K>, BatchLoaderEnvironment, Mono<Map<K, V>>> loader,
DataLoaderOptions options) {
@Nullable DataLoaderOptions options) {
this.name = name;
this.loader = loader;
@@ -216,8 +227,14 @@ public class DefaultBatchLoaderRegistry implements BatchLoaderRegistry {
return this.name;
}
public DataLoaderOptions getOptions() {
return this.options;
public DataLoaderOptions getOptionsOrDefault(
BatchLoaderContextProvider provider, DataLoaderOptions defaultOptions) {
if (this.options != null) {
return new DataLoaderOptions(this.options).setBatchLoaderContextProvider(provider);
}
return defaultOptions;
}
@Override