[JAVA-15377] Update code for Graphql SPQR article

graphql-modules/graphql-spqr/src/main/java/com/baeldung/spqr/BookResolver.java

@@ -0,0 +1,42 @@
+package com.baeldung.spqr;
+
+import io.leangen.graphql.annotations.GraphQLArgument;
+import io.leangen.graphql.annotations.GraphQLMutation;
+import io.leangen.graphql.annotations.GraphQLQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class BookResolver {
+
+    @Autowired
+    IBookService bookService;
+
+    @GraphQLQuery(name = "getBookWithTitle")
+    public Book getBookWithTitle(@GraphQLArgument(name = "title") String title) {
+        return bookService.getBookWithTitle(title);
+    }
+
+    @GraphQLQuery(name = "getAllBooks", description = "Get all books")
+    public List<Book> getAllBooks() {
+        return bookService.getAllBooks();
+    }
+
+    @GraphQLMutation(name = "addBook")
+    public Book addBook(@GraphQLArgument(name = "newBook") Book book) {
+        return bookService.addBook(book);
+    }
+
+    @GraphQLMutation(name = "updateBook")
+    public Book updateBook(@GraphQLArgument(name = "modifiedBook") Book book) {
+        return bookService.updateBook(book);
+    }
+
+    @GraphQLMutation(name = "deleteBook")
+    public void deleteBook(@GraphQLArgument(name = "book") Book book) {
+        bookService.deleteBook(book);
+    }
+}

graphql-modules/graphql-spqr/src/main/java/com/baeldung/spqr/BookService.java

@@ -1,51 +1,53 @@
 package com.baeldung.spqr;
 
-import io.leangen.graphql.annotations.GraphQLArgument;
-import io.leangen.graphql.annotations.GraphQLMutation;
-import io.leangen.graphql.annotations.GraphQLQuery;
-import io.leangen.graphql.spqr.spring.annotations.GraphQLApi;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 @Service
-@GraphQLApi
 public class BookService implements IBookService {
 
-    Set<Book> books = new HashSet<>();
+    private static final Set<Book> BOOKS_DATA = initializeData();
 
-    @GraphQLQuery(name = "getBookWithTitle")
-    public Book getBookWithTitle(@GraphQLArgument(name = "title") String title) {
-        return books.stream()
-            .filter(book -> book.getTitle()
-                .equals(title))
+    @Override
+    public Book getBookWithTitle(String title) {
+        return BOOKS_DATA.stream()
+            .filter(book -> book.getTitle().equals(title))
             .findFirst()
             .orElse(null);
     }
 
-    @GraphQLQuery(name = "getAllBooks", description = "Get all books")
+    @Override
     public List<Book> getAllBooks() {
-        return books.stream().collect(Collectors.toList());
+        return new ArrayList<>(BOOKS_DATA);
     }
 
-    @GraphQLMutation(name = "addBook")
-    public Book addBook(@GraphQLArgument(name = "newBook") Book book) {
-        books.add(book);
+    @Override
+    public Book addBook(Book book) {
+        BOOKS_DATA.add(book);
         return book;
     }
 
-    @GraphQLMutation(name = "updateBook")
-    public Book updateBook(@GraphQLArgument(name = "modifiedBook") Book book) {
-        books.remove(book);
-        books.add(book);
+    @Override
+    public Book updateBook(Book book) {
+        BOOKS_DATA.removeIf(b -> Objects.equals(b.getId(), book.getId()));
+        BOOKS_DATA.add(book);
         return book;
     }
 
-    @GraphQLMutation(name = "deleteBook")
-    public boolean deleteBook(@GraphQLArgument(name = "book") Book book) {
-        return books.remove(book);
+    @Override
+    public boolean deleteBook(Book book) {
+        return BOOKS_DATA.remove(book);
     }
-}
+
+    private static Set<Book> initializeData() {
+        Book book = new Book(1, "J.R.R. Tolkien", "The Lord of the Rings");
+        Set<Book> books = new HashSet<>();
+        books.add(book);
+        return books;
+    }
+}

graphql-modules/graphql-spqr/src/main/java/com/baeldung/spqr/GraphqlController.java

@@ -0,0 +1,36 @@
+package com.baeldung.spqr;
+
+import graphql.ExecutionResult;
+import graphql.GraphQL;
+import graphql.GraphQLException;
+import graphql.schema.GraphQLSchema;
+import io.leangen.graphql.GraphQLSchemaGenerator;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+@RestController
+public class GraphqlController {
+
+    private final GraphQL graphQL;
+
+    @Autowired
+    public GraphqlController(BookResolver bookResolver) {
+        GraphQLSchema schema = new GraphQLSchemaGenerator()
+          .withBasePackages("com.baeldung")
+          .withOperationsFromSingleton(bookResolver)
+          .generate();
+        this.graphQL = new GraphQL.Builder(schema).build();
+    }
+
+    @PostMapping(value = "/graphql")
+    public Map<String, Object> execute(@RequestBody Map<String, String> request, HttpServletRequest raw) throws GraphQLException {
+        ExecutionResult result = graphQL.execute(request.get("query"));
+        return result.getData();
+    }
+}

graphql-modules/graphql-spqr/src/main/java/com/baeldung/spqr/IBookService.java

@@ -12,4 +12,4 @@ public interface IBookService {
     Book updateBook(Book book);
 
     boolean deleteBook(Book book);
-}
+}

graphql-modules/graphql-spqr/src/main/java/com/baeldung/spqr/SpqrApp.java

@@ -1,11 +1,13 @@
-package com.baeldung;
+package com.baeldung.spqr;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class SpringBootApp {
+public class SpqrApp {
+
     public static void main(String[] args) {
-        SpringApplication.run(SpringBootApp.class, args);
+        SpringApplication.run(SpqrApp.class, args);
     }
+
 }

graphql-modules/graphql-spqr/src/test/java/com/baeldung/spqr/SpqrAppIntegrationTest.java

@@ -0,0 +1,61 @@
+package com.baeldung.spqr;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.reactive.server.WebTestClient;
+import reactor.core.publisher.Mono;
+
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+@SpringBootTest(webEnvironment = RANDOM_PORT, classes = SpqrApp.class)
+class SpqrAppIntegrationTest {
+
+    private static final String GRAPHQL_PATH = "/graphql";
+
+    @Autowired
+    private WebTestClient webTestClient;
+
+    @Test
+    void whenGetAllBooks_thenValidResponseReturned() {
+        String getAllBooksQuery = "{getAllBooks{ id title author }}";
+
+        webTestClient.post()
+          .uri(GRAPHQL_PATH)
+          .contentType(MediaType.APPLICATION_JSON)
+          .body(Mono.just(toJSON(getAllBooksQuery)), String.class)
+          .exchange()
+          .expectStatus().isOk()
+          .expectBody()
+          .jsonPath("$.getAllBooks").isNotEmpty();
+    }
+
+    @Test
+    void whenAddBook_thenValidResponseReturned() {
+        String addBookMutation = "mutation { addBook(newBook: {id: 123, author: \"J. K. Rowling\", "
+          + "title: \"Harry Potter and Philosopher's Stone\"}) { id author title } }";
+
+        webTestClient.post()
+          .uri(GRAPHQL_PATH)
+          .contentType(MediaType.APPLICATION_JSON)
+          .body(Mono.just(toJSON(addBookMutation)), String.class)
+          .exchange()
+          .expectStatus().isOk()
+          .expectBody()
+          .jsonPath("$.addBook.id").isEqualTo("123")
+          .jsonPath("$.addBook.title").isEqualTo("Harry Potter and Philosopher's Stone")
+          .jsonPath("$.addBook.author").isEqualTo("J. K. Rowling");
+    }
+
+    private static String toJSON(String query) {
+        try {
+            return new JSONObject().put("query", query).toString();
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}

graphql-modules/graphql-spqr/src/test/java/com/baeldung/spqr/SpringContextTest.java

@@ -0,0 +1,12 @@
+package com.baeldung.spqr;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest(classes = SpqrApp.class)
+class SpringContextTest {
+
+    @Test
+    void whenSpringContextIsBootstrapped_thenNoExceptions() {
+    }
+}