Improve error support

Author: oliemansm

gradle.properties

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

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

@@ -0,0 +1,15 @@
+package graphql.kickstart.spring.webclient.boot;
+
+import java.util.List;
+import java.util.Map;
+import lombok.Data;
+
+@Data
+public class GraphQLError {
+
+  private String message;
+  private List<Location> locations;
+  private List<String> path;
+  private Map<String, Object> extensions  ;
+
+}

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

@@ -0,0 +1,20 @@
+package graphql.kickstart.spring.webclient.boot;
+
+import java.util.List;
+import lombok.EqualsAndHashCode;
+import lombok.RequiredArgsConstructor;
+import lombok.Value;
+
+@Value
+@EqualsAndHashCode(callSuper = false)
+@RequiredArgsConstructor
+public class GraphQLErrorsException extends RuntimeException {
+
+  List<GraphQLError> errors;
+
+  @Override
+  public String getMessage() {
+    return errors.get(0).getMessage();
+  }
+
+}

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

@@ -3,16 +3,28 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.NoSuchElementException;
 import lombok.Data;
 
 @Data
 class GraphQLResponse {
 
   private Map<String, Object> data;
-  private List<String> errors;
+  private List<GraphQLError> errors;
 
   Object getFirstObject() {
-    return data.entrySet().stream().findFirst().map(Entry::getValue).orElseThrow();
+    validateNoErrors();
+
+    if (data != null) {
+      return data.entrySet().stream().findFirst().map(Entry::getValue).orElseThrow(NoSuchElementException::new);
+    }
+    throw new NoSuchElementException();
+  }
+
+  private void validateNoErrors() {
+    if (errors != null && !errors.isEmpty()) {
+      throw new GraphQLErrorsException(errors);
+    }
   }
 
 }

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

@@ -0,0 +1,11 @@
+package graphql.kickstart.spring.webclient.boot;
+
+import lombok.Data;
+
+@Data
+public class Location {
+
+  private int line;
+  private int column;
+
+}

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

@@ -2,10 +2,10 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import graphql.kickstart.spring.webclient.testapp.Simple;
-import java.util.HashMap;
 import java.util.Map;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -47,23 +47,25 @@ void queryWithoutVariablesSucceeds() {
   @Test
   @DisplayName("Query echo with String variable and returning String")
   void echoStringSucceeds() {
-    Map<String, Object> variables = new HashMap<>();
-    variables.put("value", "echo echo echo");
-    Mono<String> response = graphqlClient.post("query-echo.graphql", variables, String.class);
+    Mono<String> response = graphqlClient.post("query-echo.graphql", Map.of("value", "echo echo echo"), String.class);
     assertNotNull("response should not be null", response);
     assertEquals("response should equal 'echo echo echo'", "echo echo echo", response.block());
   }
 
   @Test
   @DisplayName("Query simple return type")
   void simpleTypeSucceeds() {
-    Map<String, Object> variables = new HashMap<>();
-    variables.put("id", "my-id");
-    Mono<Simple> response = graphqlClient.post("query-simple.graphql", variables, Simple.class);
+    Mono<Simple> response = graphqlClient.post("query-simple.graphql", Map.of("id", "my-id"), Simple.class);
     assertNotNull("response should not be null", response);
     Simple object = response.block();
     assertNotNull(object);
     assertEquals("response id should equal 'my-id'", "my-id", object.getId());
   }
 
+  @Test
+  void errorResponseSucceeds() {
+    Mono<String> response = graphqlClient.post("error.graphql", String.class);
+    assertThrows(GraphQLErrorsException.class, response::block);
+  }
+
 }

graphql-webclient/src/test/resources/error.graphql

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

travis-build.sh

@@ -15,15 +15,15 @@ EOL
 }
 
 if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then
-  if [ "${RELEASE}" = "true" ]; then
+#  if [ "${RELEASE}" = "true" ]; then
     echo "Deploying release to Bintray"
     saveGitCredentials
     ./gradlew clean assemble && ./gradlew check --info && ./gradlew bintrayUpload -x check --info
-  else
-    echo "Deploying snapshot"
-    saveGitCredentials
-    ./gradlew artifactoryPublish -Dsnapshot=true -Dbuild.number="${TRAVIS_BUILD_NUMBER}"
-  fi
+#  else
+#    echo "Deploying snapshot"
+#    saveGitCredentials
+#    ./gradlew artifactoryPublish -Dsnapshot=true -Dbuild.number="${TRAVIS_BUILD_NUMBER}"
+#  fi
 else
     echo "Verify"
     ./gradlew clean assemble && ./gradlew check --info