diff --git a/.gitignore b/.gitignore index 9243c63..c2065bc 100644 --- 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/ \ No newline at end of file +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/LICENSE b/LICENSE index b51dd6a..10e82c9 100644 --- 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 index 9aaa40b..3310056 100644 --- 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/ \ No newline at end of file +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 index 3865729..38eb04a 100644 --- 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 index 41d9927..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 00e33ed..1af9e09 100644 --- 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 index 1b6c787..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/java/com/graphqljava/tutorial/bookDetails/Author.java b/src/main/java/com/graphqljava/tutorial/bookDetails/Author.java index 0334878..505aafa 100644 --- 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 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; - } } \ No newline at end of file diff --git a/src/main/java/com/graphqljava/tutorial/bookDetails/Book.java b/src/main/java/com/graphqljava/tutorial/bookDetails/Book.java index 732241f..8001f5f 100644 --- 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 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; - } } \ No newline at end of file diff --git a/src/main/java/com/graphqljava/tutorial/bookDetails/BookController.java b/src/main/java/com/graphqljava/tutorial/bookDetails/BookController.java index f6121f0..f7db4b0 100644 --- a/src/main/java/com/graphqljava/tutorial/bookDetails/BookController.java +++ b/src/main/java/com/graphqljava/tutorial/bookDetails/BookController.java @@ -6,7 +6,8 @@ import org.springframework.stereotype.Controller; @Controller -public class BookController { +class BookController { + @QueryMapping public Book bookById(@Argument String id) { return Book.getById(id); @@ -14,6 +15,7 @@ public Book bookById(@Argument String id) { @SchemaMapping public Author author(Book book) { - return Author.getById(book.getAuthorId()); + return Author.getById(book.authorId()); } + } \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index ada8f13..1bd50b3 100644 --- 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 index 85bb6ad..a6613e5 100644 --- 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 -} \ No newline at end of file +}