Replace Guava's Multimap with Map in public APIs

andimarek · Jan 10, 2024 · Dec 5, 2023 · Dec 5, 2023 · Dec 12, 2023 · Dec 12, 2023
commit 4db220e19eb73badb23bb8b710d0b1f011c6364f
diff --git a/src/main/java/graphql/normalized/ExecutableNormalizedOperation.java b/src/main/java/graphql/normalized/ExecutableNormalizedOperation.java
@@ -13,6 +13,7 @@
 import graphql.schema.FieldCoordinates;
 import graphql.schema.GraphQLFieldsContainer;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -135,8 +136,8 @@ public Map<ExecutableNormalizedField, QueryDirectives> getNormalizedFieldToQuery
      * @return a map of {@link ExecutableNormalizedField} to  its {@link DeferExecution}
      */
     @ExperimentalApi
-    public ImmutableListMultimap<ExecutableNormalizedField, DeferExecution> getNormalizedFieldToDeferExecution() {
-        return normalizedFieldToDeferExecution;
+    public Map<ExecutableNormalizedField, Collection<DeferExecution>> getNormalizedFieldToDeferExecution() {
+        return normalizedFieldToDeferExecution.asMap();
     }
 
 

diff --git a/src/main/java/graphql/normalized/ExecutableNormalizedOperationToAstCompiler.java b/src/main/java/graphql/normalized/ExecutableNormalizedOperationToAstCompiler.java
@@ -1,7 +1,6 @@
 package graphql.normalized;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMap;
 import graphql.Assert;
 import graphql.Directives;
@@ -34,6 +33,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -156,7 +156,7 @@ public static CompilerResult compileToDocumentWithDeferSupport(@NotNull GraphQLS
                                                                    @Nullable String operationName,
                                                                    @NotNull List<ExecutableNormalizedField> topLevelFields,
                                                                    @Nullable VariablePredicate variablePredicate,
-                                                                   @Nullable ImmutableListMultimap<ExecutableNormalizedField, DeferExecution> normalizedFieldToDeferExecution) {
+                                                                   @Nullable Map<ExecutableNormalizedField, Collection<DeferExecution>> normalizedFieldToDeferExecution) {
         return compileToDocumentWithDeferSupport(schema, operationKind, operationName, topLevelFields, Map.of(), variablePredicate, normalizedFieldToDeferExecution);
     }
 
@@ -185,7 +185,7 @@ public static CompilerResult compileToDocumentWithDeferSupport(@NotNull GraphQLS
                                                                    @NotNull List<ExecutableNormalizedField> topLevelFields,
                                                                    @NotNull Map<ExecutableNormalizedField, QueryDirectives> normalizedFieldToQueryDirectives,
                                                                    @Nullable VariablePredicate variablePredicate,
-                                                                   @Nullable ImmutableListMultimap<ExecutableNormalizedField, DeferExecution> normalizedFieldToDeferExecution) {
+                                                                   @Nullable Map<ExecutableNormalizedField, Collection<DeferExecution>> normalizedFieldToDeferExecution) {
         return compileToDocument(schema, operationKind, operationName, topLevelFields, normalizedFieldToQueryDirectives, variablePredicate, normalizedFieldToDeferExecution);
     }
 
@@ -195,7 +195,7 @@ private static CompilerResult compileToDocument(@NotNull GraphQLSchema schema,
                                                     @NotNull List<ExecutableNormalizedField> topLevelFields,
                                                     @NotNull Map<ExecutableNormalizedField, QueryDirectives> normalizedFieldToQueryDirectives,
                                                     @Nullable VariablePredicate variablePredicate,
-                                                    @Nullable ImmutableListMultimap<ExecutableNormalizedField, DeferExecution> normalizedFieldToDeferExecution) {
+                                                    @Nullable Map<ExecutableNormalizedField, Collection<DeferExecution>> normalizedFieldToDeferExecution) {
         GraphQLObjectType operationType = getOperationType(schema, operationKind);
 
         VariableAccumulator variableAccumulator = new VariableAccumulator(variablePredicate);
@@ -222,7 +222,7 @@ private static List<Selection<?>> subselectionsForNormalizedField(GraphQLSchema
                                                                       List<ExecutableNormalizedField> executableNormalizedFields,
                                                                       @NotNull Map<ExecutableNormalizedField, QueryDirectives> normalizedFieldToQueryDirectives,
                                                                       VariableAccumulator variableAccumulator,
-                                                                      @Nullable ImmutableListMultimap<ExecutableNormalizedField, DeferExecution> normalizedFieldToDeferExecution) {
+                                                                      @Nullable Map<ExecutableNormalizedField, Collection<DeferExecution>> normalizedFieldToDeferExecution) {
         if (normalizedFieldToDeferExecution != null) {
             return subselectionsForNormalizedFieldWithDeferSupport(schema, parentOutputType, executableNormalizedFields, normalizedFieldToQueryDirectives, normalizedFieldToDeferExecution, variableAccumulator);
         } else {
@@ -270,7 +270,7 @@ private static List<Selection<?>> subselectionsForNormalizedFieldWithDeferSuppor
                                                                                       @NotNull String parentOutputType,
                                                                                       List<ExecutableNormalizedField> executableNormalizedFields,
                                                                                       @NotNull Map<ExecutableNormalizedField, QueryDirectives> normalizedFieldToQueryDirectives,
-                                                                                      @NotNull ImmutableListMultimap<ExecutableNormalizedField, DeferExecution> normalizedFieldToDeferExecution,
+                                                                                      @NotNull Map<ExecutableNormalizedField, Collection<DeferExecution>> normalizedFieldToDeferExecution,
                                                                                       VariableAccumulator variableAccumulator) {
         ImmutableList.Builder<Selection<?>> selections = ImmutableList.builder();
 
@@ -280,12 +280,12 @@ private static List<Selection<?>> subselectionsForNormalizedFieldWithDeferSuppor
         Map<ExecutionFragmentDetails, List<Field>> fieldsByFragmentDetails = new LinkedHashMap<>();
 
         for (ExecutableNormalizedField nf : executableNormalizedFields) {
-            List<DeferExecution> deferExecutions = normalizedFieldToDeferExecution.get(nf);
+            Collection<DeferExecution> deferExecutions = normalizedFieldToDeferExecution.get(nf);
 
             if (nf.isConditional(schema)) {
                 selectionForNormalizedField(schema, nf, normalizedFieldToQueryDirectives, variableAccumulator, normalizedFieldToDeferExecution)
                         .forEach((objectTypeName, field) -> {
-                            if (deferExecutions.isEmpty()) {
+                            if (deferExecutions == null || deferExecutions.isEmpty()) {
                                 fieldsByFragmentDetails
                                         .computeIfAbsent(new ExecutionFragmentDetails(objectTypeName, null), ignored -> new ArrayList<>())
                                         .add(field);
@@ -298,7 +298,7 @@ private static List<Selection<?>> subselectionsForNormalizedFieldWithDeferSuppor
                             }
                         });
 
-            } else if (!deferExecutions.isEmpty()) {
+            } else if (deferExecutions != null && !deferExecutions.isEmpty()) {
                 Field field = selectionForNormalizedField(schema, parentOutputType, nf, normalizedFieldToQueryDirectives, variableAccumulator, normalizedFieldToDeferExecution);
 
                 deferExecutions.forEach(deferExecution -> {
@@ -344,7 +344,7 @@ private static Map<String, Field> selectionForNormalizedField(GraphQLSchema sche
                                                                   ExecutableNormalizedField executableNormalizedField,
                                                                   @NotNull Map<ExecutableNormalizedField, QueryDirectives> normalizedFieldToQueryDirectives,
                                                                   VariableAccumulator variableAccumulator,
-                                                                  @Nullable ImmutableListMultimap<ExecutableNormalizedField, DeferExecution> normalizedFieldToDeferExecution) {
+                                                                  @Nullable Map<ExecutableNormalizedField, Collection<DeferExecution>> normalizedFieldToDeferExecution) {
         Map<String, Field> groupedFields = new LinkedHashMap<>();
 
         for (String objectTypeName : executableNormalizedField.getObjectTypeNames()) {
@@ -362,7 +362,7 @@ private static Field selectionForNormalizedField(GraphQLSchema schema,
                                                      ExecutableNormalizedField executableNormalizedField,
                                                      @NotNull Map<ExecutableNormalizedField, QueryDirectives> normalizedFieldToQueryDirectives,
                                                      VariableAccumulator variableAccumulator,
-                                                     @Nullable ImmutableListMultimap<ExecutableNormalizedField, DeferExecution> normalizedFieldToDeferExecution) {
+                                                     @Nullable Map<ExecutableNormalizedField, Collection<DeferExecution>> normalizedFieldToDeferExecution) {
         final List<Selection<?>> subSelections;
         if (executableNormalizedField.getChildren().isEmpty()) {
             subSelections = emptyList();

diff --git a/src/test/groovy/graphql/normalized/ExecutableNormalizedOperationFactoryDeferTest.groovy b/src/test/groovy/graphql/normalized/ExecutableNormalizedOperationFactoryDeferTest.groovy
@@ -606,7 +606,7 @@ class ExecutableNormalizedOperationFactoryDeferTest extends Specification {
 
             String printDeferExecutionDetails(ExecutableNormalizedField field) {
                 def deferExecutions = normalizedFieldToDeferExecution.get(field)
-                if (deferExecutions.isEmpty()) {
+                if (deferExecutions == null || deferExecutions.isEmpty()) {
                     return ""
                 }
 

diff --git a/src/test/groovy/graphql/normalized/ExecutableNormalizedOperationToAstCompilerTest.groovy b/src/test/groovy/graphql/normalized/ExecutableNormalizedOperationToAstCompilerTest.groovy
@@ -2184,7 +2184,7 @@ abstract class ExecutableNormalizedOperationToAstCompilerTest extends Specificat
             String operationName,
             List<ExecutableNormalizedField> topLevelFields,
             VariablePredicate variablePredicate,
-            ImmutableListMultimap<ExecutableNormalizedField, DeferExecution> normalizedFieldToDeferExecution
+            Map<ExecutableNormalizedField, Collection<DeferExecution>> normalizedFieldToDeferExecution
     ) {
         return localCompileToDocument(schema, operationKind, operationName, topLevelFields, Map.of(), variablePredicate, normalizedFieldToDeferExecution)
     }
@@ -2196,7 +2196,7 @@ abstract class ExecutableNormalizedOperationToAstCompilerTest extends Specificat
             List<ExecutableNormalizedField> topLevelFields,
             Map<ExecutableNormalizedField, QueryDirectives> normalizedFieldToQueryDirectives,
             VariablePredicate variablePredicate,
-            ImmutableListMultimap<ExecutableNormalizedField, DeferExecution> normalizedFieldToDeferExecution
+            Map<ExecutableNormalizedField, Collection<DeferExecution>> normalizedFieldToDeferExecution
     ) {
         if (deferSupport) {
             return compileToDocumentWithDeferSupport(schema, operationKind, operationName, topLevelFields, normalizedFieldToQueryDirectives, variablePredicate, normalizedFieldToDeferExecution)