Set InputArgumentResolver to highest priority so it is matched first.…

… This fixes issues with resolving MultipartFile with @InputArgument.
Netflix · Apr 16, 2024 · b764b86 · b764b86
1 parent 74542df
commit b764b86
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/...le-java/src/main/java/com/netflix/graphql/dgs/example/datafetcher/FileUploadMutation.java b/...le-java/src/main/java/com/netflix/graphql/dgs/example/datafetcher/FileUploadMutation.java
@@ -66,6 +66,13 @@ public boolean uploadFile(@InputArgument FileUploadInput input, DataFetchingEnvi
  return !parts.isEmpty();
  }
 
+ @DgsData(parentType = "Mutation", field = "uploadTest")
+ public boolean uploadTest(@InputArgument MultipartFile input, DataFetchingEnvironment dfe) {
+ MultipartFile file = input;
+ if (file == null || file.isEmpty()) return false;
+ return true;
+ }
+
  static class FileUploadInput {
  private String description;
  private List<MultipartFile> files;

diff --git a/graphql-dgs-example-shared/src/main/resources/schema/schema.graphqls b/graphql-dgs-example-shared/src/main/resources/schema/schema.graphqls
@@ -58,6 +58,7 @@ type Mutation {
  addRating(input: RatingInput):Rating
  uploadFile(input: FileUploadInput!): Boolean
  updateCookie(value: String): String
+ uploadTest(input: Upload!): Boolean
 }
 
 input RatingInput {

diff --git a/...igure/src/main/kotlin/com/netflix/graphql/dgs/autoconfig/DgsInputArgumentConfiguration.kt b/...igure/src/main/kotlin/com/netflix/graphql/dgs/autoconfig/DgsInputArgumentConfiguration.kt
@@ -22,10 +22,13 @@ import com.netflix.graphql.dgs.internal.method.*
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.core.Ordered
+import org.springframework.core.annotation.Order
 
 @Configuration
 open class DgsInputArgumentConfiguration {
  @Bean
+ @Order(Ordered.HIGHEST_PRECEDENCE)
  open fun inputArgumentResolver(inputObjectMapper: InputObjectMapper): ArgumentResolver {
  return InputArgumentResolver(inputObjectMapper)
  }

diff --git a/...le-java/src/main/java/com/netflix/graphql/dgs/example/datafetcher/FileUploadMutation.java b/...le-java/src/main/java/com/netflix/graphql/dgs/example/datafetcher/FileUploadMutation.java
@@ -66,6 +66,14 @@ public boolean uploadFile(@InputArgument FileUploadInput input, DataFetchingEnvi
  return !parts.isEmpty();
  }
 
+ @DgsData(parentType = "Mutation", field = "uploadTest")
+ public boolean uploadTest(@InputArgument MultipartFile input, DataFetchingEnvironment dfe) {
+ MultipartFile file = input;
+ MultipartFile inputTest = (MultipartFile) dfe.getArgument("input");
+ if (file == null || file.isEmpty()) return false;
+ return true;
+ }
+
  static class FileUploadInput {
  private String description;
  private List<MultipartFile> files;