Support multiple queries in a single request #340

plugins/gradle/example-client/build.gradle

@@ -92,7 +92,7 @@ task graphqlCodegenStarwarsService(type: GraphQLCodegenGradleTask) {
     ]
     generateClient = true
     generateApis = false
-    generateBuilder = false
+    generateBuilder = true
     generateToString = true
     generateParameterizedFieldsResolvers = false
 }

plugins/gradle/example-client/src/main/java/io/github/kobylynskyi/order/external/product/ProductInput.java

@@ -0,0 +1,18 @@
+package io.github.kobylynskyi.order.external.product;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductInput {
+
+    private String title;
+    private String sku;
+    private BigDecimal price;
+
+}

plugins/gradle/example-client/src/main/java/io/github/kobylynskyi/order/external/product/ProductServiceGraphQLClient.java

@@ -1,6 +1,9 @@
 package io.github.kobylynskyi.order.external.product;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLRequest;
+import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLRequests;
+import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLResponse;
 import io.github.kobylynskyi.order.model.Product;
 import io.github.kobylynskyi.order.model.UnableToCreateProductException;
 import io.github.kobylynskyi.order.model.UnableToRetrieveProductException;
@@ -23,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import java.math.BigDecimal;
 import java.net.URI;
 import java.util.Collections;
 import java.util.List;
@@ -38,6 +40,9 @@ public class ProductServiceGraphQLClient {
     @Autowired
     private RestTemplate restTemplate;
 
+    @Autowired
+    private ObjectMapper objectMapper;
+
     @Value("${external.service.product.url}")
     private String productUrl;
 
@@ -79,19 +84,11 @@ public List<Product> getProducts(List<String> productIds) throws UnableToRetriev
         return result.productsByIds().stream().map(productMapper::map).collect(Collectors.toList());
     }
 
-    public Product createProduct(String productTitle, String productSku, BigDecimal productPrice) throws UnableToCreateProductException {
+    public Product createProduct(ProductInput input) throws UnableToCreateProductException {
         CreateMutationRequest createProductRequest = new CreateMutationRequest();
-        createProductRequest.setProductInput(new ProductInputTO.Builder()
-                .setTitle(productTitle)
-                .setPrice(productPrice.toString())
-                .setSku(productSku)
-                .build());
-        ProductResponseProjection responseProjection = new ProductResponseProjection()
-                .id()
-                .title()
-                .price()
-                .sku();
-        GraphQLRequest request = new GraphQLRequest(createProductRequest, responseProjection);
+        createProductRequest.setProductInput(mapInputTO(input));
+        GraphQLRequest request = new GraphQLRequest(createProductRequest,
+                new ProductResponseProjection().id().title().price().sku());
 
         CreateMutationResponse result = restTemplate.exchange(URI.create(productUrl),
                 HttpMethod.POST,
@@ -104,10 +101,48 @@ public Product createProduct(String productTitle, String productSku, BigDecimal
         return productMapper.map(productTO);
     }
 
+    public List<Product> createMultipleProduct(List<ProductInput> inputs) throws UnableToCreateProductException {
+        GraphQLRequests requests = new GraphQLRequests();
+        for (ProductInput input : inputs) {
+            CreateMutationRequest createProductRequest = new CreateMutationRequest("create" + input.getSku());
+            createProductRequest.setProductInput(mapInputTO(input));
+            requests.addRequest(new GraphQLRequest(createProductRequest,
+                    new ProductResponseProjection().id().title().price().sku()));
+        }
+
+        GraphQLResponse result = restTemplate.exchange(URI.create(productUrl),
+                HttpMethod.POST,
+                httpEntity(requests),
+                GraphQLResponse.class).getBody();
+        if (result.hasErrors()) {
+            throw new UnableToCreateProductException(result.getErrors().get(0).getMessage());
+        }
+        return result.getData().values().stream()
+                .map(o -> objectMapper.convertValue(o, ProductTO.class))
+                .map(productMapper::map)
+                .collect(Collectors.toList());
+    }
+
+    public ProductInputTO mapInputTO(ProductInput input) {
+        return new ProductInputTO.Builder()
+                .setTitle(input.getTitle())
+                .setPrice(input.getPrice().toString())
+                .setSku(input.getSku())
+                .build();
+    }
+
     private static HttpEntity<String> httpEntity(GraphQLRequest request) {
+        return new HttpEntity<>(request.toHttpJsonBody(), getHttpHeaders());
+    }
+
+    private static HttpEntity<String> httpEntity(GraphQLRequests request) {
+        return new HttpEntity<>(request.toHttpJsonBody(), getHttpHeaders());
+    }
+
+    private static HttpHeaders getHttpHeaders() {
         HttpHeaders headers = new HttpHeaders();
         headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
         headers.setContentType(MediaType.APPLICATION_JSON);
-        return new HttpEntity<>(request.toHttpJsonBody(), headers);
+        return headers;
     }
 }

plugins/gradle/example-client/src/main/java/io/github/kobylynskyi/order/graphql/config/GraphQLConfiguration.java

@@ -26,4 +26,9 @@ public GraphQLScalarType extendedScalarsDate() {
         return ExtendedScalars.Date;
     }
 
+    @Bean
+    public GraphQLScalarType extendedScalarsBigDecimal() {
+        return ExtendedScalars.GraphQLBigDecimal;
+    }
+
 }

plugins/gradle/example-server/src/main/java/io/github/kobylynskyi/product/graphql/config/GraphQLConfiguration.java

@@ -1,46 +1,29 @@
 package io.github.kobylynskyi.product.graphql.config;
 
-import graphql.language.StringValue;
-import graphql.schema.*;
+import graphql.scalars.ExtendedScalars;
+import graphql.schema.GraphQLScalarType;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 /**
  * @author bogdankobylinsky
  */
 @Configuration
 public class GraphQLConfiguration {
 
-    private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
-
     @Bean
-    public GraphQLScalarType dateGraphQLScalarType() {
-        return GraphQLScalarType.newScalar()
-                .name("DateTime")
-                .coercing(new Coercing() {
-                    @Override
-                    public Object serialize(Object o) throws CoercingSerializeException {
-                        return DATE_FORMAT.format((Date) o);
-                    }
+    public GraphQLScalarType extendedScalarsDateTime() {
+        return ExtendedScalars.DateTime;
+    }
 
-                    @Override
-                    public Object parseValue(Object o) throws CoercingParseValueException {
-                        return serialize(o);
-                    }
+    @Bean
+    public GraphQLScalarType extendedScalarsDate() {
+        return ExtendedScalars.Date;
+    }
 
-                    @Override
-                    public Object parseLiteral(Object o) throws CoercingParseLiteralException {
-                        try {
-                            return DATE_FORMAT.parse(((StringValue) o).getValue());
-                        } catch (ParseException e) {
-                            return null;
-                        }
-                    }
-                }).build();
+    @Bean
+    public GraphQLScalarType extendedScalarsBigDecimal() {
+        return ExtendedScalars.GraphQLBigDecimal;
     }
 
 }

plugins/maven/example-client/pom.xml

@@ -74,7 +74,7 @@
                             </customAnnotationsMapping>
                             <generateClient>true</generateClient>
                             <generateApis>false</generateApis>
-                            <generateBuilder>false</generateBuilder>
+                            <generateBuilder>true</generateBuilder>
                             <generateToString>true</generateToString>
                             <generateParameterizedFieldsResolvers>false</generateParameterizedFieldsResolvers>
                         </configuration>
@@ -134,7 +134,7 @@
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java-extended-scalars</artifactId>
-            <version>1.0.1</version>
+            <version>1.1.0</version>
         </dependency>
 
 
@@ -185,4 +185,12 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>jcenter</id>
+            <name>jcenter</name>
+            <url>https://jcenter.bintray.com</url>
+        </repository>
+    </repositories>
+
 </project>

plugins/maven/example-client/src/main/java/io/github/kobylynskyi/order/external/product/ProductInput.java

@@ -0,0 +1,18 @@
+package io.github.kobylynskyi.order.external.product;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProductInput {
+
+    private String title;
+    private String sku;
+    private BigDecimal price;
+
+}

plugins/maven/example-client/src/main/java/io/github/kobylynskyi/order/external/product/ProductServiceGraphQLClient.java

@@ -1,6 +1,9 @@
 package io.github.kobylynskyi.order.external.product;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLRequest;
+import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLRequests;
+import com.kobylynskyi.graphql.codegen.model.graphql.GraphQLResponse;
 import io.github.kobylynskyi.order.model.Product;
 import io.github.kobylynskyi.order.model.UnableToCreateProductException;
 import io.github.kobylynskyi.order.model.UnableToRetrieveProductException;
@@ -23,7 +26,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import java.math.BigDecimal;
 import java.net.URI;
 import java.util.Collections;
 import java.util.List;
@@ -38,6 +40,9 @@ public class ProductServiceGraphQLClient {
     @Autowired
     private RestTemplate restTemplate;
 
+    @Autowired
+    private ObjectMapper objectMapper;
+
     @Value("${external.service.product.url}")
     private String productUrl;
 
@@ -79,19 +84,11 @@ public List<Product> getProducts(List<String> productIds) throws UnableToRetriev
         return result.productsByIds().stream().map(productMapper::map).collect(Collectors.toList());
     }
 
-    public Product createProduct(String productTitle, String productSku, BigDecimal productPrice) throws UnableToCreateProductException {
+    public Product createProduct(ProductInput input) throws UnableToCreateProductException {
         CreateMutationRequest createProductRequest = new CreateMutationRequest();
-        createProductRequest.setProductInput(new ProductInputTO.Builder()
-                .setTitle(productTitle)
-                .setPrice(productPrice.toString())
-                .setSku(productSku)
-                .build());
-        ProductResponseProjection responseProjection = new ProductResponseProjection()
-                .id()
-                .title()
-                .price()
-                .sku();
-        GraphQLRequest request = new GraphQLRequest(createProductRequest, responseProjection);
+        createProductRequest.setProductInput(mapInputTO(input));
+        GraphQLRequest request = new GraphQLRequest(createProductRequest,
+                new ProductResponseProjection().id().title().price().sku());
 
         CreateMutationResponse result = restTemplate.exchange(URI.create(productUrl),
                 HttpMethod.POST,
@@ -104,10 +101,48 @@ public Product createProduct(String productTitle, String productSku, BigDecimal
         return productMapper.map(productTO);
     }
 
+    public List<Product> createMultipleProduct(List<ProductInput> inputs) throws UnableToCreateProductException {
+        GraphQLRequests requests = new GraphQLRequests();
+        for (ProductInput input : inputs) {
+            CreateMutationRequest createProductRequest = new CreateMutationRequest("create" + input.getSku());
+            createProductRequest.setProductInput(mapInputTO(input));
+            requests.addRequest(new GraphQLRequest(createProductRequest,
+                    new ProductResponseProjection().id().title().price().sku()));
+        }
+
+        GraphQLResponse result = restTemplate.exchange(URI.create(productUrl),
+                HttpMethod.POST,
+                httpEntity(requests),
+                GraphQLResponse.class).getBody();
+        if (result.hasErrors()) {
+            throw new UnableToCreateProductException(result.getErrors().get(0).getMessage());
+        }
+        return result.getData().values().stream()
+                .map(o -> objectMapper.convertValue(o, ProductTO.class))
+                .map(productMapper::map)
+                .collect(Collectors.toList());
+    }
+
+    public ProductInputTO mapInputTO(ProductInput input) {
+        return new ProductInputTO.Builder()
+                .setTitle(input.getTitle())
+                .setPrice(input.getPrice().toString())
+                .setSku(input.getSku())
+                .build();
+    }
+
     private static HttpEntity<String> httpEntity(GraphQLRequest request) {
+        return new HttpEntity<>(request.toHttpJsonBody(), getHttpHeaders());
+    }
+
+    private static HttpEntity<String> httpEntity(GraphQLRequests request) {
+        return new HttpEntity<>(request.toHttpJsonBody(), getHttpHeaders());
+    }
+
+    private static HttpHeaders getHttpHeaders() {
         HttpHeaders headers = new HttpHeaders();
         headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
         headers.setContentType(MediaType.APPLICATION_JSON);
-        return new HttpEntity<>(request.toHttpJsonBody(), headers);
+        return headers;
     }
 }

plugins/maven/example-client/src/main/java/io/github/kobylynskyi/order/graphql/config/GraphQLConfiguration.java

@@ -26,4 +26,9 @@ public GraphQLScalarType extendedScalarsDate() {
         return ExtendedScalars.Date;
     }
 
+    @Bean
+    public GraphQLScalarType extendedScalarsBigDecimal() {
+        return ExtendedScalars.GraphQLBigDecimal;
+    }
+
 }

plugins/maven/example-server/pom.xml

@@ -95,7 +95,7 @@
         <dependency>
             <groupId>com.graphql-java</groupId>
             <artifactId>graphql-java-extended-scalars</artifactId>
-            <version>1.0.1</version>
+            <version>1.1.0</version>
         </dependency>
 
         <dependency>
@@ -116,4 +116,13 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>jcenter</id>
+            <name>jcenter</name>
+            <url>https://jcenter.bintray.com</url>
+        </repository>
+    </repositories>
+
+
 </project>