diff --git a/clientui/pom.xml b/clientui/pom.xml index 65155ba..4c35366 100644 --- a/clientui/pom.xml +++ b/clientui/pom.xml @@ -46,6 +46,10 @@ spring-cloud-starter-openfeign + + org.springframework.cloud + spring-cloud-starter-config + org.springframework.boot diff --git a/clientui/src/main/resources/bootstrap.properties b/clientui/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..8648d88 --- /dev/null +++ b/clientui/src/main/resources/bootstrap.properties @@ -0,0 +1,3 @@ +spring.application.name=microservice-clientui + +spring.cloud.config.uri=http://localhost:9101 \ No newline at end of file diff --git a/config-server/.gitignore b/config-server/.gitignore new file mode 100644 index 0000000..2af7cef --- /dev/null +++ b/config-server/.gitignore @@ -0,0 +1,24 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/config-server/.mvn/wrapper/maven-wrapper.jar b/config-server/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..9cc84ea Binary files /dev/null and b/config-server/.mvn/wrapper/maven-wrapper.jar differ diff --git a/config-server/.mvn/wrapper/maven-wrapper.properties b/config-server/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..b573bb5 --- /dev/null +++ b/config-server/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.3/apache-maven-3.5.3-bin.zip diff --git a/config-server/mvnw b/config-server/mvnw new file mode 100755 index 0000000..5bf251c --- /dev/null +++ b/config-server/mvnw @@ -0,0 +1,225 @@ +#!/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 +# +# http://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 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 Migwn, 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)`" + # TODO classpath? +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 + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +echo $MAVEN_PROJECTBASEDIR +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 + +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/config-server/mvnw.cmd b/config-server/mvnw.cmd new file mode 100644 index 0000000..019bd74 --- /dev/null +++ b/config-server/mvnw.cmd @@ -0,0 +1,143 @@ +@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 http://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 Maven2 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 key stroke 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 enable echoing my 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 + +%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/config-server/pom.xml b/config-server/pom.xml new file mode 100644 index 0000000..ae2ec45 --- /dev/null +++ b/config-server/pom.xml @@ -0,0 +1,74 @@ + + + 4.0.0 + + com.mcommerce + config-server + 0.0.1-SNAPSHOT + jar + + config-server + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 2.0.0.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + Finchley.M8 + + + + + org.springframework.cloud + spring-cloud-config-server + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + diff --git a/config-server/src/main/java/com/mcommerce/configserver/ConfigServerApplication.java b/config-server/src/main/java/com/mcommerce/configserver/ConfigServerApplication.java new file mode 100644 index 0000000..e18b08d --- /dev/null +++ b/config-server/src/main/java/com/mcommerce/configserver/ConfigServerApplication.java @@ -0,0 +1,14 @@ +package com.mcommerce.configserver; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.config.server.EnableConfigServer; + +@SpringBootApplication +@EnableConfigServer +public class ConfigServerApplication { + + public static void main(String[] args) { + SpringApplication.run(ConfigServerApplication.class, args); + } +} diff --git a/config-server/src/main/resources/application.properties b/config-server/src/main/resources/application.properties new file mode 100644 index 0000000..c3c6173 --- /dev/null +++ b/config-server/src/main/resources/application.properties @@ -0,0 +1,5 @@ + +spring.application.name=config-server +server.port:9101 + +spring.cloud.config.server.git.uri=https://github.com/AmarMicroDev/mcommerce-config-repo.git \ No newline at end of file diff --git a/config-server/src/test/java/com/mcommerce/configserver/ConfigServerApplicationTests.java b/config-server/src/test/java/com/mcommerce/configserver/ConfigServerApplicationTests.java new file mode 100644 index 0000000..69c94ce --- /dev/null +++ b/config-server/src/test/java/com/mcommerce/configserver/ConfigServerApplicationTests.java @@ -0,0 +1,16 @@ +package com.mcommerce.configserver; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ConfigServerApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/microservice-commandes/pom.xml b/microservice-commandes/pom.xml index bbc5c66..07f3cc5 100644 --- a/microservice-commandes/pom.xml +++ b/microservice-commandes/pom.xml @@ -22,6 +22,7 @@ UTF-8 UTF-8 1.8 + Finchley.M8 @@ -42,6 +43,11 @@ runtime + + org.springframework.cloud + spring-cloud-starter-config + + org.springframework.boot spring-boot-starter-test @@ -49,6 +55,18 @@ + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + @@ -58,5 +76,15 @@ + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + diff --git a/microservice-commandes/src/main/resources/bootstrap.properties b/microservice-commandes/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..e04afcf --- /dev/null +++ b/microservice-commandes/src/main/resources/bootstrap.properties @@ -0,0 +1,3 @@ +spring.application.name=microservice-commandes + +spring.cloud.config.uri=http://localhost:9101 \ No newline at end of file diff --git a/microservice-paiement/pom.xml b/microservice-paiement/pom.xml index 5090803..abc405b 100644 --- a/microservice-paiement/pom.xml +++ b/microservice-paiement/pom.xml @@ -48,6 +48,11 @@ spring-cloud-starter-openfeign + + org.springframework.cloud + spring-cloud-starter-config + + org.springframework.boot spring-boot-starter-test diff --git a/microservice-paiement/src/main/resources/bootstrap.properties b/microservice-paiement/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..47c5ca4 --- /dev/null +++ b/microservice-paiement/src/main/resources/bootstrap.properties @@ -0,0 +1,3 @@ +spring.application.name=microservice-paiement + +spring.cloud.config.uri=http://localhost:9101 \ No newline at end of file diff --git a/microservice-produits/pom.xml b/microservice-produits/pom.xml index b0c9209..b9f7642 100644 --- a/microservice-produits/pom.xml +++ b/microservice-produits/pom.xml @@ -22,6 +22,7 @@ UTF-8 UTF-8 1.8 + Finchley.M8 @@ -42,6 +43,17 @@ runtime + + org.springframework.boot + spring-boot-configuration-processor + true + + + + org.springframework.cloud + spring-cloud-starter-config + + org.springframework.boot spring-boot-starter-test @@ -49,6 +61,18 @@ + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + @@ -58,5 +82,16 @@ + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + diff --git a/microservice-produits/src/main/java/com/mproduits/MproduitsApplication.java b/microservice-produits/src/main/java/com/mproduits/MproduitsApplication.java index 3f9132c..89014e7 100644 --- a/microservice-produits/src/main/java/com/mproduits/MproduitsApplication.java +++ b/microservice-produits/src/main/java/com/mproduits/MproduitsApplication.java @@ -1,9 +1,12 @@ package com.mproduits; +import com.mproduits.configurations.ApplicationPropertiesConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; @SpringBootApplication +@EnableConfigurationProperties public class MproduitsApplication { public static void main(String[] args) { diff --git a/microservice-produits/src/main/java/com/mproduits/configurations/ApplicationPropertiesConfiguration.java b/microservice-produits/src/main/java/com/mproduits/configurations/ApplicationPropertiesConfiguration.java new file mode 100644 index 0000000..ea3ffac --- /dev/null +++ b/microservice-produits/src/main/java/com/mproduits/configurations/ApplicationPropertiesConfiguration.java @@ -0,0 +1,21 @@ +package com.mproduits.configurations; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties("mes-configs") +public class ApplicationPropertiesConfiguration { + + private int limitDeProduits; + + public int getLimitDeProduits() { + return limitDeProduits; + } + + public void setLimitDeProduits(int limitDeProduits) { + this.limitDeProduits = limitDeProduits; + } +} 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 23bdf51..cdc8e11 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 @@ -1,9 +1,11 @@ package com.mproduits.web.controller; +import com.mproduits.configurations.ApplicationPropertiesConfiguration; import com.mproduits.dao.ProductDao; import com.mproduits.model.Product; import com.mproduits.web.exceptions.ProductNotFoundException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; @@ -17,6 +19,9 @@ public class ProductController { @Autowired ProductDao productDao; + @Autowired + ApplicationPropertiesConfiguration appProperties; + // Affiche la liste de tous les produits disponibles @GetMapping(value = "/Produits") public List listeDesProduits(){ @@ -25,7 +30,9 @@ public class ProductController { if(products.isEmpty()) throw new ProductNotFoundException("Aucun produit n'est disponible à la vente"); - return products; + List listeLimitee = products.subList(0, appProperties.getLimitDeProduits()); + + return listeLimitee; } diff --git a/microservice-produits/src/main/resources/application.properties b/microservice-produits/src/main/resources/application.properties deleted file mode 100644 index 03aadee..0000000 --- a/microservice-produits/src/main/resources/application.properties +++ /dev/null @@ -1,10 +0,0 @@ -spring.application.name=microservice-produits - -server.port 9001 - -#Configurations H2 -spring.jpa.show-sql=true -spring.h2.console.enabled=true - -#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/main/resources/bootstrap.properties b/microservice-produits/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..8baabbf --- /dev/null +++ b/microservice-produits/src/main/resources/bootstrap.properties @@ -0,0 +1,3 @@ +spring.application.name=microservice-produits + +spring.cloud.config.uri=http://localhost:9101 \ No newline at end of file