From 958caa7f13bd72ca5ca84d705c3d3b3675fad8a0 Mon Sep 17 00:00:00 2001 From: Aleksandr Gladskoy Date: Thu, 15 Feb 2024 16:22:14 +0300 Subject: [PATCH 1/3] #16: spring boot --- .gitignore | 2 +- .mvn/wrapper/maven-wrapper.properties | 2 + mvnw | 308 ++++++++++++++++++ mvnw.cmd | 205 ++++++++++++ pom.xml | 136 +++----- .../booklibrary/SbLibraryApplication.java | 12 + .../booklibrary/config/SpringConfig.java | 121 ------- .../SpringDispatcherServletInitializer.java | 53 --- .../resources/application.properties.origin | 8 - src/main/resources/application.yml | 30 ++ src/main/resources/logback.xml | 20 -- .../static}/css/main.css | 0 .../resources => resources/static}/js/main.js | 0 .../templates}/books/book.html | 0 .../templates}/books/list.html | 0 .../templates}/books/new.html | 0 .../templates}/books/update.html | 0 .../templates}/error/not-found.html | 0 .../templates}/fragments/footer.html | 0 .../templates}/fragments/header.html | 0 .../templates}/fragments/main.html | 4 +- .../templates}/fragments/modal.html | 0 .../templates}/fragments/pagination.html | 0 .../templates}/fragments/section.html | 0 .../templates}/fragments/svg.html | 0 .../templates}/home/index.html | 0 .../templates}/people/list.html | 0 .../templates}/people/new.html | 0 .../templates}/people/person.html | 0 .../templates}/people/update.html | 0 .../booklibrary/BaseControllerTest.java | 9 +- src/test/resources/application.properties | 1 - src/test/resources/application.yml | 32 ++ src/test/resources/logback-test.xml | 24 -- 34 files changed, 635 insertions(+), 332 deletions(-) create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 src/main/java/ru/saneci/booklibrary/SbLibraryApplication.java delete mode 100644 src/main/java/ru/saneci/booklibrary/config/SpringConfig.java delete mode 100644 src/main/java/ru/saneci/booklibrary/config/SpringDispatcherServletInitializer.java delete mode 100644 src/main/resources/application.properties.origin create mode 100644 src/main/resources/application.yml delete mode 100644 src/main/resources/logback.xml rename src/main/{webapp/resources => resources/static}/css/main.css (100%) rename src/main/{webapp/resources => resources/static}/js/main.js (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/books/book.html (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/books/list.html (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/books/new.html (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/books/update.html (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/error/not-found.html (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/fragments/footer.html (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/fragments/header.html (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/fragments/main.html (83%) rename src/main/{webapp/WEB-INF/views => resources/templates}/fragments/modal.html (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/fragments/pagination.html (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/fragments/section.html (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/fragments/svg.html (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/home/index.html (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/people/list.html (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/people/new.html (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/people/person.html (100%) rename src/main/{webapp/WEB-INF/views => resources/templates}/people/update.html (100%) delete mode 100644 src/test/resources/application.properties create mode 100644 src/test/resources/application.yml delete mode 100644 src/test/resources/logback-test.xml diff --git a/.gitignore b/.gitignore index 3cfa02a..c59720f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ # Project target -src/main/resources/*.properties +*dev.yml # Compiled class file *.class diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..5f0536e --- /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.9.5/apache-maven-3.9.5-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..66df285 --- /dev/null +++ b/mvnw @@ -0,0 +1,308 @@ +#!/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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# 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 /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + 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 + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -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 "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); 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="$(\unset -f command 2>/dev/null; \command -v 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 + +# 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/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# 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. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +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 "$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 + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..95ba6f5 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,205 @@ +@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 Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@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 "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\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 WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_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 WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_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('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@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 "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\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% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml index ca82ef3..953d952 100644 --- a/pom.xml +++ b/pom.xml @@ -1,140 +1,84 @@ + + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - ru.saneci.booklibrary + + org.springframework.boot + spring-boot-starter-parent + 3.2.2 + + + + ru.saneci book-library 1.0.0 - war SB Library - http://localhost:8080 + Saneci Book Library is a digital accounting of books in the library - UTF-8 - 17 - 6.1.1 - 1.19.3 + 17 - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-web - ${spring.version} + org.springframework.boot + spring-boot-starter-data-jpa - org.springframework - spring-webmvc - ${spring.version} + org.springframework.boot + spring-boot-starter-thymeleaf - org.springframework - spring-orm - ${spring.version} + org.springframework.boot + spring-boot-starter-validation - org.springframework.data - spring-data-jpa - 3.2.0 + org.springframework.boot + spring-boot-starter-web - org.springframework - spring-test - ${spring.version} - test - - - org.junit.jupiter - junit-jupiter-api - 5.10.1 - test + org.postgresql + postgresql + runtime + - org.hamcrest - hamcrest-library - 2.2 + org.springframework.boot + spring-boot-starter-test test - org.testcontainers - postgresql - ${testcontainers.version} + org.springframework.boot + spring-boot-testcontainers test org.testcontainers junit-jupiter - ${testcontainers.version} test - org.thymeleaf - thymeleaf-spring6 - 3.1.2.RELEASE - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - provided - - - org.hibernate.validator - hibernate-validator - 8.0.1.Final - - - - org.glassfish.expressly - expressly - 5.0.0 - test - - - org.hibernate.orm - hibernate-core - 6.4.0.Final - - - org.postgresql + org.testcontainers postgresql - 42.6.0 - - - ch.qos.logback - logback-classic - 1.4.14 + test - Book Library - - org.apache.maven.plugins - maven-compiler-plugin - 3.11.0 - - 17 - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.2.2 + org.springframework.boot + spring-boot-maven-plugin + + + src/main/resources + + application-dev.yml + + + diff --git a/src/main/java/ru/saneci/booklibrary/SbLibraryApplication.java b/src/main/java/ru/saneci/booklibrary/SbLibraryApplication.java new file mode 100644 index 0000000..1c7460d --- /dev/null +++ b/src/main/java/ru/saneci/booklibrary/SbLibraryApplication.java @@ -0,0 +1,12 @@ +package ru.saneci.booklibrary; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SbLibraryApplication { + + public static void main(String[] args) { + SpringApplication.run(SbLibraryApplication.class, args); + } +} diff --git a/src/main/java/ru/saneci/booklibrary/config/SpringConfig.java b/src/main/java/ru/saneci/booklibrary/config/SpringConfig.java deleted file mode 100644 index 9c8b25d..0000000 --- a/src/main/java/ru/saneci/booklibrary/config/SpringConfig.java +++ /dev/null @@ -1,121 +0,0 @@ -package ru.saneci.booklibrary.config; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; -import org.springframework.core.env.Environment; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.jdbc.datasource.DriverManagerDataSource; -import org.springframework.orm.jpa.JpaTransactionManager; -import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; -import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; -import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.annotation.EnableTransactionManagement; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.ViewResolverRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import org.thymeleaf.spring6.SpringTemplateEngine; -import org.thymeleaf.spring6.templateresolver.SpringResourceTemplateResolver; -import org.thymeleaf.spring6.view.ThymeleafViewResolver; - -import javax.sql.DataSource; -import java.util.Objects; -import java.util.Properties; - -@Configuration -@EnableWebMvc -@ComponentScan({ - "ru.saneci.booklibrary.repository", - "ru.saneci.booklibrary.service", - "ru.saneci.booklibrary.controller", -}) -@EnableTransactionManagement -@EnableJpaRepositories("ru.saneci.booklibrary.repository") -@PropertySource(value = "classpath:application.properties", ignoreResourceNotFound = true) -public class SpringConfig implements WebMvcConfigurer { - - private final ApplicationContext applicationContext; - private final Environment env; - - @Autowired - public SpringConfig(ApplicationContext applicationContext, Environment env) { - this.applicationContext = applicationContext; - this.env = env; - } - - @Bean - public SpringResourceTemplateResolver templateResolver() { - SpringResourceTemplateResolver templateResolver = new SpringResourceTemplateResolver(); - templateResolver.setApplicationContext(applicationContext); - templateResolver.setPrefix("/WEB-INF/views/"); - templateResolver.setSuffix(".html"); - templateResolver.setCharacterEncoding("UTF-8"); - - return templateResolver; - } - - @Bean - public SpringTemplateEngine templateEngine() { - SpringTemplateEngine templateEngine = new SpringTemplateEngine(); - templateEngine.setTemplateResolver(templateResolver()); - templateEngine.setEnableSpringELCompiler(true); - - return templateEngine; - } - - @Override - public void configureViewResolvers(ViewResolverRegistry registry) { - ThymeleafViewResolver resolver = new ThymeleafViewResolver(); - resolver.setTemplateEngine(templateEngine()); - resolver.setCharacterEncoding("UTF-8"); - registry.viewResolver(resolver); - } - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler("/resources/**").addResourceLocations("/resources/"); - } - - @Bean - public DataSource dataSource() { - DriverManagerDataSource dataSource = new DriverManagerDataSource(); - dataSource.setDriverClassName(Objects.requireNonNull(env.getRequiredProperty("spring.datasource.driver"))); - dataSource.setUrl(env.getRequiredProperty("spring.datasource.url")); - dataSource.setUsername(env.getRequiredProperty("spring.datasource.username")); - dataSource.setPassword(env.getRequiredProperty("spring.datasource.password")); - - return dataSource; - } - - private Properties hibernateProperties() { - Properties properties = new Properties(); - properties.put("hibernate.format_sql", env.getRequiredProperty("spring.datasource.format_sql")); - properties.put("hibernate.highlight_sql", env.getRequiredProperty("spring.datasource.highlight_sql")); - - return properties; - } - - @Bean - public LocalContainerEntityManagerFactoryBean entityManagerFactory() { - final HibernateJpaVendorAdapter hibernateJpaVendorAdapter = new HibernateJpaVendorAdapter(); - final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); - em.setJpaVendorAdapter(hibernateJpaVendorAdapter); - em.setDataSource(dataSource()); - em.setJpaProperties(hibernateProperties()); - em.setPackagesToScan("ru.saneci.booklibrary.domain"); - - return em; - } - - @Bean - public PlatformTransactionManager transactionManager() { - JpaTransactionManager transactionManager = new JpaTransactionManager(); - transactionManager.setEntityManagerFactory(entityManagerFactory().getObject()); - - return transactionManager; - } -} diff --git a/src/main/java/ru/saneci/booklibrary/config/SpringDispatcherServletInitializer.java b/src/main/java/ru/saneci/booklibrary/config/SpringDispatcherServletInitializer.java deleted file mode 100644 index d3b593c..0000000 --- a/src/main/java/ru/saneci/booklibrary/config/SpringDispatcherServletInitializer.java +++ /dev/null @@ -1,53 +0,0 @@ -package ru.saneci.booklibrary.config; - -import jakarta.servlet.DispatcherType; -import jakarta.servlet.FilterRegistration.Dynamic; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletException; -import org.springframework.web.filter.CharacterEncodingFilter; -import org.springframework.web.filter.HiddenHttpMethodFilter; -import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer; - -import java.util.EnumSet; - -public class SpringDispatcherServletInitializer extends AbstractAnnotationConfigDispatcherServletInitializer { - - @Override - protected Class[] getRootConfigClasses() { - // Этот метод использоваться не будет, поэтому возвращаем null. - return null; - } - - @Override - protected Class[] getServletConfigClasses() { - return new Class[]{SpringConfig.class}; - } - - @Override - protected String[] getServletMappings() { - // Указание "/" необходимо для того чтобы все HTTP-запросы приходили на DispatcherServlet - return new String[]{"/"}; - } - - @Override - public void onStartup(ServletContext context) throws ServletException { - super.onStartup(context); - registerHiddenHttpMethodFilter(context); - registerCharacterEncodingFilter(context); - } - - private void registerHiddenHttpMethodFilter(ServletContext context) { - Dynamic filterRegistration = context.addFilter("hiddenHttpMethodFilter", new HiddenHttpMethodFilter()); - filterRegistration.addMappingForUrlPatterns(null, true, "/*"); - } - - private void registerCharacterEncodingFilter(ServletContext context) { - CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter(); - characterEncodingFilter.setEncoding("UTF-8"); - characterEncodingFilter.setForceEncoding(true); - - EnumSet dispatcherTypes = EnumSet.of(DispatcherType.REQUEST, DispatcherType.FORWARD); - Dynamic filterRegistration = context.addFilter("characterEncodingFilter", characterEncodingFilter); - filterRegistration.addMappingForUrlPatterns(dispatcherTypes, true, "/*"); - } -} diff --git a/src/main/resources/application.properties.origin b/src/main/resources/application.properties.origin deleted file mode 100644 index c33d63d..0000000 --- a/src/main/resources/application.properties.origin +++ /dev/null @@ -1,8 +0,0 @@ -spring.datasource.driver=org.postgresql.Driver -spring.datasource.url=jdbc:postgresql://[database_host]:[database_port]/[database_name] -spring.datasource.username= -spring.datasource.password= -spring.datasource.format_sql=false -spring.datasource.highlight_sql=true - -spring.application.days_until_book_overdue=10 \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..9824e49 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,30 @@ +spring: + datasource: + driver-class-name: org.postgresql.Driver + url: ${DATASOURCE_URL} + username: ${DATASOURCE_USERNAME} + password: ${DATASOURCE_PASSWORD} + jpa: + properties: + hibernate: + format_sql: false + highlight_sql: true + mvc: + hiddenmethod.filter.enabled: true + application: + days_until_book_overdue: ${DAYS_UNTIL_BOOK_OVERDUE} + +logging: + pattern: + console: "%d{${LOG_DATEFORMAT_PATTERN:yyyy-MM-dd HH:mm:ss.SSSXXX}} %clr(${LOG_LEVEL_PATTERN:%5level}) %clr(%-45.55logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}" + level: + org: + springframework: + web: INFO + thymeleaf: INFO + hibernate: + SQL: OFF + orm: + results: INFO + validator: WARN + ru.saneci.booklibrary: WARN \ No newline at end of file diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml deleted file mode 100644 index 9f2e375..0000000 --- a/src/main/resources/logback.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - [%d{yyyy-MM-dd HH:mm:ss.SSS}] %-5level %logger{35} - %msg%n - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/webapp/resources/css/main.css b/src/main/resources/static/css/main.css similarity index 100% rename from src/main/webapp/resources/css/main.css rename to src/main/resources/static/css/main.css diff --git a/src/main/webapp/resources/js/main.js b/src/main/resources/static/js/main.js similarity index 100% rename from src/main/webapp/resources/js/main.js rename to src/main/resources/static/js/main.js diff --git a/src/main/webapp/WEB-INF/views/books/book.html b/src/main/resources/templates/books/book.html similarity index 100% rename from src/main/webapp/WEB-INF/views/books/book.html rename to src/main/resources/templates/books/book.html diff --git a/src/main/webapp/WEB-INF/views/books/list.html b/src/main/resources/templates/books/list.html similarity index 100% rename from src/main/webapp/WEB-INF/views/books/list.html rename to src/main/resources/templates/books/list.html diff --git a/src/main/webapp/WEB-INF/views/books/new.html b/src/main/resources/templates/books/new.html similarity index 100% rename from src/main/webapp/WEB-INF/views/books/new.html rename to src/main/resources/templates/books/new.html diff --git a/src/main/webapp/WEB-INF/views/books/update.html b/src/main/resources/templates/books/update.html similarity index 100% rename from src/main/webapp/WEB-INF/views/books/update.html rename to src/main/resources/templates/books/update.html diff --git a/src/main/webapp/WEB-INF/views/error/not-found.html b/src/main/resources/templates/error/not-found.html similarity index 100% rename from src/main/webapp/WEB-INF/views/error/not-found.html rename to src/main/resources/templates/error/not-found.html diff --git a/src/main/webapp/WEB-INF/views/fragments/footer.html b/src/main/resources/templates/fragments/footer.html similarity index 100% rename from src/main/webapp/WEB-INF/views/fragments/footer.html rename to src/main/resources/templates/fragments/footer.html diff --git a/src/main/webapp/WEB-INF/views/fragments/header.html b/src/main/resources/templates/fragments/header.html similarity index 100% rename from src/main/webapp/WEB-INF/views/fragments/header.html rename to src/main/resources/templates/fragments/header.html diff --git a/src/main/webapp/WEB-INF/views/fragments/main.html b/src/main/resources/templates/fragments/main.html similarity index 83% rename from src/main/webapp/WEB-INF/views/fragments/main.html rename to src/main/resources/templates/fragments/main.html index eb0fb7f..85fd61f 100644 --- a/src/main/webapp/WEB-INF/views/fragments/main.html +++ b/src/main/resources/templates/fragments/main.html @@ -4,7 +4,7 @@ Main layout - + @@ -15,6 +15,6 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/fragments/modal.html b/src/main/resources/templates/fragments/modal.html similarity index 100% rename from src/main/webapp/WEB-INF/views/fragments/modal.html rename to src/main/resources/templates/fragments/modal.html diff --git a/src/main/webapp/WEB-INF/views/fragments/pagination.html b/src/main/resources/templates/fragments/pagination.html similarity index 100% rename from src/main/webapp/WEB-INF/views/fragments/pagination.html rename to src/main/resources/templates/fragments/pagination.html diff --git a/src/main/webapp/WEB-INF/views/fragments/section.html b/src/main/resources/templates/fragments/section.html similarity index 100% rename from src/main/webapp/WEB-INF/views/fragments/section.html rename to src/main/resources/templates/fragments/section.html diff --git a/src/main/webapp/WEB-INF/views/fragments/svg.html b/src/main/resources/templates/fragments/svg.html similarity index 100% rename from src/main/webapp/WEB-INF/views/fragments/svg.html rename to src/main/resources/templates/fragments/svg.html diff --git a/src/main/webapp/WEB-INF/views/home/index.html b/src/main/resources/templates/home/index.html similarity index 100% rename from src/main/webapp/WEB-INF/views/home/index.html rename to src/main/resources/templates/home/index.html diff --git a/src/main/webapp/WEB-INF/views/people/list.html b/src/main/resources/templates/people/list.html similarity index 100% rename from src/main/webapp/WEB-INF/views/people/list.html rename to src/main/resources/templates/people/list.html diff --git a/src/main/webapp/WEB-INF/views/people/new.html b/src/main/resources/templates/people/new.html similarity index 100% rename from src/main/webapp/WEB-INF/views/people/new.html rename to src/main/resources/templates/people/new.html diff --git a/src/main/webapp/WEB-INF/views/people/person.html b/src/main/resources/templates/people/person.html similarity index 100% rename from src/main/webapp/WEB-INF/views/people/person.html rename to src/main/resources/templates/people/person.html diff --git a/src/main/webapp/WEB-INF/views/people/update.html b/src/main/resources/templates/people/update.html similarity index 100% rename from src/main/webapp/WEB-INF/views/people/update.html rename to src/main/resources/templates/people/update.html diff --git a/src/test/java/ru/saneci/booklibrary/BaseControllerTest.java b/src/test/java/ru/saneci/booklibrary/BaseControllerTest.java index 67a9e65..33aeec2 100644 --- a/src/test/java/ru/saneci/booklibrary/BaseControllerTest.java +++ b/src/test/java/ru/saneci/booklibrary/BaseControllerTest.java @@ -1,17 +1,16 @@ package ru.saneci.booklibrary; import org.junit.jupiter.api.BeforeEach; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; -import org.springframework.test.context.junit.jupiter.web.SpringJUnitWebConfig; import org.springframework.test.web.servlet.MockMvc; import org.springframework.web.context.WebApplicationContext; import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.utility.MountableFile; -import ru.saneci.booklibrary.config.SpringConfig; import java.io.File; @@ -19,7 +18,7 @@ @DirtiesContext @Testcontainers -@SpringJUnitWebConfig(classes = SpringConfig.class) +@SpringBootTest public abstract class BaseControllerTest { protected MockMvc mockMvc; @@ -53,12 +52,10 @@ private static String getContainerInitDatabasePath(String suffix) { @DynamicPropertySource static void configureProperties(DynamicPropertyRegistry registry) { - registry.add("spring.datasource.driver", postgreSQLContainer::getDriverClassName); + registry.add("spring.datasource.driver-class-name", postgreSQLContainer::getDriverClassName); registry.add("spring.datasource.url", postgreSQLContainer::getJdbcUrl); registry.add("spring.datasource.username", postgreSQLContainer::getUsername); registry.add("spring.datasource.password", postgreSQLContainer::getPassword); - registry.add("spring.datasource.format_sql", () -> false); - registry.add("spring.datasource.highlight_sql", () -> true); } @BeforeEach diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties deleted file mode 100644 index 6bc628c..0000000 --- a/src/test/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.application.days_until_book_overdue=10 \ No newline at end of file diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml new file mode 100644 index 0000000..52e3d08 --- /dev/null +++ b/src/test/resources/application.yml @@ -0,0 +1,32 @@ +spring: + jpa: + properties: + hibernate: + format_sql: false + highlight_sql: true + mvc: + hiddenmethod.filter.enabled: true + application: + days_until_book_overdue: 10 + +logging: + pattern: + console: "%d{${LOG_DATEFORMAT_PATTERN:yyyy-MM-dd HH:mm:ss.SSSXXX}} %clr(${LOG_LEVEL_PATTERN:%5level}) %clr(%-45.55logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}" + level: + org: + springframework: + web: WARN + test: OFF + mock: OFF + testcontainers: INFO + thymeleaf: WARN + hibernate: + SQL: DEBUG + orm: + results: INFO + validator: WARN + com: + github: + dockerjava: WARN + dockerjava.zerodep: OFF + ru.saneci.booklibrary: DEBUG \ No newline at end of file diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml deleted file mode 100644 index 25be7b2..0000000 --- a/src/test/resources/logback-test.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - [%d{yyyy-MM-dd HH:mm:ss.SSS}] %-5level %logger{35} - %msg%n - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From c0caeb748d307ce3cc13651ca427f7da471db313 Mon Sep 17 00:00:00 2001 From: Aleksandr Gladskoy Date: Thu, 15 Feb 2024 18:31:49 +0300 Subject: [PATCH 2/3] #16: update readme --- README.md | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 47816f7..b87c619 100644 --- a/README.md +++ b/README.md @@ -18,23 +18,29 @@ It is necessary to implement a web application for this purpose. #### Technologies used in the project - Java 17 -- Spring Framework 6.0 +- Spring Boot 3.2.2 +- Spring Web MVC +- Spring Data JPA +- Hibernate - PostgreSQL 16 -- Thymeleaf 3.1 -- Apache Tomcat 10 +- Thymeleaf +- Apache Tomcat #### Connecting to the database 1. Install the DBMS [PostgreSQL](https://www.postgresql.org/download/) 2. Using PG Admin, create a new database and then connect to the DBMS 3. Execute DDL scripts located in the folder `src/main/resources/db/migration` -4. Copy configuration file `src/main/resources/application.properties.origin` into `src/main/resources`, - and rename it to `application.properties` -5. Specify data for connecting to the Database in the created configuration file #### Running application -1. Install [Tomcat](https://tomcat.apache.org/download-10.cgi) -2. Configure the IDE to work with Tomcat ([instructions](https://www.jetbrains.com/idea/guide/tutorials/working-with-apache-tomcat/using-existing-application/)) -3. Start Tomcat -4. The application will be launched at [localhost:8080](http://localhost:8080) +1. Upload jar file from [latest release](https://github.com/saneci/book-library/releases/latest) +2. Run the application using below command (don't forget substitute right values instead of variables) + ```shell + java -Dspring.datasource.url=jdbc:postgresql://[database_host]:[database_port]/[database_name] \ + -Dspring.datasource.username=[database_username] \ + -Dspring.datasource.password=[database_password] \ + -Dspring.application.days_until_book_overdue=[int_value] \ + -jar target/[jar_file_name] + ``` + The application will be launched at [localhost:8080](http://localhost:8080) From 939a18f99de077e4febed76123e2e40b370c0735 Mon Sep 17 00:00:00 2001 From: Aleksandr Gladskoy Date: Thu, 15 Feb 2024 18:32:40 +0300 Subject: [PATCH 3/3] #16: up version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 953d952..b1d4e75 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ ru.saneci book-library - 1.0.0 + 1.0.2 SB Library Saneci Book Library is a digital accounting of books in the library