diff --git a/spring-cloud-modules/spring-cloud-aws-v3/.gitignore b/spring-cloud-modules/spring-cloud-aws-v3/.gitignore new file mode 100644 index 0000000000..549e00a2a9 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/.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/spring-cloud-modules/spring-cloud-aws-v3/.mvn/wrapper/maven-wrapper.jar b/spring-cloud-modules/spring-cloud-aws-v3/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000..cb28b0e37c Binary files /dev/null and b/spring-cloud-modules/spring-cloud-aws-v3/.mvn/wrapper/maven-wrapper.jar differ diff --git a/spring-cloud-modules/spring-cloud-aws-v3/.mvn/wrapper/maven-wrapper.properties b/spring-cloud-modules/spring-cloud-aws-v3/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000..5f0536eb74 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/spring-cloud-modules/spring-cloud-aws-v3/mvnw b/spring-cloud-modules/spring-cloud-aws-v3/mvnw new file mode 100755 index 0000000000..66df285428 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/mvnw @@ -0,0 +1,308 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "$(uname)" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin ; then + javaHome="$(dirname "\"$javaExecutable\"")" + javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "\"$javaExecutable\"")" + fi + javaHome="$(dirname "\"$javaExecutable\"")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$(cd "$wdir/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +fi + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/spring-cloud-modules/spring-cloud-aws-v3/mvnw.cmd b/spring-cloud-modules/spring-cloud-aws-v3/mvnw.cmd new file mode 100644 index 0000000000..95ba6f54ac --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/mvnw.cmd @@ -0,0 +1,205 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/spring-cloud-modules/spring-cloud-aws-v3/pom.xml b/spring-cloud-modules/spring-cloud-aws-v3/pom.xml index 7c020ae8a3..2a075af200 100644 --- a/spring-cloud-modules/spring-cloud-aws-v3/pom.xml +++ b/spring-cloud-modules/spring-cloud-aws-v3/pom.xml @@ -1,14 +1,18 @@ - + 4.0.0 - com.baeldung.spring.cloud + + org.springframework.boot + spring-boot-starter-parent + 3.2.2 + + + com.baeldung.spring.cloud.aws.sqs spring-cloud-aws-v3 0.0.1-SNAPSHOT spring-cloud-aws-v3 - jar - Spring Cloud AWS Examples + spring-cloud-aws-v3 @@ -55,14 +59,29 @@ awaitility test - + + org.assertj + assertj-core + test + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + - com.baeldung.spring.cloud.aws.SpringCloudAwsApplication + com.baeldung.spring.cloud.aws.sqs.SpringCloudAwsApplication 3.1.0 + 3.1.0 17 17 + 17 - \ No newline at end of file + diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/OrderProcessingApplication.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/OrderProcessingApplication.java new file mode 100644 index 0000000000..58da5f44ba --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/OrderProcessingApplication.java @@ -0,0 +1,16 @@ +package com.baeldung.spring.cloud.aws.sqs.acknowledgement; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Profile; + +@SpringBootApplication +public class OrderProcessingApplication { + + public static void main(String[] args) { + SpringApplication app = new SpringApplication(OrderProcessingApplication.class); + app.setAdditionalProfiles("acknowledgement"); + app.run(args); + } + +} diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/configuration/EventsQueuesProperties.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/configuration/EventsQueuesProperties.java new file mode 100644 index 0000000000..5046f9223b --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/configuration/EventsQueuesProperties.java @@ -0,0 +1,37 @@ +package com.baeldung.spring.cloud.aws.sqs.acknowledgement.configuration; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "events.queues") +public class EventsQueuesProperties { + + private String orderProcessingRetryQueue; + + private String orderProcessingAsyncQueue; + + private String orderProcessingNoRetriesQueue; + + public String getOrderProcessingRetryQueue() { + return orderProcessingRetryQueue; + } + + public void setOrderProcessingRetryQueue(String orderProcessingRetryQueue) { + this.orderProcessingRetryQueue = orderProcessingRetryQueue; + } + + public String getOrderProcessingAsyncQueue() { + return orderProcessingAsyncQueue; + } + + public void setOrderProcessingAsyncQueue(String orderProcessingAsyncQueue) { + this.orderProcessingAsyncQueue = orderProcessingAsyncQueue; + } + + public String getOrderProcessingNoRetriesQueue() { + return orderProcessingNoRetriesQueue; + } + + public void setOrderProcessingNoRetriesQueue(String orderProcessingNoRetriesQueue) { + this.orderProcessingNoRetriesQueue = orderProcessingNoRetriesQueue; + } +} \ No newline at end of file diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/configuration/OrderProcessingConfiguration.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/configuration/OrderProcessingConfiguration.java new file mode 100644 index 0000000000..516bb99b2a --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/configuration/OrderProcessingConfiguration.java @@ -0,0 +1,10 @@ +package com.baeldung.spring.cloud.aws.sqs.acknowledgement.configuration; + +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@EnableConfigurationProperties({ EventsQueuesProperties.class, ProductIdProperties.class}) +@Configuration +public class OrderProcessingConfiguration { + +} diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/configuration/ProductIdProperties.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/configuration/ProductIdProperties.java new file mode 100644 index 0000000000..615d4a95a6 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/configuration/ProductIdProperties.java @@ -0,0 +1,40 @@ +package com.baeldung.spring.cloud.aws.sqs.acknowledgement.configuration; + +import java.util.UUID; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("product.id") +public class ProductIdProperties { + + private UUID smartphone; + + private UUID wirelessHeadphones; + + private UUID laptop; + + public UUID getSmartphone() { + return smartphone; + } + + public void setSmartphone(UUID smartphone) { + this.smartphone = smartphone; + } + + public UUID getWirelessHeadphones() { + return wirelessHeadphones; + } + + public void setWirelessHeadphones(UUID wirelessHeadphones) { + this.wirelessHeadphones = wirelessHeadphones; + } + + public UUID getLaptop() { + return laptop; + } + + public void setLaptop(UUID laptop) { + this.laptop = laptop; + } + +} diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/exception/OutOfStockException.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/exception/OutOfStockException.java new file mode 100644 index 0000000000..e4bd0ff54c --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/exception/OutOfStockException.java @@ -0,0 +1,8 @@ +package com.baeldung.spring.cloud.aws.sqs.acknowledgement.exception; + +public class OutOfStockException extends RuntimeException { + + public OutOfStockException(String errorMessage) { + super(errorMessage); + } +} diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/exception/ProductNotFoundException.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/exception/ProductNotFoundException.java new file mode 100644 index 0000000000..a184e1707b --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/exception/ProductNotFoundException.java @@ -0,0 +1,8 @@ +package com.baeldung.spring.cloud.aws.sqs.acknowledgement.exception; + +public class ProductNotFoundException extends RuntimeException { + + public ProductNotFoundException(String errorMessage) { + super(errorMessage); + } +} diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/listener/OrderProcessingListeners.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/listener/OrderProcessingListeners.java new file mode 100644 index 0000000000..12e1d64e6b --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/listener/OrderProcessingListeners.java @@ -0,0 +1,65 @@ +package com.baeldung.spring.cloud.aws.sqs.acknowledgement.listener; + +import java.util.concurrent.CompletableFuture; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import com.baeldung.spring.cloud.aws.sqs.acknowledgement.model.OrderCreatedEvent; +import com.baeldung.spring.cloud.aws.sqs.acknowledgement.model.OrderStatus; +import com.baeldung.spring.cloud.aws.sqs.acknowledgement.service.OrderService; +import com.baeldung.spring.cloud.aws.sqs.acknowledgement.service.InventoryService; + +import io.awspring.cloud.sqs.annotation.SqsListener; +import io.awspring.cloud.sqs.annotation.SqsListenerAcknowledgementMode; +import io.awspring.cloud.sqs.listener.acknowledgement.Acknowledgement; + +@Component +public class OrderProcessingListeners { + + private static final Logger logger = LoggerFactory.getLogger(OrderProcessingListeners.class); + + private final InventoryService inventoryService; + + private final OrderService orderService; + + public OrderProcessingListeners(InventoryService inventoryService, OrderService orderService) { + this.inventoryService = inventoryService; + this.orderService = orderService; + } + + @SqsListener(value = "${events.queues.order-processing-retry-queue}", id = "retry-order-processing-container", messageVisibilitySeconds = "1") + public void stockCheckRetry(OrderCreatedEvent orderCreatedEvent) { + logger.info("Message received: {}", orderCreatedEvent); + + orderService.updateOrderStatus(orderCreatedEvent.id(), OrderStatus.PROCESSING); + inventoryService.checkInventory(orderCreatedEvent.productId(), orderCreatedEvent.quantity()); + orderService.updateOrderStatus(orderCreatedEvent.id(), OrderStatus.PROCESSED); + logger.info("Message processed successfully: {}", orderCreatedEvent); + } + + @SqsListener(value = "${events.queues.order-processing-async-queue}", acknowledgementMode = SqsListenerAcknowledgementMode.MANUAL, id = "async-order-processing-container", messageVisibilitySeconds = "3") + public void slowStockCheckAsynchronous(OrderCreatedEvent orderCreatedEvent, Acknowledgement acknowledgement) { + logger.info("Message received: {}", orderCreatedEvent); + + orderService.updateOrderStatus(orderCreatedEvent.id(), OrderStatus.PROCESSING); + CompletableFuture.runAsync(() -> inventoryService.slowCheckInventory(orderCreatedEvent.productId(), orderCreatedEvent.quantity())) + .thenRun(() -> orderService.updateOrderStatus(orderCreatedEvent.id(), OrderStatus.PROCESSED)) + .thenCompose(voidFuture -> acknowledgement.acknowledgeAsync()) + .thenRun(() -> logger.info("Message for order {} acknowledged", orderCreatedEvent.id())); + + logger.info("Releasing processing thread."); + } + + @SqsListener(value = "${events.queues.order-processing-no-retries-queue}", acknowledgementMode = "${events.acknowledgment.order-processing-no-retries-queue}", id = "no-retries-order-processing-container", messageVisibilitySeconds = "3") + public void stockCheckNoRetries(OrderCreatedEvent orderCreatedEvent) { + logger.info("Message received: {}", orderCreatedEvent); + + // Fire and forget scenario where we're not interested on the outcome, e.g. a sales event with limited inventory. + orderService.updateOrderStatus(orderCreatedEvent.id(), OrderStatus.RECEIVED); + inventoryService.checkInventory(orderCreatedEvent.productId(), orderCreatedEvent.quantity()); + logger.info("Message processed: {}", orderCreatedEvent); + } + +} diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/model/OrderCreatedEvent.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/model/OrderCreatedEvent.java new file mode 100644 index 0000000000..12e82594a1 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/model/OrderCreatedEvent.java @@ -0,0 +1,7 @@ +package com.baeldung.spring.cloud.aws.sqs.acknowledgement.model; + +import java.util.UUID; + +public record OrderCreatedEvent(UUID id, UUID productId, int quantity) { + +} diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/model/OrderStatus.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/model/OrderStatus.java new file mode 100644 index 0000000000..74daddf526 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/model/OrderStatus.java @@ -0,0 +1,15 @@ +package com.baeldung.spring.cloud.aws.sqs.acknowledgement.model; + +public enum OrderStatus { + + RECEIVED, + + PROCESSING, + + PROCESSED, + + ERROR, + + UNKNOWN + +} diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/service/InventoryService.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/service/InventoryService.java new file mode 100644 index 0000000000..7d708ae2b2 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/service/InventoryService.java @@ -0,0 +1,62 @@ +package com.baeldung.spring.cloud.aws.sqs.acknowledgement.service; + +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +import org.springframework.beans.factory.InitializingBean; +import org.springframework.stereotype.Service; + +import com.baeldung.spring.cloud.aws.sqs.acknowledgement.configuration.ProductIdProperties; +import com.baeldung.spring.cloud.aws.sqs.acknowledgement.exception.OutOfStockException; +import com.baeldung.spring.cloud.aws.sqs.acknowledgement.exception.ProductNotFoundException; + +@Service +public class InventoryService implements InitializingBean { + + private final ProductIdProperties productIdProperties; + + // Using a Map to simulate storage + private Map inventory; + + public InventoryService(ProductIdProperties productIdProperties) { + this.productIdProperties = productIdProperties; + } + + @Override + public void afterPropertiesSet() { + this.inventory = new ConcurrentHashMap<>(Map.of(productIdProperties.getSmartphone(), 10, + productIdProperties.getWirelessHeadphones(), 15, + productIdProperties.getLaptop(), 5)); + } + + public void checkInventory(UUID productId, int quantity) { + Integer stock = inventory.get(productId); + if (stock == null) { + throw new ProductNotFoundException("Product with id %s not found in Inventory".formatted(productId)); + } + if (stock < quantity) { + // Simulate Stock Replenishment for Retries + inventory.put(productId, stock + (int) (Math.random() * 5)); + throw new OutOfStockException( + "Product with id %s is out of stock. Quantity requested: %s ".formatted(productId, quantity)); + } + // Decrease inventory + inventory.put(productId, stock - quantity); + } + + public void slowCheckInventory(UUID productId, int quantity) { + simulateBusyConnection(); + checkInventory(productId, quantity); + } + + private void simulateBusyConnection() { + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new RuntimeException(e); + } + } + +} diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/service/OrderService.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/service/OrderService.java new file mode 100644 index 0000000000..a5840a0be4 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/service/OrderService.java @@ -0,0 +1,24 @@ +package com.baeldung.spring.cloud.aws.sqs.acknowledgement.service; + +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + +import org.springframework.stereotype.Service; + +import com.baeldung.spring.cloud.aws.sqs.acknowledgement.model.OrderStatus; + +@Service +public class OrderService { + + Map ORDER_STATUS_STORAGE = new ConcurrentHashMap<>(); + + public void updateOrderStatus(UUID orderId, OrderStatus status) { + ORDER_STATUS_STORAGE.put(orderId, status); + } + + public OrderStatus getOrderStatus(UUID orderId) { + return ORDER_STATUS_STORAGE.getOrDefault(orderId, OrderStatus.UNKNOWN); + } + +} diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/EventQueuesProperties.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/EventQueuesProperties.java similarity index 94% rename from spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/EventQueuesProperties.java rename to spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/EventQueuesProperties.java index d3631c39fa..b2df8d5a50 100644 --- a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/EventQueuesProperties.java +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/EventQueuesProperties.java @@ -1,4 +1,4 @@ -package com.baeldung.spring.cloud.aws.sqs; +package com.baeldung.spring.cloud.aws.sqs.introduction; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/User.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/User.java similarity index 52% rename from spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/User.java rename to spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/User.java index 43b538f24d..a630bb8f83 100644 --- a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/User.java +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/User.java @@ -1,4 +1,4 @@ -package com.baeldung.spring.cloud.aws.sqs; +package com.baeldung.spring.cloud.aws.sqs.introduction; public record User(String id, String name, String email) { diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/UserCreatedEvent.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/UserCreatedEvent.java similarity index 58% rename from spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/UserCreatedEvent.java rename to spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/UserCreatedEvent.java index 242ddfa20d..507cbe8602 100644 --- a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/UserCreatedEvent.java +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/UserCreatedEvent.java @@ -1,4 +1,4 @@ -package com.baeldung.spring.cloud.aws.sqs; +package com.baeldung.spring.cloud.aws.sqs.introduction; public record UserCreatedEvent(String id, String username, String email) { diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/UserEventListeners.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/UserEventListeners.java similarity index 97% rename from spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/UserEventListeners.java rename to spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/UserEventListeners.java index 50cff6e9bb..f5ec791e36 100644 --- a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/UserEventListeners.java +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/UserEventListeners.java @@ -1,4 +1,4 @@ -package com.baeldung.spring.cloud.aws.sqs; +package com.baeldung.spring.cloud.aws.sqs.introduction; import static io.awspring.cloud.sqs.listener.SqsHeaders.MessageSystemAttributes.SQS_APPROXIMATE_FIRST_RECEIVE_TIMESTAMP; diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/UserRepository.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/UserRepository.java similarity index 92% rename from spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/UserRepository.java rename to spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/UserRepository.java index c42352dc53..573693ed8b 100644 --- a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/UserRepository.java +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/UserRepository.java @@ -1,4 +1,4 @@ -package com.baeldung.spring.cloud.aws.sqs; +package com.baeldung.spring.cloud.aws.sqs.introduction; import java.util.Map; import java.util.Optional; diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/UserServiceApplication.java similarity index 50% rename from spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java rename to spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/UserServiceApplication.java index ece8a72cbb..e68a7001cc 100644 --- a/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/java/com/baeldung/spring/cloud/aws/sqs/introduction/UserServiceApplication.java @@ -1,17 +1,19 @@ -package com.baeldung.spring.cloud.aws; +package com.baeldung.spring.cloud.aws.sqs.introduction; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import com.baeldung.spring.cloud.aws.sqs.EventQueuesProperties; +import com.baeldung.spring.cloud.aws.sqs.acknowledgement.OrderProcessingApplication; @SpringBootApplication @EnableConfigurationProperties(EventQueuesProperties.class) -public class SpringCloudAwsApplication { +public class UserServiceApplication { public static void main(String[] args) { - SpringApplication.run(SpringCloudAwsApplication.class, args); + SpringApplication app = new SpringApplication(OrderProcessingApplication.class); + app.setAdditionalProfiles("introduction"); + app.run(args); } } diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/resources/application-acknowledgement.yaml b/spring-cloud-modules/spring-cloud-aws-v3/src/main/resources/application-acknowledgement.yaml new file mode 100644 index 0000000000..62ac78812f --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/main/resources/application-acknowledgement.yaml @@ -0,0 +1,13 @@ +events: + queues: + order-processing-retry-queue: order_processing_retry_queue + order-processing-async-queue: order_processing_async_queue + order-processing-no-retries-queue: order_processing_no_retries_queue + acknowledgment: + order-processing-no-retries-queue: ALWAYS + +product: + id: + smartphone: 123e4567-e89b-12d3-a456-426614174000 + wireless-headphones: 123e4567-e89b-12d3-a456-426614174001 + laptop: 123e4567-e89b-12d3-a456-426614174002 diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/main/resources/application.yaml b/spring-cloud-modules/spring-cloud-aws-v3/src/main/resources/application-introduction.yaml similarity index 100% rename from spring-cloud-modules/spring-cloud-aws-v3/src/main/resources/application.yaml rename to spring-cloud-modules/spring-cloud-aws-v3/src/main/resources/application-introduction.yaml diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/test/java/com/baeldung/spring/cloud/aws/sqs/BaseSqsIntegrationTest.java b/spring-cloud-modules/spring-cloud-aws-v3/src/test/java/com/baeldung/spring/cloud/aws/sqs/BaseSqsLiveTest.java similarity index 87% rename from spring-cloud-modules/spring-cloud-aws-v3/src/test/java/com/baeldung/spring/cloud/aws/sqs/BaseSqsIntegrationTest.java rename to spring-cloud-modules/spring-cloud-aws-v3/src/test/java/com/baeldung/spring/cloud/aws/sqs/BaseSqsLiveTest.java index 6fd4dedbb0..bf7e69338a 100644 --- a/spring-cloud-modules/spring-cloud-aws-v3/src/test/java/com/baeldung/spring/cloud/aws/sqs/BaseSqsIntegrationTest.java +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/test/java/com/baeldung/spring/cloud/aws/sqs/BaseSqsLiveTest.java @@ -2,7 +2,6 @@ package com.baeldung.spring.cloud.aws.sqs; import static org.testcontainers.containers.localstack.LocalStackContainer.Service.SQS; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; import org.testcontainers.containers.localstack.LocalStackContainer; @@ -10,9 +9,8 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.utility.DockerImageName; -@SpringBootTest @Testcontainers -public class BaseSqsIntegrationTest { +public class BaseSqsLiveTest { private static final String LOCAL_STACK_VERSION = "localstack/localstack:2.3.2"; @@ -26,7 +24,6 @@ public class BaseSqsIntegrationTest { registry.add("spring.cloud.aws.credentials.secret-key", () -> localStack.getSecretKey()); registry.add("spring.cloud.aws.sqs.endpoint", () -> localStack.getEndpointOverride(SQS) .toString()); - // ...other AWS services endpoints can be added here } } diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/test/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/OrderProcessingApplicationLiveTest.java b/spring-cloud-modules/spring-cloud-aws-v3/src/test/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/OrderProcessingApplicationLiveTest.java new file mode 100644 index 0000000000..7e283f6639 --- /dev/null +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/test/java/com/baeldung/spring/cloud/aws/sqs/acknowledgement/OrderProcessingApplicationLiveTest.java @@ -0,0 +1,99 @@ +package com.baeldung.spring.cloud.aws.sqs.acknowledgement; + +import static org.assertj.core.api.Assertions.assertThat; + +import java.time.Duration; +import java.util.Objects; +import java.util.UUID; + +import org.awaitility.Awaitility; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; + +import com.baeldung.spring.cloud.aws.sqs.BaseSqsLiveTest; +import com.baeldung.spring.cloud.aws.sqs.acknowledgement.configuration.EventsQueuesProperties; +import com.baeldung.spring.cloud.aws.sqs.acknowledgement.configuration.ProductIdProperties; +import com.baeldung.spring.cloud.aws.sqs.acknowledgement.model.OrderCreatedEvent; +import com.baeldung.spring.cloud.aws.sqs.acknowledgement.model.OrderStatus; +import com.baeldung.spring.cloud.aws.sqs.acknowledgement.service.OrderService; + +import io.awspring.cloud.sqs.listener.MessageListenerContainerRegistry; +import io.awspring.cloud.sqs.operations.SqsTemplate; + +@ActiveProfiles("acknowledgement") +@SpringBootTest +class OrderProcessingApplicationLiveTest extends BaseSqsLiveTest { + + private static final Logger logger = LoggerFactory.getLogger(OrderProcessingApplicationLiveTest.class); + + @Autowired + private EventsQueuesProperties eventsQueuesProperties; + + @Autowired + private ProductIdProperties productIdProperties; + + @Autowired + private SqsTemplate sqsTemplate; + + @Autowired + private OrderService orderService; + + @Autowired + private MessageListenerContainerRegistry registry; + + @Test + public void givenOnSuccessAcknowledgementMode_whenProcessingThrows_shouldRetry() { + var orderId = UUID.randomUUID(); + var queueName = eventsQueuesProperties.getOrderProcessingRetryQueue(); + sqsTemplate.send(queueName, new OrderCreatedEvent(orderId, productIdProperties.getLaptop(), 10)); + Awaitility.await() + .atMost(Duration.ofMinutes(1)) + .until(() -> orderService.getOrderStatus(orderId) + .equals(OrderStatus.PROCESSED)); + assertQueueIsEmpty(queueName, "retry-order-processing-container"); + } + + @Test + public void givenManualAcknowledgementMode_whenManuallyAcknowledge_shouldAcknowledge() { + var orderId = UUID.randomUUID(); + var queueName = eventsQueuesProperties.getOrderProcessingAsyncQueue(); + sqsTemplate.send(queueName, new OrderCreatedEvent(orderId, productIdProperties.getSmartphone(), 1)); + Awaitility.await() + .atMost(Duration.ofMinutes(1)) + .until(() -> orderService.getOrderStatus(orderId) + .equals(OrderStatus.PROCESSED)); + assertQueueIsEmpty(queueName, "async-order-processing-container"); + } + + @Test + public void givenAlwaysAcknowledgementMode_whenProcessThrows_shouldAcknowledge() { + var orderId = UUID.randomUUID(); + var queueName = eventsQueuesProperties.getOrderProcessingNoRetriesQueue(); + sqsTemplate.send(queueName, new OrderCreatedEvent(orderId, productIdProperties.getWirelessHeadphones(), 20)); + Awaitility.await() + .atMost(Duration.ofMinutes(1)) + .until(() -> orderService.getOrderStatus(orderId) + .equals(OrderStatus.RECEIVED)); + assertQueueIsEmpty(queueName, "no-retries-order-processing-container"); + } + + private void assertQueueIsEmpty(String queueName, String containerId) { + // Stop the listener so it doesn't pick the message again if it's still there + logger.info("Stopping container {}", containerId); + var container = Objects + .requireNonNull(registry.getContainerById(containerId), () -> "could not find container " + containerId); + container.stop(); + // Look for messages in the queue + logger.info("Checking for messages in queue {}", queueName); + var message = sqsTemplate.receive(from -> from.queue(queueName) + // Polltimeout here must be set to a higher value than the message visibility set in the annotation + .pollTimeout(Duration.ofSeconds(5))); + assertThat(message).isEmpty(); + logger.info("No messages found in queue {}", queueName); + } + +} diff --git a/spring-cloud-modules/spring-cloud-aws-v3/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudAwsSQSLiveTest.java b/spring-cloud-modules/spring-cloud-aws-v3/src/test/java/com/baeldung/spring/cloud/aws/sqs/introduction/SpringCloudAwsSQSLiveTest.java similarity index 84% rename from spring-cloud-modules/spring-cloud-aws-v3/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudAwsSQSLiveTest.java rename to spring-cloud-modules/spring-cloud-aws-v3/src/test/java/com/baeldung/spring/cloud/aws/sqs/introduction/SpringCloudAwsSQSLiveTest.java index 9248c77385..114d6bcaf5 100644 --- a/spring-cloud-modules/spring-cloud-aws-v3/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudAwsSQSLiveTest.java +++ b/spring-cloud-modules/spring-cloud-aws-v3/src/test/java/com/baeldung/spring/cloud/aws/sqs/introduction/SpringCloudAwsSQSLiveTest.java @@ -1,6 +1,6 @@ -package com.baeldung.spring.cloud.aws.sqs; +package com.baeldung.spring.cloud.aws.sqs.introduction; -import static com.baeldung.spring.cloud.aws.sqs.UserEventListeners.EVENT_TYPE_CUSTOM_HEADER; +import static com.baeldung.spring.cloud.aws.sqs.introduction.UserEventListeners.EVENT_TYPE_CUSTOM_HEADER; import static org.awaitility.Awaitility.await; import java.time.Duration; @@ -11,10 +11,16 @@ import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; + +import com.baeldung.spring.cloud.aws.sqs.BaseSqsLiveTest; import io.awspring.cloud.sqs.operations.SqsTemplate; -public class SpringCloudAwsSQSLiveTest extends BaseSqsIntegrationTest { +@ActiveProfiles("introduction") +@SpringBootTest +public class SpringCloudAwsSQSLiveTest extends BaseSqsLiveTest { private static final Logger logger = LoggerFactory.getLogger(SpringCloudAwsSQSLiveTest.class); diff --git a/spring-cloud-modules/spring-cloud-aws/pom.xml b/spring-cloud-modules/spring-cloud-aws/pom.xml index 3de0c7146a..24e8f45ee5 100644 --- a/spring-cloud-modules/spring-cloud-aws/pom.xml +++ b/spring-cloud-modules/spring-cloud-aws/pom.xml @@ -75,7 +75,7 @@ - com.baeldung.spring.cloud.aws.SpringCloudAwsApplication + com.baeldung.spring.cloud.aws.sqs.SpringCloudAwsApplication Dalston.SR4 2.2.1.RELEASE