From 2cb7f8a29cb1bbaeaf06eeeac722d4ae3f5e6ec4 Mon Sep 17 00:00:00 2001 From: William Suane Date: Tue, 27 Oct 2020 13:18:07 +0100 Subject: [PATCH 01/47] feat: code used in video 06 --- .gitignore | 33 ++ .mvn/wrapper/MavenWrapperDownloader.java | 117 +++++++ .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 50710 bytes .mvn/wrapper/maven-wrapper.properties | 2 + mvnw | 310 ++++++++++++++++++ mvnw.cmd | 182 ++++++++++ pom.xml | 61 ++++ .../Springboot2EssentialsApplication.java | 13 + .../controller/AnimeController.java | 27 ++ .../devdojo/springboot2/domain/Anime.java | 20 ++ .../devdojo/springboot2/util/DateUtil.java | 13 + src/main/resources/application.properties | 1 + ...Springboot2EssentialsApplicationTests.java | 13 + 13 files changed, 792 insertions(+) create mode 100644 .gitignore create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/academy/devdojo/springboot2/Springboot2EssentialsApplication.java create mode 100644 src/main/java/academy/devdojo/springboot2/controller/AnimeController.java create mode 100644 src/main/java/academy/devdojo/springboot2/domain/Anime.java create mode 100644 src/main/java/academy/devdojo/springboot2/util/DateUtil.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/academy/devdojo/springboot2/Springboot2EssentialsApplicationTests.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..e76d1f3 --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054 GIT binary patch literal 50710 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 EfAhh=DF6Tf literal 0 HcmV?d00001 diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..642d572 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..a16b543 --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..693b49e --- /dev/null +++ b/pom.xml @@ -0,0 +1,61 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.3.4.RELEASE + + + + academy.devdojo + springboot2-essentials + 0.0.1-SNAPSHOT + springboot2-essentials + Curso de Spring Boot do DevDojo + + + 11 + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/academy/devdojo/springboot2/Springboot2EssentialsApplication.java b/src/main/java/academy/devdojo/springboot2/Springboot2EssentialsApplication.java new file mode 100644 index 0000000..47f4f81 --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/Springboot2EssentialsApplication.java @@ -0,0 +1,13 @@ +package academy.devdojo.springboot2; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Springboot2EssentialsApplication { + + public static void main(String[] args) { + SpringApplication.run(Springboot2EssentialsApplication.class, args); + } + +} diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java new file mode 100644 index 0000000..2e007df --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -0,0 +1,27 @@ +package academy.devdojo.springboot2.controller; + +import academy.devdojo.springboot2.domain.Anime; +import academy.devdojo.springboot2.util.DateUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.time.LocalDateTime; +import java.util.List; + +@RestController +@RequestMapping("anime") +@Log4j2 +@RequiredArgsConstructor +public class AnimeController { + private final DateUtil dateUtil; + + @GetMapping(path = "list") + public List list(){ + log.info(dateUtil.formatLocalDateTimeToDatabaseStyle(LocalDateTime.now())); + return List.of(new Anime("Boku No Hero"), new Anime("Berserk")); + } + +} diff --git a/src/main/java/academy/devdojo/springboot2/domain/Anime.java b/src/main/java/academy/devdojo/springboot2/domain/Anime.java new file mode 100644 index 0000000..ef9a7a0 --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/domain/Anime.java @@ -0,0 +1,20 @@ +package academy.devdojo.springboot2.domain; + +public class Anime { + private String name; + + public Anime(String name) { + this.name = name; + } + + public Anime() { + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/src/main/java/academy/devdojo/springboot2/util/DateUtil.java b/src/main/java/academy/devdojo/springboot2/util/DateUtil.java new file mode 100644 index 0000000..397095b --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/util/DateUtil.java @@ -0,0 +1,13 @@ +package academy.devdojo.springboot2.util; + +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + +@Component +public class DateUtil { + public String formatLocalDateTimeToDatabaseStyle(LocalDateTime localDateTime){ + return DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(localDateTime); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/src/test/java/academy/devdojo/springboot2/Springboot2EssentialsApplicationTests.java b/src/test/java/academy/devdojo/springboot2/Springboot2EssentialsApplicationTests.java new file mode 100644 index 0000000..9584faf --- /dev/null +++ b/src/test/java/academy/devdojo/springboot2/Springboot2EssentialsApplicationTests.java @@ -0,0 +1,13 @@ +package academy.devdojo.springboot2; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class Springboot2EssentialsApplicationTests { + + @Test + void contextLoads() { + } + +} From fa6ab61acf0127251dcd64921180c97f141e3a9b Mon Sep 17 00:00:00 2001 From: William Suane Date: Tue, 27 Oct 2020 13:38:26 +0100 Subject: [PATCH 02/47] feat: code used in video 07 --- .../controller/AnimeController.java | 8 +++++--- .../devdojo/springboot2/domain/Anime.java | 20 ++++++------------- .../repository/AnimeRepository.java | 9 +++++++++ .../springboot2/service/AnimeService.java | 15 ++++++++++++++ 4 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 src/main/java/academy/devdojo/springboot2/repository/AnimeRepository.java create mode 100644 src/main/java/academy/devdojo/springboot2/service/AnimeService.java diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index 2e007df..c38fa21 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -1,6 +1,7 @@ package academy.devdojo.springboot2.controller; import academy.devdojo.springboot2.domain.Anime; +import academy.devdojo.springboot2.service.AnimeService; import academy.devdojo.springboot2.util.DateUtil; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; @@ -12,16 +13,17 @@ import java.util.List; @RestController -@RequestMapping("anime") +@RequestMapping("animes") @Log4j2 @RequiredArgsConstructor public class AnimeController { private final DateUtil dateUtil; + private final AnimeService animeService; - @GetMapping(path = "list") + @GetMapping public List list(){ log.info(dateUtil.formatLocalDateTimeToDatabaseStyle(LocalDateTime.now())); - return List.of(new Anime("Boku No Hero"), new Anime("Berserk")); + return animeService.listAll(); } } diff --git a/src/main/java/academy/devdojo/springboot2/domain/Anime.java b/src/main/java/academy/devdojo/springboot2/domain/Anime.java index ef9a7a0..245d1e5 100644 --- a/src/main/java/academy/devdojo/springboot2/domain/Anime.java +++ b/src/main/java/academy/devdojo/springboot2/domain/Anime.java @@ -1,20 +1,12 @@ package academy.devdojo.springboot2.domain; +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor public class Anime { + private Long id; private String name; - public Anime(String name) { - this.name = name; - } - - public Anime() { - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } } diff --git a/src/main/java/academy/devdojo/springboot2/repository/AnimeRepository.java b/src/main/java/academy/devdojo/springboot2/repository/AnimeRepository.java new file mode 100644 index 0000000..c1e0db2 --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/repository/AnimeRepository.java @@ -0,0 +1,9 @@ +package academy.devdojo.springboot2.repository; + +import academy.devdojo.springboot2.domain.Anime; + +import java.util.List; + +public interface AnimeRepository { + List listAll(); +} diff --git a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java new file mode 100644 index 0000000..55ede4a --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java @@ -0,0 +1,15 @@ +package academy.devdojo.springboot2.service; + +import academy.devdojo.springboot2.domain.Anime; +import academy.devdojo.springboot2.repository.AnimeRepository; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class AnimeService { + // private final AnimeRepository animeRepository; + public List listAll() { + return List.of(new Anime(1L, "Boku No Hero"), new Anime(2L, "Berserk")); + } +} From 18863d74d56015bd368b0afc5660f9ded3604728 Mon Sep 17 00:00:00 2001 From: William Suane Date: Tue, 27 Oct 2020 14:32:09 +0100 Subject: [PATCH 03/47] feat: code used in video 08 --- .../springboot2/controller/AnimeController.java | 10 ++++++++-- .../devdojo/springboot2/service/AnimeService.java | 14 ++++++++++++-- src/main/resources/application.properties | 1 - src/main/resources/application.yml | 3 +++ 4 files changed, 23 insertions(+), 5 deletions(-) delete mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/application.yml diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index c38fa21..245b744 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -5,7 +5,9 @@ import academy.devdojo.springboot2.util.DateUtil; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -21,9 +23,13 @@ public class AnimeController { private final AnimeService animeService; @GetMapping - public List list(){ + public ResponseEntity> list(){ log.info(dateUtil.formatLocalDateTimeToDatabaseStyle(LocalDateTime.now())); - return animeService.listAll(); + return ResponseEntity.ok(animeService.listAll()); } + @GetMapping(path = "/{id}") + public ResponseEntity findById(@PathVariable long id){ + return ResponseEntity.ok(animeService.findById(id)); + } } diff --git a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java index 55ede4a..638f91e 100644 --- a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java +++ b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java @@ -1,15 +1,25 @@ package academy.devdojo.springboot2.service; import academy.devdojo.springboot2.domain.Anime; -import academy.devdojo.springboot2.repository.AnimeRepository; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import org.springframework.web.server.ResponseStatusException; import java.util.List; @Service public class AnimeService { + private List animes = List.of(new Anime(1L, "Boku No Hero"), new Anime(2L, "Berserk")); + // private final AnimeRepository animeRepository; public List listAll() { - return List.of(new Anime(1L, "Boku No Hero"), new Anime(2L, "Berserk")); + return animes; + } + + public Anime findById(long id) { + return animes.stream() + .filter(anime -> anime.getId().equals(id)) + .findFirst() + .orElseThrow(() -> new ResponseStatusException(HttpStatus.BAD_REQUEST, "Anime not Found")); } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 8b13789..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..e3126ec --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,3 @@ +server: + error: + include-stacktrace: on_param From 42ee0e28a746420dfd7e0170f96a32468367d45f Mon Sep 17 00:00:00 2001 From: William Suane Date: Tue, 27 Oct 2020 14:47:14 +0100 Subject: [PATCH 04/47] feat: code used in video 09 --- .../springboot2/controller/AnimeController.java | 11 +++++++---- .../devdojo/springboot2/service/AnimeService.java | 14 +++++++++++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index 245b744..f38adac 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -5,11 +5,9 @@ import academy.devdojo.springboot2.util.DateUtil; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; import java.util.List; @@ -32,4 +30,9 @@ public ResponseEntity> list(){ public ResponseEntity findById(@PathVariable long id){ return ResponseEntity.ok(animeService.findById(id)); } + + @PostMapping + public ResponseEntity save(@RequestBody Anime anime){ + return new ResponseEntity<>(animeService.save(anime), HttpStatus.CREATED); + } } diff --git a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java index 638f91e..0152e91 100644 --- a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java +++ b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java @@ -5,11 +5,17 @@ import org.springframework.stereotype.Service; import org.springframework.web.server.ResponseStatusException; +import java.util.ArrayList; import java.util.List; +import java.util.concurrent.ThreadLocalRandom; @Service public class AnimeService { - private List animes = List.of(new Anime(1L, "Boku No Hero"), new Anime(2L, "Berserk")); + private static List animes; + + static { + animes = new ArrayList<>(List.of(new Anime(1L, "Boku No Hero"), new Anime(2L, "Berserk"))); + } // private final AnimeRepository animeRepository; public List listAll() { @@ -22,4 +28,10 @@ public Anime findById(long id) { .findFirst() .orElseThrow(() -> new ResponseStatusException(HttpStatus.BAD_REQUEST, "Anime not Found")); } + + public Anime save(Anime anime) { + anime.setId(ThreadLocalRandom.current().nextLong(3, 100000)); + animes.add(anime); + return anime; + } } From c4a1e406df25a576ad4f0b57eadd4a0967d7f8f5 Mon Sep 17 00:00:00 2001 From: William Suane Date: Tue, 27 Oct 2020 15:12:27 +0100 Subject: [PATCH 05/47] feat: code used in video 10 --- .../springboot2/controller/AnimeController.java | 12 +++++++++--- .../devdojo/springboot2/service/AnimeService.java | 4 ++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index f38adac..8e18b2f 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -21,18 +21,24 @@ public class AnimeController { private final AnimeService animeService; @GetMapping - public ResponseEntity> list(){ + public ResponseEntity> list() { log.info(dateUtil.formatLocalDateTimeToDatabaseStyle(LocalDateTime.now())); return ResponseEntity.ok(animeService.listAll()); } @GetMapping(path = "/{id}") - public ResponseEntity findById(@PathVariable long id){ + public ResponseEntity findById(@PathVariable long id) { return ResponseEntity.ok(animeService.findById(id)); } @PostMapping - public ResponseEntity save(@RequestBody Anime anime){ + public ResponseEntity save(@RequestBody Anime anime) { return new ResponseEntity<>(animeService.save(anime), HttpStatus.CREATED); } + + @DeleteMapping(path = "/{id}") + public ResponseEntity delete(@PathVariable long id) { + animeService.delete(id); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } } diff --git a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java index 0152e91..6d069c7 100644 --- a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java +++ b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java @@ -34,4 +34,8 @@ public Anime save(Anime anime) { animes.add(anime); return anime; } + + public void delete(long id) { + animes.remove(findById(id)); + } } From 04957af83cb505b38bc13c1e0c35d2eea76e3ada Mon Sep 17 00:00:00 2001 From: William Suane Date: Tue, 27 Oct 2020 15:16:54 +0100 Subject: [PATCH 06/47] feat: code used in video 11 --- .../devdojo/springboot2/controller/AnimeController.java | 6 ++++++ .../academy/devdojo/springboot2/service/AnimeService.java | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index 8e18b2f..b2cb3d3 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -41,4 +41,10 @@ public ResponseEntity delete(@PathVariable long id) { animeService.delete(id); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + + @PutMapping + public ResponseEntity replace(@RequestBody Anime anime) { + animeService.replace(anime); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } } diff --git a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java index 6d069c7..4e3df3b 100644 --- a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java +++ b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java @@ -38,4 +38,9 @@ public Anime save(Anime anime) { public void delete(long id) { animes.remove(findById(id)); } + + public void replace(Anime anime) { + delete(anime.getId()); + animes.add(anime); + } } From b60043a44c8376892a6ca3fc249411812b827c0b Mon Sep 17 00:00:00 2001 From: William Suane Date: Tue, 27 Oct 2020 15:55:43 +0100 Subject: [PATCH 07/47] feat: code used in video 12 --- docker-compose.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..1b33d8d --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.1' +services: + db: + image: mysql + container_name: mysql + environment: + MYSQL_ROOT_PASSWORD: root + ports: + - "3306:3306" + volumes: + - devdojo_data:/var/lib/mysql + +volumes: + devdojo_data: From 983bf94e3818f6e0167d303d7365bc4304a2ff39 Mon Sep 17 00:00:00 2001 From: William Suane Date: Tue, 27 Oct 2020 18:15:09 +0100 Subject: [PATCH 08/47] feat: code used in video 13 --- pom.xml | 10 ++++++++++ .../java/academy/devdojo/springboot2/domain/Anime.java | 10 ++++++++++ src/main/resources/application.yml | 9 +++++++++ 3 files changed, 29 insertions(+) diff --git a/pom.xml b/pom.xml index 693b49e..23f3a2c 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,16 @@ + + org.springframework.boot + spring-boot-starter-data-jpa + + + + mysql + mysql-connector-java + + org.springframework.boot spring-boot-starter-web diff --git a/src/main/java/academy/devdojo/springboot2/domain/Anime.java b/src/main/java/academy/devdojo/springboot2/domain/Anime.java index 245d1e5..d39de8a 100644 --- a/src/main/java/academy/devdojo/springboot2/domain/Anime.java +++ b/src/main/java/academy/devdojo/springboot2/domain/Anime.java @@ -2,10 +2,20 @@ import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; @Data @AllArgsConstructor +@NoArgsConstructor +@Entity public class Anime { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String name; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e3126ec..09e6146 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,12 @@ server: error: include-stacktrace: on_param + +spring: + datasource: + url: jdbc:mysql://localhost:3306/anime?useSSL=false&createDatabaseIfNotExist=true&allowPublicKeyRetrieval=true + username: root + password: root + jpa: + hibernate: + ddl-auto: update \ No newline at end of file From 8aecb6eb9eb28e67bb79bf6cddb346dea31a8090 Mon Sep 17 00:00:00 2001 From: William Suane Date: Tue, 27 Oct 2020 18:34:37 +0100 Subject: [PATCH 09/47] feat: code used in video 14 --- .../controller/AnimeController.java | 12 +++--- .../devdojo/springboot2/domain/Anime.java | 2 + .../repository/AnimeRepository.java | 5 +-- .../requests/AnimePostRequestBody.java | 8 ++++ .../requests/AnimePutRequestBody.java | 9 +++++ .../springboot2/service/AnimeService.java | 40 +++++++++---------- 6 files changed, 48 insertions(+), 28 deletions(-) create mode 100644 src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java create mode 100644 src/main/java/academy/devdojo/springboot2/requests/AnimePutRequestBody.java diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index b2cb3d3..7430030 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -1,6 +1,8 @@ package academy.devdojo.springboot2.controller; import academy.devdojo.springboot2.domain.Anime; +import academy.devdojo.springboot2.requests.AnimePostRequestBody; +import academy.devdojo.springboot2.requests.AnimePutRequestBody; import academy.devdojo.springboot2.service.AnimeService; import academy.devdojo.springboot2.util.DateUtil; import lombok.RequiredArgsConstructor; @@ -28,12 +30,12 @@ public ResponseEntity> list() { @GetMapping(path = "/{id}") public ResponseEntity findById(@PathVariable long id) { - return ResponseEntity.ok(animeService.findById(id)); + return ResponseEntity.ok(animeService.findByIdOrThrowBadRequestException(id)); } @PostMapping - public ResponseEntity save(@RequestBody Anime anime) { - return new ResponseEntity<>(animeService.save(anime), HttpStatus.CREATED); + public ResponseEntity save(@RequestBody AnimePostRequestBody animePostRequestBody) { + return new ResponseEntity<>(animeService.save(animePostRequestBody), HttpStatus.CREATED); } @DeleteMapping(path = "/{id}") @@ -43,8 +45,8 @@ public ResponseEntity delete(@PathVariable long id) { } @PutMapping - public ResponseEntity replace(@RequestBody Anime anime) { - animeService.replace(anime); + public ResponseEntity replace(@RequestBody AnimePutRequestBody animePutRequestBody) { + animeService.replace(animePutRequestBody); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } } diff --git a/src/main/java/academy/devdojo/springboot2/domain/Anime.java b/src/main/java/academy/devdojo/springboot2/domain/Anime.java index d39de8a..eeb2f05 100644 --- a/src/main/java/academy/devdojo/springboot2/domain/Anime.java +++ b/src/main/java/academy/devdojo/springboot2/domain/Anime.java @@ -1,6 +1,7 @@ package academy.devdojo.springboot2.domain; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; @@ -13,6 +14,7 @@ @AllArgsConstructor @NoArgsConstructor @Entity +@Builder public class Anime { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/academy/devdojo/springboot2/repository/AnimeRepository.java b/src/main/java/academy/devdojo/springboot2/repository/AnimeRepository.java index c1e0db2..f06ae57 100644 --- a/src/main/java/academy/devdojo/springboot2/repository/AnimeRepository.java +++ b/src/main/java/academy/devdojo/springboot2/repository/AnimeRepository.java @@ -1,9 +1,8 @@ package academy.devdojo.springboot2.repository; import academy.devdojo.springboot2.domain.Anime; +import org.springframework.data.jpa.repository.JpaRepository; -import java.util.List; +public interface AnimeRepository extends JpaRepository { -public interface AnimeRepository { - List listAll(); } diff --git a/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java b/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java new file mode 100644 index 0000000..7424bf8 --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java @@ -0,0 +1,8 @@ +package academy.devdojo.springboot2.requests; + +import lombok.Data; + +@Data +public class AnimePostRequestBody { + private String name; +} diff --git a/src/main/java/academy/devdojo/springboot2/requests/AnimePutRequestBody.java b/src/main/java/academy/devdojo/springboot2/requests/AnimePutRequestBody.java new file mode 100644 index 0000000..64003b9 --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/requests/AnimePutRequestBody.java @@ -0,0 +1,9 @@ +package academy.devdojo.springboot2.requests; + +import lombok.Data; + +@Data +public class AnimePutRequestBody { + private Long id; + private String name; +} diff --git a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java index 4e3df3b..3819fd1 100644 --- a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java +++ b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java @@ -1,46 +1,46 @@ package academy.devdojo.springboot2.service; import academy.devdojo.springboot2.domain.Anime; +import academy.devdojo.springboot2.repository.AnimeRepository; +import academy.devdojo.springboot2.requests.AnimePostRequestBody; +import academy.devdojo.springboot2.requests.AnimePutRequestBody; +import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.web.server.ResponseStatusException; -import java.util.ArrayList; import java.util.List; -import java.util.concurrent.ThreadLocalRandom; @Service +@RequiredArgsConstructor public class AnimeService { - private static List animes; - static { - animes = new ArrayList<>(List.of(new Anime(1L, "Boku No Hero"), new Anime(2L, "Berserk"))); - } + private final AnimeRepository animeRepository; - // private final AnimeRepository animeRepository; public List listAll() { - return animes; + return animeRepository.findAll(); } - public Anime findById(long id) { - return animes.stream() - .filter(anime -> anime.getId().equals(id)) - .findFirst() + public Anime findByIdOrThrowBadRequestException(long id) { + return animeRepository.findById(id) .orElseThrow(() -> new ResponseStatusException(HttpStatus.BAD_REQUEST, "Anime not Found")); } - public Anime save(Anime anime) { - anime.setId(ThreadLocalRandom.current().nextLong(3, 100000)); - animes.add(anime); - return anime; + public Anime save(AnimePostRequestBody animePostRequestBody) { + return animeRepository.save(Anime.builder().name(animePostRequestBody.getName()).build()); } public void delete(long id) { - animes.remove(findById(id)); + animeRepository.delete(findByIdOrThrowBadRequestException(id)); } - public void replace(Anime anime) { - delete(anime.getId()); - animes.add(anime); + public void replace(AnimePutRequestBody animePutRequestBody) { + Anime savedAnime = findByIdOrThrowBadRequestException(animePutRequestBody.getId()); + Anime anime = Anime.builder() + .id(savedAnime.getId()) + .name(animePutRequestBody.getName()) + .build(); + + animeRepository.save(anime); } } From 1b61b8ef1c8e1bbf3e1664d54ba36cafe71b90e3 Mon Sep 17 00:00:00 2001 From: William Suane Date: Tue, 27 Oct 2020 18:50:06 +0100 Subject: [PATCH 10/47] feat: code used in video 15 --- pom.xml | 148 +++++++++++------- .../springboot2/mapper/AnimeMapper.java | 16 ++ .../springboot2/service/AnimeService.java | 10 +- 3 files changed, 108 insertions(+), 66 deletions(-) create mode 100644 src/main/java/academy/devdojo/springboot2/mapper/AnimeMapper.java diff --git a/pom.xml b/pom.xml index 23f3a2c..4e3bc0e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,71 +1,99 @@ - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.3.4.RELEASE - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.3.4.RELEASE + + - academy.devdojo - springboot2-essentials - 0.0.1-SNAPSHOT - springboot2-essentials - Curso de Spring Boot do DevDojo + academy.devdojo + springboot2-essentials + 0.0.1-SNAPSHOT + springboot2-essentials + Curso de Spring Boot do DevDojo - - 11 - + + 11 + 1.4.1.Final + 3.8.1 + - - - org.springframework.boot - spring-boot-starter-data-jpa - + + + org.mapstruct + mapstruct + ${org.mapstruct.version} + + + org.springframework.boot + spring-boot-starter-data-jpa + - - mysql - mysql-connector-java - + + mysql + mysql-connector-java + - - org.springframework.boot - spring-boot-starter-web - + + org.springframework.boot + spring-boot-starter-web + - - org.springframework.boot - spring-boot-devtools - runtime - true - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - org.junit.vintage - junit-vintage-engine - - - - + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + 11 + 11 + + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + + + org.projectlombok + lombok + ${lombok.version} + + + + + + diff --git a/src/main/java/academy/devdojo/springboot2/mapper/AnimeMapper.java b/src/main/java/academy/devdojo/springboot2/mapper/AnimeMapper.java new file mode 100644 index 0000000..2a116c9 --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/mapper/AnimeMapper.java @@ -0,0 +1,16 @@ +package academy.devdojo.springboot2.mapper; + +import academy.devdojo.springboot2.domain.Anime; +import academy.devdojo.springboot2.requests.AnimePostRequestBody; +import academy.devdojo.springboot2.requests.AnimePutRequestBody; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +@Mapper(componentModel = "spring") +public abstract class AnimeMapper { + public static final AnimeMapper INSTANCE = Mappers.getMapper(AnimeMapper.class); + + public abstract Anime toAnime(AnimePostRequestBody animePostRequestBody); + + public abstract Anime toAnime(AnimePutRequestBody animePostRequestBody); +} diff --git a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java index 3819fd1..89f9191 100644 --- a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java +++ b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java @@ -1,6 +1,7 @@ package academy.devdojo.springboot2.service; import academy.devdojo.springboot2.domain.Anime; +import academy.devdojo.springboot2.mapper.AnimeMapper; import academy.devdojo.springboot2.repository.AnimeRepository; import academy.devdojo.springboot2.requests.AnimePostRequestBody; import academy.devdojo.springboot2.requests.AnimePutRequestBody; @@ -27,7 +28,7 @@ public Anime findByIdOrThrowBadRequestException(long id) { } public Anime save(AnimePostRequestBody animePostRequestBody) { - return animeRepository.save(Anime.builder().name(animePostRequestBody.getName()).build()); + return animeRepository.save(AnimeMapper.INSTANCE.toAnime(animePostRequestBody)); } public void delete(long id) { @@ -36,11 +37,8 @@ public void delete(long id) { public void replace(AnimePutRequestBody animePutRequestBody) { Anime savedAnime = findByIdOrThrowBadRequestException(animePutRequestBody.getId()); - Anime anime = Anime.builder() - .id(savedAnime.getId()) - .name(animePutRequestBody.getName()) - .build(); - + Anime anime = AnimeMapper.INSTANCE.toAnime(animePutRequestBody); + anime.setId(savedAnime.getId()); animeRepository.save(anime); } } From 01f37e3a3bc97771d63705ed8e4e67174769c6c7 Mon Sep 17 00:00:00 2001 From: William Suane Date: Wed, 28 Oct 2020 10:46:57 +0100 Subject: [PATCH 11/47] feat: code used in video 16 --- .../devdojo/springboot2/controller/AnimeController.java | 4 ++++ .../devdojo/springboot2/repository/AnimeRepository.java | 3 +++ .../academy/devdojo/springboot2/service/AnimeService.java | 4 ++++ src/main/resources/application.yml | 5 +++-- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index 7430030..1cbdc91 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -32,6 +32,10 @@ public ResponseEntity> list() { public ResponseEntity findById(@PathVariable long id) { return ResponseEntity.ok(animeService.findByIdOrThrowBadRequestException(id)); } + @GetMapping(path = "/find") + public ResponseEntity> findByName(@RequestParam String name) { + return ResponseEntity.ok(animeService.findByName(name)); + } @PostMapping public ResponseEntity save(@RequestBody AnimePostRequestBody animePostRequestBody) { diff --git a/src/main/java/academy/devdojo/springboot2/repository/AnimeRepository.java b/src/main/java/academy/devdojo/springboot2/repository/AnimeRepository.java index f06ae57..d8223b1 100644 --- a/src/main/java/academy/devdojo/springboot2/repository/AnimeRepository.java +++ b/src/main/java/academy/devdojo/springboot2/repository/AnimeRepository.java @@ -3,6 +3,9 @@ import academy.devdojo.springboot2.domain.Anime; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; + public interface AnimeRepository extends JpaRepository { + List findByName(String name); } diff --git a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java index 89f9191..12f829c 100644 --- a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java +++ b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java @@ -22,6 +22,10 @@ public List listAll() { return animeRepository.findAll(); } + public List findByName(String name) { + return animeRepository.findByName(name); + } + public Anime findByIdOrThrowBadRequestException(long id) { return animeRepository.findById(id) .orElseThrow(() -> new ResponseStatusException(HttpStatus.BAD_REQUEST, "Anime not Found")); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 09e6146..2660eca 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,9 +4,10 @@ server: spring: datasource: - url: jdbc:mysql://localhost:3306/anime?useSSL=false&createDatabaseIfNotExist=true&allowPublicKeyRetrieval=true + url: jdbc:mysql://localhost:3306/anime?createDatabaseIfNotExist=true username: root password: root jpa: hibernate: - ddl-auto: update \ No newline at end of file + ddl-auto: update + show-sql: true \ No newline at end of file From 2332b66e5003986bc6b399204b7b638950031367 Mon Sep 17 00:00:00 2001 From: William Suane Date: Wed, 28 Oct 2020 10:57:35 +0100 Subject: [PATCH 12/47] feat: code used in video 17 --- .../springboot2/exception/BadRequestException.java | 11 +++++++++++ .../devdojo/springboot2/service/AnimeService.java | 5 ++--- 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 src/main/java/academy/devdojo/springboot2/exception/BadRequestException.java diff --git a/src/main/java/academy/devdojo/springboot2/exception/BadRequestException.java b/src/main/java/academy/devdojo/springboot2/exception/BadRequestException.java new file mode 100644 index 0000000..7d71231 --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/exception/BadRequestException.java @@ -0,0 +1,11 @@ +package academy.devdojo.springboot2.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ResponseStatus(HttpStatus.BAD_REQUEST) +public class BadRequestException extends RuntimeException{ + public BadRequestException(String message) { + super(message); + } +} diff --git a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java index 12f829c..dd021ab 100644 --- a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java +++ b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java @@ -1,14 +1,13 @@ package academy.devdojo.springboot2.service; import academy.devdojo.springboot2.domain.Anime; +import academy.devdojo.springboot2.exception.BadRequestException; import academy.devdojo.springboot2.mapper.AnimeMapper; import academy.devdojo.springboot2.repository.AnimeRepository; import academy.devdojo.springboot2.requests.AnimePostRequestBody; import academy.devdojo.springboot2.requests.AnimePutRequestBody; import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import org.springframework.web.server.ResponseStatusException; import java.util.List; @@ -28,7 +27,7 @@ public List findByName(String name) { public Anime findByIdOrThrowBadRequestException(long id) { return animeRepository.findById(id) - .orElseThrow(() -> new ResponseStatusException(HttpStatus.BAD_REQUEST, "Anime not Found")); + .orElseThrow(() -> new BadRequestException("Anime not Found")); } public Anime save(AnimePostRequestBody animePostRequestBody) { From 0b6be7e54c7161599aae56e968bfd3dd7e7eed90 Mon Sep 17 00:00:00 2001 From: William Suane Date: Wed, 28 Oct 2020 11:10:18 +0100 Subject: [PATCH 13/47] feat: code used in video 18 --- .../exception/BadRequestExceptionDetails.java | 16 ++++++++++++ .../handler/RestExceptionHandler.java | 26 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 src/main/java/academy/devdojo/springboot2/exception/BadRequestExceptionDetails.java create mode 100644 src/main/java/academy/devdojo/springboot2/handler/RestExceptionHandler.java diff --git a/src/main/java/academy/devdojo/springboot2/exception/BadRequestExceptionDetails.java b/src/main/java/academy/devdojo/springboot2/exception/BadRequestExceptionDetails.java new file mode 100644 index 0000000..d93e234 --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/exception/BadRequestExceptionDetails.java @@ -0,0 +1,16 @@ +package academy.devdojo.springboot2.exception; + +import lombok.Builder; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +@Builder +public class BadRequestExceptionDetails { + private String title; + private int status; + private String details; + private String developerMessage; + private LocalDateTime timestamp; +} diff --git a/src/main/java/academy/devdojo/springboot2/handler/RestExceptionHandler.java b/src/main/java/academy/devdojo/springboot2/handler/RestExceptionHandler.java new file mode 100644 index 0000000..1816bf1 --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/handler/RestExceptionHandler.java @@ -0,0 +1,26 @@ +package academy.devdojo.springboot2.handler; + +import academy.devdojo.springboot2.exception.BadRequestException; +import academy.devdojo.springboot2.exception.BadRequestExceptionDetails; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +import java.time.LocalDateTime; + +@ControllerAdvice +public class RestExceptionHandler { + + @ExceptionHandler(BadRequestException.class) + public ResponseEntity handlerBadRequestException(BadRequestException bre){ + return new ResponseEntity<>( + BadRequestExceptionDetails.builder() + .timestamp(LocalDateTime.now()) + .status(HttpStatus.BAD_REQUEST.value()) + .title("Bad Request Exception, Check the Documentation") + .details(bre.getMessage()) + .developerMessage(bre.getClass().getName()) + .build(), HttpStatus.BAD_REQUEST); + } +} From 1eb989fe60446afc5d0f0b6737c902b1cc50a123 Mon Sep 17 00:00:00 2001 From: William Suane Date: Wed, 28 Oct 2020 11:24:11 +0100 Subject: [PATCH 14/47] feat: code used in video 19 --- .../academy/devdojo/springboot2/controller/AnimeController.java | 1 + .../java/academy/devdojo/springboot2/service/AnimeService.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index 1cbdc91..646af77 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -32,6 +32,7 @@ public ResponseEntity> list() { public ResponseEntity findById(@PathVariable long id) { return ResponseEntity.ok(animeService.findByIdOrThrowBadRequestException(id)); } + @GetMapping(path = "/find") public ResponseEntity> findByName(@RequestParam String name) { return ResponseEntity.ok(animeService.findByName(name)); diff --git a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java index dd021ab..3e7824c 100644 --- a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java +++ b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java @@ -8,6 +8,7 @@ import academy.devdojo.springboot2.requests.AnimePutRequestBody; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -30,6 +31,7 @@ public Anime findByIdOrThrowBadRequestException(long id) { .orElseThrow(() -> new BadRequestException("Anime not Found")); } + @Transactional public Anime save(AnimePostRequestBody animePostRequestBody) { return animeRepository.save(AnimeMapper.INSTANCE.toAnime(animePostRequestBody)); } From 78dc10c143167f2fd22505309f932120e1a6fcdc Mon Sep 17 00:00:00 2001 From: William Suane Date: Wed, 28 Oct 2020 11:38:15 +0100 Subject: [PATCH 15/47] feat: code used in video 20 --- pom.xml | 5 +++++ .../devdojo/springboot2/controller/AnimeController.java | 3 ++- .../devdojo/springboot2/requests/AnimePostRequestBody.java | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e3bc0e..68ff124 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,11 @@ + + org.springframework.boot + spring-boot-starter-validation + + org.mapstruct mapstruct diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index 646af77..f408121 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -11,6 +11,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.time.LocalDateTime; import java.util.List; @@ -39,7 +40,7 @@ public ResponseEntity> findByName(@RequestParam String name) { } @PostMapping - public ResponseEntity save(@RequestBody AnimePostRequestBody animePostRequestBody) { + public ResponseEntity save(@RequestBody @Valid AnimePostRequestBody animePostRequestBody) { return new ResponseEntity<>(animeService.save(animePostRequestBody), HttpStatus.CREATED); } diff --git a/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java b/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java index 7424bf8..e118c4f 100644 --- a/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java +++ b/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java @@ -2,7 +2,10 @@ import lombok.Data; +import javax.validation.constraints.NotEmpty; + @Data public class AnimePostRequestBody { + @NotEmpty(message = "The anime name cannot be empty") private String name; } From a2957f747027de150c1839742de68061d7fa1069 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Fri, 25 Feb 2022 14:27:03 -0300 Subject: [PATCH 16/47] =?UTF-8?q?Continua=C3=A7=C3=A3o=20SpringBoot-2=20es?= =?UTF-8?q?sentials?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devdojo/springboot2/domain/Anime.java | 3 ++ .../exception/BadRequestExceptionDetails.java | 14 ++++----- .../exception/ExceptionDetails.java | 16 ++++++++++ .../exception/ValidationExceptionDetails.java | 11 +++++++ .../handler/RestExceptionHandler.java | 30 +++++++++++++++++++ .../requests/AnimePostRequestBody.java | 3 ++ 6 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 src/main/java/academy/devdojo/springboot2/exception/ExceptionDetails.java create mode 100644 src/main/java/academy/devdojo/springboot2/exception/ValidationExceptionDetails.java diff --git a/src/main/java/academy/devdojo/springboot2/domain/Anime.java b/src/main/java/academy/devdojo/springboot2/domain/Anime.java index eeb2f05..98fb4f5 100644 --- a/src/main/java/academy/devdojo/springboot2/domain/Anime.java +++ b/src/main/java/academy/devdojo/springboot2/domain/Anime.java @@ -4,11 +4,13 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.URL; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; +import javax.validation.constraints.NotEmpty; @Data @AllArgsConstructor @@ -21,4 +23,5 @@ public class Anime { private Long id; private String name; + } diff --git a/src/main/java/academy/devdojo/springboot2/exception/BadRequestExceptionDetails.java b/src/main/java/academy/devdojo/springboot2/exception/BadRequestExceptionDetails.java index d93e234..82cde2c 100644 --- a/src/main/java/academy/devdojo/springboot2/exception/BadRequestExceptionDetails.java +++ b/src/main/java/academy/devdojo/springboot2/exception/BadRequestExceptionDetails.java @@ -2,15 +2,13 @@ import lombok.Builder; import lombok.Data; +import lombok.Getter; +import lombok.experimental.SuperBuilder; import java.time.LocalDateTime; -@Data -@Builder -public class BadRequestExceptionDetails { - private String title; - private int status; - private String details; - private String developerMessage; - private LocalDateTime timestamp; +@Getter +@SuperBuilder +public class BadRequestExceptionDetails extends ExceptionDetails { + } diff --git a/src/main/java/academy/devdojo/springboot2/exception/ExceptionDetails.java b/src/main/java/academy/devdojo/springboot2/exception/ExceptionDetails.java new file mode 100644 index 0000000..d60077d --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/exception/ExceptionDetails.java @@ -0,0 +1,16 @@ +package academy.devdojo.springboot2.exception; + +import lombok.Data; +import lombok.experimental.SuperBuilder; + +import java.time.LocalDateTime; + +@Data +@SuperBuilder +public class ExceptionDetails { + protected String title; + protected int status; + protected String details; + protected String developerMessage; + protected LocalDateTime timestamp; +} diff --git a/src/main/java/academy/devdojo/springboot2/exception/ValidationExceptionDetails.java b/src/main/java/academy/devdojo/springboot2/exception/ValidationExceptionDetails.java new file mode 100644 index 0000000..63134be --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/exception/ValidationExceptionDetails.java @@ -0,0 +1,11 @@ +package academy.devdojo.springboot2.exception; + +import lombok.Getter; +import lombok.experimental.SuperBuilder; + +@Getter +@SuperBuilder +public class ValidationExceptionDetails extends ExceptionDetails{ + private final String fields; + private final String fieldsMessage; +} diff --git a/src/main/java/academy/devdojo/springboot2/handler/RestExceptionHandler.java b/src/main/java/academy/devdojo/springboot2/handler/RestExceptionHandler.java index 1816bf1..784e12d 100644 --- a/src/main/java/academy/devdojo/springboot2/handler/RestExceptionHandler.java +++ b/src/main/java/academy/devdojo/springboot2/handler/RestExceptionHandler.java @@ -2,14 +2,22 @@ import academy.devdojo.springboot2.exception.BadRequestException; import academy.devdojo.springboot2.exception.BadRequestExceptionDetails; +import academy.devdojo.springboot2.exception.ValidationExceptionDetails; +import lombok.extern.log4j.Log4j2; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Collectors; + @ControllerAdvice +@Log4j2 public class RestExceptionHandler { @ExceptionHandler(BadRequestException.class) @@ -23,4 +31,26 @@ public ResponseEntity handlerBadRequestException(Bad .developerMessage(bre.getClass().getName()) .build(), HttpStatus.BAD_REQUEST); } + + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity handlerMethodArgumentNotValidException( + MethodArgumentNotValidException exception){ + List fieldErrors = exception.getBindingResult().getFieldErrors(); + String fields = fieldErrors.stream().map(FieldError::getField).collect(Collectors.joining(", ")); + String fieldsMessage = fieldErrors.stream().map(FieldError::getDefaultMessage).collect(Collectors.joining(", ")); + + return new ResponseEntity<>( + ValidationExceptionDetails.builder() + .timestamp(LocalDateTime.now()) + .status(HttpStatus.BAD_REQUEST.value()) + .title("Bad Request Exception, Invalid fields") + .details("Check the field(s) error") + .developerMessage(exception.getClass().getName()) + .fields(fields) + .fieldsMessage(fieldsMessage) + .build(), HttpStatus.BAD_REQUEST); + } + + + } diff --git a/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java b/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java index e118c4f..6205cfd 100644 --- a/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java +++ b/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java @@ -1,11 +1,14 @@ package academy.devdojo.springboot2.requests; import lombok.Data; +import org.hibernate.validator.constraints.URL; import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; @Data public class AnimePostRequestBody { @NotEmpty(message = "The anime name cannot be empty") private String name; + } From 5888a89ab5fe7bd0e94be89771e8a6a7154a1b33 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Sat, 12 Mar 2022 20:12:08 -0300 Subject: [PATCH 17/47] =?UTF-8?q?altera=C3=A7ao=20do=20mapstruct?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 68ff124..613d57d 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 11 - 1.4.1.Final + 1.4.2.Final 3.8.1 From ae740a665250beba70ff3fbdfabcf874922577fd Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Sat, 12 Mar 2022 21:15:57 -0300 Subject: [PATCH 18/47] Aula 22 - Sobrescrevendo handler do Spring --- .../exception/BadRequestExceptionDetails.java | 4 --- .../handler/RestExceptionHandler.java | 30 +++++++++++++++---- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/main/java/academy/devdojo/springboot2/exception/BadRequestExceptionDetails.java b/src/main/java/academy/devdojo/springboot2/exception/BadRequestExceptionDetails.java index 82cde2c..51df01b 100644 --- a/src/main/java/academy/devdojo/springboot2/exception/BadRequestExceptionDetails.java +++ b/src/main/java/academy/devdojo/springboot2/exception/BadRequestExceptionDetails.java @@ -1,12 +1,8 @@ package academy.devdojo.springboot2.exception; -import lombok.Builder; -import lombok.Data; import lombok.Getter; import lombok.experimental.SuperBuilder; -import java.time.LocalDateTime; - @Getter @SuperBuilder public class BadRequestExceptionDetails extends ExceptionDetails { diff --git a/src/main/java/academy/devdojo/springboot2/handler/RestExceptionHandler.java b/src/main/java/academy/devdojo/springboot2/handler/RestExceptionHandler.java index 784e12d..c946cc6 100644 --- a/src/main/java/academy/devdojo/springboot2/handler/RestExceptionHandler.java +++ b/src/main/java/academy/devdojo/springboot2/handler/RestExceptionHandler.java @@ -2,14 +2,19 @@ import academy.devdojo.springboot2.exception.BadRequestException; import academy.devdojo.springboot2.exception.BadRequestExceptionDetails; +import academy.devdojo.springboot2.exception.ExceptionDetails; import academy.devdojo.springboot2.exception.ValidationExceptionDetails; import lombok.extern.log4j.Log4j2; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.lang.Nullable; import org.springframework.validation.FieldError; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; import java.time.LocalDateTime; import java.util.List; @@ -18,10 +23,10 @@ @ControllerAdvice @Log4j2 -public class RestExceptionHandler { +public class RestExceptionHandler extends ResponseEntityExceptionHandler { @ExceptionHandler(BadRequestException.class) - public ResponseEntity handlerBadRequestException(BadRequestException bre){ + public ResponseEntity handleBadRequestException(BadRequestException bre) { return new ResponseEntity<>( BadRequestExceptionDetails.builder() .timestamp(LocalDateTime.now()) @@ -32,9 +37,10 @@ public ResponseEntity handlerBadRequestException(Bad .build(), HttpStatus.BAD_REQUEST); } - @ExceptionHandler(MethodArgumentNotValidException.class) - public ResponseEntity handlerMethodArgumentNotValidException( - MethodArgumentNotValidException exception){ + @Override + protected ResponseEntity handleMethodArgumentNotValid( + MethodArgumentNotValidException exception, HttpHeaders headers, HttpStatus status, WebRequest request) { + List fieldErrors = exception.getBindingResult().getFieldErrors(); String fields = fieldErrors.stream().map(FieldError::getField).collect(Collectors.joining(", ")); String fieldsMessage = fieldErrors.stream().map(FieldError::getDefaultMessage).collect(Collectors.joining(", ")); @@ -51,6 +57,20 @@ public ResponseEntity handlerMethodArgumentNotValidE .build(), HttpStatus.BAD_REQUEST); } + @Override + protected ResponseEntity handleExceptionInternal( + Exception ex, @Nullable Object body, HttpHeaders headers, HttpStatus status, WebRequest request) { + + ExceptionDetails exceptionDetails = ExceptionDetails.builder() + .timestamp(LocalDateTime.now()) + .status(status.value()) + .title(ex.getCause().getMessage()) + .details(ex.getMessage()) + .developerMessage(ex.getClass().getName()) + .build(); + + return new ResponseEntity<>(exceptionDetails, headers, status); + } } From e9ef220e48f9ece7f99d6377bd7ef0aed0c6ba9c Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Sun, 13 Mar 2022 10:41:46 -0300 Subject: [PATCH 19/47] =?UTF-8?q?Aula=2023=20-=20Pagina=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devdojo/springboot2/controller/AnimeController.java | 7 +++++-- .../academy/devdojo/springboot2/service/AnimeService.java | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index f408121..347d333 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -7,6 +7,9 @@ import academy.devdojo.springboot2.util.DateUtil; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.springframework.boot.autoconfigure.data.web.SpringDataWebProperties; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -24,9 +27,9 @@ public class AnimeController { private final AnimeService animeService; @GetMapping - public ResponseEntity> list() { + public ResponseEntity> list(Pageable pageable) { log.info(dateUtil.formatLocalDateTimeToDatabaseStyle(LocalDateTime.now())); - return ResponseEntity.ok(animeService.listAll()); + return ResponseEntity.ok(animeService.listAll(pageable)); } @GetMapping(path = "/{id}") diff --git a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java index 3e7824c..9591a34 100644 --- a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java +++ b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java @@ -7,6 +7,8 @@ import academy.devdojo.springboot2.requests.AnimePostRequestBody; import academy.devdojo.springboot2.requests.AnimePutRequestBody; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -18,8 +20,8 @@ public class AnimeService { private final AnimeRepository animeRepository; - public List listAll() { - return animeRepository.findAll(); + public Page listAll(Pageable pageable) { + return animeRepository.findAll(pageable); } public List findByName(String name) { From 24510c3c31bc9c75529e6e9c08fc67304d762912 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Sun, 13 Mar 2022 10:54:21 -0300 Subject: [PATCH 20/47] Aula 24 - WebMvcConfigurer --- .../configurer/DevDojoWebConfigurer.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/main/java/academy/devdojo/springboot2/configurer/DevDojoWebConfigurer.java diff --git a/src/main/java/academy/devdojo/springboot2/configurer/DevDojoWebConfigurer.java b/src/main/java/academy/devdojo/springboot2/configurer/DevDojoWebConfigurer.java new file mode 100644 index 0000000..7949d23 --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/configurer/DevDojoWebConfigurer.java @@ -0,0 +1,20 @@ +package academy.devdojo.springboot2.configurer; + +import org.springframework.context.annotation.Configuration; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.web.PageableHandlerMethodArgumentResolver; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.util.List; + +@Configuration +public class DevDojoWebConfigurer implements WebMvcConfigurer { + + @Override + public void addArgumentResolvers(List resolvers) { + PageableHandlerMethodArgumentResolver pageHandler = new PageableHandlerMethodArgumentResolver(); + pageHandler.setFallbackPageable(PageRequest.of(0, 5)); + resolvers.add(pageHandler); + } +} From 8855a53e7877728cc19f3563330840acc55ebdc3 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Sun, 13 Mar 2022 11:07:31 -0300 Subject: [PATCH 21/47] Aula 25 - Sorting, Log SQL --- ...ojoWebConfigurer.java => DevDojoWebMvcConfigurer.java} | 2 +- src/main/resources/application.yml | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) rename src/main/java/academy/devdojo/springboot2/configurer/{DevDojoWebConfigurer.java => DevDojoWebMvcConfigurer.java} (91%) diff --git a/src/main/java/academy/devdojo/springboot2/configurer/DevDojoWebConfigurer.java b/src/main/java/academy/devdojo/springboot2/configurer/DevDojoWebMvcConfigurer.java similarity index 91% rename from src/main/java/academy/devdojo/springboot2/configurer/DevDojoWebConfigurer.java rename to src/main/java/academy/devdojo/springboot2/configurer/DevDojoWebMvcConfigurer.java index 7949d23..3cc7f33 100644 --- a/src/main/java/academy/devdojo/springboot2/configurer/DevDojoWebConfigurer.java +++ b/src/main/java/academy/devdojo/springboot2/configurer/DevDojoWebMvcConfigurer.java @@ -9,7 +9,7 @@ import java.util.List; @Configuration -public class DevDojoWebConfigurer implements WebMvcConfigurer { +public class DevDojoWebMvcConfigurer implements WebMvcConfigurer { @Override public void addArgumentResolvers(List resolvers) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2660eca..aba1c49 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,4 +10,10 @@ spring: jpa: hibernate: ddl-auto: update - show-sql: true \ No newline at end of file + + +logging: + level: + org: + hibernate: + SQL: DEBUG \ No newline at end of file From 5f7e0670ea531b198c7effba2491c24cdbb41a1e Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Mon, 14 Mar 2022 13:29:01 -0300 Subject: [PATCH 22/47] Aula 26 - RestTemplate getForObject e getForEntity --- .../springboot2/client/SpringClient.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/main/java/academy/devdojo/springboot2/client/SpringClient.java diff --git a/src/main/java/academy/devdojo/springboot2/client/SpringClient.java b/src/main/java/academy/devdojo/springboot2/client/SpringClient.java new file mode 100644 index 0000000..c90bb5a --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/client/SpringClient.java @@ -0,0 +1,19 @@ +package academy.devdojo.springboot2.client; + +import academy.devdojo.springboot2.domain.Anime; +import lombok.extern.log4j.Log4j2; +import org.springframework.http.ResponseEntity; +import org.springframework.web.client.RestTemplate; + +@Log4j2 +public class SpringClient { + public static void main(String[] args) { + ResponseEntity entity = new RestTemplate().getForEntity("http://localhost:8080/animes/{id}", + Anime.class, 7); + log.info(entity); + + Anime object = new RestTemplate().getForObject("http://localhost:8080/animes/{id}", + Anime.class, 7); + log.info(object); + } +} From de9e0978116379252782bedd674d6f49c305abfb Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Mon, 14 Mar 2022 14:01:09 -0300 Subject: [PATCH 23/47] Aula 27 - RestTemplate exchange --- .../springboot2/client/SpringClient.java | 23 +++++++++++++++---- .../controller/AnimeController.java | 7 +++++- .../springboot2/service/AnimeService.java | 5 ++++ 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/main/java/academy/devdojo/springboot2/client/SpringClient.java b/src/main/java/academy/devdojo/springboot2/client/SpringClient.java index c90bb5a..9d277ee 100644 --- a/src/main/java/academy/devdojo/springboot2/client/SpringClient.java +++ b/src/main/java/academy/devdojo/springboot2/client/SpringClient.java @@ -2,18 +2,33 @@ import academy.devdojo.springboot2.domain.Anime; import lombok.extern.log4j.Log4j2; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestTemplate; +import java.util.Arrays; +import java.util.List; + @Log4j2 public class SpringClient { public static void main(String[] args) { - ResponseEntity entity = new RestTemplate().getForEntity("http://localhost:8080/animes/{id}", - Anime.class, 7); + ResponseEntity entity = new RestTemplate().getForEntity("http://localhost:8080/animes/{id}", Anime.class, 7); log.info(entity); - Anime object = new RestTemplate().getForObject("http://localhost:8080/animes/{id}", - Anime.class, 7); + Anime object = new RestTemplate().getForObject("http://localhost:8080/animes/{id}", Anime.class, 7); + log.info(object); + + Anime[] animes = new RestTemplate().getForObject("http://localhost:8080/animes/all", Anime[].class); + + log.info(Arrays.toString(animes)); + //@formatter:off + ResponseEntity> exchange = new RestTemplate().exchange("http://localhost:8080/animes/all" + ,HttpMethod.GET + ,null + , new ParameterizedTypeReference<>() {}); + //@formatter:on + log.info(exchange.getBody()); } } diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index 347d333..4672164 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -7,7 +7,6 @@ import academy.devdojo.springboot2.util.DateUtil; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; -import org.springframework.boot.autoconfigure.data.web.SpringDataWebProperties; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -32,6 +31,12 @@ public ResponseEntity> list(Pageable pageable) { return ResponseEntity.ok(animeService.listAll(pageable)); } + @GetMapping(path = "/all") + public ResponseEntity> listAll() { + log.info(dateUtil.formatLocalDateTimeToDatabaseStyle(LocalDateTime.now())); + return ResponseEntity.ok(animeService.listAllNonPageable()); + } + @GetMapping(path = "/{id}") public ResponseEntity findById(@PathVariable long id) { return ResponseEntity.ok(animeService.findByIdOrThrowBadRequestException(id)); diff --git a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java index 9591a34..60a3b01 100644 --- a/src/main/java/academy/devdojo/springboot2/service/AnimeService.java +++ b/src/main/java/academy/devdojo/springboot2/service/AnimeService.java @@ -24,6 +24,10 @@ public Page listAll(Pageable pageable) { return animeRepository.findAll(pageable); } + public List listAllNonPageable() { + return animeRepository.findAll(); + } + public List findByName(String name) { return animeRepository.findByName(name); } @@ -48,4 +52,5 @@ public void replace(AnimePutRequestBody animePutRequestBody) { anime.setId(savedAnime.getId()); animeRepository.save(anime); } + } From 0e4ec0fc1b233e0ca2eacaa970c1bd9234ed0cb3 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Tue, 15 Mar 2022 13:46:16 -0300 Subject: [PATCH 24/47] Aula 28 - RestTemplate POST --- .../springboot2/client/SpringClient.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/academy/devdojo/springboot2/client/SpringClient.java b/src/main/java/academy/devdojo/springboot2/client/SpringClient.java index 9d277ee..0550f14 100644 --- a/src/main/java/academy/devdojo/springboot2/client/SpringClient.java +++ b/src/main/java/academy/devdojo/springboot2/client/SpringClient.java @@ -3,8 +3,7 @@ import academy.devdojo.springboot2.domain.Anime; import lombok.extern.log4j.Log4j2; import org.springframework.core.ParameterizedTypeReference; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; +import org.springframework.http.*; import org.springframework.web.client.RestTemplate; import java.util.Arrays; @@ -30,5 +29,22 @@ public static void main(String[] args) { , new ParameterizedTypeReference<>() {}); //@formatter:on log.info(exchange.getBody()); + +// Anime kingdom = Anime.builder().name("Kingdom").build(); +// Anime kingdomSaved = new RestTemplate().postForObject("http://localhost:8080/animes/", kingdom, Anime.class); +// log.info("Saved anime '{}'", kingdomSaved); + + Anime samuraiChamploo = Anime.builder().name("Samurai Champloo").build(); + ResponseEntity samuraiChamplooSaved = new RestTemplate().exchange("http://localhost:8080/animes/", + HttpMethod.POST, + new HttpEntity<>(samuraiChamploo, httpJsonHeaders()), + Anime.class); + log.info("Saved anime '{}'", samuraiChamplooSaved); + } + + private static HttpHeaders httpJsonHeaders(){ + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.setContentType(MediaType.APPLICATION_JSON); + return httpHeaders; } } From e7fb09217c0db9a2f99048c265a965a133aeff8a Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Tue, 15 Mar 2022 14:21:47 -0300 Subject: [PATCH 25/47] Aula 29 - RestTemplate PUT and DELETE --- .../springboot2/client/SpringClient.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/main/java/academy/devdojo/springboot2/client/SpringClient.java b/src/main/java/academy/devdojo/springboot2/client/SpringClient.java index 0550f14..bf2613e 100644 --- a/src/main/java/academy/devdojo/springboot2/client/SpringClient.java +++ b/src/main/java/academy/devdojo/springboot2/client/SpringClient.java @@ -40,6 +40,28 @@ public static void main(String[] args) { new HttpEntity<>(samuraiChamploo, httpJsonHeaders()), Anime.class); log.info("Saved anime '{}'", samuraiChamplooSaved); + + + Anime animeToBeUpdate = samuraiChamplooSaved.getBody(); + animeToBeUpdate.setName("Samurai Champloo 2"); + + ResponseEntity samuraiChamplooUpdate = new RestTemplate().exchange("http://localhost:8080/animes/", + HttpMethod.PUT, + new HttpEntity<>(animeToBeUpdate, httpJsonHeaders()), + Void.class); + + log.info(samuraiChamplooUpdate); + + + ResponseEntity samuraiChamplooDelete = new RestTemplate().exchange("http://localhost:8080/animes/{id}", + HttpMethod.DELETE, + null, + Void.class, + animeToBeUpdate.getId()); + + log.info(samuraiChamplooDelete); + + } private static HttpHeaders httpJsonHeaders(){ From e08f173be36e86b8997919e4589a3e90a64eeb11 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Thu, 17 Mar 2022 15:29:01 -0300 Subject: [PATCH 26/47] Aula 30 - Spring Data JPA Test pt 01 --- pom.xml | 6 ++++ .../repository/AnimeRepositoryTest.java | 32 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java diff --git a/pom.xml b/pom.xml index 613d57d..b06a619 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,12 @@ lombok true + + com.h2database + h2 + test + + org.springframework.boot spring-boot-starter-test diff --git a/src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java b/src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java new file mode 100644 index 0000000..3a02af5 --- /dev/null +++ b/src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java @@ -0,0 +1,32 @@ +package academy.devdojo.springboot2.repository; + +import academy.devdojo.springboot2.domain.Anime; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; + +@DataJpaTest +@DisplayName("Test for Anime Repository") +class AnimeRepositoryTest { + @Autowired + private AnimeRepository animeRepository; + + @Test + @DisplayName("Save creates anime when Successful") + void save_PersistAnime_WhenSuccessful(){ + Anime animeToBeSave = createAnime(); + Anime animeSaved = this.animeRepository.save(animeToBeSave); + Assertions.assertThat(animeSaved).isNotNull(); + Assertions.assertThat(animeSaved.getId()).isNotNull(); + Assertions.assertThat(animeSaved.getName()).isEqualTo(animeToBeSave.getName()); + } + + private Anime createAnime(){ + return Anime.builder() + .name("Hajime no Ippo ") + .build(); + } + +} \ No newline at end of file From ad631936d7e11283485938713aaceb2d16db0f83 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Thu, 17 Mar 2022 17:16:24 -0300 Subject: [PATCH 27/47] Aula 31 - Spring Data JPA Test pt 02 --- .../repository/AnimeRepositoryTest.java | 70 ++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java b/src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java index 3a02af5..b9c6037 100644 --- a/src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java +++ b/src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java @@ -7,6 +7,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import java.util.List; +import java.util.Optional; + @DataJpaTest @DisplayName("Test for Anime Repository") class AnimeRepositoryTest { @@ -14,15 +17,80 @@ class AnimeRepositoryTest { private AnimeRepository animeRepository; @Test - @DisplayName("Save creates anime when Successful") + @DisplayName("Save persists anime when Successful") void save_PersistAnime_WhenSuccessful(){ Anime animeToBeSave = createAnime(); + Anime animeSaved = this.animeRepository.save(animeToBeSave); + + Assertions.assertThat(animeSaved).isNotNull(); + Assertions.assertThat(animeSaved.getId()).isNotNull(); + Assertions.assertThat(animeSaved.getName()).isEqualTo(animeToBeSave.getName()); } + @Test + @DisplayName("Save update anime when Successful") + void save_UpdateAnime_WhenSuccessful(){ + Anime animeToBeSave = createAnime(); + + Anime animeSaved = this.animeRepository.save(animeToBeSave); + + animeSaved.setName("Overlord"); + + Anime animeUpdated = this.animeRepository.save(animeSaved); + + Assertions.assertThat(animeUpdated).isNotNull(); + + Assertions.assertThat(animeUpdated.getId()).isNotNull(); + + Assertions.assertThat(animeUpdated.getName()).isEqualTo(animeSaved.getName()); + } + + @Test + @DisplayName("Delete removes anime when Successful") + void delete_RemovesAnime_WhenSuccessful(){ + Anime animeToBeSave = createAnime(); + + Anime animeSaved = this.animeRepository.save(animeToBeSave); + + this.animeRepository.delete(animeSaved); + + Optional animeOptional = this.animeRepository.findById(animeSaved.getId()); + + Assertions.assertThat(animeOptional).isEmpty(); + } + + @Test + @DisplayName("Find By name return list of anime when Successful") + void findByName_ReturnListOfAnime_WhenSuccessful(){ + Anime animeToBeSave = createAnime(); + + Anime animeSaved = this.animeRepository.save(animeToBeSave); + + String name = animeSaved.getName(); + + List animes = this.animeRepository.findByName(name); + + Assertions.assertThat(animes).isNotEmpty(); + + Assertions.assertThat(animes).contains(animeSaved); + + } + + @Test + @DisplayName("Find By name return empty list when not animes is found") + void findByName_ReturnEmptyList_WhenAnimesIsNotFound(){ + List animes = this.animeRepository.findByName("xaxa"); + + Assertions.assertThat(animes).isEmpty(); + + } + + + private Anime createAnime(){ return Anime.builder() .name("Hajime no Ippo ") From 82502971b214397ba38e9b7f3289a7440cd93143 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Fri, 18 Mar 2022 13:37:32 -0300 Subject: [PATCH 28/47] =?UTF-8?q?Aula=2032=20-=20Spring=20Data=20JPA=20Tes?= =?UTF-8?q?t=20pt=2003=20-=20Exce=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devdojo/springboot2/domain/Anime.java | 7 ++-- .../repository/AnimeRepositoryTest.java | 33 +++++++++++++------ 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/main/java/academy/devdojo/springboot2/domain/Anime.java b/src/main/java/academy/devdojo/springboot2/domain/Anime.java index 98fb4f5..1ceb60f 100644 --- a/src/main/java/academy/devdojo/springboot2/domain/Anime.java +++ b/src/main/java/academy/devdojo/springboot2/domain/Anime.java @@ -1,9 +1,6 @@ package academy.devdojo.springboot2.domain; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import org.hibernate.validator.constraints.URL; import javax.persistence.Entity; @@ -21,6 +18,8 @@ public class Anime { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + + @NotEmpty(message = "The anime name cannot be empty") private String name; diff --git a/src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java b/src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java index b9c6037..2711942 100644 --- a/src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java +++ b/src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java @@ -7,6 +7,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import javax.validation.ConstraintViolation; +import javax.validation.ConstraintViolationException; import java.util.List; import java.util.Optional; @@ -18,7 +20,7 @@ class AnimeRepositoryTest { @Test @DisplayName("Save persists anime when Successful") - void save_PersistAnime_WhenSuccessful(){ + void save_PersistAnime_WhenSuccessful() { Anime animeToBeSave = createAnime(); Anime animeSaved = this.animeRepository.save(animeToBeSave); @@ -33,7 +35,7 @@ void save_PersistAnime_WhenSuccessful(){ @Test @DisplayName("Save update anime when Successful") - void save_UpdateAnime_WhenSuccessful(){ + void save_UpdateAnime_WhenSuccessful() { Anime animeToBeSave = createAnime(); Anime animeSaved = this.animeRepository.save(animeToBeSave); @@ -51,7 +53,7 @@ void save_UpdateAnime_WhenSuccessful(){ @Test @DisplayName("Delete removes anime when Successful") - void delete_RemovesAnime_WhenSuccessful(){ + void delete_RemovesAnime_WhenSuccessful() { Anime animeToBeSave = createAnime(); Anime animeSaved = this.animeRepository.save(animeToBeSave); @@ -65,7 +67,7 @@ void delete_RemovesAnime_WhenSuccessful(){ @Test @DisplayName("Find By name return list of anime when Successful") - void findByName_ReturnListOfAnime_WhenSuccessful(){ + void findByName_ReturnListOfAnime_WhenSuccessful() { Anime animeToBeSave = createAnime(); Anime animeSaved = this.animeRepository.save(animeToBeSave); @@ -74,24 +76,35 @@ void findByName_ReturnListOfAnime_WhenSuccessful(){ List animes = this.animeRepository.findByName(name); - Assertions.assertThat(animes).isNotEmpty(); - - Assertions.assertThat(animes).contains(animeSaved); - + Assertions.assertThat(animes) + .isNotEmpty() + .contains(animeSaved); } @Test @DisplayName("Find By name return empty list when not animes is found") - void findByName_ReturnEmptyList_WhenAnimesIsNotFound(){ + void findByName_ReturnEmptyList_WhenAnimesIsNotFound() { List animes = this.animeRepository.findByName("xaxa"); Assertions.assertThat(animes).isEmpty(); } + @Test + @DisplayName("Save Throw ConstraintViolationException when name is empty") + void save_ThrowConstraintViolationException_WhenNameIsEmpty() { + Anime anime = new Anime(); +// Assertions.assertThatThrownBy(() -> this.animeRepository.save(anime)) +// .isInstanceOf(ConstraintViolationException.class); + + Assertions.assertThatExceptionOfType(ConstraintViolationException.class) + .isThrownBy(() -> this.animeRepository.save(anime)) + .withMessageContaining("The anime name cannot be empty"); + + } - private Anime createAnime(){ + private Anime createAnime() { return Anime.builder() .name("Hajime no Ippo ") .build(); From 696f88b360be13d3575b7c749ab4b129adadc87c Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Fri, 18 Mar 2022 14:39:10 -0300 Subject: [PATCH 29/47] Aula 33 - Unit Tests pt 02 --- .../controller/AnimeController.java | 3 - .../controller/AnimeControllerTest.java | 55 +++++++++++++++++++ .../repository/AnimeRepositoryTest.java | 15 ++--- .../springboot2/util/AnimeCreator.java | 27 +++++++++ 4 files changed, 87 insertions(+), 13 deletions(-) create mode 100644 src/test/java/academy/devdojo/springboot2/controller/AnimeControllerTest.java create mode 100644 src/test/java/academy/devdojo/springboot2/util/AnimeCreator.java diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index 4672164..b3ab3da 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.time.LocalDateTime; import java.util.List; @RestController @@ -27,13 +26,11 @@ public class AnimeController { @GetMapping public ResponseEntity> list(Pageable pageable) { - log.info(dateUtil.formatLocalDateTimeToDatabaseStyle(LocalDateTime.now())); return ResponseEntity.ok(animeService.listAll(pageable)); } @GetMapping(path = "/all") public ResponseEntity> listAll() { - log.info(dateUtil.formatLocalDateTimeToDatabaseStyle(LocalDateTime.now())); return ResponseEntity.ok(animeService.listAllNonPageable()); } diff --git a/src/test/java/academy/devdojo/springboot2/controller/AnimeControllerTest.java b/src/test/java/academy/devdojo/springboot2/controller/AnimeControllerTest.java new file mode 100644 index 0000000..9809026 --- /dev/null +++ b/src/test/java/academy/devdojo/springboot2/controller/AnimeControllerTest.java @@ -0,0 +1,55 @@ +package academy.devdojo.springboot2.controller; + +import academy.devdojo.springboot2.domain.Anime; +import academy.devdojo.springboot2.service.AnimeService; +import academy.devdojo.springboot2.util.AnimeCreator; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentMatchers; +import org.mockito.BDDMockito; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import java.util.List; + +@ExtendWith(SpringExtension.class) +class AnimeControllerTest { + + @InjectMocks + private AnimeController animeController; + @Mock + private AnimeService animeServiceMock; + + @BeforeEach + void setUp(){ + PageImpl animePage = new PageImpl<>(List.of(AnimeCreator.createValidAnime())); + BDDMockito.when(animeServiceMock.listAll(ArgumentMatchers.any())) + .thenReturn(animePage); + + } + + + @Test + @DisplayName("List returns list of anime inside page object when successful") + void list_ReturnsListOfAnimesInsidePageObject_WhenSuccessful(){ + String expectedName = AnimeCreator.createValidAnime().getName(); + + Page animePage = animeController.list(null).getBody(); + + Assertions.assertThat(animePage).isNotNull(); + + Assertions.assertThat(animePage.toList()) + .isNotEmpty() + .hasSize(1); + + Assertions.assertThat(animePage.toList().get(0).getName()).isEqualTo(expectedName); + + } +} \ No newline at end of file diff --git a/src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java b/src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java index 2711942..f7b98bc 100644 --- a/src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java +++ b/src/test/java/academy/devdojo/springboot2/repository/AnimeRepositoryTest.java @@ -1,6 +1,7 @@ package academy.devdojo.springboot2.repository; import academy.devdojo.springboot2.domain.Anime; +import academy.devdojo.springboot2.util.AnimeCreator; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -21,7 +22,7 @@ class AnimeRepositoryTest { @Test @DisplayName("Save persists anime when Successful") void save_PersistAnime_WhenSuccessful() { - Anime animeToBeSave = createAnime(); + Anime animeToBeSave = AnimeCreator.createAnimeToBeSaved(); Anime animeSaved = this.animeRepository.save(animeToBeSave); @@ -36,7 +37,7 @@ void save_PersistAnime_WhenSuccessful() { @Test @DisplayName("Save update anime when Successful") void save_UpdateAnime_WhenSuccessful() { - Anime animeToBeSave = createAnime(); + Anime animeToBeSave = AnimeCreator.createAnimeToBeSaved(); Anime animeSaved = this.animeRepository.save(animeToBeSave); @@ -54,7 +55,7 @@ void save_UpdateAnime_WhenSuccessful() { @Test @DisplayName("Delete removes anime when Successful") void delete_RemovesAnime_WhenSuccessful() { - Anime animeToBeSave = createAnime(); + Anime animeToBeSave = AnimeCreator.createAnimeToBeSaved(); Anime animeSaved = this.animeRepository.save(animeToBeSave); @@ -68,7 +69,7 @@ void delete_RemovesAnime_WhenSuccessful() { @Test @DisplayName("Find By name return list of anime when Successful") void findByName_ReturnListOfAnime_WhenSuccessful() { - Anime animeToBeSave = createAnime(); + Anime animeToBeSave = AnimeCreator.createAnimeToBeSaved(); Anime animeSaved = this.animeRepository.save(animeToBeSave); @@ -104,10 +105,4 @@ void save_ThrowConstraintViolationException_WhenNameIsEmpty() { } - private Anime createAnime() { - return Anime.builder() - .name("Hajime no Ippo ") - .build(); - } - } \ No newline at end of file diff --git a/src/test/java/academy/devdojo/springboot2/util/AnimeCreator.java b/src/test/java/academy/devdojo/springboot2/util/AnimeCreator.java new file mode 100644 index 0000000..a56bed6 --- /dev/null +++ b/src/test/java/academy/devdojo/springboot2/util/AnimeCreator.java @@ -0,0 +1,27 @@ +package academy.devdojo.springboot2.util; + +import academy.devdojo.springboot2.domain.Anime; + +public class AnimeCreator { + + public static Anime createAnimeToBeSaved() { + return Anime.builder() + .name("Hajime no Ippo ") + .build(); + } + + public static Anime createValidAnime() { + return Anime.builder() + .name("Hajime no Ippo") + .id(1L) + .build(); + } + + public static Anime createValidUpdateAnime() { + return Anime.builder() + .name("Hajime no Ippo 2") + .id(1L) + .build(); + } + +} From a757d672aebc29bb6b96b571f96d0520f9080db1 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Mon, 21 Mar 2022 14:21:40 -0300 Subject: [PATCH 30/47] Aula 34 - Unit Tests pt 02 --- .../requests/AnimePostRequestBody.java | 2 + .../requests/AnimePutRequestBody.java | 2 + .../controller/AnimeControllerTest.java | 133 +++++++++++++++++- .../util/AnimePostRequestBodyCreator.java | 12 ++ .../util/AnimePutRequestBodyCreator.java | 13 ++ 5 files changed, 159 insertions(+), 3 deletions(-) create mode 100644 src/test/java/academy/devdojo/springboot2/util/AnimePostRequestBodyCreator.java create mode 100644 src/test/java/academy/devdojo/springboot2/util/AnimePutRequestBodyCreator.java diff --git a/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java b/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java index 6205cfd..ec420fe 100644 --- a/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java +++ b/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java @@ -1,5 +1,6 @@ package academy.devdojo.springboot2.requests; +import lombok.Builder; import lombok.Data; import org.hibernate.validator.constraints.URL; @@ -7,6 +8,7 @@ import javax.validation.constraints.NotNull; @Data +@Builder public class AnimePostRequestBody { @NotEmpty(message = "The anime name cannot be empty") private String name; diff --git a/src/main/java/academy/devdojo/springboot2/requests/AnimePutRequestBody.java b/src/main/java/academy/devdojo/springboot2/requests/AnimePutRequestBody.java index 64003b9..083f461 100644 --- a/src/main/java/academy/devdojo/springboot2/requests/AnimePutRequestBody.java +++ b/src/main/java/academy/devdojo/springboot2/requests/AnimePutRequestBody.java @@ -1,8 +1,10 @@ package academy.devdojo.springboot2.requests; +import lombok.Builder; import lombok.Data; @Data +@Builder public class AnimePutRequestBody { private Long id; private String name; diff --git a/src/test/java/academy/devdojo/springboot2/controller/AnimeControllerTest.java b/src/test/java/academy/devdojo/springboot2/controller/AnimeControllerTest.java index 9809026..662a82f 100644 --- a/src/test/java/academy/devdojo/springboot2/controller/AnimeControllerTest.java +++ b/src/test/java/academy/devdojo/springboot2/controller/AnimeControllerTest.java @@ -1,8 +1,12 @@ package academy.devdojo.springboot2.controller; import academy.devdojo.springboot2.domain.Anime; +import academy.devdojo.springboot2.requests.AnimePostRequestBody; +import academy.devdojo.springboot2.requests.AnimePutRequestBody; import academy.devdojo.springboot2.service.AnimeService; import academy.devdojo.springboot2.util.AnimeCreator; +import academy.devdojo.springboot2.util.AnimePostRequestBodyCreator; +import academy.devdojo.springboot2.util.AnimePutRequestBodyCreator; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -12,11 +16,13 @@ import org.mockito.BDDMockito; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.test.context.junit.jupiter.SpringExtension; +import java.util.Collections; import java.util.List; @ExtendWith(SpringExtension.class) @@ -28,17 +34,33 @@ class AnimeControllerTest { private AnimeService animeServiceMock; @BeforeEach - void setUp(){ + void setUp() { PageImpl animePage = new PageImpl<>(List.of(AnimeCreator.createValidAnime())); BDDMockito.when(animeServiceMock.listAll(ArgumentMatchers.any())) .thenReturn(animePage); + BDDMockito.when(animeServiceMock.listAllNonPageable()) + .thenReturn(List.of(AnimeCreator.createValidAnime())); + + BDDMockito.when(animeServiceMock.findByIdOrThrowBadRequestException(ArgumentMatchers.anyLong())) + .thenReturn(AnimeCreator.createValidAnime()); + + BDDMockito.when(animeServiceMock.findByName(ArgumentMatchers.anyString())) + .thenReturn(List.of(AnimeCreator.createValidAnime())); + + BDDMockito.when(animeServiceMock.save(ArgumentMatchers.any(AnimePostRequestBody.class))) + .thenReturn(AnimeCreator.createValidAnime()); + + BDDMockito.doNothing().when(animeServiceMock).replace(ArgumentMatchers.any(AnimePutRequestBody.class)); + + BDDMockito.doNothing().when(animeServiceMock).delete(ArgumentMatchers.anyLong()); + } @Test @DisplayName("List returns list of anime inside page object when successful") - void list_ReturnsListOfAnimesInsidePageObject_WhenSuccessful(){ + void list_ReturnsListOfAnimesInsidePageObject_WhenSuccessful() { String expectedName = AnimeCreator.createValidAnime().getName(); Page animePage = animeController.list(null).getBody(); @@ -52,4 +74,109 @@ void list_ReturnsListOfAnimesInsidePageObject_WhenSuccessful(){ Assertions.assertThat(animePage.toList().get(0).getName()).isEqualTo(expectedName); } + + @Test + @DisplayName("List returns list of anime when successful") + void listAll_ReturnsListOfAnimes_WhenSuccessful() { + String expectedName = AnimeCreator.createValidAnime().getName(); + + List animes = animeController.listAll().getBody(); + + Assertions.assertThat(animes) + .isNotNull() + .isNotEmpty() + .hasSize(1); + + + Assertions.assertThat(animes.get(0).getName()).isEqualTo(expectedName); + + } + + @Test + @DisplayName("findById returns anime when successful") + void findById_ReturnAnime_WhenSuccessful() { + Long expectedId = AnimeCreator.createValidAnime().getId(); + + Anime anime = animeController.findById(1).getBody(); + + Assertions.assertThat(anime).isNotNull(); + + Assertions.assertThat(anime.getId()).isNotNull().isEqualTo(expectedId); + + } + + @Test + @DisplayName("findByName returns list a of anime when successful") + void findByName_ReturnsListOfAnime_WhenSuccessful() { + String expectedName = AnimeCreator.createValidAnime().getName(); + + List anime = animeController.findByName("").getBody(); + + Assertions.assertThat(anime) + .isNotNull() + .isNotEmpty() + .hasSize(1); + + Assertions.assertThat(anime.get(0).getName()).isNotNull().isEqualTo(expectedName); + + } + + @Test + @DisplayName("findByName returns an empty list a of anime when anime is not found") + void findByName_ReturnsEmptyListOfAnime_WhenAnimeIsNotFound() { + BDDMockito.when(animeServiceMock.findByName(ArgumentMatchers.anyString())) + .thenReturn(Collections.emptyList()); + + List anime = animeController.findByName("").getBody(); + + Assertions.assertThat(anime) + .isNotNull() + .isEmpty(); + } + + @Test + @DisplayName("save returns anime when successful") + void save_ReturnsAnime_WhenSuccessful() { + + Anime anime = animeController.save(AnimePostRequestBodyCreator.createAnimePostRequestBody()).getBody(); + + Assertions.assertThat(anime).isNotNull().isEqualTo(AnimeCreator.createValidAnime()); + + } + + @Test + @DisplayName("replace updates anime when successful") + void replace_UpdaterAnime_WhenSuccessful() { + + Assertions.assertThatCode(() -> animeController.replace(AnimePutRequestBodyCreator.createAnimePutRequestBody())) + .doesNotThrowAnyException(); + + + ResponseEntity entity = animeController.replace(AnimePutRequestBodyCreator.createAnimePutRequestBody()); + + Assertions.assertThat(entity).isNotNull(); + + Assertions.assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); + + } + + @Test + @DisplayName("delete removes anime when successful") + void delete_RemovesAnime_WhenSuccessful() { + + Assertions.assertThatCode(() -> animeController.delete(1)) + .doesNotThrowAnyException(); + + + ResponseEntity entity = animeController.delete(1); + + Assertions.assertThat(entity).isNotNull(); + + Assertions.assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); + + + } + + + } \ No newline at end of file diff --git a/src/test/java/academy/devdojo/springboot2/util/AnimePostRequestBodyCreator.java b/src/test/java/academy/devdojo/springboot2/util/AnimePostRequestBodyCreator.java new file mode 100644 index 0000000..a8fff20 --- /dev/null +++ b/src/test/java/academy/devdojo/springboot2/util/AnimePostRequestBodyCreator.java @@ -0,0 +1,12 @@ +package academy.devdojo.springboot2.util; + +import academy.devdojo.springboot2.requests.AnimePostRequestBody; + +public class AnimePostRequestBodyCreator { + + public static AnimePostRequestBody createAnimePostRequestBody() { + return AnimePostRequestBody.builder() + .name(AnimeCreator.createAnimeToBeSaved().getName()) + .build(); + } +} diff --git a/src/test/java/academy/devdojo/springboot2/util/AnimePutRequestBodyCreator.java b/src/test/java/academy/devdojo/springboot2/util/AnimePutRequestBodyCreator.java new file mode 100644 index 0000000..f16d058 --- /dev/null +++ b/src/test/java/academy/devdojo/springboot2/util/AnimePutRequestBodyCreator.java @@ -0,0 +1,13 @@ +package academy.devdojo.springboot2.util; + +import academy.devdojo.springboot2.requests.AnimePutRequestBody; + +public class AnimePutRequestBodyCreator { + + public static AnimePutRequestBody createAnimePutRequestBody() { + return AnimePutRequestBody.builder() + .name(AnimeCreator.createValidUpdateAnime().getName()) + .id(AnimeCreator.createValidUpdateAnime().getId()) + .build(); + } +} From e42f22860f213344452d21acef35551c1d4ff2d0 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Mon, 21 Mar 2022 14:54:38 -0300 Subject: [PATCH 31/47] Aula 35 - Unit Tests pt 03 --- .../springboot2/service/AnimeServiceTest.java | 174 ++++++++++++++++++ 1 file changed, 174 insertions(+) create mode 100644 src/test/java/academy/devdojo/springboot2/service/AnimeServiceTest.java diff --git a/src/test/java/academy/devdojo/springboot2/service/AnimeServiceTest.java b/src/test/java/academy/devdojo/springboot2/service/AnimeServiceTest.java new file mode 100644 index 0000000..b00f94e --- /dev/null +++ b/src/test/java/academy/devdojo/springboot2/service/AnimeServiceTest.java @@ -0,0 +1,174 @@ +package academy.devdojo.springboot2.service; + +import academy.devdojo.springboot2.domain.Anime; +import academy.devdojo.springboot2.exception.BadRequestException; +import academy.devdojo.springboot2.repository.AnimeRepository; +import academy.devdojo.springboot2.util.AnimeCreator; +import academy.devdojo.springboot2.util.AnimePostRequestBodyCreator; +import academy.devdojo.springboot2.util.AnimePutRequestBodyCreator; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentMatchers; +import org.mockito.BDDMockito; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import javax.validation.ConstraintViolationException; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + +@ExtendWith(SpringExtension.class) +class AnimeServiceTest { + @InjectMocks + private AnimeService animeService; + @Mock + private AnimeRepository animeRepositoryMock; + + @BeforeEach + void setUp() { + PageImpl animePage = new PageImpl<>(List.of(AnimeCreator.createValidAnime())); + BDDMockito.when(animeRepositoryMock.findAll(ArgumentMatchers.any(PageRequest.class))) + .thenReturn(animePage); + + BDDMockito.when(animeRepositoryMock.findAll()) + .thenReturn(List.of(AnimeCreator.createValidAnime())); + + BDDMockito.when(animeRepositoryMock.findById(ArgumentMatchers.anyLong())) + .thenReturn(Optional.of(AnimeCreator.createValidAnime())); + + BDDMockito.when(animeRepositoryMock.findByName(ArgumentMatchers.anyString())) + .thenReturn(List.of(AnimeCreator.createValidAnime())); + + BDDMockito.when(animeRepositoryMock.save(ArgumentMatchers.any(Anime.class))) + .thenReturn(AnimeCreator.createValidAnime()); + + + BDDMockito.doNothing().when(animeRepositoryMock).delete(ArgumentMatchers.any(Anime.class)); + + } + + + @Test + @DisplayName("listAll returns list of anime inside page object when successful") + void listAll_ReturnsListOfAnimesInsidePageObject_WhenSuccessful() { + String expectedName = AnimeCreator.createValidAnime().getName(); + + Page animePage = animeService.listAll(PageRequest.of(1,1)); + + Assertions.assertThat(animePage).isNotNull(); + + Assertions.assertThat(animePage.toList()) + .isNotEmpty() + .hasSize(1); + + Assertions.assertThat(animePage.toList().get(0).getName()).isEqualTo(expectedName); + + } + + @Test + @DisplayName("listAllNonPageable returns list of anime when successful") + void listAllNonPageable_ReturnsListOfAnimes_WhenSuccessful() { + String expectedName = AnimeCreator.createValidAnime().getName(); + + List animes = animeService.listAllNonPageable(); + + Assertions.assertThat(animes) + .isNotNull() + .isNotEmpty() + .hasSize(1); + + + Assertions.assertThat(animes.get(0).getName()).isEqualTo(expectedName); + + } + + @Test + @DisplayName("findByIdOrThrowBadRequestException returns anime when successful") + void findByIdOrThrowBadRequestException_ReturnAnime_WhenSuccessful() { + Long expectedId = AnimeCreator.createValidAnime().getId(); + + Anime anime = animeService.findByIdOrThrowBadRequestException(1); + + Assertions.assertThat(anime).isNotNull(); + + Assertions.assertThat(anime.getId()).isNotNull().isEqualTo(expectedId); + + } + + + @Test + @DisplayName("findByIdOrThrowBadRequestException throws BadRequestException when anime is not found ") + void findByIdOrThrowBadRequestException_ThrowsBadRequestException_WhenAnimeIsNotFound() { + BDDMockito.when(animeRepositoryMock.findById(ArgumentMatchers.anyLong())) + .thenReturn(Optional.empty()); + + Assertions.assertThatExceptionOfType(BadRequestException.class) + .isThrownBy(() -> animeService.findByIdOrThrowBadRequestException(1)); + + } + + + @Test + @DisplayName("findByName returns list a of anime when successful") + void findByName_ReturnsListOfAnime_WhenSuccessful() { + String expectedName = AnimeCreator.createValidAnime().getName(); + + List anime = animeService.findByName(""); + + Assertions.assertThat(anime) + .isNotNull() + .isNotEmpty() + .hasSize(1); + + Assertions.assertThat(anime.get(0).getName()).isNotNull().isEqualTo(expectedName); + + } + + @Test + @DisplayName("findByName returns an empty list a of anime when anime is not found") + void findByName_ReturnsEmptyListOfAnime_WhenAnimeIsNotFound() { + BDDMockito.when(animeRepositoryMock.findByName(ArgumentMatchers.anyString())) + .thenReturn(Collections.emptyList()); + + List anime = animeService.findByName(""); + + Assertions.assertThat(anime) + .isNotNull() + .isEmpty(); + } + + @Test + @DisplayName("save returns anime when successful") + void save_ReturnsAnime_WhenSuccessful() { + + Anime anime = animeService.save(AnimePostRequestBodyCreator.createAnimePostRequestBody()); + + Assertions.assertThat(anime).isNotNull().isEqualTo(AnimeCreator.createValidAnime()); + + } + + @Test + @DisplayName("replace updates anime when successful") + void replace_UpdaterAnime_WhenSuccessful() { + + Assertions.assertThatCode(() -> animeService.replace(AnimePutRequestBodyCreator.createAnimePutRequestBody())) + .doesNotThrowAnyException(); + } + + @Test + @DisplayName("delete removes anime when successful") + void delete_RemovesAnime_WhenSuccessful() { + + Assertions.assertThatCode(() -> animeService.delete(1)) + .doesNotThrowAnyException(); + } + +} From cf7177b32cf44f734f8b8db3fbfbb2911d56fa0a Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Tue, 22 Mar 2022 13:42:16 -0300 Subject: [PATCH 32/47] =?UTF-8?q?Aula=2036=20-=20Testes=20de=20Integra?= =?UTF-8?q?=C3=A7=C3=A3o=20pt=2001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springboot2/wrapper/PageableResponse.java | 40 ++++++++++++++ .../integration/AnimeControllerIT.java | 55 +++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 src/main/java/academy/devdojo/springboot2/wrapper/PageableResponse.java create mode 100644 src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java diff --git a/src/main/java/academy/devdojo/springboot2/wrapper/PageableResponse.java b/src/main/java/academy/devdojo/springboot2/wrapper/PageableResponse.java new file mode 100644 index 0000000..928934a --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/wrapper/PageableResponse.java @@ -0,0 +1,40 @@ +package academy.devdojo.springboot2.wrapper; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonCreator.Mode; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.JsonNode; +import java.util.List; +import lombok.Getter; +import lombok.Setter; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; + +@Getter +@Setter +public class PageableResponse extends PageImpl { + private boolean first; + private boolean last; + private int totalPages; + private int numberOfElements; + + @JsonCreator(mode = Mode.PROPERTIES ) + public PageableResponse(@JsonProperty("content") List content, + @JsonProperty("number") int number, + @JsonProperty("size") int size, + @JsonProperty("totalElements") int totalElements, + @JsonProperty("last") boolean last, + @JsonProperty("first") boolean first, + @JsonProperty("totalPages") int totalPages, + @JsonProperty("numberOfElements") int numberOfElements, + @JsonProperty("pageable") JsonNode pageable, + @JsonProperty("sort") JsonNode sort) { + super(content, PageRequest.of(number, size), totalElements); + + this.last = last; + this.first = first; + this.totalPages = totalPages; + this.numberOfElements = numberOfElements; + + } +} \ No newline at end of file diff --git a/src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java b/src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java new file mode 100644 index 0000000..94dc13c --- /dev/null +++ b/src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java @@ -0,0 +1,55 @@ +package academy.devdojo.springboot2.integration; + +import academy.devdojo.springboot2.domain.Anime; +import academy.devdojo.springboot2.repository.AnimeRepository; +import academy.devdojo.springboot2.util.AnimeCreator; +import academy.devdojo.springboot2.wrapper.PageableResponse; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +//sempre cria uma porta aleatoria, para nao termos que usar a porta que está em produção +@AutoConfigureTestDatabase +//Com essa anotacao nossa configuracao de banco de dados vai utilizar o valor que temos em memoria +class AnimeControllerIT { + @Autowired + private TestRestTemplate testRestTemplate; + // @LocalServerPort +// private int port; //para pegar uma porta expecifica passada + @Autowired + private AnimeRepository animeRepository; + + @Test + @DisplayName("List returns list of anime inside page object when successful") + void list_ReturnsListOfAnimesInsidePageObject_WhenSuccessful() { + Anime savedAnime = animeRepository.save(AnimeCreator.createAnimeToBeSaved()); + + String expectedName = savedAnime.getName(); + + PageableResponse animePage = testRestTemplate.exchange("/animes", HttpMethod.GET, null, + new ParameterizedTypeReference>() { + }).getBody(); + + Assertions.assertThat(animePage).isNotNull(); + + Assertions.assertThat(animePage.toList()) + .isNotEmpty() + .hasSize(1); + + Assertions.assertThat(animePage.toList().get(0).getName()).isEqualTo(expectedName); + + } + + +} From 10e4f396353457c7512258101bde1a3361015413 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Tue, 22 Mar 2022 14:23:14 -0300 Subject: [PATCH 33/47] =?UTF-8?q?Aula=2037=20-=20Testes=20de=20Integra?= =?UTF-8?q?=C3=A7=C3=A3o=20pt=2002?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../requests/AnimePostRequestBody.java | 4 + .../integration/AnimeControllerIT.java | 126 +++++++++++++++++- src/test/resources/logback-test.xml | 11 ++ 3 files changed, 136 insertions(+), 5 deletions(-) create mode 100644 src/test/resources/logback-test.xml diff --git a/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java b/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java index ec420fe..43b4555 100644 --- a/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java +++ b/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java @@ -1,7 +1,9 @@ package academy.devdojo.springboot2.requests; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.URL; import javax.validation.constraints.NotEmpty; @@ -9,6 +11,8 @@ @Data @Builder +@AllArgsConstructor +@NoArgsConstructor public class AnimePostRequestBody { @NotEmpty(message = "The anime name cannot be empty") private String name; diff --git a/src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java b/src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java index 94dc13c..e5e18f7 100644 --- a/src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java +++ b/src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java @@ -2,7 +2,9 @@ import academy.devdojo.springboot2.domain.Anime; import academy.devdojo.springboot2.repository.AnimeRepository; +import academy.devdojo.springboot2.requests.AnimePostRequestBody; import academy.devdojo.springboot2.util.AnimeCreator; +import academy.devdojo.springboot2.util.AnimePostRequestBodyCreator; import academy.devdojo.springboot2.wrapper.PageableResponse; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -11,22 +13,25 @@ import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; -import org.springframework.boot.web.server.LocalServerPort; import org.springframework.core.ParameterizedTypeReference; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; +import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.test.annotation.DirtiesContext; + +import java.util.List; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) //sempre cria uma porta aleatoria, para nao termos que usar a porta que está em produção @AutoConfigureTestDatabase -//Com essa anotacao nossa configuracao de banco de dados vai utilizar o valor que temos em memoria +@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) +//Antes de cada metodo ele da um drop no banco de dados e recria para cada metodo class AnimeControllerIT { @Autowired private TestRestTemplate testRestTemplate; // @LocalServerPort -// private int port; //para pegar uma porta expecifica passada + // private int port; //para pegar uma porta expecifica passada @Autowired private AnimeRepository animeRepository; @@ -48,6 +53,117 @@ void list_ReturnsListOfAnimesInsidePageObject_WhenSuccessful() { .hasSize(1); Assertions.assertThat(animePage.toList().get(0).getName()).isEqualTo(expectedName); + } + + @Test + @DisplayName("List returns list of anime when successful") + void listAll_ReturnsListOfAnimes_WhenSuccessful() { + Anime savedAnime = animeRepository.save(AnimeCreator.createAnimeToBeSaved()); + + String expectedName = savedAnime.getName(); + + List animes = testRestTemplate.exchange("/animes/all", HttpMethod.GET, null, + new ParameterizedTypeReference>() { + }).getBody(); + + Assertions.assertThat(animes).isNotNull() + .isNotEmpty() + .hasSize(1); + + Assertions.assertThat(animes.get(0).getName()).isEqualTo(expectedName); + } + + @Test + @DisplayName("findById returns anime when successful") + void findById_ReturnAnime_WhenSuccessful() { + Anime savedAnime = animeRepository.save(AnimeCreator.createAnimeToBeSaved()); + + Long expectedId = savedAnime.getId(); + + Anime anime = testRestTemplate.getForObject("/animes/{id}", Anime.class, expectedId); + + Assertions.assertThat(anime).isNotNull(); + + Assertions.assertThat(anime.getId()).isNotNull().isEqualTo(expectedId); + + } + + @Test + @DisplayName("findByName returns list a of anime when successful") + void findByName_ReturnsListOfAnime_WhenSuccessful() { + Anime savedAnime = animeRepository.save(AnimeCreator.createAnimeToBeSaved()); + + String expectedName = savedAnime.getName(); + + String url = String.format("/animes/find?name=%s", expectedName); + + List animes = testRestTemplate.exchange(url, HttpMethod.GET, null, + new ParameterizedTypeReference>() { + }).getBody(); + + Assertions.assertThat(animes) + .isNotNull() + .isNotEmpty() + .hasSize(1); + + Assertions.assertThat(animes.get(0).getName()).isNotNull().isEqualTo(expectedName); + + } + + @Test + @DisplayName("findByName returns an empty list a of anime when anime is not found") + void findByName_ReturnsEmptyListOfAnime_WhenAnimeIsNotFound() { + List animes = testRestTemplate.exchange("/animes/find?name=dbz", HttpMethod.GET, null, + new ParameterizedTypeReference>() { + }).getBody(); + + Assertions.assertThat(animes) + .isNotNull() + .isEmpty(); + + } + + @Test + @DisplayName("save returns anime when successful") + void save_ReturnsAnime_WhenSuccessful() { + AnimePostRequestBody animePostRequestBody = AnimePostRequestBodyCreator.createAnimePostRequestBody(); + + ResponseEntity animeResponseEntity = testRestTemplate.postForEntity("/animes", animePostRequestBody, Anime.class); + + Assertions.assertThat(animeResponseEntity).isNotNull(); + Assertions.assertThat(animeResponseEntity.getStatusCode()).isEqualTo(HttpStatus.CREATED); + Assertions.assertThat(animeResponseEntity.getBody()).isNotNull(); + Assertions.assertThat(animeResponseEntity.getBody().getId()).isNotNull(); + + } + + @Test + @DisplayName("replace updates anime when successful") + void replace_UpdaterAnime_WhenSuccessful() { + Anime savedAnime = animeRepository.save(AnimeCreator.createAnimeToBeSaved()); + + savedAnime.setName("new Name"); + + ResponseEntity animeResponseEntity = testRestTemplate.exchange("/animes", HttpMethod.PUT, new HttpEntity<>(savedAnime), Void.class); + + Assertions.assertThat(animeResponseEntity).isNotNull(); + + Assertions.assertThat(animeResponseEntity.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); + + } + + @Test + @DisplayName("delete removes anime when successful") + void delete_RemovesAnime_WhenSuccessful() { + + Anime savedAnime = animeRepository.save(AnimeCreator.createAnimeToBeSaved()); + + ResponseEntity animeResponseEntity = testRestTemplate.exchange("/animes/{id}", HttpMethod.DELETE, null, Void.class, savedAnime.getId()); + + Assertions.assertThat(animeResponseEntity).isNotNull(); + + Assertions.assertThat(animeResponseEntity.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); + } diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml new file mode 100644 index 0000000..4bd2e37 --- /dev/null +++ b/src/test/resources/logback-test.xml @@ -0,0 +1,11 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + \ No newline at end of file From f006cce3a2887f4cb746be9eca3fbd5f821c62f4 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Tue, 22 Mar 2022 15:14:06 -0300 Subject: [PATCH 34/47] =?UTF-8?q?Aula=2038=20-=20Maven=20Profile=20Para=20?= =?UTF-8?q?Testes=20de=20Integra=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 20 ++++++++++++++++++- ...Springboot2EssentialsApplicationTests.java | 4 ++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b06a619..5950396 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,25 @@ - + + + integration-tests + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Test.* + **/*IT.* + + + + + + + diff --git a/src/test/java/academy/devdojo/springboot2/Springboot2EssentialsApplicationTests.java b/src/test/java/academy/devdojo/springboot2/Springboot2EssentialsApplicationTests.java index 9584faf..35cf8da 100644 --- a/src/test/java/academy/devdojo/springboot2/Springboot2EssentialsApplicationTests.java +++ b/src/test/java/academy/devdojo/springboot2/Springboot2EssentialsApplicationTests.java @@ -3,10 +3,10 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -@SpringBootTest +//@SpringBootTest class Springboot2EssentialsApplicationTests { - @Test +//@Test void contextLoads() { } From 7e2a4f54744e3686482836b179af6944f69b19b1 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Wed, 23 Mar 2022 11:23:35 -0300 Subject: [PATCH 35/47] =?UTF-8?q?Aula=2039=20-=20Spring=20Security=20pt=20?= =?UTF-8?q?01=20-=20Autentica=C3=A7=C3=A3o=20em=20mem=C3=B3ria?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 5 +++ .../springboot2/config/SecurityConfig.java | 38 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java diff --git a/pom.xml b/pom.xml index 5950396..e22f457 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,11 @@ + + org.springframework.boot + spring-boot-starter-security + + org.springframework.boot spring-boot-starter-validation diff --git a/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java b/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java new file mode 100644 index 0000000..60b141a --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java @@ -0,0 +1,38 @@ +package academy.devdojo.springboot2.config; + +import lombok.extern.log4j.Log4j2; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.factory.PasswordEncoderFactories; +import org.springframework.security.crypto.password.PasswordEncoder; + +@EnableWebSecurity +@Log4j2 +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.authorizeRequests() + .anyRequest() + .authenticated() + .and() + .httpBasic(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + //Não fazer o password só com texto // do not make password with text only + PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder(); + log.info("Password encoded {}", passwordEncoder.encode("test")); + auth.inMemoryAuthentication() + .withUser("william") + .password(passwordEncoder.encode("academy")) + .roles("USER", "ADMIN") + .and() + .withUser("guilherme") + .password(passwordEncoder.encode("academy")) + .roles("USER"); + } +} From 2e92d01c213d27b89343de62cc8c24b3b9de14aa Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Wed, 23 Mar 2022 11:52:53 -0300 Subject: [PATCH 36/47] Aula 40 - Spring Security pt 01 - CSRF Token --- .../academy/devdojo/springboot2/config/SecurityConfig.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java b/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java index 60b141a..af9e3bb 100644 --- a/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java +++ b/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java @@ -7,6 +7,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.crypto.factory.PasswordEncoderFactories; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.csrf.CookieCsrfTokenRepository; @EnableWebSecurity @Log4j2 @@ -14,7 +15,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(HttpSecurity http) throws Exception { - http.authorizeRequests() + http.csrf().disable() +// .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()) + .authorizeRequests() .anyRequest() .authenticated() .and() From 5031d05976d89bbc69c7344933bc3f205e65926a Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Thu, 24 Mar 2022 14:42:04 -0300 Subject: [PATCH 37/47] =?UTF-8?q?Aula=2041=20-=20Spring=20Security=20pt=20?= =?UTF-8?q?02=20-=20Seguran=C3=A7a=20a=20n=C3=ADvel=20de=20m=C3=A9todos=20?= =?UTF-8?q?com=20PreAuthori?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../academy/devdojo/springboot2/config/SecurityConfig.java | 3 ++- .../devdojo/springboot2/controller/AnimeController.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java b/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java index af9e3bb..a7bb049 100644 --- a/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java +++ b/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java @@ -2,15 +2,16 @@ import lombok.extern.log4j.Log4j2; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.crypto.factory.PasswordEncoderFactories; import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.security.web.csrf.CookieCsrfTokenRepository; @EnableWebSecurity @Log4j2 +@EnableGlobalMethodSecurity(prePostEnabled = true) public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index b3ab3da..8127106 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -11,6 +11,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -45,6 +46,7 @@ public ResponseEntity> findByName(@RequestParam String name) { } @PostMapping + @PreAuthorize("hasRole('ADMIN')") public ResponseEntity save(@RequestBody @Valid AnimePostRequestBody animePostRequestBody) { return new ResponseEntity<>(animeService.save(animePostRequestBody), HttpStatus.CREATED); } From 37b69167387a2ab2e884ec73baabcfe0cbf74371 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Thu, 24 Mar 2022 15:07:21 -0300 Subject: [PATCH 38/47] =?UTF-8?q?Aula=2042=20-=20Spring=20Security=20pt=20?= =?UTF-8?q?03=20-=20Authentication=20Principal=20e=20p=C3=A1gina=20padr?= =?UTF-8?q?=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devdojo/springboot2/config/SecurityConfig.java | 14 +++++++++++++- .../springboot2/controller/AnimeController.java | 9 +++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java b/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java index a7bb049..632cd62 100644 --- a/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java +++ b/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java @@ -13,7 +13,17 @@ @Log4j2 @EnableGlobalMethodSecurity(prePostEnabled = true) public class SecurityConfig extends WebSecurityConfigurerAdapter { - + /** + * --- Filtros do Spring --- + * BasicAuthenticationFilter + * UsernamePasswordGeneratingFilter + * DefaultLoginPageGeneratingFilter + * DefaultLogoutPageGeneratingFilter + * FilterSecurityInterceptor + * Authentication -> Authorization + * @param http + * @throws Exception + */ @Override protected void configure(HttpSecurity http) throws Exception { http.csrf().disable() @@ -22,6 +32,8 @@ protected void configure(HttpSecurity http) throws Exception { .anyRequest() .authenticated() .and() + .formLogin() + .and() .httpBasic(); } diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index 8127106..52ea3cc 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -12,6 +12,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -40,6 +42,13 @@ public ResponseEntity findById(@PathVariable long id) { return ResponseEntity.ok(animeService.findByIdOrThrowBadRequestException(id)); } + @GetMapping(path = "by-id/{id}") + public ResponseEntity findByIdAuthenticationPrincipal(@PathVariable long id, + @AuthenticationPrincipal UserDetails userDetails) { + log.info(userDetails); + return ResponseEntity.ok(animeService.findByIdOrThrowBadRequestException(id)); + } + @GetMapping(path = "/find") public ResponseEntity> findByName(@RequestParam String name) { return ResponseEntity.ok(animeService.findByName(name)); From 2de798439ce7c4a87a95353514ea4a56ca7a37f3 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Mon, 28 Mar 2022 10:36:36 -0300 Subject: [PATCH 39/47] =?UTF-8?q?Aula=2044=20-=20Spring=20Security=20pt=20?= =?UTF-8?q?05=20-=20Prote=C3=A7=C3=A3o=20de=20URL=20com=20Antmatcher?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../academy/devdojo/springboot2/config/SecurityConfig.java | 4 ++-- .../devdojo/springboot2/controller/AnimeController.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java b/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java index 632cd62..54ca454 100644 --- a/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java +++ b/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java @@ -21,14 +21,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { * DefaultLogoutPageGeneratingFilter * FilterSecurityInterceptor * Authentication -> Authorization - * @param http - * @throws Exception */ @Override protected void configure(HttpSecurity http) throws Exception { http.csrf().disable() // .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()) .authorizeRequests() + .antMatchers("/animes/admin/**").hasRole("ADMIN") + .antMatchers("/animes/**").hasRole("USER") .anyRequest() .authenticated() .and() diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index 52ea3cc..02b50cd 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -55,12 +55,11 @@ public ResponseEntity> findByName(@RequestParam String name) { } @PostMapping - @PreAuthorize("hasRole('ADMIN')") public ResponseEntity save(@RequestBody @Valid AnimePostRequestBody animePostRequestBody) { return new ResponseEntity<>(animeService.save(animePostRequestBody), HttpStatus.CREATED); } - @DeleteMapping(path = "/{id}") + @DeleteMapping(path = "/admin/{id}") public ResponseEntity delete(@PathVariable long id) { animeService.delete(id); return new ResponseEntity<>(HttpStatus.NO_CONTENT); From b88328bf9ef774343cc7a3ff8a9f757f92492495 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Mon, 28 Mar 2022 11:50:53 -0300 Subject: [PATCH 40/47] =?UTF-8?q?Aula=2045=20=201/2=20-=20Spring=20Securit?= =?UTF-8?q?y=20pt=2006=20-=20Testes=20de=20Integra=C3=A7=C3=A3o=20com=20Sp?= =?UTF-8?q?ring=20Security?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springboot2/config/SecurityConfig.java | 2 +- .../springboot2/domain/DevDojoUser.java | 72 +++++++++++++++++++ .../repository/DevDojoUserRepository.java | 9 +++ .../service/DevDojoUserDetailsService.java | 22 ++++++ .../integration/AnimeControllerIT.java | 36 +++++++++- 5 files changed, 138 insertions(+), 3 deletions(-) create mode 100644 src/main/java/academy/devdojo/springboot2/domain/DevDojoUser.java create mode 100644 src/main/java/academy/devdojo/springboot2/repository/DevDojoUserRepository.java create mode 100644 src/main/java/academy/devdojo/springboot2/service/DevDojoUserDetailsService.java diff --git a/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java b/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java index 54ca454..5db5afa 100644 --- a/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java +++ b/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java @@ -47,7 +47,7 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception { .password(passwordEncoder.encode("academy")) .roles("USER", "ADMIN") .and() - .withUser("guilherme") + .withUser("devdojo") .password(passwordEncoder.encode("academy")) .roles("USER"); } diff --git a/src/main/java/academy/devdojo/springboot2/domain/DevDojoUser.java b/src/main/java/academy/devdojo/springboot2/domain/DevDojoUser.java new file mode 100644 index 0000000..b10976b --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/domain/DevDojoUser.java @@ -0,0 +1,72 @@ +package academy.devdojo.springboot2.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.validation.constraints.NotEmpty; +import java.util.Arrays; +import java.util.Collection; +import java.util.stream.Collectors; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Builder +public class DevDojoUser implements UserDetails { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @NotEmpty(message = "The user's name cannot be empty") + private String name; + private String username; + private String password; + private String authorities; + + @Override + public Collection getAuthorities() { + return Arrays.stream(authorities.split(",")) + .map(SimpleGrantedAuthority::new) + .collect(Collectors.toList()); + } + + @Override + public String getPassword() { + return this.password; + } + + @Override + public String getUsername() { + return this.username; + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return true; + } +} \ No newline at end of file diff --git a/src/main/java/academy/devdojo/springboot2/repository/DevDojoUserRepository.java b/src/main/java/academy/devdojo/springboot2/repository/DevDojoUserRepository.java new file mode 100644 index 0000000..e2683a6 --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/repository/DevDojoUserRepository.java @@ -0,0 +1,9 @@ +package academy.devdojo.springboot2.repository; + +import academy.devdojo.springboot2.domain.DevDojoUser; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface DevDojoUserRepository extends JpaRepository { + + DevDojoUser findByUsername(String username); +} \ No newline at end of file diff --git a/src/main/java/academy/devdojo/springboot2/service/DevDojoUserDetailsService.java b/src/main/java/academy/devdojo/springboot2/service/DevDojoUserDetailsService.java new file mode 100644 index 0000000..9968133 --- /dev/null +++ b/src/main/java/academy/devdojo/springboot2/service/DevDojoUserDetailsService.java @@ -0,0 +1,22 @@ +package academy.devdojo.springboot2.service; + +import academy.devdojo.springboot2.repository.DevDojoUserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +@Service +@RequiredArgsConstructor +public class DevDojoUserDetailsService implements UserDetailsService { + private final DevDojoUserRepository devDojoUserRepository; + + @Override + public UserDetails loadUserByUsername(String username){ + return Optional.ofNullable(devDojoUserRepository.findByUsername(username)) + .orElseThrow(() -> new UsernameNotFoundException("DevDojo User not found")); + } +} \ No newline at end of file diff --git a/src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java b/src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java index e5e18f7..2f8939f 100644 --- a/src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java +++ b/src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java @@ -1,7 +1,9 @@ package academy.devdojo.springboot2.integration; import academy.devdojo.springboot2.domain.Anime; +import academy.devdojo.springboot2.domain.DevDojoUser; import academy.devdojo.springboot2.repository.AnimeRepository; +import academy.devdojo.springboot2.repository.DevDojoUserRepository; import academy.devdojo.springboot2.requests.AnimePostRequestBody; import academy.devdojo.springboot2.util.AnimeCreator; import academy.devdojo.springboot2.util.AnimePostRequestBodyCreator; @@ -10,15 +12,24 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.CustomAutowireConfigurer; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.web.client.RestTemplateBuilder; +import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Lazy; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.test.annotation.DirtiesContext; +import org.springframework.web.client.RestTemplate; import java.util.List; @@ -29,16 +40,37 @@ //Antes de cada metodo ele da um drop no banco de dados e recria para cada metodo class AnimeControllerIT { @Autowired + @Qualifier(value = "testRestTemplateRoleUser") private TestRestTemplate testRestTemplate; - // @LocalServerPort - // private int port; //para pegar uma porta expecifica passada @Autowired private AnimeRepository animeRepository; + @Autowired + private DevDojoUserRepository devDojoUserRepository; + + //bean que será utilizado na hora do @Autowired + @TestConfiguration + @Lazy + static class Config { + @Bean(name = "testRestTemplateRoleUser") + public TestRestTemplate testRestTemplateRoleUserCreator(@Value("${local.server.port}") int port){ + RestTemplateBuilder restTemplateBuilder = new RestTemplateBuilder() + .rootUri("http://localhost:"+ port) + .basicAuthentication("devdojo", "academy"); + return new TestRestTemplate(restTemplateBuilder); + } + } @Test @DisplayName("List returns list of anime inside page object when successful") void list_ReturnsListOfAnimesInsidePageObject_WhenSuccessful() { Anime savedAnime = animeRepository.save(AnimeCreator.createAnimeToBeSaved()); + DevDojoUser user = DevDojoUser.builder() + .name("DevDojo Academy") + .password("{bcrypt}$2a$10$hSTIR1LEGbkA6US1B0IJVeoTsHrFKzPwXSeE40SvIFckopmMHoUTm") + .username("devdojo") + .authorities("ROLE_USER") + .build(); + devDojoUserRepository.save(user); String expectedName = savedAnime.getName(); From c9995bab5b21c6e5554793bd1bf611e924b60687 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Mon, 28 Mar 2022 13:11:57 -0300 Subject: [PATCH 41/47] =?UTF-8?q?Aula=2045=20=202/2=20-=20Spring=20Securit?= =?UTF-8?q?y=20pt=2006=20-=20Testes=20de=20Integra=C3=A7=C3=A3o=20com=20Sp?= =?UTF-8?q?ring=20Security?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../integration/AnimeControllerIT.java | 80 ++++++++++++++----- 1 file changed, 58 insertions(+), 22 deletions(-) diff --git a/src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java b/src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java index 2f8939f..62d2f82 100644 --- a/src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java +++ b/src/test/java/academy/devdojo/springboot2/integration/AnimeControllerIT.java @@ -12,7 +12,6 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.CustomAutowireConfigurer; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; @@ -20,7 +19,6 @@ import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.web.client.RestTemplateBuilder; -import org.springframework.boot.web.server.LocalServerPort; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Lazy; import org.springframework.core.ParameterizedTypeReference; @@ -29,7 +27,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.web.client.RestTemplate; import java.util.List; @@ -41,40 +38,59 @@ class AnimeControllerIT { @Autowired @Qualifier(value = "testRestTemplateRoleUser") - private TestRestTemplate testRestTemplate; + private TestRestTemplate testRestTemplateRoleUser; + @Autowired + @Qualifier(value = "testRestTemplateRoleAdmin") + private TestRestTemplate testRestTemplateRoleAdmin; @Autowired private AnimeRepository animeRepository; @Autowired private DevDojoUserRepository devDojoUserRepository; + private static final DevDojoUser USER = DevDojoUser.builder() + .name("DevDojo Academy") + .password("{bcrypt}$2a$10$hSTIR1LEGbkA6US1B0IJVeoTsHrFKzPwXSeE40SvIFckopmMHoUTm") + .username("devdojo") + .authorities("ROLE_USER") + .build(); + + private static final DevDojoUser ADMIN = DevDojoUser.builder() + .name("William Suane") + .password("{bcrypt}$2a$10$hSTIR1LEGbkA6US1B0IJVeoTsHrFKzPwXSeE40SvIFckopmMHoUTm") + .username("william") + .authorities("ROLE_USER,ROLE_ADMIN") + .build(); //bean que será utilizado na hora do @Autowired @TestConfiguration @Lazy static class Config { @Bean(name = "testRestTemplateRoleUser") - public TestRestTemplate testRestTemplateRoleUserCreator(@Value("${local.server.port}") int port){ + public TestRestTemplate testRestTemplateRoleUserCreator(@Value("${local.server.port}") int port) { RestTemplateBuilder restTemplateBuilder = new RestTemplateBuilder() - .rootUri("http://localhost:"+ port) + .rootUri("http://localhost:" + port) .basicAuthentication("devdojo", "academy"); return new TestRestTemplate(restTemplateBuilder); } + + @Bean(name = "testRestTemplateRoleAdmin") + public TestRestTemplate testRestTemplateRoleAdminCreator(@Value("${local.server.port}") int port) { + RestTemplateBuilder restTemplateBuilder = new RestTemplateBuilder() + .rootUri("http://localhost:" + port) + .basicAuthentication("william", "academy"); + return new TestRestTemplate(restTemplateBuilder); + } } @Test @DisplayName("List returns list of anime inside page object when successful") void list_ReturnsListOfAnimesInsidePageObject_WhenSuccessful() { Anime savedAnime = animeRepository.save(AnimeCreator.createAnimeToBeSaved()); - DevDojoUser user = DevDojoUser.builder() - .name("DevDojo Academy") - .password("{bcrypt}$2a$10$hSTIR1LEGbkA6US1B0IJVeoTsHrFKzPwXSeE40SvIFckopmMHoUTm") - .username("devdojo") - .authorities("ROLE_USER") - .build(); - devDojoUserRepository.save(user); + + devDojoUserRepository.save(USER); String expectedName = savedAnime.getName(); - PageableResponse animePage = testRestTemplate.exchange("/animes", HttpMethod.GET, null, + PageableResponse animePage = testRestTemplateRoleUser.exchange("/animes", HttpMethod.GET, null, new ParameterizedTypeReference>() { }).getBody(); @@ -91,10 +107,11 @@ void list_ReturnsListOfAnimesInsidePageObject_WhenSuccessful() { @DisplayName("List returns list of anime when successful") void listAll_ReturnsListOfAnimes_WhenSuccessful() { Anime savedAnime = animeRepository.save(AnimeCreator.createAnimeToBeSaved()); + devDojoUserRepository.save(USER); String expectedName = savedAnime.getName(); - List animes = testRestTemplate.exchange("/animes/all", HttpMethod.GET, null, + List animes = testRestTemplateRoleUser.exchange("/animes/all", HttpMethod.GET, null, new ParameterizedTypeReference>() { }).getBody(); @@ -109,10 +126,11 @@ void listAll_ReturnsListOfAnimes_WhenSuccessful() { @DisplayName("findById returns anime when successful") void findById_ReturnAnime_WhenSuccessful() { Anime savedAnime = animeRepository.save(AnimeCreator.createAnimeToBeSaved()); + devDojoUserRepository.save(USER); Long expectedId = savedAnime.getId(); - Anime anime = testRestTemplate.getForObject("/animes/{id}", Anime.class, expectedId); + Anime anime = testRestTemplateRoleUser.getForObject("/animes/{id}", Anime.class, expectedId); Assertions.assertThat(anime).isNotNull(); @@ -124,12 +142,13 @@ void findById_ReturnAnime_WhenSuccessful() { @DisplayName("findByName returns list a of anime when successful") void findByName_ReturnsListOfAnime_WhenSuccessful() { Anime savedAnime = animeRepository.save(AnimeCreator.createAnimeToBeSaved()); + devDojoUserRepository.save(USER); String expectedName = savedAnime.getName(); String url = String.format("/animes/find?name=%s", expectedName); - List animes = testRestTemplate.exchange(url, HttpMethod.GET, null, + List animes = testRestTemplateRoleUser.exchange(url, HttpMethod.GET, null, new ParameterizedTypeReference>() { }).getBody(); @@ -145,7 +164,9 @@ void findByName_ReturnsListOfAnime_WhenSuccessful() { @Test @DisplayName("findByName returns an empty list a of anime when anime is not found") void findByName_ReturnsEmptyListOfAnime_WhenAnimeIsNotFound() { - List animes = testRestTemplate.exchange("/animes/find?name=dbz", HttpMethod.GET, null, + devDojoUserRepository.save(USER); + + List animes = testRestTemplateRoleUser.exchange("/animes/find?name=dbz", HttpMethod.GET, null, new ParameterizedTypeReference>() { }).getBody(); @@ -159,8 +180,9 @@ void findByName_ReturnsEmptyListOfAnime_WhenAnimeIsNotFound() { @DisplayName("save returns anime when successful") void save_ReturnsAnime_WhenSuccessful() { AnimePostRequestBody animePostRequestBody = AnimePostRequestBodyCreator.createAnimePostRequestBody(); + devDojoUserRepository.save(USER); - ResponseEntity animeResponseEntity = testRestTemplate.postForEntity("/animes", animePostRequestBody, Anime.class); + ResponseEntity animeResponseEntity = testRestTemplateRoleUser.postForEntity("/animes", animePostRequestBody, Anime.class); Assertions.assertThat(animeResponseEntity).isNotNull(); Assertions.assertThat(animeResponseEntity.getStatusCode()).isEqualTo(HttpStatus.CREATED); @@ -173,10 +195,11 @@ void save_ReturnsAnime_WhenSuccessful() { @DisplayName("replace updates anime when successful") void replace_UpdaterAnime_WhenSuccessful() { Anime savedAnime = animeRepository.save(AnimeCreator.createAnimeToBeSaved()); + devDojoUserRepository.save(USER); savedAnime.setName("new Name"); - ResponseEntity animeResponseEntity = testRestTemplate.exchange("/animes", HttpMethod.PUT, new HttpEntity<>(savedAnime), Void.class); + ResponseEntity animeResponseEntity = testRestTemplateRoleUser.exchange("/animes", HttpMethod.PUT, new HttpEntity<>(savedAnime), Void.class); Assertions.assertThat(animeResponseEntity).isNotNull(); @@ -187,15 +210,28 @@ void replace_UpdaterAnime_WhenSuccessful() { @Test @DisplayName("delete removes anime when successful") void delete_RemovesAnime_WhenSuccessful() { - Anime savedAnime = animeRepository.save(AnimeCreator.createAnimeToBeSaved()); + devDojoUserRepository.save(ADMIN); - ResponseEntity animeResponseEntity = testRestTemplate.exchange("/animes/{id}", HttpMethod.DELETE, null, Void.class, savedAnime.getId()); + ResponseEntity animeResponseEntity = testRestTemplateRoleAdmin.exchange("/animes/admin/{id}", HttpMethod.DELETE, null, Void.class, savedAnime.getId()); Assertions.assertThat(animeResponseEntity).isNotNull(); Assertions.assertThat(animeResponseEntity.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); + } + + @Test + @DisplayName("delete returns 403 when user is not Admin") + void delete_Returns403_WhenUserIsNotAdmin() { + Anime savedAnime = animeRepository.save(AnimeCreator.createAnimeToBeSaved()); + devDojoUserRepository.save(USER); + + ResponseEntity animeResponseEntity = testRestTemplateRoleUser.exchange("/animes/admin/{id}", HttpMethod.DELETE, null, Void.class, savedAnime.getId()); + + Assertions.assertThat(animeResponseEntity).isNotNull(); + + Assertions.assertThat(animeResponseEntity.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN); } From a178fbd66e145bd1dce5188ae19f395115e5c339 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Tue, 29 Mar 2022 11:31:48 -0300 Subject: [PATCH 42/47] =?UTF-8?q?Aula=2046=20-=20Documenta=C3=A7=C3=A3o=20?= =?UTF-8?q?com=20SpringDoc=20OpenAPI=20pt=2001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 33 +++++++++++++++---- .../controller/AnimeController.java | 4 ++- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index e22f457..8677ced 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.4.RELEASE + 2.3.5.RELEASE @@ -19,9 +19,34 @@ 11 1.4.2.Final 3.8.1 + 1.6.6 + + mysql + mysql-connector-java + 8.0.28 + + + + org.springdoc + springdoc-openapi-ui + ${springdoc-openapi-ui.version} + + + + org.springdoc + springdoc-openapi-data-rest + ${springdoc-openapi-ui.version} + + + + org.springdoc + springdoc-openapi-security + ${springdoc-openapi-ui.version} + + org.springframework.boot spring-boot-starter-security @@ -42,11 +67,6 @@ spring-boot-starter-data-jpa - - mysql - mysql-connector-java - - org.springframework.boot spring-boot-starter-web @@ -58,6 +78,7 @@ runtime true + org.projectlombok lombok diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index 02b50cd..1467b2a 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -5,8 +5,10 @@ import academy.devdojo.springboot2.requests.AnimePutRequestBody; import academy.devdojo.springboot2.service.AnimeService; import academy.devdojo.springboot2.util.DateUtil; +import io.swagger.v3.oas.annotations.Parameter; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.springdoc.api.annotations.ParameterObject; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; @@ -28,7 +30,7 @@ public class AnimeController { private final AnimeService animeService; @GetMapping - public ResponseEntity> list(Pageable pageable) { + public ResponseEntity> list(@ParameterObject Pageable pageable) { return ResponseEntity.ok(animeService.listAll(pageable)); } From ab7f0030092ef0a236d97e91080b52f692dca51e Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Tue, 29 Mar 2022 14:03:11 -0300 Subject: [PATCH 43/47] =?UTF-8?q?Aula=2046=20-=20Documenta=C3=A7=C3=A3o=20?= =?UTF-8?q?com=20SpringDoc=20OpenAPI=20pt=2002?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devdojo/springboot2/controller/AnimeController.java | 9 +++++++++ .../springboot2/requests/AnimePostRequestBody.java | 2 ++ 2 files changed, 11 insertions(+) diff --git a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java index 1467b2a..24d4870 100644 --- a/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java +++ b/src/main/java/academy/devdojo/springboot2/controller/AnimeController.java @@ -5,7 +5,10 @@ import academy.devdojo.springboot2.requests.AnimePutRequestBody; import academy.devdojo.springboot2.service.AnimeService; import academy.devdojo.springboot2.util.DateUtil; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springdoc.api.annotations.ParameterObject; @@ -30,6 +33,8 @@ public class AnimeController { private final AnimeService animeService; @GetMapping + @Operation(summary = "List all animes paginated", description = "The default size is 20, use the parameter size " + + "to change the default value", tags = {"anime"} ) public ResponseEntity> list(@ParameterObject Pageable pageable) { return ResponseEntity.ok(animeService.listAll(pageable)); } @@ -62,6 +67,10 @@ public ResponseEntity save(@RequestBody @Valid AnimePostRequestBody anime } @DeleteMapping(path = "/admin/{id}") + @ApiResponses(value = { + @ApiResponse(responseCode = "204", description = "Successful Operation"), + @ApiResponse(responseCode = "400", description = "When anime does is not exist in database") + }) public ResponseEntity delete(@PathVariable long id) { animeService.delete(id); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java b/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java index 43b4555..f82c1bc 100644 --- a/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java +++ b/src/main/java/academy/devdojo/springboot2/requests/AnimePostRequestBody.java @@ -1,5 +1,6 @@ package academy.devdojo.springboot2.requests; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -15,6 +16,7 @@ @NoArgsConstructor public class AnimePostRequestBody { @NotEmpty(message = "The anime name cannot be empty") + @Schema(description = "This is the anime's name", example = "Samurai Chaaplo", required = true) private String name; } From bc1255ca81d83f3431399a0487dffab539166644 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Wed, 30 Mar 2022 11:26:37 -0300 Subject: [PATCH 44/47] Aula 48 - Spring Boot Actuator --- pom.xml | 5 +++++ .../devdojo/springboot2/config/SecurityConfig.java | 1 + src/main/resources/application.yml | 13 ++++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8677ced..c103ded 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,11 @@ + + org.springframework.boot + spring-boot-starter-actuator + + mysql mysql-connector-java diff --git a/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java b/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java index 5db5afa..97d6c07 100644 --- a/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java +++ b/src/main/java/academy/devdojo/springboot2/config/SecurityConfig.java @@ -29,6 +29,7 @@ protected void configure(HttpSecurity http) throws Exception { .authorizeRequests() .antMatchers("/animes/admin/**").hasRole("ADMIN") .antMatchers("/animes/**").hasRole("USER") + .antMatchers("/actuator/**").permitAll() .anyRequest() .authenticated() .and() diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index aba1c49..35f5acc 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -16,4 +16,15 @@ logging: level: org: hibernate: - SQL: DEBUG \ No newline at end of file + SQL: DEBUG + +management: + endpoints: + web: + exposure: + include: info, health, metrics + +info: + app: Spring Boot 2 Essentials by DevDojo + website: https://devdojo.academy + github: https://github.com/GuilhermeMelo01 \ No newline at end of file From 84f74abd93d4a4014616e51d192f3e3023a70d2c Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Wed, 30 Mar 2022 13:29:26 -0300 Subject: [PATCH 45/47] =?UTF-8?q?Aula=2049=20-=20Monitorando=20aplica?= =?UTF-8?q?=C3=A7=C3=A3o=20com=20prometheus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 11 +++++++++++ pom.xml | 4 ++++ src/main/resources/application.yml | 2 +- src/main/resources/prometheus.yml | 27 +++++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/prometheus.yml diff --git a/docker-compose.yml b/docker-compose.yml index 1b33d8d..79e08d3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,5 +10,16 @@ services: volumes: - devdojo_data:/var/lib/mysql + prometheus: + image: prom/prometheus:latest + container_name: prometheus + volumes: + - "./src/main/resources/prometheus.yml:/etc/prometheus/prometheus.yml" + command: + - "--config.file=/etc/prometheus/prometheus.yml" + ports: + - "9090:9090" + + volumes: devdojo_data: diff --git a/pom.xml b/pom.xml index c103ded..cbcf779 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,10 @@ org.springframework.boot spring-boot-starter-actuator + + io.micrometer + micrometer-registry-prometheus + mysql diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 35f5acc..6603d7b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -22,7 +22,7 @@ management: endpoints: web: exposure: - include: info, health, metrics + include: info, health, metrics, prometheus info: app: Spring Boot 2 Essentials by DevDojo diff --git a/src/main/resources/prometheus.yml b/src/main/resources/prometheus.yml new file mode 100644 index 0000000..8fb8b6d --- /dev/null +++ b/src/main/resources/prometheus.yml @@ -0,0 +1,27 @@ +global: + scrape_interval: 15s # By default, scrape targets every 15 seconds. + + # Attach these labels to any time series or alerts when communicating with + # external systems (federation, remote storage, Alertmanager). +# external_labels: +# monitor: 'codelab-monitor' + +# A scrape configuration containing exactly one endpoint to scrape: +# Here it's Prometheus itself. +scrape_configs: +# # The job name is added as a label `job=` to any timeseries scraped from this config. +# - job_name: 'prometheus' +# +# # Override the global default and scrape targets from this job every 5 seconds. +# scrape_interval: 5s +# +# static_configs: +# - targets: [ 'localhost:9090' ] + + - job_name: 'springboot-essentials-actuator' + + # Override the global default and scrape targets from this job every 5 seconds. + scrape_interval: 5s + metrics_path: "/actuator/prometheus" + static_configs: + - targets: ['host.docker.internal:8080'] \ No newline at end of file From 23e7085647fefa6864ba8e594c495881c5f8f895 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Wed, 30 Mar 2022 20:37:06 -0300 Subject: [PATCH 46/47] =?UTF-8?q?Aula=20=2050=20-=20Monitorando=20m=C3=A9t?= =?UTF-8?q?ricas=20com=20gr=C3=A1ficos=20no=20Grafana?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 6 +++++- .../springboot2/Springboot2EssentialsApplication.java | 9 +++++++++ src/main/resources/application.yml | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 79e08d3..992085a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,6 +20,10 @@ services: ports: - "9090:9090" - + grafana: + image: grafana/grafana:latest + container_name: grafana + ports: + - "3000:3000" volumes: devdojo_data: diff --git a/src/main/java/academy/devdojo/springboot2/Springboot2EssentialsApplication.java b/src/main/java/academy/devdojo/springboot2/Springboot2EssentialsApplication.java index 47f4f81..0d55709 100644 --- a/src/main/java/academy/devdojo/springboot2/Springboot2EssentialsApplication.java +++ b/src/main/java/academy/devdojo/springboot2/Springboot2EssentialsApplication.java @@ -1,7 +1,11 @@ package academy.devdojo.springboot2; +import io.micrometer.core.instrument.MeterRegistry; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; +import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; @SpringBootApplication public class Springboot2EssentialsApplication { @@ -10,4 +14,9 @@ public static void main(String[] args) { SpringApplication.run(Springboot2EssentialsApplication.class, args); } + @Bean + MeterRegistryCustomizer configurer( + @Value("${spring.application.name}") String applicationName) { + return (registry) -> registry.config().commonTags("application", applicationName); + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6603d7b..cdf01cd 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,6 +3,8 @@ server: include-stacktrace: on_param spring: + application: + name: springboot2-essentials datasource: url: jdbc:mysql://localhost:3306/anime?createDatabaseIfNotExist=true username: root From 37eb836bf8eb495fbe77303b1ccafc4ad7f1afa8 Mon Sep 17 00:00:00 2001 From: GuilhermeMelo01 Date: Wed, 30 Mar 2022 22:13:43 -0300 Subject: [PATCH 47/47] Aula 51 - Criado imagem com jib e executando via docker-compose --- docker-compose.yml | 22 +++++++++++++++++++--- pom.xml | 26 +++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 992085a..a02697f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,9 @@ -version: '3.1' +version: '2.4' +x-database-variables: &database-variables + SPRING_DATASOURCE_URL: jdbc:mysql://mysql:3306/anime?createDatabaseIfNotExist=true + SPRING_DATASOURCE_USERNAME: root + SPRING_DATASOURCE_PASSWORD: root + services: db: image: mysql @@ -9,21 +14,32 @@ services: - "3306:3306" volumes: - devdojo_data:/var/lib/mysql + mem_limit: 512m prometheus: image: prom/prometheus:latest container_name: prometheus volumes: - "./src/main/resources/prometheus.yml:/etc/prometheus/prometheus.yml" - command: - - "--config.file=/etc/prometheus/prometheus.yml" + command: "--config.file=/etc/prometheus/prometheus.yml" ports: - "9090:9090" + mem_limit: 128m grafana: image: grafana/grafana:latest container_name: grafana ports: - "3000:3000" + mem_limit: 128m + + springboot2-essentials: + image: guilhermemelo01/springboot2-essentials:0.0.1-SNAPSHOT + ports: + - "8080:8080" + environment: + <<: *database-variables + mem_limit: 512m + volumes: devdojo_data: diff --git a/pom.xml b/pom.xml index cbcf779..f94b1aa 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ academy.devdojo springboot2-essentials - 0.0.1-SNAPSHOT + 0.0.2-SNAPSHOT springboot2-essentials Curso de Spring Boot do DevDojo @@ -20,6 +20,11 @@ 1.4.2.Final 3.8.1 1.6.6 + 3.2.0 + gcr.io/distroless/java11-debian11 + guilhermemelo01 + springboot2-essentials + ${docker.repo.url}/${docker.repo.project} @@ -132,6 +137,25 @@ + + com.google.cloud.tools + jib-maven-plugin + ${jib-maven-plugin.version} + + + ${docker.distroless.image} + + + ${docker.image.name} + + ${project.version} + + + + academy.devdojo.springboot2.Springboot2EssentialsApplication + + + org.springframework.boot spring-boot-maven-plugin