diff --git a/.gitignore.txt b/.gitignore.txt new file mode 100644 index 00000000..eea63538 --- /dev/null +++ b/.gitignore.txt @@ -0,0 +1,5 @@ +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr \ No newline at end of file diff --git a/HELP.md b/HELP.md new file mode 100644 index 00000000..e47bfb1e --- /dev/null +++ b/HELP.md @@ -0,0 +1,19 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) +* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.3.4.RELEASE/maven-plugin/reference/html/) +* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.3.4.RELEASE/maven-plugin/reference/html/#build-image) +* [Spring Web](https://docs.spring.io/spring-boot/docs/2.3.4.RELEASE/reference/htmlsingle/#boot-features-developing-web-applications) +* [Thymeleaf](https://docs.spring.io/spring-boot/docs/2.3.4.RELEASE/reference/htmlsingle/#boot-features-spring-mvc-template-engines) + +### Guides +The following guides illustrate how to use some features concretely: + +* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) +* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) +* [Building REST services with Spring](https://spring.io/guides/tutorials/bookmarks/) +* [Handling Form Submission](https://spring.io/guides/gs/handling-form-submission/) + diff --git a/microservice-client/.gitignore b/microservice-client/.gitignore new file mode 100644 index 00000000..294f756f --- /dev/null +++ b/microservice-client/.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/microservice-client/.mvn/wrapper/MavenWrapperDownloader.java b/microservice-client/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..e76d1f32 --- /dev/null +++ b/microservice-client/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/microservice-client/.mvn/wrapper/maven-wrapper.jar b/microservice-client/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..2cc7d4a5 Binary files /dev/null and b/microservice-client/.mvn/wrapper/maven-wrapper.jar differ diff --git a/microservice-client/.mvn/wrapper/maven-wrapper.properties b/microservice-client/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..642d572c --- /dev/null +++ b/microservice-client/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/microservice-client/mvnw b/microservice-client/mvnw new file mode 100644 index 00000000..a16b5431 --- /dev/null +++ b/microservice-client/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/microservice-client/mvnw.cmd b/microservice-client/mvnw.cmd new file mode 100644 index 00000000..c8d43372 --- /dev/null +++ b/microservice-client/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/microservice-client/pom.xml b/microservice-client/pom.xml new file mode 100644 index 00000000..bbb8161c --- /dev/null +++ b/microservice-client/pom.xml @@ -0,0 +1,74 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.3.4.RELEASE + + + com.mclientui + mclientui + 0.0.1-SNAPSHOT + jar + + mclientui + Client UI pour l'application + + + 11 + + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-web + + + org.projectlombok + lombok + true + + + mysql + mysql-connector-java + 8.0.20 + + + org.webjars + bootstrap + 4.0.0-2 + + + org.springframework.cloud + spring-cloud-starter-openfeign + 2.2.5.RELEASE + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/microservice-client/src/main/java/com/mclientui/MclientuiApplication.java b/microservice-client/src/main/java/com/mclientui/MclientuiApplication.java new file mode 100644 index 00000000..2a2e637d --- /dev/null +++ b/microservice-client/src/main/java/com/mclientui/MclientuiApplication.java @@ -0,0 +1,15 @@ +package com.mclientui; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; + +@SpringBootApplication +@EnableFeignClients("com.mclientui") +public class MclientuiApplication { + + public static void main(String[] args) { + SpringApplication.run(MclientuiApplication.class, args); + } + +} diff --git a/microservice-client/src/main/java/com/mclientui/bean/CommandeBean.java b/microservice-client/src/main/java/com/mclientui/bean/CommandeBean.java new file mode 100644 index 00000000..e558becc --- /dev/null +++ b/microservice-client/src/main/java/com/mclientui/bean/CommandeBean.java @@ -0,0 +1,19 @@ +package com.mclientui.bean; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class CommandeBean { + + private int id; + private Integer productId; + private Date dateCommande; + private Integer quantite; + private Boolean commandePayee; +} diff --git a/microservice-client/src/main/java/com/mclientui/bean/PaiementBean.java b/microservice-client/src/main/java/com/mclientui/bean/PaiementBean.java new file mode 100644 index 00000000..3d5928e6 --- /dev/null +++ b/microservice-client/src/main/java/com/mclientui/bean/PaiementBean.java @@ -0,0 +1,19 @@ +package com.mclientui.bean; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class PaiementBean { + + private int id; + + private Integer idCommande; + + private Double montant; + + private Long numeroCarte; +} diff --git a/microservice-client/src/main/java/com/mclientui/bean/ProductBean.java b/microservice-client/src/main/java/com/mclientui/bean/ProductBean.java new file mode 100644 index 00000000..f80625bf --- /dev/null +++ b/microservice-client/src/main/java/com/mclientui/bean/ProductBean.java @@ -0,0 +1,17 @@ +package com.mclientui.bean; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ProductBean { + + private int id; + private String titre; + private String description; + private String image; + private Double prix; +} \ No newline at end of file diff --git a/microservice-client/src/main/java/com/mclientui/configuration/FeignExceptionConfig.java b/microservice-client/src/main/java/com/mclientui/configuration/FeignExceptionConfig.java new file mode 100644 index 00000000..f1ab9d23 --- /dev/null +++ b/microservice-client/src/main/java/com/mclientui/configuration/FeignExceptionConfig.java @@ -0,0 +1,14 @@ +package com.mclientui.configuration; + +import com.mclientui.exceptions.CustomErrorDecoder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class FeignExceptionConfig { + + @Bean + public CustomErrorDecoder mCustomErrorDecoder(){ + return new CustomErrorDecoder(); + } +} diff --git a/microservice-client/src/main/java/com/mclientui/controller/ClientController.java b/microservice-client/src/main/java/com/mclientui/controller/ClientController.java new file mode 100644 index 00000000..fd5d6910 --- /dev/null +++ b/microservice-client/src/main/java/com/mclientui/controller/ClientController.java @@ -0,0 +1,86 @@ +package com.mclientui.controller; + +import com.mclientui.bean.CommandeBean; +import com.mclientui.bean.PaiementBean; +import com.mclientui.bean.ProductBean; +import com.mclientui.proxies.MicroServiceCommandeProxy; +import com.mclientui.proxies.MicroServicePaiementProxy; +import com.mclientui.proxies.MicroserviceProduitsProxy; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.Date; +import java.util.List; +import java.util.concurrent.ThreadLocalRandom; + +@Controller +public class ClientController { + + @Autowired + private MicroserviceProduitsProxy microserviceProduitsProxy; + @Autowired + private MicroServiceCommandeProxy microServiceCommandeProxy; + @Autowired + private MicroServicePaiementProxy microServicePaiementProxy; + + + @RequestMapping("/") + public String accueil(Model model){ + + List produits = microserviceProduitsProxy.listeDesProduits(); + model.addAttribute("produits", produits); + return "Accueil"; + } + + @RequestMapping("/details-produit/{id}") + public String ficheProduit(@PathVariable("id") int id, Model model){ + ProductBean produit = microserviceProduitsProxy.recupererUnProduit(id); + model.addAttribute("produit", produit); + return "FicheProduit"; + } + + @RequestMapping("/commander-produit/{id}/{montant}") + public String passerCommande(@PathVariable("id") int id, @PathVariable("montant") Double montant, Model model){ + + CommandeBean commandeBean = new CommandeBean(); + commandeBean.setProductId(id); + commandeBean.setDateCommande(new Date()); + commandeBean.setQuantite(1); + + CommandeBean commandeAdded = microServiceCommandeProxy.ajouterCommande(commandeBean); + model.addAttribute("commande", commandeAdded); + model.addAttribute("montant", montant); + return "Paiement"; + } + + @RequestMapping("/payer-commande/{idCommande}/{montant}") + public String payerCommande(@PathVariable int idCommande, @PathVariable Double montant, Model model) { + + PaiementBean paiementBean = new PaiementBean(); + paiementBean.setIdCommande(idCommande); + paiementBean.setMontant(montant); + paiementBean.setNumeroCarte(numcarte()); + + ResponseEntity paiement = microServicePaiementProxy.payerUneCommande(paiementBean); + Boolean paiementOk = false; + + if(paiement.getStatusCode() == HttpStatus.CREATED){ + paiementOk = true; + } + + model.addAttribute("paiementOk", paiementOk); + + return "Confirmation"; + } + + //Génére une serie de 16 chiffres au hasard pour simuler vaguement une CB + private Long numcarte() { + + return ThreadLocalRandom.current().nextLong(1000000000000000L,9000000000000000L ); + } +} diff --git a/microservice-client/src/main/java/com/mclientui/exceptions/CustomErrorDecoder.java b/microservice-client/src/main/java/com/mclientui/exceptions/CustomErrorDecoder.java new file mode 100644 index 00000000..b113223e --- /dev/null +++ b/microservice-client/src/main/java/com/mclientui/exceptions/CustomErrorDecoder.java @@ -0,0 +1,32 @@ +package com.mclientui.exceptions; + +import feign.Response; +import feign.codec.ErrorDecoder; + +public class CustomErrorDecoder implements ErrorDecoder { + + private final ErrorDecoder defaultErrorDecoder = new Default(); + + @Override + public Exception decode(String invoqueur, Response response){ + + if(response.status() == 400){ + return new ProductBadRequestException( + "Requête Incorrecte" + ); + } + else if(response.status() == 404 ) { + return new ProductNotFoundException( + "Produit(s) non trouvé " + ); + } + else if(response.status() == 409 ) { + return new PaiementConflictException( + "Paiement existant" + ); + } + return defaultErrorDecoder.decode(invoqueur, response); + } + + +} diff --git a/microservice-client/src/main/java/com/mclientui/exceptions/PaiementConflictException.java b/microservice-client/src/main/java/com/mclientui/exceptions/PaiementConflictException.java new file mode 100644 index 00000000..602a3263 --- /dev/null +++ b/microservice-client/src/main/java/com/mclientui/exceptions/PaiementConflictException.java @@ -0,0 +1,12 @@ +package com.mclientui.exceptions; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ResponseStatus(HttpStatus.CONFLICT) +public class PaiementConflictException extends RuntimeException{ + + public PaiementConflictException(String s){ + super(s); + } +} diff --git a/microservice-client/src/main/java/com/mclientui/exceptions/ProductBadRequestException.java b/microservice-client/src/main/java/com/mclientui/exceptions/ProductBadRequestException.java new file mode 100644 index 00000000..5c499d9a --- /dev/null +++ b/microservice-client/src/main/java/com/mclientui/exceptions/ProductBadRequestException.java @@ -0,0 +1,12 @@ +package com.mclientui.exceptions; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ResponseStatus(HttpStatus.BAD_REQUEST) +public class ProductBadRequestException extends RuntimeException{ + + public ProductBadRequestException(String s){ + super(s); + } +} diff --git a/microservice-client/src/main/java/com/mclientui/exceptions/ProductNotFoundException.java b/microservice-client/src/main/java/com/mclientui/exceptions/ProductNotFoundException.java new file mode 100644 index 00000000..ca39f1a8 --- /dev/null +++ b/microservice-client/src/main/java/com/mclientui/exceptions/ProductNotFoundException.java @@ -0,0 +1,12 @@ +package com.mclientui.exceptions; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ResponseStatus(HttpStatus.NOT_FOUND) +public class ProductNotFoundException extends RuntimeException{ + + public ProductNotFoundException(String s){ + super(s); + } +} diff --git a/microservice-client/src/main/java/com/mclientui/proxies/MicroServiceCommandeProxy.java b/microservice-client/src/main/java/com/mclientui/proxies/MicroServiceCommandeProxy.java new file mode 100644 index 00000000..7c3497d4 --- /dev/null +++ b/microservice-client/src/main/java/com/mclientui/proxies/MicroServiceCommandeProxy.java @@ -0,0 +1,19 @@ +package com.mclientui.proxies; + +import com.mclientui.bean.CommandeBean; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient(name = "microservice-commandes", url = "localhost:9003") +public interface MicroServiceCommandeProxy { + + @PostMapping(value="/commandes") + CommandeBean ajouterCommande(@RequestBody CommandeBean commandeBean); + + @GetMapping(value = "/commandes/{id}") + CommandeBean recupererUneCommande(@PathVariable int id); +} diff --git a/microservice-client/src/main/java/com/mclientui/proxies/MicroServicePaiementProxy.java b/microservice-client/src/main/java/com/mclientui/proxies/MicroServicePaiementProxy.java new file mode 100644 index 00000000..0e6aeb42 --- /dev/null +++ b/microservice-client/src/main/java/com/mclientui/proxies/MicroServicePaiementProxy.java @@ -0,0 +1,14 @@ +package com.mclientui.proxies; + +import com.mclientui.bean.PaiementBean; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient(name = "microservice-paiement", url = "localhost:9004") +public interface MicroServicePaiementProxy { + + @PostMapping(value = "/paiement") + ResponseEntity payerUneCommande(@RequestBody PaiementBean paiementBean); +} diff --git a/microservice-client/src/main/java/com/mclientui/proxies/MicroserviceProduitsProxy.java b/microservice-client/src/main/java/com/mclientui/proxies/MicroserviceProduitsProxy.java new file mode 100644 index 00000000..848134ee --- /dev/null +++ b/microservice-client/src/main/java/com/mclientui/proxies/MicroserviceProduitsProxy.java @@ -0,0 +1,20 @@ +package com.mclientui.proxies; + +import com.mclientui.bean.ProductBean; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.List; + +// (, decode404 = true) => cette argyment permet de passer l'erreur et donc d'éviter de lancer la fameuse 'FeignException' +@FeignClient(name = "microservice-produits", url = "localhost:9002") +public interface MicroserviceProduitsProxy { + + @GetMapping(value = "/Produits") + List listeDesProduits(); + + @GetMapping( value = "/Produits/{id}") + ProductBean recupererUnProduit(@PathVariable("id") int id); + +} \ No newline at end of file diff --git a/microservice-client/src/main/resources/application.properties b/microservice-client/src/main/resources/application.properties new file mode 100644 index 00000000..f38340b4 --- /dev/null +++ b/microservice-client/src/main/resources/application.properties @@ -0,0 +1,7 @@ +#Mysql Configuration +spring.datasource.url= jdbc:mysql://localhost:3306/mcommercedb +spring.datasource.username=root +spring.datasource.password= +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect +spring.jpa.hibernate.ddl-auto=update \ No newline at end of file diff --git a/microservice-client/src/main/resources/templates/Accueil.html b/microservice-client/src/main/resources/templates/Accueil.html new file mode 100644 index 00000000..4051989a --- /dev/null +++ b/microservice-client/src/main/resources/templates/Accueil.html @@ -0,0 +1,24 @@ + + + + + Mcommerce + + + +
+

Application Mcommerce

+
+
+ + +

+ +
+
+
+ + + + + \ No newline at end of file diff --git a/microservice-client/src/main/resources/templates/Confirmation.html b/microservice-client/src/main/resources/templates/Confirmation.html new file mode 100644 index 00000000..5eb155a8 --- /dev/null +++ b/microservice-client/src/main/resources/templates/Confirmation.html @@ -0,0 +1,32 @@ + + + + + Mcommerce + + + + + +
+

Application Mcommerce

+
+
+ +

+ Paiement Accepté +

+ +

+ Le paiement n'a pas abouti +

+ +
+
+
+ + + + + \ No newline at end of file diff --git a/microservice-client/src/main/resources/templates/FicheProduit.html b/microservice-client/src/main/resources/templates/FicheProduit.html new file mode 100644 index 00000000..dbda9d63 --- /dev/null +++ b/microservice-client/src/main/resources/templates/FicheProduit.html @@ -0,0 +1,28 @@ + + + + + Mcommerce + + + + +
+

Application Mcommerce

+
+
+ +

+

+

+ COMMANDER +

+
+
+
+ + + + + \ No newline at end of file diff --git a/microservice-client/src/main/resources/templates/Paiement.html b/microservice-client/src/main/resources/templates/Paiement.html new file mode 100644 index 00000000..31b6b61b --- /dev/null +++ b/microservice-client/src/main/resources/templates/Paiement.html @@ -0,0 +1,32 @@ + + + + + Mcommerce + + + + +
+

Application Mcommerce

+
+
+

+ Ici l'utilisateur sélectionne en temps normal un moyen de paiement et entre les informations de sa carte bancaire.
+ Nous allons éviter d'ajouter les formulaires nécessaireS afin de garder l'application la plus basique et simple possible pour la suite.
+ Si vous vous sentez à l'aise, vous pouvez créer un formulaire pour accepter le numéro de la CB, que vous traiterez dans le contrôleur grâce à + un PostMapping. +

+ +

+ Payer Ma Commande +

+
+
+
+ + + + + \ No newline at end of file diff --git a/microservice-client/src/test/java/com/mclientui/MclientuiApplicationTests.java b/microservice-client/src/test/java/com/mclientui/MclientuiApplicationTests.java new file mode 100644 index 00000000..43f0969c --- /dev/null +++ b/microservice-client/src/test/java/com/mclientui/MclientuiApplicationTests.java @@ -0,0 +1,13 @@ +package com.mclientui; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class MclientuiApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/microservice-commandes/pom.xml b/microservice-commandes/pom.xml index bbc5c664..a4c2a7a9 100644 --- a/microservice-commandes/pom.xml +++ b/microservice-commandes/pom.xml @@ -1,62 +1,68 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.mcommandes - mcommandes - 0.0.1-SNAPSHOT - jar + com.mcommandes + mcommandes + 0.0.1-SNAPSHOT + jar - mcommandes - Microservices pour simuler des paiements + mcommandes + Microservices pour simuler des paiements - - org.springframework.boot - spring-boot-starter-parent - 2.0.0.RELEASE - - + + org.springframework.boot + spring-boot-starter-parent + 2.3.4.RELEASE + + - - UTF-8 - UTF-8 - 1.8 - + + UTF-8 + UTF-8 + 1.8 + - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - - com.h2database - h2 - runtime - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + com.h2database + h2 + runtime + + + javax.xml.bind + jaxb-api + 2.3.0 + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/microservice-commandes/src/main/java/com/mcommandes/McommandesApplication.java b/microservice-commandes/src/main/java/com/mcommandes/McommandesApplication.java index 246684a2..4bb81181 100644 --- a/microservice-commandes/src/main/java/com/mcommandes/McommandesApplication.java +++ b/microservice-commandes/src/main/java/com/mcommandes/McommandesApplication.java @@ -6,7 +6,7 @@ @SpringBootApplication public class McommandesApplication { - public static void main(String[] args) { - SpringApplication.run(McommandesApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(McommandesApplication.class, args); + } } diff --git a/microservice-commandes/src/main/java/com/mcommandes/model/Commande.java b/microservice-commandes/src/main/java/com/mcommandes/model/Commande.java index 2f1e8b22..7e5e11db 100644 --- a/microservice-commandes/src/main/java/com/mcommandes/model/Commande.java +++ b/microservice-commandes/src/main/java/com/mcommandes/model/Commande.java @@ -1,6 +1,5 @@ package com.mcommandes.model; - import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.Id; diff --git a/microservice-commandes/src/main/java/com/mcommandes/web/controller/CommandeController.java b/microservice-commandes/src/main/java/com/mcommandes/web/controller/CommandeController.java index a578723e..26b256d6 100644 --- a/microservice-commandes/src/main/java/com/mcommandes/web/controller/CommandeController.java +++ b/microservice-commandes/src/main/java/com/mcommandes/web/controller/CommandeController.java @@ -18,23 +18,29 @@ public class CommandeController { @Autowired CommandesDao commandesDao; - @PostMapping (value = "/commandes") - public ResponseEntity ajouterCommande(@RequestBody Commande commande){ + @PostMapping(value = "/commandes") + public ResponseEntity ajouterCommande(@RequestBody Commande commande) { Commande nouvelleCommande = commandesDao.save(commande); - - if(nouvelleCommande == null) throw new ImpossibleAjouterCommandeException("Impossible d'ajouter cette commande"); + if (nouvelleCommande == null) + throw new ImpossibleAjouterCommandeException("Impossible d'ajouter cette commande"); return new ResponseEntity(commande, HttpStatus.CREATED); } @GetMapping(value = "/commandes/{id}") - public Optional recupererUneCommande(@PathVariable int id){ + public Optional recupererUneCommande(@PathVariable int id) { Optional commande = commandesDao.findById(id); - - if(!commande.isPresent()) throw new CommandeNotFoundException("Cette commande n'existe pas"); + if (!commande.isPresent()) throw new CommandeNotFoundException("Cette commande n'existe pas"); return commande; } + + @PutMapping(value= "/commandes") + public void modifierCommande(@RequestBody Commande commande){ + + Commande commandeUpdated = commandesDao.save(commande); + + } } diff --git a/microservice-commandes/src/main/java/com/mcommandes/web/exceptions/CommandeNotFoundException.java b/microservice-commandes/src/main/java/com/mcommandes/web/exceptions/CommandeNotFoundException.java index ebdcba49..fc0a9173 100644 --- a/microservice-commandes/src/main/java/com/mcommandes/web/exceptions/CommandeNotFoundException.java +++ b/microservice-commandes/src/main/java/com/mcommandes/web/exceptions/CommandeNotFoundException.java @@ -6,7 +6,6 @@ @ResponseStatus(HttpStatus.NOT_FOUND) public class CommandeNotFoundException extends RuntimeException { - public CommandeNotFoundException(String message) { super(message); } diff --git a/microservice-commandes/src/main/resources/application.properties b/microservice-commandes/src/main/resources/application.properties index 3d785cfe..367108bb 100644 --- a/microservice-commandes/src/main/resources/application.properties +++ b/microservice-commandes/src/main/resources/application.properties @@ -1,9 +1,9 @@ +spring.application.name= microservice-commandes -server.port 9002 - +server.port 9003 #Configurations H2 spring.jpa.show-sql=true spring.h2.console.enabled=true - +spring.datasource.url=jdbc:h2:mem:mcommandesdb #défini l'encodage pour data.sql spring.datasource.sql-script-encoding=UTF-8 \ No newline at end of file diff --git a/microservice-commandes/src/test/java/com/mcommandes/McommandesApplicationTests.java b/microservice-commandes/src/test/java/com/mcommandes/McommandesApplicationTests.java index ce03e245..3f1eb2f4 100644 --- a/microservice-commandes/src/test/java/com/mcommandes/McommandesApplicationTests.java +++ b/microservice-commandes/src/test/java/com/mcommandes/McommandesApplicationTests.java @@ -1,16 +1,13 @@ package com.mcommandes; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; -@RunWith(SpringRunner.class) @SpringBootTest public class McommandesApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/microservice-commandes/src/test/java/com/mpayement/MpayementApplicationTests.java b/microservice-commandes/src/test/java/com/mpayement/MpayementApplicationTests.java index dc70e047..7e0a416f 100644 --- a/microservice-commandes/src/test/java/com/mpayement/MpayementApplicationTests.java +++ b/microservice-commandes/src/test/java/com/mpayement/MpayementApplicationTests.java @@ -1,16 +1,13 @@ package com.mpayement; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; -@RunWith(SpringRunner.class) @SpringBootTest public class MpayementApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/microservice-paiement/pom.xml b/microservice-paiement/pom.xml index 22dad479..2e9dab24 100644 --- a/microservice-paiement/pom.xml +++ b/microservice-paiement/pom.xml @@ -1,62 +1,79 @@ - 4.0.0 - - com.mpaiement - mpaiement - 0.0.1-SNAPSHOT - jar - - mpaiement - Microservice pour simuler des paiements - - - org.springframework.boot - spring-boot-starter-parent - 2.0.0.RELEASE - - - - - UTF-8 - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - - com.h2database - h2 - runtime - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.mpaiement + mpaiement + 0.0.1-SNAPSHOT + jar + + mpaiement + Microservice pour simuler des paiements + + + org.springframework.boot + spring-boot-starter-parent + 2.3.4.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + com.h2database + h2 + runtime + + + javax.xml.bind + jaxb-api + 2.3.0 + + + org.springframework.cloud + spring-cloud-starter-openfeign + 2.2.5.RELEASE + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/microservice-paiement/src/main/java/com/mpaiement/MpaiementApplication.java b/microservice-paiement/src/main/java/com/mpaiement/MpaiementApplication.java index cdfe616c..a1f14fac 100644 --- a/microservice-paiement/src/main/java/com/mpaiement/MpaiementApplication.java +++ b/microservice-paiement/src/main/java/com/mpaiement/MpaiementApplication.java @@ -2,11 +2,13 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication +@EnableFeignClients("com.mpaiement") public class MpaiementApplication { - public static void main(String[] args) { - SpringApplication.run(MpaiementApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(MpaiementApplication.class, args); + } } diff --git a/microservice-paiement/src/main/java/com/mpaiement/bean/CommandeBean.java b/microservice-paiement/src/main/java/com/mpaiement/bean/CommandeBean.java new file mode 100644 index 00000000..eb6a1d1d --- /dev/null +++ b/microservice-paiement/src/main/java/com/mpaiement/bean/CommandeBean.java @@ -0,0 +1,19 @@ +package com.mpaiement.bean; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class CommandeBean { + + private int id; + private Integer productId; + private Date dateCommande; + private Integer quantite; + private Boolean commandePayee; +} diff --git a/microservice-paiement/src/main/java/com/mpaiement/dao/PaiementDao.java b/microservice-paiement/src/main/java/com/mpaiement/dao/PaiementDao.java index 37b7490a..b97e8a56 100644 --- a/microservice-paiement/src/main/java/com/mpaiement/dao/PaiementDao.java +++ b/microservice-paiement/src/main/java/com/mpaiement/dao/PaiementDao.java @@ -5,7 +5,7 @@ import org.springframework.stereotype.Repository; @Repository -public interface PaiementDao extends JpaRepository{ +public interface PaiementDao extends JpaRepository { - Paiement findByidCommande(int idCommande); + Paiement findByIdCommande(int idCommande); } diff --git a/microservice-paiement/src/main/java/com/mpaiement/proxies/MicroServiceCommandeProxy.java b/microservice-paiement/src/main/java/com/mpaiement/proxies/MicroServiceCommandeProxy.java new file mode 100644 index 00000000..6ce917d4 --- /dev/null +++ b/microservice-paiement/src/main/java/com/mpaiement/proxies/MicroServiceCommandeProxy.java @@ -0,0 +1,20 @@ +package com.mpaiement.proxies; + +import com.mpaiement.bean.CommandeBean; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.Optional; + +@FeignClient(name="microservice-commandes", url="localhost:9003") +public interface MicroServiceCommandeProxy { + + @GetMapping(value ="/commandes/{id}") + Optional recupererUneCommande(@PathVariable int id); + + @PutMapping(value = "/commandes") + void modifierCommande(@RequestBody CommandeBean commande); +} diff --git a/microservice-paiement/src/main/java/com/mpaiement/web/controller/PaiementController.java b/microservice-paiement/src/main/java/com/mpaiement/web/controller/PaiementController.java index 6a126bd8..5834adeb 100644 --- a/microservice-paiement/src/main/java/com/mpaiement/web/controller/PaiementController.java +++ b/microservice-paiement/src/main/java/com/mpaiement/web/controller/PaiementController.java @@ -1,43 +1,53 @@ package com.mpaiement.web.controller; +import com.mpaiement.bean.CommandeBean; import com.mpaiement.dao.PaiementDao; import com.mpaiement.model.Paiement; +import com.mpaiement.proxies.MicroServiceCommandeProxy; import com.mpaiement.web.exceptions.PaiementExistantException; import com.mpaiement.web.exceptions.PaiementImpossibleException; +import net.bytebuddy.asm.Advice; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.util.Optional; + @RestController public class PaiementController { @Autowired PaiementDao paiementDao; + @Autowired + MicroServiceCommandeProxy microServiceCommandeProxy; @PostMapping(value = "/paiement") - public ResponseEntity payerUneCommande(@RequestBody Paiement paiement){ - + public ResponseEntity payerUneCommande(@RequestBody Paiement paiement) { //Vérifions s'il y a déjà un paiement enregistré pour cette commande - Paiement paiementExistant = paiementDao.findByidCommande(paiement.getIdCommande()); - if(paiementExistant != null) throw new PaiementExistantException("Cette commande est déjà payée"); + Paiement paiementExistant = paiementDao.findByIdCommande(paiement.getIdCommande()); + if (paiementExistant != null ) { + throw new PaiementExistantException("Cette commande est déjà payée"); + } + + Optional commandeBean = microServiceCommandeProxy.recupererUneCommande(paiement.getIdCommande()); + CommandeBean commande = (commandeBean.isPresent()) ? commandeBean.get() : null; //Enregistrer le paiement Paiement nouveauPaiement = paiementDao.save(paiement); - - - if(nouveauPaiement == null) throw new PaiementImpossibleException("Erreur, impossible d'établir le paiement, réessayez plus tard"); - - + if (nouveauPaiement == null && commande!=null) { + commande.setCommandePayee(false); + throw new PaiementImpossibleException("Erreur, impossible d'établir le paiement, réessayez plus tard"); + } //TODO Nous allons appeler le Microservice Commandes ici pour lui signifier que le paiement est accepté + commande.setCommandePayee(true); + microServiceCommandeProxy.modifierCommande(commande); return new ResponseEntity(nouveauPaiement, HttpStatus.CREATED); } - - } diff --git a/microservice-paiement/src/main/resources/application.properties b/microservice-paiement/src/main/resources/application.properties index bc316dd2..a84151b9 100644 --- a/microservice-paiement/src/main/resources/application.properties +++ b/microservice-paiement/src/main/resources/application.properties @@ -1,9 +1,9 @@ +spring.application.name=microservice-paiement -server.port 9003 - +server.port 9004 #Configurations H2 spring.jpa.show-sql=true spring.h2.console.enabled=true - +spring.datasource.url=jdbc:h2:mem:mpaiementdb #défini l'encodage pour data.sql spring.datasource.sql-script-encoding=UTF-8 \ No newline at end of file diff --git a/microservice-paiement/src/test/java/com/mpaiement/MpaiementApplicationTests.java b/microservice-paiement/src/test/java/com/mpaiement/MpaiementApplicationTests.java index 5da814f7..f48e9f6f 100644 --- a/microservice-paiement/src/test/java/com/mpaiement/MpaiementApplicationTests.java +++ b/microservice-paiement/src/test/java/com/mpaiement/MpaiementApplicationTests.java @@ -1,16 +1,13 @@ package com.mpaiement; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; -@RunWith(SpringRunner.class) @SpringBootTest public class MpaiementApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } diff --git a/microservice-produits/pom.xml b/microservice-produits/pom.xml index b0c92092..03123359 100644 --- a/microservice-produits/pom.xml +++ b/microservice-produits/pom.xml @@ -1,62 +1,68 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.mproduits - mproduits - 0.0.1-SNAPSHOT - jar + com.mproduits + mproduits + 0.0.1-SNAPSHOT + jar - mproduits - Microservice de gestion des produits + mproduits + Microservice de gestion des produits - - org.springframework.boot - spring-boot-starter-parent - 2.0.0.RELEASE - - + + org.springframework.boot + spring-boot-starter-parent + 2.3.4.RELEASE + + - - UTF-8 - UTF-8 - 1.8 - + + UTF-8 + UTF-8 + 1.8 + - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - - - com.h2database - h2 - runtime - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + com.h2database + h2 + runtime + + + javax.xml.bind + jaxb-api + 2.3.1 + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/microservice-produits/src/main/java/com/mproduits/MproduitsApplication.java b/microservice-produits/src/main/java/com/mproduits/MproduitsApplication.java index 3f9132c4..a532db1e 100644 --- a/microservice-produits/src/main/java/com/mproduits/MproduitsApplication.java +++ b/microservice-produits/src/main/java/com/mproduits/MproduitsApplication.java @@ -6,7 +6,7 @@ @SpringBootApplication public class MproduitsApplication { - public static void main(String[] args) { - SpringApplication.run(MproduitsApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(MproduitsApplication.class, args); + } } diff --git a/microservice-produits/src/main/java/com/mproduits/dao/ProductDao.java b/microservice-produits/src/main/java/com/mproduits/dao/ProductDao.java index 7a032800..1d2f6482 100644 --- a/microservice-produits/src/main/java/com/mproduits/dao/ProductDao.java +++ b/microservice-produits/src/main/java/com/mproduits/dao/ProductDao.java @@ -6,5 +6,5 @@ @Repository -public interface ProductDao extends JpaRepository{ +public interface ProductDao extends JpaRepository { } diff --git a/microservice-produits/src/main/java/com/mproduits/model/Product.java b/microservice-produits/src/main/java/com/mproduits/model/Product.java index 97f1dba3..659e60b6 100644 --- a/microservice-produits/src/main/java/com/mproduits/model/Product.java +++ b/microservice-produits/src/main/java/com/mproduits/model/Product.java @@ -1,9 +1,6 @@ package com.mproduits.model; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import javax.persistence.*; @Entity public class Product { diff --git a/microservice-produits/src/main/java/com/mproduits/web/controller/ProductController.java b/microservice-produits/src/main/java/com/mproduits/web/controller/ProductController.java index 23bdf514..7d87d35b 100644 --- a/microservice-produits/src/main/java/com/mproduits/web/controller/ProductController.java +++ b/microservice-produits/src/main/java/com/mproduits/web/controller/ProductController.java @@ -19,23 +19,23 @@ public class ProductController { // Affiche la liste de tous les produits disponibles @GetMapping(value = "/Produits") - public List listeDesProduits(){ + public List listeDesProduits() { List products = productDao.findAll(); - if(products.isEmpty()) throw new ProductNotFoundException("Aucun produit n'est disponible à la vente"); - + if (products.isEmpty()) throw new ProductNotFoundException("Aucun produit n'est disponible à la vente"); return products; } //Récuperer un produit par son id - @GetMapping( value = "/Produits/{id}") + @GetMapping(value = "/Produits/{id}") public Optional recupererUnProduit(@PathVariable int id) { Optional product = productDao.findById(id); - if(!product.isPresent()) throw new ProductNotFoundException("Le produit correspondant à l'id " + id + " n'existe pas"); + if (!product.isPresent()) + throw new ProductNotFoundException("Le produit correspondant à l'id " + id + " n'existe pas"); return product; } diff --git a/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java b/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java index 3572f58e..c3f2ecdf 100644 --- a/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java +++ b/microservice-produits/src/main/java/com/mproduits/web/exceptions/ProductNotFoundException.java @@ -6,7 +6,6 @@ @ResponseStatus(HttpStatus.NOT_FOUND) public class ProductNotFoundException extends RuntimeException { - public ProductNotFoundException(String message) { super(message); } diff --git a/microservice-produits/src/main/resources/application.properties b/microservice-produits/src/main/resources/application.properties index 4d87d838..725215e6 100644 --- a/microservice-produits/src/main/resources/application.properties +++ b/microservice-produits/src/main/resources/application.properties @@ -1,9 +1,9 @@ +spring.application.name=microservice-produits -server.port 9001 - +server.port 9002 #Configurations H2 spring.jpa.show-sql=true spring.h2.console.enabled=true - +spring.datasource.url=jdbc:h2:mem:mproduitsdb #défini l'encodage pour data.sql spring.datasource.sql-script-encoding=UTF-8 \ No newline at end of file diff --git a/microservice-produits/src/test/java/com/mproduits/MproduitsApplicationTests.java b/microservice-produits/src/test/java/com/mproduits/MproduitsApplicationTests.java index 32bd4cce..ecbe138c 100644 --- a/microservice-produits/src/test/java/com/mproduits/MproduitsApplicationTests.java +++ b/microservice-produits/src/test/java/com/mproduits/MproduitsApplicationTests.java @@ -1,16 +1,13 @@ package com.mproduits; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; -@RunWith(SpringRunner.class) @SpringBootTest public class MproduitsApplicationTests { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } }