Skip to content

Commit a868331

Browse files
rstoyanchevrstoyanchev
committed
Polishing
1 parent fb6a225 commit a868331

File tree

3 files changed

+80
-68
lines changed

3 files changed

+80
-68
lines changed

‎spring-graphql/src/main/java/org/springframework/graphql/data/method/annotation/support/AnnotatedControllerConfigurer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,11 @@ static class SchemaMappingDataFetcher implements SelfDescribingDataFetcher<Objec
640640
this.subscription = this.info.getCoordinates().getTypeName().equalsIgnoreCase("Subscription");
641641
}
642642

643+
@Override
644+
public ResolvableType getReturnType() {
645+
return ResolvableType.forMethodReturnType(this.info.getHandlerMethod().getMethod());
646+
}
647+
643648
/**
644649
* Return the {@link HandlerMethod} used to fetch data.
645650
*/
@@ -697,11 +702,6 @@ private <T> Publisher<T> handleSubscriptionError(
697702
.switchIfEmpty(Mono.error(ex));
698703
}
699704

700-
@Override
701-
public ResolvableType getReturnType() {
702-
return ResolvableType.forMethodReturnType(this.info.getHandlerMethod().getMethod());
703-
}
704-
705705
}
706706

707707

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

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,8 @@ public interface ReactiveQueryByExampleBuilderCustomizer<T> {
640640
}
641641

642642

643-
private static class SingleEntityFetcher<T, R> extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<R> {
643+
private static class SingleEntityFetcher<T, R>
644+
extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<R> {
644645

645646
private final QueryByExampleExecutor<T> executor;
646647

@@ -657,6 +658,11 @@ private static class SingleEntityFetcher<T, R> extends QueryByExampleDataFetcher
657658
this.sort = sort;
658659
}
659660

661+
@Override
662+
public ResolvableType getReturnType() {
663+
return ResolvableType.forClass(this.resultType);
664+
}
665+
660666
@Override
661667
@SuppressWarnings({"ConstantConditions", "unchecked"})
662668
public R get(DataFetchingEnvironment env) throws BindException {
@@ -679,14 +685,11 @@ public R get(DataFetchingEnvironment env) throws BindException {
679685
}).orElse(null);
680686
}
681687

682-
@Override
683-
public ResolvableType getReturnType() {
684-
return ResolvableType.forClass(this.resultType);
685-
}
686688
}
687689

688690

689-
private static class ManyEntityFetcher<T, R> extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Iterable<R>> {
691+
private static class ManyEntityFetcher<T, R>
692+
extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Iterable<R>> {
690693

691694
private final QueryByExampleExecutor<T> executor;
692695

@@ -704,6 +707,11 @@ private static class ManyEntityFetcher<T, R> extends QueryByExampleDataFetcher<T
704707
this.sort = sort;
705708
}
706709

710+
@Override
711+
public ResolvableType getReturnType() {
712+
return ResolvableType.forClassWithGenerics(Iterable.class, this.resultType);
713+
}
714+
707715
@Override
708716
@SuppressWarnings("unchecked")
709717
public Iterable<R> get(DataFetchingEnvironment env) throws BindException {
@@ -729,11 +737,6 @@ protected Iterable<R> getResult(FluentQuery.FetchableFluentQuery<R> queryToUse,
729737
return queryToUse.all();
730738
}
731739

732-
@Override
733-
public ResolvableType getReturnType() {
734-
return ResolvableType.forClassWithGenerics(Iterable.class, this.resultType);
735-
}
736-
737740
}
738741

739742

@@ -760,6 +763,11 @@ private static class ScrollableEntityFetcher<T, R> extends ManyEntityFetcher<T,
760763
this.scrollableResultType = ResolvableType.forClassWithGenerics(Window.class, resultType);
761764
}
762765

766+
@Override
767+
public ResolvableType getReturnType() {
768+
return ResolvableType.forClassWithGenerics(Iterable.class, this.scrollableResultType);
769+
}
770+
763771
@SuppressWarnings("OptionalGetWithoutIsPresent")
764772
@Override
765773
protected Iterable<R> getResult(FluentQuery.FetchableFluentQuery<R> queryToUse, DataFetchingEnvironment env) {
@@ -769,15 +777,11 @@ protected Iterable<R> getResult(FluentQuery.FetchableFluentQuery<R> queryToUse,
769777
return queryToUse.limit(limit).scroll(position);
770778
}
771779

772-
@Override
773-
public ResolvableType getReturnType() {
774-
return ResolvableType.forClassWithGenerics(Iterable.class, this.scrollableResultType);
775-
}
776-
777780
}
778781

779782

780-
private static class ReactiveSingleEntityFetcher<T, R> extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Mono<R>> {
783+
private static class ReactiveSingleEntityFetcher<T, R>
784+
extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Mono<R>> {
781785

782786
private final ReactiveQueryByExampleExecutor<T> executor;
783787

@@ -795,6 +799,11 @@ private static class ReactiveSingleEntityFetcher<T, R> extends QueryByExampleDat
795799
this.sort = sort;
796800
}
797801

802+
@Override
803+
public ResolvableType getReturnType() {
804+
return ResolvableType.forClassWithGenerics(Mono.class, this.resultType);
805+
}
806+
798807
@Override
799808
@SuppressWarnings("unchecked")
800809
public Mono<R> get(DataFetchingEnvironment env) throws BindException {
@@ -816,15 +825,11 @@ public Mono<R> get(DataFetchingEnvironment env) throws BindException {
816825
});
817826
}
818827

819-
@Override
820-
public ResolvableType getReturnType() {
821-
return ResolvableType.forClassWithGenerics(Mono.class, this.resultType);
822-
}
823-
824828
}
825829

826830

827-
private static class ReactiveManyEntityFetcher<T, R> extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Flux<R>> {
831+
private static class ReactiveManyEntityFetcher<T, R>
832+
extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Flux<R>> {
828833

829834
private final ReactiveQueryByExampleExecutor<T> executor;
830835

@@ -842,6 +847,11 @@ private static class ReactiveManyEntityFetcher<T, R> extends QueryByExampleDataF
842847
this.sort = sort;
843848
}
844849

850+
@Override
851+
public ResolvableType getReturnType() {
852+
return ResolvableType.forClassWithGenerics(Flux.class, this.resultType);
853+
}
854+
845855
@Override
846856
@SuppressWarnings("unchecked")
847857
public Flux<R> get(DataFetchingEnvironment env) throws BindException {
@@ -863,15 +873,11 @@ public Flux<R> get(DataFetchingEnvironment env) throws BindException {
863873
});
864874
}
865875

866-
@Override
867-
public ResolvableType getReturnType() {
868-
return ResolvableType.forClassWithGenerics(Flux.class, this.resultType);
869-
}
870-
871876
}
872877

873878

874-
private static class ReactiveScrollableEntityFetcher<T, R> extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Mono<Iterable<R>>> {
879+
private static class ReactiveScrollableEntityFetcher<T, R>
880+
extends QueryByExampleDataFetcher<T> implements SelfDescribingDataFetcher<Mono<Iterable<R>>> {
875881

876882
private final ReactiveQueryByExampleExecutor<T> executor;
877883

@@ -901,6 +907,11 @@ private static class ReactiveScrollableEntityFetcher<T, R> extends QueryByExampl
901907
this.sort = sort;
902908
}
903909

910+
@Override
911+
public ResolvableType getReturnType() {
912+
return ResolvableType.forClassWithGenerics(Mono.class, this.scrollableResultType);
913+
}
914+
904915
@Override
905916
@SuppressWarnings({"unchecked", "OptionalGetWithoutIsPresent"})
906917
public Mono<Iterable<R>> get(DataFetchingEnvironment env) throws BindException {
@@ -926,11 +937,6 @@ public Mono<Iterable<R>> get(DataFetchingEnvironment env) throws BindException {
926937
});
927938
}
928939

929-
@Override
930-
public ResolvableType getReturnType() {
931-
return ResolvableType.forClassWithGenerics(Mono.class, this.scrollableResultType);
932-
}
933-
934940
}
935941

936942
}

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

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,8 @@ public interface ReactiveQuerydslBuilderCustomizer<T> {
734734
}
735735

736736

737-
private static class SingleEntityFetcher<T, R> extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<R> {
737+
private static class SingleEntityFetcher<T, R>
738+
extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<R> {
738739

739740
private final QuerydslPredicateExecutor<T> executor;
740741

@@ -755,6 +756,11 @@ private static class SingleEntityFetcher<T, R> extends QuerydslDataFetcher<T> im
755756
this.sort = sort;
756757
}
757758

759+
@Override
760+
public ResolvableType getReturnType() {
761+
return ResolvableType.forClass(this.resultType);
762+
}
763+
758764
@Override
759765
@SuppressWarnings({"ConstantConditions", "unchecked"})
760766
public R get(DataFetchingEnvironment env) {
@@ -777,14 +783,11 @@ public R get(DataFetchingEnvironment env) {
777783
}).orElse(null);
778784
}
779785

780-
@Override
781-
public ResolvableType getReturnType() {
782-
return ResolvableType.forClass(this.resultType);
783-
}
784786
}
785787

786788

787-
private static class ManyEntityFetcher<T, R> extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Iterable<R>> {
789+
private static class ManyEntityFetcher<T, R>
790+
extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Iterable<R>> {
788791

789792
private final QuerydslPredicateExecutor<T> executor;
790793

@@ -805,6 +808,11 @@ private static class ManyEntityFetcher<T, R> extends QuerydslDataFetcher<T> impl
805808
this.sort = sort;
806809
}
807810

811+
@Override
812+
public ResolvableType getReturnType() {
813+
return ResolvableType.forClassWithGenerics(Iterable.class, this.resultType);
814+
}
815+
808816
@Override
809817
@SuppressWarnings("unchecked")
810818
public Iterable<R> get(DataFetchingEnvironment env) {
@@ -830,11 +838,6 @@ protected Iterable<R> getResult(FetchableFluentQuery<R> queryToUse, DataFetching
830838
return queryToUse.all();
831839
}
832840

833-
@Override
834-
public ResolvableType getReturnType() {
835-
return ResolvableType.forClassWithGenerics(Iterable.class, this.resultType);
836-
}
837-
838841
}
839842

840843

@@ -872,7 +875,8 @@ protected Iterable<R> getResult(FetchableFluentQuery<R> queryToUse, DataFetching
872875
}
873876

874877

875-
private static class ReactiveSingleEntityFetcher<T, R> extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Mono<R>> {
878+
private static class ReactiveSingleEntityFetcher<T, R>
879+
extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Mono<R>> {
876880

877881
private final ReactiveQuerydslPredicateExecutor<T> executor;
878882

@@ -893,6 +897,11 @@ private static class ReactiveSingleEntityFetcher<T, R> extends QuerydslDataFetch
893897
this.sort = sort;
894898
}
895899

900+
@Override
901+
public ResolvableType getReturnType() {
902+
return ResolvableType.forClassWithGenerics(Mono.class, this.resultType);
903+
}
904+
896905
@Override
897906
@SuppressWarnings("unchecked")
898907
public Mono<R> get(DataFetchingEnvironment env) {
@@ -914,15 +923,11 @@ public Mono<R> get(DataFetchingEnvironment env) {
914923
});
915924
}
916925

917-
@Override
918-
public ResolvableType getReturnType() {
919-
return ResolvableType.forClassWithGenerics(Mono.class, this.resultType);
920-
}
921-
922926
}
923927

924928

925-
private static class ReactiveManyEntityFetcher<T, R> extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Flux<R>> {
929+
private static class ReactiveManyEntityFetcher<T, R>
930+
extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Flux<R>> {
926931

927932
private final ReactiveQuerydslPredicateExecutor<T> executor;
928933

@@ -943,6 +948,11 @@ private static class ReactiveManyEntityFetcher<T, R> extends QuerydslDataFetcher
943948
this.sort = sort;
944949
}
945950

951+
@Override
952+
public ResolvableType getReturnType() {
953+
return ResolvableType.forClassWithGenerics(Flux.class, this.resultType);
954+
}
955+
946956
@Override
947957
@SuppressWarnings("unchecked")
948958
public Flux<R> get(DataFetchingEnvironment env) {
@@ -964,15 +974,11 @@ public Flux<R> get(DataFetchingEnvironment env) {
964974
});
965975
}
966976

967-
@Override
968-
public ResolvableType getReturnType() {
969-
return ResolvableType.forClassWithGenerics(Flux.class, this.resultType);
970-
}
971-
972977
}
973978

974979

975-
private static class ReactiveScrollableEntityFetcher<T, R> extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Mono<Iterable<R>>> {
980+
private static class ReactiveScrollableEntityFetcher<T, R>
981+
extends QuerydslDataFetcher<T> implements SelfDescribingDataFetcher<Mono<Iterable<R>>> {
976982

977983
private final ReactiveQuerydslPredicateExecutor<T> executor;
978984

@@ -1006,6 +1012,11 @@ private static class ReactiveScrollableEntityFetcher<T, R> extends QuerydslDataF
10061012
this.sort = sort;
10071013
}
10081014

1015+
@Override
1016+
public ResolvableType getReturnType() {
1017+
return ResolvableType.forClassWithGenerics(Mono.class, this.scrollableResultType);
1018+
}
1019+
10091020
@Override
10101021
@SuppressWarnings({"unchecked", "OptionalGetWithoutIsPresent"})
10111022
public Mono<Iterable<R>> get(DataFetchingEnvironment env) {
@@ -1031,11 +1042,6 @@ public Mono<Iterable<R>> get(DataFetchingEnvironment env) {
10311042
});
10321043
}
10331044

1034-
@Override
1035-
public ResolvableType getReturnType() {
1036-
return ResolvableType.forClassWithGenerics(Mono.class, this.scrollableResultType);
1037-
}
1038-
10391045
}
10401046

10411047
}

0 commit comments

Comments
 (0)