diff --git a/build.gradle b/build.gradle index dc613e5..db9cb16 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'org.springframework.boot' version '2.5.2' - id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'org.springframework.boot' version '4.0.6' + id 'io.spring.dependency-management' version '1.1.7' id 'java' id 'jacoco' id "io.freefair.lombok" version "9.5.0" @@ -10,7 +10,10 @@ plugins { group = 'io.github.raeperd' version = '2.1.1' -sourceCompatibility = '17' + +java { + sourceCompatibility = JavaVersion.VERSION_17 +} repositories { mavenCentral() @@ -24,6 +27,9 @@ dependencies { runtimeOnly 'com.h2database:h2' testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.boot:spring-boot-webmvc-test' + testImplementation 'org.springframework.boot:spring-boot-data-jpa-test' + testImplementation 'org.springframework.boot:spring-boot-security-test' testImplementation 'org.springframework.security:spring-security-test' testImplementation 'org.mockito:mockito-inline:5.2.0' } @@ -36,7 +42,7 @@ test { jib { from { - image = "openjdk:11.0.10-jre-buster" + image = "eclipse-temurin:17-jre" platforms { platform { architecture = 'amd64' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..b1b8ef5 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3994438..743f487 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip +networkTimeout=10000 +retries=0 +retryBackOffMs=500 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..b9bb139 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,81 +15,114 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..aa5f10b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,19 +13,22 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,15 +43,15 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -56,34 +59,24 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/src/main/java/io/github/raeperd/realworld/application/article/ArticlePostRequestDTO.java b/src/main/java/io/github/raeperd/realworld/application/article/ArticlePostRequestDTO.java index cba8d4a..8736f8f 100644 --- a/src/main/java/io/github/raeperd/realworld/application/article/ArticlePostRequestDTO.java +++ b/src/main/java/io/github/raeperd/realworld/application/article/ArticlePostRequestDTO.java @@ -7,8 +7,8 @@ import io.github.raeperd.realworld.domain.article.tag.Tag; import lombok.Value; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import java.util.Set; import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; diff --git a/src/main/java/io/github/raeperd/realworld/application/article/ArticleRestController.java b/src/main/java/io/github/raeperd/realworld/application/article/ArticleRestController.java index 86e2fc4..fb20b7d 100644 --- a/src/main/java/io/github/raeperd/realworld/application/article/ArticleRestController.java +++ b/src/main/java/io/github/raeperd/realworld/application/article/ArticleRestController.java @@ -8,7 +8,7 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; +import jakarta.validation.Valid; import static org.springframework.http.HttpStatus.NO_CONTENT; import static org.springframework.http.ResponseEntity.of; diff --git a/src/main/java/io/github/raeperd/realworld/application/article/comment/CommentPostRequestDTO.java b/src/main/java/io/github/raeperd/realworld/application/article/comment/CommentPostRequestDTO.java index 56c0fc1..f98d0ae 100644 --- a/src/main/java/io/github/raeperd/realworld/application/article/comment/CommentPostRequestDTO.java +++ b/src/main/java/io/github/raeperd/realworld/application/article/comment/CommentPostRequestDTO.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Getter; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME; diff --git a/src/main/java/io/github/raeperd/realworld/application/article/comment/CommentRestController.java b/src/main/java/io/github/raeperd/realworld/application/article/comment/CommentRestController.java index 19cc8e3..9f78a43 100644 --- a/src/main/java/io/github/raeperd/realworld/application/article/comment/CommentRestController.java +++ b/src/main/java/io/github/raeperd/realworld/application/article/comment/CommentRestController.java @@ -6,7 +6,7 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; +import jakarta.validation.Valid; import static java.util.Optional.ofNullable; diff --git a/src/main/java/io/github/raeperd/realworld/application/security/JWTAuthenticationFilter.java b/src/main/java/io/github/raeperd/realworld/application/security/JWTAuthenticationFilter.java index 986094a..cd27e96 100644 --- a/src/main/java/io/github/raeperd/realworld/application/security/JWTAuthenticationFilter.java +++ b/src/main/java/io/github/raeperd/realworld/application/security/JWTAuthenticationFilter.java @@ -1,25 +1,36 @@ package io.github.raeperd.realworld.application.security; +import io.github.raeperd.realworld.domain.jwt.JWTDeserializer; +import io.github.raeperd.realworld.domain.jwt.JWTPayload; import org.springframework.security.authentication.AbstractAuthenticationToken; +import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; +import static java.util.Collections.singleton; import static java.util.Optional.ofNullable; import static org.springframework.http.HttpHeaders.AUTHORIZATION; import static org.springframework.security.core.context.SecurityContextHolder.getContext; class JWTAuthenticationFilter extends OncePerRequestFilter { + private final JWTDeserializer jwtDeserializer; + + JWTAuthenticationFilter(JWTDeserializer jwtDeserializer) { + this.jwtDeserializer = jwtDeserializer; + } + @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { ofNullable(request.getHeader(AUTHORIZATION)) + .filter(authHeader -> authHeader.startsWith("Token ")) .map(authHeader -> authHeader.substring("Token ".length())) - .map(JWT::new) + .map(token -> new JWT(token, jwtDeserializer.jwtPayloadFromJWT(token))) .ifPresent(getContext()::setAuthentication); filterChain.doFilter(request, response); } @@ -28,20 +39,23 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse static class JWT extends AbstractAuthenticationToken { private final String token; + private final JWTPayload jwtPayload; - private JWT(String token) { - super(null); + private JWT(String token, JWTPayload jwtPayload) { + super(singleton(new SimpleGrantedAuthority("USER"))); this.token = token; + this.jwtPayload = jwtPayload; + setAuthenticated(true); } @Override public Object getPrincipal() { - return token; + return jwtPayload; } @Override public Object getCredentials() { - return null; + return token; } } } diff --git a/src/main/java/io/github/raeperd/realworld/application/security/JWTAuthenticationProvider.java b/src/main/java/io/github/raeperd/realworld/application/security/JWTAuthenticationProvider.java deleted file mode 100644 index 7aad3c5..0000000 --- a/src/main/java/io/github/raeperd/realworld/application/security/JWTAuthenticationProvider.java +++ /dev/null @@ -1,60 +0,0 @@ -package io.github.raeperd.realworld.application.security; - -import io.github.raeperd.realworld.domain.jwt.JWTDeserializer; -import io.github.raeperd.realworld.domain.jwt.JWTPayload; -import org.springframework.security.authentication.AbstractAuthenticationToken; -import org.springframework.security.authentication.AuthenticationProvider; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.authority.SimpleGrantedAuthority; - -import static java.util.Collections.singleton; -import static java.util.Optional.of; - -class JWTAuthenticationProvider implements AuthenticationProvider { - - private final JWTDeserializer jwtDeserializer; - - JWTAuthenticationProvider(JWTDeserializer jwtDeserializer) { - this.jwtDeserializer = jwtDeserializer; - } - - @Override - public Authentication authenticate(Authentication authentication) throws AuthenticationException { - return of(authentication).map(JWTAuthenticationFilter.JWT.class::cast) - .map(JWTAuthenticationFilter.JWT::getPrincipal) - .map(Object::toString) - .map(token -> new JWTAuthentication(token, jwtDeserializer.jwtPayloadFromJWT(token))) - .orElseThrow(IllegalStateException::new); - } - - @Override - public boolean supports(Class authentication) { - return JWTAuthenticationFilter.JWT.class.isAssignableFrom(authentication); - } - - @SuppressWarnings("java:S2160") - private static class JWTAuthentication extends AbstractAuthenticationToken { - - private final JWTPayload jwtPayload; - private final String token; - - private JWTAuthentication(String token, JWTPayload jwtPayload) { - super(singleton(new SimpleGrantedAuthority("USER"))); - super.setAuthenticated(true); - this.jwtPayload = jwtPayload; - this.token = token; - } - - @Override - public Object getPrincipal() { - return jwtPayload; - } - - @Override - public Object getCredentials() { - return token; - } - } - -} diff --git a/src/main/java/io/github/raeperd/realworld/application/security/SecurityConfiguration.java b/src/main/java/io/github/raeperd/realworld/application/security/SecurityConfiguration.java index 74194b2..16a2d05 100644 --- a/src/main/java/io/github/raeperd/realworld/application/security/SecurityConfiguration.java +++ b/src/main/java/io/github/raeperd/realworld/application/security/SecurityConfiguration.java @@ -2,15 +2,15 @@ import io.github.raeperd.realworld.domain.jwt.JWTDeserializer; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.ConstructorBinding; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.builders.WebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -22,7 +22,7 @@ @EnableConfigurationProperties(SecurityConfigurationProperties.class) @Configuration -public class SecurityConfiguration extends WebSecurityConfigurerAdapter implements WebMvcConfigurer { +public class SecurityConfiguration implements WebMvcConfigurer { private final SecurityConfigurationProperties properties; @@ -30,30 +30,27 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter implemen this.properties = properties; } - @Override - public void configure(WebSecurity web) { - web.ignoring().antMatchers(POST, "/users", "/users/login"); - } - - @Override - protected void configure(HttpSecurity http) throws Exception { - http.csrf().disable(); - http.cors(); - http.formLogin().disable(); - http.logout().disable(); - http.addFilterBefore(new JWTAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class); - http.authorizeRequests() - .antMatchers(GET, "/profiles/*").permitAll() - .antMatchers(GET, "/articles/**").permitAll() - .antMatchers(GET, "/tags/**").permitAll() - .anyRequest().authenticated(); + @Bean + WebSecurityCustomizer webSecurityCustomizer() { + return web -> web.ignoring().requestMatchers(POST, "/users", "/users/login"); } @Bean - JWTAuthenticationProvider jwtAuthenticationProvider(JWTDeserializer jwtDeserializer) { - return new JWTAuthenticationProvider(jwtDeserializer); + SecurityFilterChain securityFilterChain(HttpSecurity http, JWTDeserializer jwtDeserializer) throws Exception { + http.csrf(AbstractHttpConfigurer::disable); + http.cors(cors -> {}); + http.formLogin(AbstractHttpConfigurer::disable); + http.logout(AbstractHttpConfigurer::disable); + http.addFilterBefore(new JWTAuthenticationFilter(jwtDeserializer), UsernamePasswordAuthenticationFilter.class); + http.authorizeHttpRequests(requests -> requests + .requestMatchers(GET, "/profiles/*").permitAll() + .requestMatchers(GET, "/articles/**").permitAll() + .requestMatchers(GET, "/tags/**").permitAll() + .anyRequest().authenticated()); + return http.build(); } + @Bean PasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); @@ -69,7 +66,6 @@ public void addCorsMappings(CorsRegistry registry) { } } -@ConstructorBinding @ConfigurationProperties("security") class SecurityConfigurationProperties { private final List allowedOrigins; @@ -81,4 +77,4 @@ class SecurityConfigurationProperties { public List getAllowedOrigins() { return allowedOrigins; } -} \ No newline at end of file +} diff --git a/src/main/java/io/github/raeperd/realworld/application/user/UserLoginRequestDTO.java b/src/main/java/io/github/raeperd/realworld/application/user/UserLoginRequestDTO.java index bddf12d..8fda9b0 100644 --- a/src/main/java/io/github/raeperd/realworld/application/user/UserLoginRequestDTO.java +++ b/src/main/java/io/github/raeperd/realworld/application/user/UserLoginRequestDTO.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import lombok.Value; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME; diff --git a/src/main/java/io/github/raeperd/realworld/application/user/UserPostRequestDTO.java b/src/main/java/io/github/raeperd/realworld/application/user/UserPostRequestDTO.java index 7965928..d4e4af8 100644 --- a/src/main/java/io/github/raeperd/realworld/application/user/UserPostRequestDTO.java +++ b/src/main/java/io/github/raeperd/realworld/application/user/UserPostRequestDTO.java @@ -7,7 +7,7 @@ import io.github.raeperd.realworld.domain.user.UserSignUpRequest; import lombok.Value; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; import static com.fasterxml.jackson.annotation.JsonTypeInfo.As.WRAPPER_OBJECT; import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME; @@ -17,7 +17,7 @@ @Value class UserPostRequestDTO { - @javax.validation.constraints.Email + @jakarta.validation.constraints.Email String email; @NotBlank String username; diff --git a/src/main/java/io/github/raeperd/realworld/application/user/UserRestController.java b/src/main/java/io/github/raeperd/realworld/application/user/UserRestController.java index 11f46d1..2ee1d9c 100644 --- a/src/main/java/io/github/raeperd/realworld/application/user/UserRestController.java +++ b/src/main/java/io/github/raeperd/realworld/application/user/UserRestController.java @@ -9,7 +9,7 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; +import jakarta.validation.Valid; import static io.github.raeperd.realworld.application.user.UserModel.fromUserAndToken; import static org.springframework.http.ResponseEntity.of; diff --git a/src/main/java/io/github/raeperd/realworld/domain/article/Article.java b/src/main/java/io/github/raeperd/realworld/domain/article/Article.java index bd9f36c..71824f6 100644 --- a/src/main/java/io/github/raeperd/realworld/domain/article/Article.java +++ b/src/main/java/io/github/raeperd/realworld/domain/article/Article.java @@ -6,17 +6,17 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*; import java.time.Instant; import java.util.HashSet; import java.util.NoSuchElementException; import java.util.Objects; import java.util.Set; -import static javax.persistence.CascadeType.PERSIST; -import static javax.persistence.CascadeType.REMOVE; -import static javax.persistence.FetchType.EAGER; -import static javax.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.CascadeType.PERSIST; +import static jakarta.persistence.CascadeType.REMOVE; +import static jakarta.persistence.FetchType.EAGER; +import static jakarta.persistence.GenerationType.IDENTITY; @Table(name = "articles") @EntityListeners(AuditingEntityListener.class) diff --git a/src/main/java/io/github/raeperd/realworld/domain/article/ArticleContents.java b/src/main/java/io/github/raeperd/realworld/domain/article/ArticleContents.java index 2016991..e86f38c 100644 --- a/src/main/java/io/github/raeperd/realworld/domain/article/ArticleContents.java +++ b/src/main/java/io/github/raeperd/realworld/domain/article/ArticleContents.java @@ -2,12 +2,12 @@ import io.github.raeperd.realworld.domain.article.tag.Tag; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Set; -import static javax.persistence.CascadeType.PERSIST; -import static javax.persistence.FetchType.EAGER; +import static jakarta.persistence.CascadeType.PERSIST; +import static jakarta.persistence.FetchType.EAGER; @Embeddable public class ArticleContents { diff --git a/src/main/java/io/github/raeperd/realworld/domain/article/ArticleTitle.java b/src/main/java/io/github/raeperd/realworld/domain/article/ArticleTitle.java index d5f1f2e..1c367fb 100644 --- a/src/main/java/io/github/raeperd/realworld/domain/article/ArticleTitle.java +++ b/src/main/java/io/github/raeperd/realworld/domain/article/ArticleTitle.java @@ -1,7 +1,7 @@ package io.github.raeperd.realworld.domain.article; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/src/main/java/io/github/raeperd/realworld/domain/article/comment/Comment.java b/src/main/java/io/github/raeperd/realworld/domain/article/comment/Comment.java index 6a39b36..faa45eb 100644 --- a/src/main/java/io/github/raeperd/realworld/domain/article/comment/Comment.java +++ b/src/main/java/io/github/raeperd/realworld/domain/article/comment/Comment.java @@ -6,12 +6,12 @@ import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.*; +import jakarta.persistence.*; import java.time.Instant; import java.util.Objects; -import static javax.persistence.FetchType.EAGER; -import static javax.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.FetchType.EAGER; +import static jakarta.persistence.GenerationType.IDENTITY; @Table(name = "comments") @EntityListeners(AuditingEntityListener.class) diff --git a/src/main/java/io/github/raeperd/realworld/domain/article/tag/Tag.java b/src/main/java/io/github/raeperd/realworld/domain/article/tag/Tag.java index c92d096..2c1b329 100644 --- a/src/main/java/io/github/raeperd/realworld/domain/article/tag/Tag.java +++ b/src/main/java/io/github/raeperd/realworld/domain/article/tag/Tag.java @@ -1,9 +1,9 @@ package io.github.raeperd.realworld.domain.article.tag; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Objects; -import static javax.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.GenerationType.IDENTITY; @Table(name = "tags") @Entity @@ -13,7 +13,7 @@ public class Tag { @Id private Long id; - @Column(name = "value", unique = true, nullable = false) + @Column(name = "tag_value", unique = true, nullable = false) private String value; public Tag(String value) { diff --git a/src/main/java/io/github/raeperd/realworld/domain/user/Email.java b/src/main/java/io/github/raeperd/realworld/domain/user/Email.java index 9ed92ce..992ae4e 100644 --- a/src/main/java/io/github/raeperd/realworld/domain/user/Email.java +++ b/src/main/java/io/github/raeperd/realworld/domain/user/Email.java @@ -1,7 +1,7 @@ package io.github.raeperd.realworld.domain.user; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/src/main/java/io/github/raeperd/realworld/domain/user/Image.java b/src/main/java/io/github/raeperd/realworld/domain/user/Image.java index b2880f0..afc2d1e 100644 --- a/src/main/java/io/github/raeperd/realworld/domain/user/Image.java +++ b/src/main/java/io/github/raeperd/realworld/domain/user/Image.java @@ -1,7 +1,7 @@ package io.github.raeperd.realworld.domain.user; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/src/main/java/io/github/raeperd/realworld/domain/user/Password.java b/src/main/java/io/github/raeperd/realworld/domain/user/Password.java index b189653..01870c7 100644 --- a/src/main/java/io/github/raeperd/realworld/domain/user/Password.java +++ b/src/main/java/io/github/raeperd/realworld/domain/user/Password.java @@ -2,8 +2,8 @@ import org.springframework.security.crypto.password.PasswordEncoder; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; @Embeddable class Password { diff --git a/src/main/java/io/github/raeperd/realworld/domain/user/Profile.java b/src/main/java/io/github/raeperd/realworld/domain/user/Profile.java index fd43860..aa17037 100644 --- a/src/main/java/io/github/raeperd/realworld/domain/user/Profile.java +++ b/src/main/java/io/github/raeperd/realworld/domain/user/Profile.java @@ -1,9 +1,9 @@ package io.github.raeperd.realworld.domain.user; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.Embedded; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Embedded; +import jakarta.persistence.Transient; @Embeddable public class Profile { diff --git a/src/main/java/io/github/raeperd/realworld/domain/user/User.java b/src/main/java/io/github/raeperd/realworld/domain/user/User.java index 6f613c5..0515e5d 100644 --- a/src/main/java/io/github/raeperd/realworld/domain/user/User.java +++ b/src/main/java/io/github/raeperd/realworld/domain/user/User.java @@ -6,14 +6,14 @@ import io.github.raeperd.realworld.domain.article.comment.Comment; import org.springframework.security.crypto.password.PasswordEncoder; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Objects; import java.util.Set; import static java.util.stream.Collectors.toSet; -import static javax.persistence.CascadeType.REMOVE; -import static javax.persistence.GenerationType.IDENTITY; +import static jakarta.persistence.CascadeType.REMOVE; +import static jakarta.persistence.GenerationType.IDENTITY; @Table(name = "users") @Entity diff --git a/src/main/java/io/github/raeperd/realworld/domain/user/UserName.java b/src/main/java/io/github/raeperd/realworld/domain/user/UserName.java index 688f05e..67e05e6 100644 --- a/src/main/java/io/github/raeperd/realworld/domain/user/UserName.java +++ b/src/main/java/io/github/raeperd/realworld/domain/user/UserName.java @@ -1,7 +1,7 @@ package io.github.raeperd.realworld.domain.user; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/src/main/java/io/github/raeperd/realworld/infrastructure/jwt/HmacSHA256JWTService.java b/src/main/java/io/github/raeperd/realworld/infrastructure/jwt/HmacSHA256JWTService.java index 7554e5b..5f8f06a 100644 --- a/src/main/java/io/github/raeperd/realworld/infrastructure/jwt/HmacSHA256JWTService.java +++ b/src/main/java/io/github/raeperd/realworld/infrastructure/jwt/HmacSHA256JWTService.java @@ -1,6 +1,6 @@ package io.github.raeperd.realworld.infrastructure.jwt; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import io.github.raeperd.realworld.domain.jwt.JWTDeserializer; import io.github.raeperd.realworld.domain.jwt.JWTPayload; import io.github.raeperd.realworld.domain.jwt.JWTSerializer; diff --git a/src/main/java/io/github/raeperd/realworld/infrastructure/jwt/JWTConfiguration.java b/src/main/java/io/github/raeperd/realworld/infrastructure/jwt/JWTConfiguration.java index d8158df..a32b2ac 100644 --- a/src/main/java/io/github/raeperd/realworld/infrastructure/jwt/JWTConfiguration.java +++ b/src/main/java/io/github/raeperd/realworld/infrastructure/jwt/JWTConfiguration.java @@ -1,6 +1,6 @@ package io.github.raeperd.realworld.infrastructure.jwt; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/io/github/raeperd/realworld/infrastructure/jwt/UserJWTPayload.java b/src/main/java/io/github/raeperd/realworld/infrastructure/jwt/UserJWTPayload.java index fecbe01..990b735 100644 --- a/src/main/java/io/github/raeperd/realworld/infrastructure/jwt/UserJWTPayload.java +++ b/src/main/java/io/github/raeperd/realworld/infrastructure/jwt/UserJWTPayload.java @@ -1,5 +1,7 @@ package io.github.raeperd.realworld.infrastructure.jwt; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; import io.github.raeperd.realworld.domain.jwt.JWTPayload; import io.github.raeperd.realworld.domain.user.User; @@ -17,7 +19,10 @@ static UserJWTPayload of(User user, long epochSecondExpired) { return new UserJWTPayload(user.getId(), valueOf(user.getEmail()), epochSecondExpired); } - UserJWTPayload(long sub, String name, long iat) { + @JsonCreator + UserJWTPayload(@JsonProperty("sub") long sub, + @JsonProperty("name") String name, + @JsonProperty("iat") long iat) { this.sub = sub; this.name = name; this.iat = iat; diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql index eb3c6de..3f081ff 100644 --- a/src/main/resources/schema.sql +++ b/src/main/resources/schema.sql @@ -1,6 +1,6 @@ CREATE TABLE IF NOT EXISTS users ( - id BIGSERIAL PRIMARY KEY, + id BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1000) PRIMARY KEY, name VARCHAR(100) NOT NULL, bio VARCHAR(1024), image VARCHAR(1024), @@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS user_followings CREATE TABLE IF NOT EXISTS articles ( - id BIGSERIAL PRIMARY KEY, + id BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1000) PRIMARY KEY, author_id BIGINT NOT NULL, title VARCHAR(255) NOT NULL, slug VARCHAR(255) NOT NULL, @@ -33,8 +33,8 @@ CREATE TABLE IF NOT EXISTS articles CREATE TABLE IF NOT EXISTS tags ( - id BIGSERIAL PRIMARY KEY, - value VARCHAR(255) UNIQUE NOT NULL + id BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1000) PRIMARY KEY, + tag_value VARCHAR(255) UNIQUE NOT NULL ); CREATE TABLE IF NOT EXISTS articles_tags @@ -57,7 +57,7 @@ CREATE TABLE IF NOT EXISTS article_favorites CREATE TABLE IF NOT EXISTS comments ( - id BIGSERIAL PRIMARY KEY, + id BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 1000) PRIMARY KEY, author_id BIGINT NOT NULL, article_id BIGINT NOT NULL, body VARCHAR NOT NULL, diff --git a/src/test/java/io/github/raeperd/realworld/IntegrationTest.java b/src/test/java/io/github/raeperd/realworld/IntegrationTest.java index 97da6c0..936df30 100644 --- a/src/test/java/io/github/raeperd/realworld/IntegrationTest.java +++ b/src/test/java/io/github/raeperd/realworld/IntegrationTest.java @@ -1,9 +1,9 @@ package io.github.raeperd.realworld; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.web.servlet.MockMvc; diff --git a/src/test/java/io/github/raeperd/realworld/IntegrationTestUtils.java b/src/test/java/io/github/raeperd/realworld/IntegrationTestUtils.java index 3644195..3d383ec 100644 --- a/src/test/java/io/github/raeperd/realworld/IntegrationTestUtils.java +++ b/src/test/java/io/github/raeperd/realworld/IntegrationTestUtils.java @@ -6,7 +6,6 @@ import static java.util.regex.Pattern.compile; import static org.hamcrest.Matchers.matchesPattern; -import static org.springframework.test.web.servlet.ResultMatcher.matchAll; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; public class IntegrationTestUtils { @@ -23,6 +22,14 @@ public class IntegrationTestUtils { private IntegrationTestUtils() { } + private static ResultMatcher matchAll(ResultMatcher... matchers) { + return result -> { + for (ResultMatcher matcher : matchers) { + matcher.match(result); + } + }; + } + public static ResultMatcher validUserModel() { return matchAll( jsonPath("user").isMap(), diff --git a/src/test/java/io/github/raeperd/realworld/application/article/ArticleRestControllerTest.java b/src/test/java/io/github/raeperd/realworld/application/article/ArticleRestControllerTest.java index 5761b8a..06e11b4 100644 --- a/src/test/java/io/github/raeperd/realworld/application/article/ArticleRestControllerTest.java +++ b/src/test/java/io/github/raeperd/realworld/application/article/ArticleRestControllerTest.java @@ -1,6 +1,6 @@ package io.github.raeperd.realworld.application.article; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import io.github.raeperd.realworld.application.security.WithMockJWTUser; import io.github.raeperd.realworld.domain.article.ArticleService; import io.github.raeperd.realworld.domain.jwt.JWTDeserializer; @@ -8,8 +8,8 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import java.util.stream.Stream; @@ -23,9 +23,9 @@ @WebMvcTest(ArticleRestController.class) class ArticleRestControllerTest { - @MockBean + @MockitoBean private ArticleService articleService; - @MockBean + @MockitoBean private JWTDeserializer jwtDeserializer; @Autowired diff --git a/src/test/java/io/github/raeperd/realworld/application/article/comment/CommentRestControllerTest.java b/src/test/java/io/github/raeperd/realworld/application/article/comment/CommentRestControllerTest.java index 5ee2fb7..2a81930 100644 --- a/src/test/java/io/github/raeperd/realworld/application/article/comment/CommentRestControllerTest.java +++ b/src/test/java/io/github/raeperd/realworld/application/article/comment/CommentRestControllerTest.java @@ -5,8 +5,8 @@ import io.github.raeperd.realworld.domain.jwt.JWTDeserializer; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import static java.util.Collections.emptySet; @@ -21,9 +21,9 @@ @WebMvcTest(CommentRestController.class) class CommentRestControllerTest { - @MockBean + @MockitoBean private CommentService commentService; - @MockBean + @MockitoBean private JWTDeserializer jwtDeserializer; @Autowired diff --git a/src/test/java/io/github/raeperd/realworld/application/tag/TagRestControllerTest.java b/src/test/java/io/github/raeperd/realworld/application/tag/TagRestControllerTest.java index fc51b28..c46d326 100644 --- a/src/test/java/io/github/raeperd/realworld/application/tag/TagRestControllerTest.java +++ b/src/test/java/io/github/raeperd/realworld/application/tag/TagRestControllerTest.java @@ -10,8 +10,8 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import java.util.Set; @@ -27,11 +27,11 @@ class TagRestControllerTest { @Autowired private MockMvc mockMvc; - @MockBean + @MockitoBean private TagService tagService; - @MockBean + @MockitoBean private JWTSerializer jwtSerializer; - @MockBean + @MockitoBean private JWTDeserializer jwtDeserializer; @WithMockJWTUser diff --git a/src/test/java/io/github/raeperd/realworld/application/user/ProfileRestControllerTest.java b/src/test/java/io/github/raeperd/realworld/application/user/ProfileRestControllerTest.java index bbd62dc..8a3a297 100644 --- a/src/test/java/io/github/raeperd/realworld/application/user/ProfileRestControllerTest.java +++ b/src/test/java/io/github/raeperd/realworld/application/user/ProfileRestControllerTest.java @@ -6,8 +6,8 @@ import io.github.raeperd.realworld.domain.user.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import java.util.NoSuchElementException; @@ -23,9 +23,9 @@ class ProfileRestControllerTest { @Autowired private MockMvc mockMvc; - @MockBean + @MockitoBean private ProfileService profileService; - @MockBean + @MockitoBean private JWTDeserializer jwtDeserializer; @Test diff --git a/src/test/java/io/github/raeperd/realworld/application/user/UserRestControllerTest.java b/src/test/java/io/github/raeperd/realworld/application/user/UserRestControllerTest.java index ba50a6e..1494904 100644 --- a/src/test/java/io/github/raeperd/realworld/application/user/UserRestControllerTest.java +++ b/src/test/java/io/github/raeperd/realworld/application/user/UserRestControllerTest.java @@ -1,6 +1,6 @@ package io.github.raeperd.realworld.application.user; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import io.github.raeperd.realworld.IntegrationTestUtils; import io.github.raeperd.realworld.application.security.WithMockJWTUser; import io.github.raeperd.realworld.domain.jwt.JWTDeserializer; @@ -12,8 +12,8 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; -import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest; +import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; import java.util.stream.Stream; @@ -35,11 +35,11 @@ class UserRestControllerTest { private MockMvc mockMvc; @Autowired private ObjectMapper objectMapper; - @MockBean + @MockitoBean private UserService userService; - @MockBean + @MockitoBean private JWTSerializer jwtSerializer; - @MockBean + @MockitoBean private JWTDeserializer jwtDeserializer; @BeforeEach diff --git a/src/test/java/io/github/raeperd/realworld/domain/article/ArticleRepositoryTest.java b/src/test/java/io/github/raeperd/realworld/domain/article/ArticleRepositoryTest.java index 6d0022e..5722a8a 100644 --- a/src/test/java/io/github/raeperd/realworld/domain/article/ArticleRepositoryTest.java +++ b/src/test/java/io/github/raeperd/realworld/domain/article/ArticleRepositoryTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; diff --git a/src/test/java/io/github/raeperd/realworld/domain/user/UserRepositoryTest.java b/src/test/java/io/github/raeperd/realworld/domain/user/UserRepositoryTest.java index 59bbcb9..bfefc2f 100644 --- a/src/test/java/io/github/raeperd/realworld/domain/user/UserRepositoryTest.java +++ b/src/test/java/io/github/raeperd/realworld/domain/user/UserRepositoryTest.java @@ -2,7 +2,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/test/java/io/github/raeperd/realworld/infrastructure/jwt/HmacSHA256JWTServiceTest.java b/src/test/java/io/github/raeperd/realworld/infrastructure/jwt/HmacSHA256JWTServiceTest.java index 08dcdea..2634ef5 100644 --- a/src/test/java/io/github/raeperd/realworld/infrastructure/jwt/HmacSHA256JWTServiceTest.java +++ b/src/test/java/io/github/raeperd/realworld/infrastructure/jwt/HmacSHA256JWTServiceTest.java @@ -1,7 +1,6 @@ package io.github.raeperd.realworld.infrastructure.jwt; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; +import tools.jackson.databind.ObjectMapper; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -11,7 +10,6 @@ import java.nio.charset.StandardCharsets; -import static com.fasterxml.jackson.annotation.JsonCreator.Mode.PROPERTIES; import static io.github.raeperd.realworld.domain.user.UserTestUtils.userWithIdAndEmail; import static io.github.raeperd.realworld.infrastructure.jwt.Base64URL.base64URLFromBytes; import static io.github.raeperd.realworld.infrastructure.jwt.Base64URL.base64URLFromString; @@ -34,7 +32,6 @@ class HmacSHA256JWTServiceTest { @BeforeEach void initializeService() { - objectMapper.registerModule(new ParameterNamesModule(PROPERTIES)); this.jwtService = new HmacSHA256JWTService(SECRET, 3, objectMapper); } diff --git a/test.gradle b/test.gradle index 4a07a32..d36ff7d 100644 --- a/test.gradle +++ b/test.gradle @@ -5,8 +5,8 @@ test { jacocoTestReport { reports { - html.enabled true - xml.enabled true + html.required = true + xml.required = true } finalizedBy 'jacocoTestCoverageVerification' }