1818import graphql .language .Value ;
1919
2020import java .util .ArrayList ;
21+ import java .util .LinkedHashMap ;
2122import java .util .List ;
2223import java .util .Map ;
2324
@@ -44,16 +45,33 @@ public static Document compileToDocument(OperationDefinition.Operation operation
4445
4546 private static List <Selection <?>> selectionsForNormalizedFields (List <ExecutableNormalizedField > executableNormalizedFields ) {
4647 ImmutableList .Builder <Selection <?>> result = ImmutableList .builder ();
48+
49+ Map <String , List <Field >> overallGroupedFields = new LinkedHashMap <>();
4750 for (ExecutableNormalizedField nf : executableNormalizedFields ) {
48- result .addAll (selectionForNormalizedField (nf ));
51+ Map <String , List <Field >> groupFieldsForChild = selectionForNormalizedField (nf );
52+
53+ groupFieldsForChild .forEach ((objectTypeName , fields ) -> {
54+ List <Field > fieldList = overallGroupedFields .computeIfAbsent (objectTypeName , ignored -> new ArrayList <>());
55+ fieldList .addAll (fields );
56+ });
57+
4958 }
59+
60+ overallGroupedFields .forEach ((objectTypeName , fields ) -> {
61+ TypeName typeName = newTypeName (objectTypeName ).build ();
62+ InlineFragment inlineFragment = newInlineFragment ().
63+ typeCondition (typeName )
64+ .selectionSet (selectionSet (fields ))
65+ .build ();
66+ result .add (inlineFragment );
67+ });
68+
5069 return result .build ();
5170 }
5271
53- private static List <Selection <?>> selectionForNormalizedField (ExecutableNormalizedField executableNormalizedField ) {
54- List <Selection <?>> result = new ArrayList <>();
55- for (String objectType : executableNormalizedField .getObjectTypeNames ()) {
56- TypeName typeName = newTypeName (objectType ).build ();
72+ private static Map <String , List <Field >> selectionForNormalizedField (ExecutableNormalizedField executableNormalizedField ) {
73+ Map <String , List <Field >> groupedFields = new LinkedHashMap <>();
74+ for (String objectTypeName : executableNormalizedField .getObjectTypeNames ()) {
5775 List <Selection <?>> subSelections = selectionsForNormalizedFields (executableNormalizedField .getChildren ());
5876 SelectionSet selectionSet = null ;
5977 if (subSelections .size () > 0 ) {
@@ -68,17 +86,14 @@ private static List<Selection<?>> selectionForNormalizedField(ExecutableNormaliz
6886 .selectionSet (selectionSet )
6987 .arguments (arguments )
7088 .build ();
71- InlineFragment inlineFragment = newInlineFragment ().
72- typeCondition (typeName )
73- .selectionSet (selectionSet (field ))
74- .build ();
75- result .add (inlineFragment );
89+
90+ groupedFields .computeIfAbsent (objectTypeName , ignored -> new ArrayList <>()).add (field );
7691 }
77- return result ;
92+ return groupedFields ;
7893 }
7994
80- private static SelectionSet selectionSet (Field field ) {
81- return newSelectionSet ().selection ( field ).build ();
95+ private static SelectionSet selectionSet (List < Field > fields ) {
96+ return newSelectionSet ().selections ( fields ).build ();
8297 }
8398
8499 private static List <Argument > createArguments (ExecutableNormalizedField executableNormalizedField ) {
0 commit comments