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

Polishing

Browse Source
This commit is contained in:
rstoyanchev
2023-04-21 08:55:00 +01:00
parent fb6a225193
commit a868331c4f
3 changed files with 80 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AnnotatedControllerConfigurer.java
View File

@@ -640,6 +640,11 @@ public class AnnotatedControllerConfigurer implements ApplicationContextAware, I
this.subscription = this.info.getCoordinates().getTypeName().equalsIgnoreCase("Subscription");
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forMethodReturnType(this.info.getHandlerMethod().getMethod());
}
/**
* Return the {@link HandlerMethod} used to fetch data.
*/
@@ -697,11 +702,6 @@ public class AnnotatedControllerConfigurer implements ApplicationContextAware, I
.switchIfEmpty(Mono.error(ex));
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forMethodReturnType(this.info.getHandlerMethod().getMethod());
}
}

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

@@ -640,7 +640,8 @@ public abstract class QueryByExampleDataFetcher<T> {
}
private static class SingleEntityFetcher<T, R> extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<R> {
private static class SingleEntityFetcher<T, R>
extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<R> {
private final QueryByExampleExecutor<T> executor;
@@ -657,6 +658,11 @@ public abstract class QueryByExampleDataFetcher<T> {
this.sort = sort;
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClass(this.resultType);
}
@Override
@SuppressWarnings({"ConstantConditions", "unchecked"})
public R get(DataFetchingEnvironment env) throws BindException {
@@ -679,14 +685,11 @@ public abstract class QueryByExampleDataFetcher<T> {
}).orElse(null);
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClass(this.resultType);
}
}
private static class ManyEntityFetcher<T, R> extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Iterable<R>> {
private static class ManyEntityFetcher<T, R>
extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Iterable<R>> {
private final QueryByExampleExecutor<T> executor;
@@ -704,6 +707,11 @@ public abstract class QueryByExampleDataFetcher<T> {
this.sort = sort;
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Iterable.class, this.resultType);
}
@Override
@SuppressWarnings("unchecked")
public Iterable<R> get(DataFetchingEnvironment env) throws BindException {
@@ -729,11 +737,6 @@ public abstract class QueryByExampleDataFetcher<T> {
return queryToUse.all();
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Iterable.class, this.resultType);
}
}
@@ -760,6 +763,11 @@ public abstract class QueryByExampleDataFetcher<T> {
this.scrollableResultType = ResolvableType.forClassWithGenerics(Window.class, resultType);
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Iterable.class, this.scrollableResultType);
}
@SuppressWarnings("OptionalGetWithoutIsPresent")
@Override
protected Iterable<R> getResult(FluentQuery.FetchableFluentQuery<R> queryToUse, DataFetchingEnvironment env) {
@@ -769,15 +777,11 @@ public abstract class QueryByExampleDataFetcher<T> {
return queryToUse.limit(limit).scroll(position);
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Iterable.class, this.scrollableResultType);
}
}
private static class ReactiveSingleEntityFetcher<T, R> extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Mono<R>> {
private static class ReactiveSingleEntityFetcher<T, R>
extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Mono<R>> {
private final ReactiveQueryByExampleExecutor<T> executor;
@@ -795,6 +799,11 @@ public abstract class QueryByExampleDataFetcher<T> {
this.sort = sort;
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Mono.class, this.resultType);
}
@Override
@SuppressWarnings("unchecked")
public Mono<R> get(DataFetchingEnvironment env) throws BindException {
@@ -816,15 +825,11 @@ public abstract class QueryByExampleDataFetcher<T> {
});
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Mono.class, this.resultType);
}
}
private static class ReactiveManyEntityFetcher<T, R> extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Flux<R>> {
private static class ReactiveManyEntityFetcher<T, R>
extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Flux<R>> {
private final ReactiveQueryByExampleExecutor<T> executor;
@@ -842,6 +847,11 @@ public abstract class QueryByExampleDataFetcher<T> {
this.sort = sort;
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Flux.class, this.resultType);
}
@Override
@SuppressWarnings("unchecked")
public Flux<R> get(DataFetchingEnvironment env) throws BindException {
@@ -863,15 +873,11 @@ public abstract class QueryByExampleDataFetcher<T> {
});
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Flux.class, this.resultType);
}
}
private static class ReactiveScrollableEntityFetcher<T, R> extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Mono<Iterable<R>>> {
private static class ReactiveScrollableEntityFetcher<T, R>
extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Mono<Iterable<R>>> {
private final ReactiveQueryByExampleExecutor<T> executor;
@@ -901,6 +907,11 @@ public abstract class QueryByExampleDataFetcher<T> {
this.sort = sort;
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Mono.class, this.scrollableResultType);
}
@Override
@SuppressWarnings({"unchecked", "OptionalGetWithoutIsPresent"})
public Mono<Iterable<R>> get(DataFetchingEnvironment env) throws BindException {
@@ -926,11 +937,6 @@ public abstract class QueryByExampleDataFetcher<T> {
});
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Mono.class, this.scrollableResultType);
}
}
}

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

@@ -734,7 +734,8 @@ public abstract class QuerydslDataFetcher<T> {
}
private static class SingleEntityFetcher<T, R> extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<R> {
private static class SingleEntityFetcher<T, R>
extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<R> {
private final QuerydslPredicateExecutor<T> executor;
@@ -755,6 +756,11 @@ public abstract class QuerydslDataFetcher<T> {
this.sort = sort;
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClass(this.resultType);
}
@Override
@SuppressWarnings({"ConstantConditions", "unchecked"})
public R get(DataFetchingEnvironment env) {
@@ -777,14 +783,11 @@ public abstract class QuerydslDataFetcher<T> {
}).orElse(null);
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClass(this.resultType);
}
}
private static class ManyEntityFetcher<T, R> extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Iterable<R>> {
private static class ManyEntityFetcher<T, R>
extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Iterable<R>> {
private final QuerydslPredicateExecutor<T> executor;
@@ -805,6 +808,11 @@ public abstract class QuerydslDataFetcher<T> {
this.sort = sort;
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Iterable.class, this.resultType);
}
@Override
@SuppressWarnings("unchecked")
public Iterable<R> get(DataFetchingEnvironment env) {
@@ -830,11 +838,6 @@ public abstract class QuerydslDataFetcher<T> {
return queryToUse.all();
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Iterable.class, this.resultType);
}
}
@@ -872,7 +875,8 @@ public abstract class QuerydslDataFetcher<T> {
}
private static class ReactiveSingleEntityFetcher<T, R> extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Mono<R>> {
private static class ReactiveSingleEntityFetcher<T, R>
extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Mono<R>> {
private final ReactiveQuerydslPredicateExecutor<T> executor;
@@ -893,6 +897,11 @@ public abstract class QuerydslDataFetcher<T> {
this.sort = sort;
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Mono.class, this.resultType);
}
@Override
@SuppressWarnings("unchecked")
public Mono<R> get(DataFetchingEnvironment env) {
@@ -914,15 +923,11 @@ public abstract class QuerydslDataFetcher<T> {
});
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Mono.class, this.resultType);
}
}
private static class ReactiveManyEntityFetcher<T, R> extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Flux<R>> {
private static class ReactiveManyEntityFetcher<T, R>
extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Flux<R>> {
private final ReactiveQuerydslPredicateExecutor<T> executor;
@@ -943,6 +948,11 @@ public abstract class QuerydslDataFetcher<T> {
this.sort = sort;
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Flux.class, this.resultType);
}
@Override
@SuppressWarnings("unchecked")
public Flux<R> get(DataFetchingEnvironment env) {
@@ -964,15 +974,11 @@ public abstract class QuerydslDataFetcher<T> {
});
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Flux.class, this.resultType);
}
}
private static class ReactiveScrollableEntityFetcher<T, R> extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Mono<Iterable<R>>> {
private static class ReactiveScrollableEntityFetcher<T, R>
extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Mono<Iterable<R>>> {
private final ReactiveQuerydslPredicateExecutor<T> executor;
@@ -1006,6 +1012,11 @@ public abstract class QuerydslDataFetcher<T> {
this.sort = sort;
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Mono.class, this.scrollableResultType);
}
@Override
@SuppressWarnings({"unchecked", "OptionalGetWithoutIsPresent"})
public Mono<Iterable<R>> get(DataFetchingEnvironment env) {
@@ -1031,11 +1042,6 @@ public abstract class QuerydslDataFetcher<T> {
});
}
@Override
public ResolvableType getReturnType() {
return ResolvableType.forClassWithGenerics(Mono.class, this.scrollableResultType);
}
}
}