Merge pull request #21 from graphql-java/spring-boot-3-update

dondonz · web-flow · commit 02e0ef7eaee7 · 2024-01-26T15:30:09.000+11:00
Update tutorial code for Spring Boot 3
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,9 @@
+HELP.md
 .gradle
-/build/
+build/
 !gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
 
 ### STS ###
 .apt_generated
@@ -10,17 +13,25 @@
 .settings
 .springBeans
 .sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
 
 ### IntelliJ IDEA ###
 .idea
 *.iws
 *.iml
 *.ipr
-/out/
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
 
 ### NetBeans ###
 /nbproject/private/
 /nbbuild/
 /dist/
 /nbdist/
-/.nb-gradle/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 GraphQL Java
+Copyright (c) 2024 GraphQL Java
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -1,5 +1,3 @@
-# Book details example 
+# Book details tutorial example
 
-
-This is the source code for the "Getting started with GraphQL Java and Spring Boot" which 
-is available here: https://www.graphql-java.com/tutorials/getting-started-with-spring-boot/ 
+This repository contains the source code for the tutorial "Getting started with GraphQL Java and Spring Boot" which is available here: https://www.graphql-java.com/tutorials/getting-started-with-spring-boot/ 
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,15 @@
 plugins {
-	id 'org.springframework.boot' version '2.7.1'
-	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id 'java'
+	id 'org.springframework.boot' version '3.2.1'
+	id 'io.spring.dependency-management' version '1.1.4'
 }
 
-group = 'com.graphql-java.tutorial'
+group = 'com.graphqljava.tutorial'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '17'
+
+java {
+	sourceCompatibility = '17'
+}
 
 repositories {
 	mavenCentral()
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/src/main/java/com/graphqljava/tutorial/bookDetails/Author.java b/src/main/java/com/graphqljava/tutorial/bookDetails/Author.java
@@ -3,28 +3,16 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class Author {
-    private String id;
-    private String firstName;
-    private String lastName;
-
-    public Author(String id, String firstName, String lastName) {
-        this.id = id;
-        this.firstName = firstName;
-        this.lastName = lastName;
-    }
+record Author(String id, String firstName, String lastName) {
 
     private static List<Author> authors = Arrays.asList(
-            new Author("author-1", "Joanne", "Rowling"),
-            new Author("author-2", "Herman", "Melville"),
-            new Author("author-3", "Anne", "Rice")
+        new Author("author-1", "Joanne", "Rowling"),
+        new Author("author-2", "Herman", "Melville"),
+        new Author("author-3", "Anne", "Rice")
     );
 
     public static Author getById(String id) {
-        return authors.stream().filter(author -> author.getId().equals(id)).findFirst().orElse(null);
+        return authors.stream().filter(author -> author.id().equals(id)).findFirst().orElse(null);
     }
 
-    public String getId() {
-        return id;
-    }
 }
diff --git a/src/main/java/com/graphqljava/tutorial/bookDetails/Book.java b/src/main/java/com/graphqljava/tutorial/bookDetails/Book.java
@@ -3,35 +3,16 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class Book {
-
-    private String id;
-    private String name;
-    private int pageCount;
-    private String authorId;
-
-    public Book(String id, String name, int pageCount, String authorId) {
-        this.id = id;
-        this.name = name;
-        this.pageCount = pageCount;
-        this.authorId = authorId;
-    }
+record Book(String id, String name, int pageCount, String authorId) {
 
     private static List<Book> books = Arrays.asList(
-            new Book("book-1", "Harry Potter and the Philosopher's Stone", 223, "author-1"),
-            new Book("book-2", "Moby Dick", 635, "author-2"),
-            new Book("book-3", "Interview with the vampire", 371, "author-3")
+        new Book("book-1", "Harry Potter and the Philosopher's Stone", 223, "author-1"),
+        new Book("book-2", "Moby Dick", 635, "author-2"),
+        new Book("book-3", "Interview with the vampire", 371, "author-3")
     );
 
     public static Book getById(String id) {
-        return books.stream().filter(book -> book.getId().equals(id)).findFirst().orElse(null);
+        return books.stream().filter(book -> book.id().equals(id)).findFirst().orElse(null);
     }
 
-    public String getId() {
-        return id;
-    }
-
-    public String getAuthorId() {
-        return authorId;
-    }
 }
diff --git a/src/main/java/com/graphqljava/tutorial/bookDetails/BookController.java b/src/main/java/com/graphqljava/tutorial/bookDetails/BookController.java
@@ -6,14 +6,16 @@
 import org.springframework.stereotype.Controller;
 
 @Controller
-public class BookController {
+class BookController {
+
     @QueryMapping
     public Book bookById(@Argument String id) {
         return Book.getById(id);
     }
 
     @SchemaMapping
     public Author author(Book book) {
-        return Author.getById(book.getAuthorId());
+        return Author.getById(book.authorId());
     }
+
 }
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,2 +1 @@
 spring.graphql.graphiql.enabled=true
-spring.graphql.graphiql.path=/graphiql
diff --git a/src/main/resources/graphql/schema.graphqls b/src/main/resources/graphql/schema.graphqls
@@ -13,4 +13,4 @@ type Author {
     id: ID
     firstName: String
     lastName: String
-}
+}
