From a1caa84071bf1022f050f2099fe1a4ce8b460fdc Mon Sep 17 00:00:00 2001 From: Pekka Helenius Date: Tue, 8 Sep 2020 18:27:49 +0300 Subject: [PATCH] Initialize project files --- bookstore/.gitignore | 33 ++ bookstore/mvnw | 310 ++++++++++++++++++ bookstore/mvnw.cmd | 182 ++++++++++ bookstore/pom.xml | 54 +++ .../bookstore/BookstoreApplication.java | 13 + .../com/fjordtek/bookstore/model/Book.java | 120 +++++++ .../bookstore/web/BookController.java | 64 ++++ .../bookstore/web/HttpExceptionHandler.java | 33 ++ .../bookstore/web/HttpServerLogger.java | 59 ++++ .../src/main/resources/application.properties | 38 +++ .../main/resources/templates/bookstore.html | 10 + .../src/main/resources/templates/error.html | 10 + .../src/main/resources/templates/index.html | 10 + .../bookstore/BookstoreApplicationTests.java | 13 + 14 files changed, 949 insertions(+) create mode 100644 bookstore/.gitignore create mode 100755 bookstore/mvnw create mode 100644 bookstore/mvnw.cmd create mode 100644 bookstore/pom.xml create mode 100644 bookstore/src/main/java/com/fjordtek/bookstore/BookstoreApplication.java create mode 100644 bookstore/src/main/java/com/fjordtek/bookstore/model/Book.java create mode 100644 bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java create mode 100644 bookstore/src/main/java/com/fjordtek/bookstore/web/HttpExceptionHandler.java create mode 100644 bookstore/src/main/java/com/fjordtek/bookstore/web/HttpServerLogger.java create mode 100644 bookstore/src/main/resources/application.properties create mode 100644 bookstore/src/main/resources/templates/bookstore.html create mode 100644 bookstore/src/main/resources/templates/error.html create mode 100644 bookstore/src/main/resources/templates/index.html create mode 100644 bookstore/src/test/java/com/fjordtek/bookstore/BookstoreApplicationTests.java diff --git a/bookstore/.gitignore b/bookstore/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/bookstore/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/bookstore/mvnw b/bookstore/mvnw new file mode 100755 index 0000000..a16b543 --- /dev/null +++ b/bookstore/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/bookstore/mvnw.cmd b/bookstore/mvnw.cmd new file mode 100644 index 0000000..c8d4337 --- /dev/null +++ b/bookstore/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/bookstore/pom.xml b/bookstore/pom.xml new file mode 100644 index 0000000..0a9dfb0 --- /dev/null +++ b/bookstore/pom.xml @@ -0,0 +1,54 @@ + + + 4.0.0 + war + + org.springframework.boot + spring-boot-starter-parent + 2.2.4.RELEASE + + + com.fjordtek.bookstore + Bookstore + 0.0.1-SNAPSHOT + Bookstore + Bookstore + + + 1.8 + + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/BookstoreApplication.java b/bookstore/src/main/java/com/fjordtek/bookstore/BookstoreApplication.java new file mode 100644 index 0000000..8b03f0a --- /dev/null +++ b/bookstore/src/main/java/com/fjordtek/bookstore/BookstoreApplication.java @@ -0,0 +1,13 @@ +package com.fjordtek.bookstore; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class BookstoreApplication { + + public static void main(String[] args) { + SpringApplication.run(BookstoreApplication.class, args); + } + +} diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/model/Book.java b/bookstore/src/main/java/com/fjordtek/bookstore/model/Book.java new file mode 100644 index 0000000..185c0e7 --- /dev/null +++ b/bookstore/src/main/java/com/fjordtek/bookstore/model/Book.java @@ -0,0 +1,120 @@ +//Pekka Helenius , Fjordtek 2020 + +package com.fjordtek.bookstore.model; + +import javax.validation.constraints.DecimalMax; +import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.Size; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.PastOrPresent; + +import java.math.BigDecimal; +import java.time.LocalDate; + +import org.springframework.format.annotation.DateTimeFormat; + +public class Book { + + //////////////////// + // Attributes with hard-coded constraints + + @NotNull + @NotEmpty(message = "Please provide a title") + @Pattern(regexp="^[a-zA-Z0-9-_ ]+$") + @Size(min = 2, max = 100, message = "Invalid title length") + private String title; + + @NotNull + @NotEmpty(message = "Please provide an author name") + @Pattern(regexp="^[a-zA-Z ]+$") + @Size(min = 2, max = 100, message = "Invalid author name length") + private String author; + + @NotNull + @PastOrPresent + @DateTimeFormat(pattern = "yyyy") + private LocalDate year; + + @NotNull + @NotEmpty(message = "Please provide an ISBN code for the book") + @Pattern(regexp="^[a-zA-Z0-9-_ ]+$") + @Size(min = 15, max = 15) + private String isbn; + + @NotNull + @DecimalMin(value = "0.01", message = "Too low price value" ) + @DecimalMax(value = "999.99", message = "Too high price value") + // Keep precision + private BigDecimal price; + + //////////////////// + // Attribute setters + + // TODO consider accessibility restrictions? + + public void setTitle(String title) { + this.title = title; + } + + public void setAuthor(String author) { + this.author = author; + } + + public void setYear(LocalDate year) { + this.year = year; + } + + public void setIsbn(String isbn) { + this.isbn = isbn; + } + + public void setPrice(BigDecimal price) { + this.price = price; + } + + //////////////////// + // Attribute getters + + // TODO consider accessibility restrictions? + + public String getTitle() { + return title; + } + + public String getAuthor() { + return author; + } + + public LocalDate getYear() { + return year; + } + + public String getIsbn() { + return isbn; + } + + public BigDecimal getPrice() { + return price; + } + + //////////////////// + // Class constructors + + public Book() { + } + + // ... + + //////////////////// + // Class overrides + + @Override + public String toString() { + // TODO + return "N/A (placeholder)"; + } + + // ... +} diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java new file mode 100644 index 0000000..493ab97 --- /dev/null +++ b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java @@ -0,0 +1,64 @@ +//Pekka Helenius , Fjordtek 2020 + +package com.fjordtek.bookstore.web; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +//import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +//import java.util.ArrayList; + +import javax.servlet.http.HttpServletRequest; +//import javax.validation.Valid; + +import com.fjordtek.bookstore.model.Book; + +@Controller +public class BookController { + + protected static final String landingPageURL = "index"; + + private HttpServerLogger httpServerLogger = new HttpServerLogger(); + private HttpExceptionHandler httpExceptionHandler = new HttpExceptionHandler(); + + @RequestMapping( + value = landingPageURL, + method = RequestMethod.GET + ) + public String DefaultWebFormGet(Model dataModel, HttpServletRequest requestData) { + + //dataModel.addAttribute("book", new Book()); + + httpServerLogger.logMessageNormal( + requestData, + "HTTPOK" + ); + + return landingPageURL; + + } + + // Redirect + @RequestMapping( + value = "/", + method = RequestMethod.GET + ) + @ResponseStatus(HttpStatus.FOUND) + public String redirectToDefaultWebForm() { + return "redirect:" + landingPageURL; + } + + // Other URL requests +@RequestMapping( + value = "*", + method = { RequestMethod.GET, RequestMethod.POST } +) + public String ErrorWebForm(HttpServletRequest requestData) { + return httpExceptionHandler.notFoundErrorHandler(requestData); + } + +} diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/web/HttpExceptionHandler.java b/bookstore/src/main/java/com/fjordtek/bookstore/web/HttpExceptionHandler.java new file mode 100644 index 0000000..5c622dc --- /dev/null +++ b/bookstore/src/main/java/com/fjordtek/bookstore/web/HttpExceptionHandler.java @@ -0,0 +1,33 @@ +// Pekka Helenius , Fjordtek 2020 + +package com.fjordtek.bookstore.web; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.ExceptionHandler; + +import javax.servlet.http.HttpServletRequest; + +@ControllerAdvice +public class HttpExceptionHandler { + + private static final String HTTPNOTFOUND = "Invalid request"; + private HttpServerLogger httpServerLogger = new HttpServerLogger(); + + @ResponseStatus( + value = HttpStatus.NOT_FOUND, + reason = HTTPNOTFOUND + ) + // Very simple exception handler (not any sophistication) + @ExceptionHandler(Exception.class) + public String notFoundErrorHandler(HttpServletRequest requestData) { + + httpServerLogger.logMessageError( + requestData, + "HTTPNOTFOUND" + ); + return "error"; + } + +} diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/web/HttpServerLogger.java b/bookstore/src/main/java/com/fjordtek/bookstore/web/HttpServerLogger.java new file mode 100644 index 0000000..53281f8 --- /dev/null +++ b/bookstore/src/main/java/com/fjordtek/bookstore/web/HttpServerLogger.java @@ -0,0 +1,59 @@ +// Pekka Helenius , Fjordtek 2020 + +package com.fjordtek.bookstore.web; + +import javax.servlet.http.HttpServletRequest; +import java.time.LocalDateTime; + +public class HttpServerLogger { + + private LocalDateTime logTimeStamp; + + private void setLogTimeStamp() { + this.logTimeStamp = LocalDateTime.now(); + } + + private LocalDateTime getLogTimeStamp() { + return this.logTimeStamp; + } + + public void logMessageNormal( + HttpServletRequest request, + String HttpRawStatusType + ) { + + setLogTimeStamp(); + System.out.printf( + "%s: HTTP request to '%s' from client %s (%s)\n", + getLogTimeStamp(), + request.getRequestURL(), + request.getRemoteAddr(), + HttpRawStatusType + ); + } + + public void logMessageError( + HttpServletRequest request, + String HttpRawStatusType + ) { + + setLogTimeStamp(); + System.err.printf( + "%s: Invalid HTTP request to '%s' from client %s (%s)\n", + getLogTimeStamp(), + request.getRequestURL(), + request.getRemoteAddr(), + HttpRawStatusType + ); + } + + public void commonError(String errorMsg, HttpServletRequest request, String ...strings) { + + // Splitting log streams for proper server error logging + System.err.printf("%s: %s - %s\n", getLogTimeStamp(), request.getRemoteAddr(), errorMsg); + for (String dataString : strings) { + System.err.printf("%s\n", dataString); + } + } + +} diff --git a/bookstore/src/main/resources/application.properties b/bookstore/src/main/resources/application.properties new file mode 100644 index 0000000..cc31876 --- /dev/null +++ b/bookstore/src/main/resources/application.properties @@ -0,0 +1,38 @@ +# Default HTTP TCP port number for this server application +# Do not set this value below 1024 as these TCP/UDP ports are privileged, requiring root permissions +# +server.port=8080 + +# Ref: https://docs.spring.io/spring-boot/docs/1.2.0.M2/reference/html/common-application-properties.html + +# # EMBEDDED SERVER CONFIGURATION (ServerProperties) +# server.port=8080 +# server.address= # bind to a specific NIC +# server.session-timeout= # session timeout in seconds +# server.context-path= # the context path, defaults to '/' +# server.servlet-path= # the servlet path, defaults to '/' +# server.ssl.client-auth= # want or need +# server.ssl.key-alias= +# server.ssl.key-password= +# server.ssl.key-store= +# server.ssl.key-store-password= +# server.ssl.key-store-provider= +# server.ssl.key-store-type= +# server.ssl.protocol=TLS +# server.ssl.trust-store= +# server.ssl.trust-store-password= +# server.ssl.trust-store-provider= +# server.ssl.trust-store-type= +# server.tomcat.access-log-pattern= # log pattern of the access log +# server.tomcat.access-log-enabled=false # is access logging enabled +# server.tomcat.internal-proxies=10\.\d{1,3}\.\d{1,3}\.\d{1,3}|\ +# 192\.168\.\d{1,3}\.\d{1,3}|\ +# 169\.254\.\d{1,3}\.\d{1,3}|\ +# 127\.\d{1,3}\.\d{1,3}\.\d{1,3} # regular expression matching trusted IP addresses +# server.tomcat.protocol-header=x-forwarded-proto # front end proxy forward header +# server.tomcat.port-header= # front end proxy port header +# server.tomcat.remote-ip-header=x-forwarded-for +# server.tomcat.basedir=/tmp # base dir (usually not needed, defaults to tmp) +# server.tomcat.background-processor-delay=30; # in seconds +# server.tomcat.max-threads = 0 # number of threads in protocol handler +# server.tomcat.uri-encoding = UTF-8 # character encoding to use for URL decoding \ No newline at end of file diff --git a/bookstore/src/main/resources/templates/bookstore.html b/bookstore/src/main/resources/templates/bookstore.html new file mode 100644 index 0000000..67c9b42 --- /dev/null +++ b/bookstore/src/main/resources/templates/bookstore.html @@ -0,0 +1,10 @@ + + + + + Bookstore page + + + N/A // To-be-added + + diff --git a/bookstore/src/main/resources/templates/error.html b/bookstore/src/main/resources/templates/error.html new file mode 100644 index 0000000..8b6fa58 --- /dev/null +++ b/bookstore/src/main/resources/templates/error.html @@ -0,0 +1,10 @@ + + + + + Error page + + + Error while processing your request. + + \ No newline at end of file diff --git a/bookstore/src/main/resources/templates/index.html b/bookstore/src/main/resources/templates/index.html new file mode 100644 index 0000000..96d69d5 --- /dev/null +++ b/bookstore/src/main/resources/templates/index.html @@ -0,0 +1,10 @@ + + + + + Home page + + + N/A // To-be-added + + diff --git a/bookstore/src/test/java/com/fjordtek/bookstore/BookstoreApplicationTests.java b/bookstore/src/test/java/com/fjordtek/bookstore/BookstoreApplicationTests.java new file mode 100644 index 0000000..3c815d7 --- /dev/null +++ b/bookstore/src/test/java/com/fjordtek/bookstore/BookstoreApplicationTests.java @@ -0,0 +1,13 @@ +package com.fjordtek.bookstore; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class BookstoreApplicationTests { + + @Test + void contextLoads() { + } + +}