Limit public api of graphql response

Author: oliemansm

.github/workflows/pull-request.yml

@@ -1,8 +1,5 @@
 name: "Pull request"
 on:
-  push:
-    branches-ignore:
-      - master
   pull_request:
     types: [opened, synchronize, reopened]
 

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

@@ -9,14 +9,16 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
 
-@Data
+@EqualsAndHashCode
 public class GraphQLResponse {
 
   public static final String ERRORS_FIELD = "errors";
 
   private final JsonNode data;
+  @Getter
   private final List<GraphQLError> errors;
   private final String rawResponse;
   private final ObjectMapper objectMapper;
@@ -60,7 +62,7 @@ public <T> T get(String fieldName, Class<T> type) {
     return null;
   }
 
-  public <T> T getFirstObject(Class<T> type) {
+  public <T> T getFirst(Class<T> type) {
     return getFirstDataEntry().map(it -> objectMapper.convertValue(it, type)).orElse(null);
   }
 

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

@@ -26,7 +26,7 @@ public <T> Mono<T> post(String resource, Map<String, Object> variables, Class<T>
     return post(resource, variables)
         .flatMap(it -> {
           it.validateNoErrors();
-          return Mono.justOrEmpty(it.getFirstObject(returnType));
+          return Mono.justOrEmpty(it.getFirst(returnType));
         });
   }
 

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

@@ -60,19 +60,18 @@ void getFieldName_dataFieldExists_returnsValue() {
   @Test
   void getFirstObject_dataIsNull_returnsNull() {
     GraphQLResponse response = constructResponse("{ \"data\": null }");
-    assertNull(response.getFirstObject(String.class));
+    assertNull(response.getFirst(String.class));
   }
 
   @Test
   void getFirstObject_notDataFieldExists_returnsNull() {
     GraphQLResponse response = constructResponse("{ \"data\": { \"field\": null } }");
-    assertNull(response.getFirstObject(String.class));
+    assertNull(response.getFirst(String.class));
   }
 
   @Test
   void getList_dataIsNull_returnsEmptyList() {
     GraphQLResponse response = constructResponse("{ \"data\": null }");
-    assertNull(response.getData());
     assertTrue(response.getList("test", String.class).isEmpty());
   }
 

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

@@ -5,7 +5,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.springframework.test.util.AssertionErrors.assertTrue;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import graphql.kickstart.spring.webclient.testapp.Simple;
 import java.util.List;
@@ -79,8 +78,8 @@ void simpleTypeAsRequestSucceeds() {
     assertNotNull(response, "response should not be null");
     GraphQLResponse object = response.block();
     assertNotNull(object);
-    JsonNode simple = object.getData().get("simple");
-    assertEquals("my-id", simple.get("id").asText(), "response id should equal 'my-id'");
+    Simple simple = object.get("simple", Simple.class);
+    assertEquals("my-id", simple.getId(), "response id should equal 'my-id'");
   }
 
   @Test
@@ -116,7 +115,7 @@ void headerIsAdded() {
     GraphQLResponse object = response.block();
     assertNotNull(object);
     assertEquals("my-custom-header-value",
-        object.getData().get("header").asText(), "response should equal 'my-custom-header-value'");
+        object.get("header", String.class), "response should equal 'my-custom-header-value'");
   }
 
 }