diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..549e00a2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..a45eb6ba --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,118 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if (mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile().exists()) { + if (!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..2cc7d4a5 Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..abd303b6 --- /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.8.2/apache-maven-3.8.2-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/liquibase.properties b/liquibase.properties new file mode 100644 index 00000000..523a4e9c --- /dev/null +++ b/liquibase.properties @@ -0,0 +1,5 @@ +changeLogFile: src/main/resources/db/changelog/db.changelog-master.xml +driver: org.postgresql.Driver +url: jdbc:postgresql://localhost/socks +username: postgres +password: postgres \ No newline at end of file diff --git a/mvnw b/mvnw new file mode 100644 index 00000000..a16b5431 --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 00000000..c8d43372 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..5b765e9f --- /dev/null +++ b/pom.xml @@ -0,0 +1,105 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.4 + + + com.example + socks + 0.0.1-SNAPSHOT + socks + socks + + 16 + 2.9.2 + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + io.springfox + springfox-swagger2 + ${swagger.version} + + + io.springfox + springfox-swagger-ui + ${swagger.version} + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.postgresql + postgresql + 42.2.23.jre7 + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + org.liquibase + liquibase-maven-plugin + 4.3.5 + + liquibase.properties + + + + org.postgresql + postgresql + 42.2.23.jre7 + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 16 + 16 + + + + + + diff --git a/socks_data_model.pdf b/socks_data_model.pdf new file mode 100644 index 00000000..9d04c413 Binary files /dev/null and b/socks_data_model.pdf differ diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile new file mode 100644 index 00000000..ea7e830b --- /dev/null +++ b/src/main/docker/Dockerfile @@ -0,0 +1,4 @@ +FROM openjdk:16-jdk-alpine +ARG JAR_FILE=*.jar +COPY ${JAR_FILE} app.jar +ENTRYPOINT ["java", "-jar", "app.jar"] \ No newline at end of file diff --git a/src/main/docker/docker-compose.yml b/src/main/docker/docker-compose.yml new file mode 100644 index 00000000..688be3ee --- /dev/null +++ b/src/main/docker/docker-compose.yml @@ -0,0 +1,26 @@ +version: '2' + +services: + app: + image: 'docker-socks:latest' + build: + context: . + container_name: app + depends_on: + - db + environment: + - SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/socks + - SPRING_DATASOURCE_USERNAME=postgres + - SPRING_DATASOURCE_PASSWORD=mysecretpassword + ports: + - "8080:8080" + + db: + image: 'postgres:13.1-alpine' + container_name: db + environment: + - POSTGRES_USER=postgres + - POSTGRES_PASSWORD=mysecretpassword + - POSTGRES_DB=socks + volumes: + - ./migrate.sql:/docker-entrypoint-initdb.d/init.sql \ No newline at end of file diff --git a/src/main/docker/migrate.sql b/src/main/docker/migrate.sql new file mode 100644 index 00000000..0a7488a4 --- /dev/null +++ b/src/main/docker/migrate.sql @@ -0,0 +1,69 @@ +-- ********************************************************************* +-- Update Database Script +-- ********************************************************************* +-- Change Log: src/main/resources/db/changelog/db.changelog-master.xml +-- Ran at: 20.10.2021, 21:25 +-- Against: postgres@jdbc:postgresql://localhost/socks +-- Liquibase version: 4.3.5 +-- ********************************************************************* + +SET SEARCH_PATH TO public; + +SET SEARCH_PATH TO public; + +-- Create Database Lock Table +CREATE TABLE databasechangeloglock (ID INTEGER NOT NULL, LOCKED BOOLEAN NOT NULL, LOCKGRANTED TIMESTAMP WITHOUT TIME ZONE, LOCKEDBY VARCHAR(255), CONSTRAINT DATABASECHANGELOGLOCK_PKEY PRIMARY KEY (ID)); + +-- Initialize Database Lock Table +DELETE FROM databasechangeloglock; + +INSERT INTO databasechangeloglock (ID, LOCKED) VALUES (1, FALSE); + +-- Lock Database +UPDATE databasechangeloglock SET LOCKED = TRUE, LOCKEDBY = 'admin-pc (192.168.1.53)', LOCKGRANTED = '2021-10-20 21:25:47.755' WHERE ID = 1 AND LOCKED = FALSE; + +SET SEARCH_PATH TO public; + +-- Create Database Change Log Table +CREATE TABLE databasechangelog (ID VARCHAR(255) NOT NULL, AUTHOR VARCHAR(255) NOT NULL, FILENAME VARCHAR(255) NOT NULL, DATEEXECUTED TIMESTAMP WITHOUT TIME ZONE NOT NULL, ORDEREXECUTED INTEGER NOT NULL, EXECTYPE VARCHAR(10) NOT NULL, MD5SUM VARCHAR(35), DESCRIPTION VARCHAR(255), COMMENTS VARCHAR(255), TAG VARCHAR(255), LIQUIBASE VARCHAR(20), CONTEXTS VARCHAR(255), LABELS VARCHAR(255), DEPLOYMENT_ID VARCHAR(10)); + +SET SEARCH_PATH TO public; + +SET SEARCH_PATH TO public; + +-- Changeset src/main/resources/db/changelog/changes/2021-09-12--01-sock-and-color-schema.xml::2021-09-12--01-sock-and-color-schema::svetashov +SET SEARCH_PATH TO public; + +CREATE TABLE color (id BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL, name VARCHAR(50) NOT NULL, CONSTRAINT COLOR_PKEY PRIMARY KEY (id), UNIQUE (name)); + +CREATE TABLE sock (id BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL, color_id BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL, cotton_part INTEGER NOT NULL, quantity INTEGER NOT NULL, CONSTRAINT SOCK_PKEY PRIMARY KEY (id)); + +ALTER TABLE sock ADD CONSTRAINT sock_color_color_id_fk FOREIGN KEY (color_id) REFERENCES color (id); + +INSERT INTO databasechangelog (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, CONTEXTS, LABELS, LIQUIBASE, DEPLOYMENT_ID) VALUES ('2021-09-12--01-sock-and-color-schema', 'svetashov', 'src/main/resources/db/changelog/changes/2021-09-12--01-sock-and-color-schema.xml', NOW(), 1, '8:8a34bcb71ec5a03b7ddb1dedc996d154', 'createTable tableName=color; createTable tableName=sock; addForeignKeyConstraint baseTableName=sock, constraintName=sock_color_color_id_fk, referencedTableName=color', '', 'EXECUTED', NULL, NULL, '4.3.5', '4754350129'); + +-- Changeset src/main/resources/db/changelog/changes/2021-09-12--02-unique-constraint.xml::2021-09-12--02-unique-constraint::svetashov +SET SEARCH_PATH TO public; + +ALTER TABLE sock ADD CONSTRAINT sock_color_id_cotton_part_unique UNIQUE (color_id, cotton_part); + +INSERT INTO databasechangelog (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, CONTEXTS, LABELS, LIQUIBASE, DEPLOYMENT_ID) VALUES ('2021-09-12--02-unique-constraint', 'svetashov', 'src/main/resources/db/changelog/changes/2021-09-12--02-unique-constraint.xml', NOW(), 2, '8:633df65ed40aa55655661a7b1bcf0e69', 'addUniqueConstraint constraintName=sock_color_id_cotton_part_unique, tableName=sock', '', 'EXECUTED', NULL, NULL, '4.3.5', '4754350129'); + +-- Changeset src/main/resources/db/changelog/changes/2021-09-12--03-init-colors.xml::2021-09-12--03-init-colors::svetashov +SET SEARCH_PATH TO public; + +INSERT INTO color (name) VALUES ('black'); + +INSERT INTO color (name) VALUES ('red'); + +INSERT INTO color (name) VALUES ('yellow'); + +INSERT INTO databasechangelog (ID, AUTHOR, FILENAME, DATEEXECUTED, ORDEREXECUTED, MD5SUM, DESCRIPTION, COMMENTS, EXECTYPE, CONTEXTS, LABELS, LIQUIBASE, DEPLOYMENT_ID) VALUES ('2021-09-12--03-init-colors', 'svetashov', 'src/main/resources/db/changelog/changes/2021-09-12--03-init-colors.xml', NOW(), 3, '8:942b8150596a4b9e319d7f0fe3ec50a4', 'insert tableName=color; insert tableName=color; insert tableName=color', '', 'EXECUTED', NULL, NULL, '4.3.5', '4754350129'); + +-- Release Database Lock +SET SEARCH_PATH TO public; + +UPDATE databasechangeloglock SET LOCKED = FALSE, LOCKEDBY = NULL, LOCKGRANTED = NULL WHERE ID = 1; + +SET SEARCH_PATH TO public; + diff --git a/src/main/docker/socks-0.0.1-SNAPSHOT.jar b/src/main/docker/socks-0.0.1-SNAPSHOT.jar new file mode 100644 index 00000000..a1125d95 Binary files /dev/null and b/src/main/docker/socks-0.0.1-SNAPSHOT.jar differ diff --git a/src/main/java/com/example/socks/SocksApplication.java b/src/main/java/com/example/socks/SocksApplication.java new file mode 100644 index 00000000..dbac7539 --- /dev/null +++ b/src/main/java/com/example/socks/SocksApplication.java @@ -0,0 +1,13 @@ +package com.example.socks; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SocksApplication { + + public static void main(String[] args) { + SpringApplication.run(SocksApplication.class, args); + } + +} diff --git a/src/main/java/com/example/socks/configuration/SpringFoxConfig.java b/src/main/java/com/example/socks/configuration/SpringFoxConfig.java new file mode 100644 index 00000000..b2589dac --- /dev/null +++ b/src/main/java/com/example/socks/configuration/SpringFoxConfig.java @@ -0,0 +1,36 @@ +package com.example.socks.configuration; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.*; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +@Configuration +@EnableSwagger2 +public class SpringFoxConfig implements WebMvcConfigurer { + @Bean + public Docket api() { + return new Docket(DocumentationType.SWAGGER_2) + .select() + .apis(RequestHandlerSelectors.any()) + .paths(PathSelectors.any()) + .build(); + } + + @Override + public void addViewControllers(ViewControllerRegistry registry) { + registry.addRedirectViewController("/", "/swagger-ui.html"); + } + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + registry.addResourceHandler("/swagger-ui.html") + .addResourceLocations("classpath:/META-INF/resources/"); + registry.addResourceHandler("/webjars/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/"); + } +} diff --git a/src/main/java/com/example/socks/controller/AboutController.java b/src/main/java/com/example/socks/controller/AboutController.java new file mode 100644 index 00000000..d2cfa5ee --- /dev/null +++ b/src/main/java/com/example/socks/controller/AboutController.java @@ -0,0 +1,13 @@ +package com.example.socks.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class AboutController { + + @GetMapping("/about") + public String about() { + return "Hello world"; + } +} diff --git a/src/main/java/com/example/socks/controller/SocksController.java b/src/main/java/com/example/socks/controller/SocksController.java new file mode 100644 index 00000000..e56096ea --- /dev/null +++ b/src/main/java/com/example/socks/controller/SocksController.java @@ -0,0 +1,40 @@ +package com.example.socks.controller; + +import com.example.socks.exception.OutOfBoundsException; +import com.example.socks.model.SockModel; +import com.example.socks.service.SocksService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RequiredArgsConstructor +@RestController +@RequestMapping("/socks") +public class SocksController { + + private final SocksService socksService; + + @PostMapping("/income") + public ResponseEntity addSocks(@RequestBody SockModel sockModel) { + int quantity = socksService.addSocks(sockModel); + return new ResponseEntity<>(quantity, HttpStatus.OK); + } + + @PostMapping("/outcome") + public ResponseEntity subSocks(@RequestBody SockModel sockModel) { + int quantity = socksService.subSocks(sockModel); + return new ResponseEntity<>(quantity, HttpStatus.OK); + } + + @GetMapping + public ResponseEntity getSocks(@RequestParam String color, + @RequestParam String operation, + @RequestParam int cottonPart) { + if (cottonPart < 0 || cottonPart > 100) + throw new OutOfBoundsException("cottonPart must be between 0 and 100"); + + int quantity = socksService.getSocks(color, operation, cottonPart); + return new ResponseEntity<>(quantity, HttpStatus.OK); + } +} diff --git a/src/main/java/com/example/socks/entity/Color.java b/src/main/java/com/example/socks/entity/Color.java new file mode 100644 index 00000000..4266019e --- /dev/null +++ b/src/main/java/com/example/socks/entity/Color.java @@ -0,0 +1,23 @@ +package com.example.socks.entity; + +import com.sun.istack.NotNull; +import lombok.*; + +import javax.persistence.*; + +@Entity +@Getter +@Setter +@ToString +@RequiredArgsConstructor +@AllArgsConstructor +public class Color { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @NotNull + @Column(unique = true) + private String name; + +} diff --git a/src/main/java/com/example/socks/entity/Sock.java b/src/main/java/com/example/socks/entity/Sock.java new file mode 100644 index 00000000..63a6c5e8 --- /dev/null +++ b/src/main/java/com/example/socks/entity/Sock.java @@ -0,0 +1,36 @@ +package com.example.socks.entity; + +import com.sun.istack.NotNull; +import lombok.*; + +import javax.persistence.*; + +@Entity +@Getter +@Setter +@ToString +@RequiredArgsConstructor +public class Sock { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne + @NotNull + @JoinColumn(name = "color_id") + private Color color; + + @NotNull + @Column(name = "cotton_part") + private int cottonPart; + + @NotNull + private int quantity; + + public Sock(Color color, int cottonPart, int quantity) { + this.color = color; + this.cottonPart = cottonPart; + this.quantity = quantity; + } +} diff --git a/src/main/java/com/example/socks/exception/ColorDoesNotExistsException.java b/src/main/java/com/example/socks/exception/ColorDoesNotExistsException.java new file mode 100644 index 00000000..4c3d2c63 --- /dev/null +++ b/src/main/java/com/example/socks/exception/ColorDoesNotExistsException.java @@ -0,0 +1,19 @@ +package com.example.socks.exception; + +public class ColorDoesNotExistsException extends SocksException{ + public ColorDoesNotExistsException() { + super(); + } + + public ColorDoesNotExistsException(String message) { + super(message); + } + + public ColorDoesNotExistsException(String message, Throwable cause) { + super(message, cause); + } + + public ColorDoesNotExistsException(Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/com/example/socks/exception/NotEnoughSocksException.java b/src/main/java/com/example/socks/exception/NotEnoughSocksException.java new file mode 100644 index 00000000..b86e10fa --- /dev/null +++ b/src/main/java/com/example/socks/exception/NotEnoughSocksException.java @@ -0,0 +1,19 @@ +package com.example.socks.exception; + +public class NotEnoughSocksException extends SocksException { + public NotEnoughSocksException() { + super(); + } + + public NotEnoughSocksException(String message) { + super(message); + } + + public NotEnoughSocksException(String message, Throwable cause) { + super(message, cause); + } + + public NotEnoughSocksException(Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/com/example/socks/exception/OperationNotFoundException.java b/src/main/java/com/example/socks/exception/OperationNotFoundException.java new file mode 100644 index 00000000..88ab21b1 --- /dev/null +++ b/src/main/java/com/example/socks/exception/OperationNotFoundException.java @@ -0,0 +1,20 @@ +package com.example.socks.exception; + +public class OperationNotFoundException extends SocksException{ + + public OperationNotFoundException() { + super(); + } + + public OperationNotFoundException(String message) { + super(message); + } + + public OperationNotFoundException(String message, Throwable cause) { + super(message, cause); + } + + public OperationNotFoundException(Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/com/example/socks/exception/OutOfBoundsException.java b/src/main/java/com/example/socks/exception/OutOfBoundsException.java new file mode 100644 index 00000000..a23346ab --- /dev/null +++ b/src/main/java/com/example/socks/exception/OutOfBoundsException.java @@ -0,0 +1,18 @@ +package com.example.socks.exception; + +public class OutOfBoundsException extends SocksException { + public OutOfBoundsException() { + } + + public OutOfBoundsException(String message) { + super(message); + } + + public OutOfBoundsException(String message, Throwable cause) { + super(message, cause); + } + + public OutOfBoundsException(Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/com/example/socks/exception/SocksException.java b/src/main/java/com/example/socks/exception/SocksException.java new file mode 100644 index 00000000..6a6a46d3 --- /dev/null +++ b/src/main/java/com/example/socks/exception/SocksException.java @@ -0,0 +1,19 @@ +package com.example.socks.exception; + +public class SocksException extends RuntimeException { + public SocksException() { + super(); + } + + public SocksException(String message) { + super(message); + } + + public SocksException(String message, Throwable cause) { + super(message, cause); + } + + public SocksException(Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/com/example/socks/handler/GlobalExceptionHandler.java b/src/main/java/com/example/socks/handler/GlobalExceptionHandler.java new file mode 100644 index 00000000..dc7d10f0 --- /dev/null +++ b/src/main/java/com/example/socks/handler/GlobalExceptionHandler.java @@ -0,0 +1,57 @@ +package com.example.socks.handler; + +import com.example.socks.exception.ColorDoesNotExistsException; +import com.example.socks.exception.NotEnoughSocksException; +import com.example.socks.exception.OperationNotFoundException; +import com.example.socks.exception.SocksException; +import com.example.socks.model.ErrorModel; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +import java.time.Instant; + +@ControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(ColorDoesNotExistsException.class) + public ResponseEntity colorDoesNotExistsExceptionHandler(ColorDoesNotExistsException e) { + Long timestamp = Instant.now().getEpochSecond(); + HttpStatus status = HttpStatus.NOT_FOUND; + return new ResponseEntity<>( + new ErrorModel(status.value(), "Color does not exists", e.getMessage(), timestamp), status); + } + + @ExceptionHandler(NotEnoughSocksException.class) + public ResponseEntity notEnoughSocksExceptionHandler(NotEnoughSocksException e) { + Long timestamp = Instant.now().getEpochSecond(); + HttpStatus status = HttpStatus.BAD_REQUEST; + return new ResponseEntity<>( + new ErrorModel(status.value(), "Not enough socks", e.getMessage(), timestamp), status); + } + + @ExceptionHandler(OperationNotFoundException.class) + public ResponseEntity operationNotFoundExceptionHandler(OperationNotFoundException e) { + Long timestamp = Instant.now().getEpochSecond(); + HttpStatus status = HttpStatus.NOT_FOUND; + return new ResponseEntity<>( + new ErrorModel(status.value(), "Operation not found", e.getMessage(), timestamp), status); + } + + @ExceptionHandler(SocksException.class) + public ResponseEntity socksExceptionHandler(SocksException e) { + Long timestamp = Instant.now().getEpochSecond(); + HttpStatus status = HttpStatus.BAD_REQUEST; + return new ResponseEntity<>( + new ErrorModel(status.value(), "Socks exception", e.getMessage(), timestamp), status); + } + + @ExceptionHandler(RuntimeException.class) + public ResponseEntity socksExceptionHandler(RuntimeException e) { + Long timestamp = Instant.now().getEpochSecond(); + HttpStatus status = HttpStatus.INTERNAL_SERVER_ERROR; + return new ResponseEntity<>( + new ErrorModel(status.value(), "Internal server error", e.getMessage(), timestamp), status); + } +} diff --git a/src/main/java/com/example/socks/model/ErrorModel.java b/src/main/java/com/example/socks/model/ErrorModel.java new file mode 100644 index 00000000..56103ef3 --- /dev/null +++ b/src/main/java/com/example/socks/model/ErrorModel.java @@ -0,0 +1,25 @@ +package com.example.socks.model; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class ErrorModel { + + @JsonProperty(value = "code") + private int code; + + @JsonProperty(value = "error") + private String error; + + @JsonProperty(value = "message") + private String message; + + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss") + @JsonProperty(value = "timestamp") + private Long timestamp; + +} diff --git a/src/main/java/com/example/socks/model/SockModel.java b/src/main/java/com/example/socks/model/SockModel.java new file mode 100644 index 00000000..075b178d --- /dev/null +++ b/src/main/java/com/example/socks/model/SockModel.java @@ -0,0 +1,22 @@ +package com.example.socks.model; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.sun.istack.NotNull; +import lombok.Data; + +@Data +public class SockModel { + + @NotNull + @JsonProperty(value = "color") + private String color; + + @NotNull + @JsonProperty(value = "cotton_part") + private int cottonPart; + + @NotNull + @JsonProperty(value = "quantity") + private int quantity; + +} diff --git a/src/main/java/com/example/socks/repository/ColorRepository.java b/src/main/java/com/example/socks/repository/ColorRepository.java new file mode 100644 index 00000000..cd6fd8e2 --- /dev/null +++ b/src/main/java/com/example/socks/repository/ColorRepository.java @@ -0,0 +1,12 @@ +package com.example.socks.repository; + +import com.example.socks.entity.Color; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface ColorRepository extends CrudRepository { + Optional findColorByName(String name); +} diff --git a/src/main/java/com/example/socks/repository/SockRepository.java b/src/main/java/com/example/socks/repository/SockRepository.java new file mode 100644 index 00000000..a5593b41 --- /dev/null +++ b/src/main/java/com/example/socks/repository/SockRepository.java @@ -0,0 +1,17 @@ +package com.example.socks.repository; + +import com.example.socks.entity.Color; +import com.example.socks.entity.Sock; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; + +@Repository +public interface SockRepository extends CrudRepository { + Optional findByColorAndCottonPart(Color color, int cottonPart); + Optional findByColorNameAndCottonPart(String colorName, int cottonPart); + List findByColorAndCottonPartLessThan(Color color, int cottonPart); + List findByColorAndCottonPartGreaterThan(Color color, int cottonPart); +} diff --git a/src/main/java/com/example/socks/service/SocksService.java b/src/main/java/com/example/socks/service/SocksService.java new file mode 100644 index 00000000..dfe273c3 --- /dev/null +++ b/src/main/java/com/example/socks/service/SocksService.java @@ -0,0 +1,83 @@ +package com.example.socks.service; + +import com.example.socks.entity.Color; +import com.example.socks.entity.Sock; +import com.example.socks.exception.ColorDoesNotExistsException; +import com.example.socks.exception.NotEnoughSocksException; +import com.example.socks.exception.OperationNotFoundException; +import com.example.socks.exception.SocksException; +import com.example.socks.model.SockModel; +import com.example.socks.repository.ColorRepository; +import com.example.socks.repository.SockRepository; +import com.sun.istack.NotNull; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class SocksService { + + private final ColorRepository colorRepository; + private final SockRepository sockRepository; + + public int addSocks(@NotNull SockModel sockModel) { + Color color = colorRepository.findColorByName(sockModel.getColor()) + .orElseThrow(ColorDoesNotExistsException::new); + Sock sock = sockRepository + .findByColorAndCottonPart(color, sockModel.getCottonPart()) + .orElse(new Sock(color, sockModel.getCottonPart(), 0)); + int newQuantity = sock.getQuantity() + sockModel.getQuantity(); + sock.setQuantity(newQuantity); + + sockRepository.save(sock); + + return newQuantity; + } + + public int subSocks(@NotNull SockModel sockModel) { + Color color = colorRepository + .findColorByName(sockModel.getColor()) + .orElseThrow(ColorDoesNotExistsException::new); + Sock sock = sockRepository + .findByColorAndCottonPart(color, sockModel.getCottonPart()) + .orElseThrow(NotEnoughSocksException::new); + if (sock.getQuantity() < sockModel.getQuantity()) + throw new NotEnoughSocksException(); + + int newQuantity = sock.getQuantity() - sockModel.getQuantity(); + sock.setQuantity(newQuantity); + + if (newQuantity == 0) + sockRepository.delete(sock); + else + sockRepository.save(sock); + + return newQuantity; + } + + public int getSocks(String colorName, String operation, int cottonPart) { + Color color = colorRepository + .findColorByName(colorName) + .orElseThrow(ColorDoesNotExistsException::new); + + int quantity = switch (operation) { + case "moreThan" -> sockRepository + .findByColorAndCottonPartGreaterThan(color, cottonPart) + .stream() + .mapToInt(Sock::getQuantity) + .sum(); + case "lessThan" -> sockRepository + .findByColorAndCottonPartLessThan(color, cottonPart) + .stream() + .mapToInt(Sock::getQuantity) + .sum(); + case "equal" -> sockRepository + .findByColorNameAndCottonPart(colorName, cottonPart) + .orElse(new Sock(null, 0, 0)) + .getQuantity(); + default -> throw new OperationNotFoundException("Operation " + operation + " not found"); + }; + + return quantity; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000..8d84575b --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,5 @@ +spring.datasource.url=jdbc:postgresql://localhost/socks +spring.datasource.username=postgres +spring.datasource.password=mysecretpassword +spring.datasource.driver-class-name=org.postgresql.Driver +server.servlet.contextPath=/api/ \ No newline at end of file diff --git a/src/main/resources/db/changelog/changes/2021-09-12--01-sock-and-color-schema.xml b/src/main/resources/db/changelog/changes/2021-09-12--01-sock-and-color-schema.xml new file mode 100644 index 00000000..e642164a --- /dev/null +++ b/src/main/resources/db/changelog/changes/2021-09-12--01-sock-and-color-schema.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/db/changelog/changes/2021-09-12--02-unique-constraint.xml b/src/main/resources/db/changelog/changes/2021-09-12--02-unique-constraint.xml new file mode 100644 index 00000000..96328c96 --- /dev/null +++ b/src/main/resources/db/changelog/changes/2021-09-12--02-unique-constraint.xml @@ -0,0 +1,27 @@ + + + + + + + + + SELECT COUNT(*) + FROM pg_constraint c + WHERE c.conname LIKE 'sock_color_id_cotton_part_unique%'; + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/db/changelog/changes/2021-09-12--03-init-colors.xml b/src/main/resources/db/changelog/changes/2021-09-12--03-init-colors.xml new file mode 100644 index 00000000..583d92f8 --- /dev/null +++ b/src/main/resources/db/changelog/changes/2021-09-12--03-init-colors.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/db/changelog/db.changelog-master.xml b/src/main/resources/db/changelog/db.changelog-master.xml new file mode 100644 index 00000000..7a6372a1 --- /dev/null +++ b/src/main/resources/db/changelog/db.changelog-master.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/src/test/java/com/example/socks/SocksApplicationTests.java b/src/test/java/com/example/socks/SocksApplicationTests.java new file mode 100644 index 00000000..c76fe5ce --- /dev/null +++ b/src/test/java/com/example/socks/SocksApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.socks; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SocksApplicationTests { + + @Test + void contextLoads() { + } + +}