From 6958e39f5cd94c310fceeef55b0cb23949cc069d Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Thu, 1 Dec 2022 12:54:15 +0000 Subject: [PATCH] Fix isOmitted to return true for omitted arguments Closes gh-553 --- .../java/org/springframework/graphql/data/ArgumentValue.java | 2 +- .../graphql/data/GraphQlArgumentBinderTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-graphql/src/main/java/org/springframework/graphql/data/ArgumentValue.java b/spring-graphql/src/main/java/org/springframework/graphql/data/ArgumentValue.java index 14199ec8..427a3394 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/data/ArgumentValue.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/data/ArgumentValue.java @@ -46,7 +46,7 @@ import org.springframework.util.ObjectUtils; */ public final class ArgumentValue { - private static final ArgumentValue OMITTED = new ArgumentValue<>(null, false); + private static final ArgumentValue OMITTED = new ArgumentValue<>(null, true); @Nullable diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/GraphQlArgumentBinderTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/GraphQlArgumentBinderTests.java index 725960d5..e64c9ed3 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/GraphQlArgumentBinderTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/GraphQlArgumentBinderTests.java @@ -230,8 +230,8 @@ class GraphQlArgumentBinderTests { itemBean = (PrimaryConstructorOptionalArgumentItemBean) result; assertThat(itemBean).isNotNull(); - assertThat(itemBean.getItem().isOmitted()).isFalse(); - assertThat(itemBean.getName().isOmitted()).isFalse(); + assertThat(itemBean.getItem().isOmitted()).isTrue(); + assertThat(itemBean.getName().isPresent()).isFalse(); } @Test