Fix empty response

Author: oliemansm

gradle.properties

@@ -1,4 +1,4 @@
-version=0.0.1b202003301508
+version=0.0.1
 
 PROJECT_GROUP = com.graphql-java-kickstart
 PROJECT_NAME = graphql-spring-webclient

graphql-webclient/src/main/java/graphql/kickstart/spring/webclient/boot/GraphQLResponse.java

@@ -3,7 +3,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.NoSuchElementException;
 import lombok.Data;
 
 @Data
@@ -15,10 +14,10 @@ class GraphQLResponse {
   Object getFirstObject() {
     validateNoErrors();
 
-    if (data != null) {
-      return data.entrySet().stream().findFirst().map(Entry::getValue).orElseThrow(NoSuchElementException::new);
+    if (data != null && !data.isEmpty()) {
+      return data.entrySet().stream().findFirst().map(Entry::getValue).orElse(null);
     }
-    throw new NoSuchElementException();
+    return null;
   }
 
   private void validateNoErrors() {

graphql-webclient/src/main/java/graphql/kickstart/spring/webclient/boot/GraphQLWebClientImpl.java

@@ -39,7 +39,7 @@ public <T> Mono<T> post(String resource, Map<String, Object> variables, Class<T>
         .bodyValue(request)
         .retrieve()
         .bodyToMono(GraphQLResponse.class)
-        .map(GraphQLResponse::getFirstObject)
+        .flatMap(it -> Mono.justOrEmpty(it.getFirstObject()))
         .map(it -> readValue(it, returnType));
   }
 

graphql-webclient/src/test/java/graphql/kickstart/spring/webclient/boot/GraphQLWebClientTest.java

@@ -3,10 +3,12 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import graphql.kickstart.spring.webclient.testapp.Simple;
 import java.util.Map;
+import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -68,4 +70,11 @@ void errorResponseSucceeds() {
     assertThrows(GraphQLErrorsException.class, response::block);
   }
 
+  @Test
+  void noResponseSucceeds() {
+    Mono<String> response = graphqlClient.post("query-noResponse.graphql", String.class);
+    Optional<String> noResponse = response.blockOptional();
+    assertTrue("response should be empty", noResponse.isEmpty());
+  }
+
 }

graphql-webclient/src/test/java/graphql/kickstart/spring/webclient/testapp/Query.java

@@ -10,6 +10,10 @@ String test() {
     return "test";
   }
 
+  String noResponse() {
+    return null;
+  }
+
   String echo(String value) {
     return value;
   }

graphql-webclient/src/test/resources/query-noResponse.graphql

@@ -0,0 +1,3 @@
+query {
+    noResponse
+}

graphql-webclient/src/test/resources/schema.graphqls

@@ -1,5 +1,6 @@
 type Query {
     test: String!
+    noResponse: String
     echo(value: String!): String!
     simple(id: ID!): Simple!
 }

travis-build.sh

@@ -17,6 +17,9 @@ EOL
 if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then
 #  if [ "${RELEASE}" = "true" ]; then
     echo "Deploying release to Bintray"
+    VERSION=$(gradle properties -q | grep "version:" | grep -v "kotlin_version:" | awk '{print $2}' | tr -d '[:space:]')
+    NEXT_VERSION="${VERSION}b$(date +%Y%m%d%H%M)"
+    sed -i -E "s/^version(\s)?=.*/version=${NEXT_VERSION}/" gradle.properties
     saveGitCredentials
     ./gradlew clean assemble && ./gradlew check --info && ./gradlew bintrayUpload -x check --info
 #  else