diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 00000000..49bd28f2 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,47 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Java CI with Maven +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v5 + - name: Set up JDK 11 + uses: actions/setup-java@v5 + with: + java-version: '11' + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: | + # Give execute permission to scripts + chmod +x mvnw + chmod +x setup.sh + chmod +x test-em-all.sh + + # Setup environment + ./setup.sh + + # Build without docker + ./mvnw clean verify -Ddockerfile.skip + + # Start docker compose services + docker compose -p ssm up -d + + # Wait for services to be ready (extra buffer) + sleep 30 + + # Run tests with increased timeouts + HOST=localhost PORT=8443 WAIT_TIME=10 RETRY_COUNT=40 ./test-em-all.sh + + # Cleanup + docker compose -p ssm down --remove-orphans \ No newline at end of file diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java deleted file mode 100644 index d6d13813..00000000 --- a/.mvn/wrapper/MavenWrapperDownloader.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * 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.util.Properties; - -public class MavenWrapperDownloader { - - private static final String WRAPPER_VERSION = "0.5.6"; - /** - * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. - */ - private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" - + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; - - /** - * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to - * use instead of the default one. - */ - private static final String MAVEN_WRAPPER_PROPERTIES_PATH = - ".mvn/wrapper/maven-wrapper.properties"; - - /** - * Path where the maven-wrapper.jar will be saved to. - */ - private static final String MAVEN_WRAPPER_JAR_PATH = - ".mvn/wrapper/maven-wrapper.jar"; - - /** - * Name of the property which should be used to override the default download url for the wrapper. - */ - private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; - - public static void main(String args[]) { - System.out.println("- Downloader started"); - File baseDirectory = new File(args[0]); - System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); - - // If the maven-wrapper.properties exists, read it and check if it contains a custom - // wrapperUrl parameter. - File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); - String url = DEFAULT_DOWNLOAD_URL; - if (mavenWrapperPropertyFile.exists()) { - FileInputStream mavenWrapperPropertyFileInputStream = null; - try { - mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); - Properties mavenWrapperProperties = new Properties(); - mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); - url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); - } catch (IOException e) { - System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); - } finally { - try { - if (mavenWrapperPropertyFileInputStream != null) { - mavenWrapperPropertyFileInputStream.close(); - } - } catch (IOException e) { - // Ignore ... - } - } - } - System.out.println("- Downloading from: " + url); - - File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); - if (!outputFile.getParentFile().exists()) { - if (!outputFile.getParentFile().mkdirs()) { - System.out.println( - "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); - } - } - System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); - try { - downloadFileFromURL(url, outputFile); - System.out.println("Done"); - System.exit(0); - } catch (Throwable e) { - System.out.println("- Error downloading"); - e.printStackTrace(); - System.exit(1); - } - } - - private static void downloadFileFromURL(String urlString, File destination) throws Exception { - if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { - String username = System.getenv("MVNW_USERNAME"); - char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); - Authenticator.setDefault(new Authenticator() { - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(username, password); - } - }); - } - URL website = new URL(urlString); - ReadableByteChannel rbc; - rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(destination); - fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); - fos.close(); - rbc.close(); - } - -} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 2cc7d4a5..00000000 Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 642d572c..c0bcafe9 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,3 @@ -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 +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/docker-compose-kafka.yml b/docker-compose-kafka.yml index 00dd2988..b5f221ef 100644 --- a/docker-compose-kafka.yml +++ b/docker-compose-kafka.yml @@ -171,7 +171,7 @@ services: ## Start - mongodb database definition ### $ mongo mongodb: - image: mongo:4.2.6-bionic + image: mongo:4.2.24-bionic ports: - "27017-27019:27017-27019" healthcheck: @@ -186,7 +186,7 @@ services: ## Start - MySql database definition ### $ mysql -uroot -h127.0.0.1 -p mysql: - image: mysql:8.0.20 + image: mysql:8.4.6 ports: - "3306:3306" environment: diff --git a/docker-compose-partitions.yml b/docker-compose-partitions.yml index 70a7f13a..d3dfca7d 100644 --- a/docker-compose-partitions.yml +++ b/docker-compose-partitions.yml @@ -170,7 +170,7 @@ services: ## Start - mongodb database definition ### $ mongo mongodb: - image: mongo:4.2.6-bionic + image: mongo:4.2.24-bionic ports: - "27017-27019:27017-27019" healthcheck: @@ -185,7 +185,7 @@ services: ## Start - MySql database definition ### $ mysql -uroot -h127.0.0.1 -p mysql: - image: mysql:8.0.20 + image: mysql:8.4.6 ports: - "3306:3306" environment: diff --git a/docker-compose.yml b/docker-compose.yml index 74ac457c..40c01bf0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -132,7 +132,7 @@ services: ## Start - mongodb database definition ### $ mongo mongodb: - image: mongo:4.2.6-bionic + image: mongo:4.2.24-bionic ports: - "27017-27019:27017-27019" healthcheck: @@ -147,7 +147,7 @@ services: ## Start - MySql database definition ### $ mysql -uroot -h127.0.0.1 -p mysql: - image: mysql:8.0.20 + image: mysql:8.4.6 ports: - "3306:3306" environment: @@ -189,5 +189,5 @@ services: depends_on: - rabbitmq restart: on-failure - ## Start - Zipkin Distributed Tracking visualizer + ## End - Zipkin Distributed Tracking visualizer # End - Data and transport Infrastructure diff --git a/mvnw b/mvnw index a16b5431..bd8896bf 100755 --- a/mvnw +++ b/mvnw @@ -8,7 +8,7 @@ # "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 +# 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 @@ -19,292 +19,277 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Maven Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir +# Apache Maven Wrapper startup batch script, version 3.3.4 # # 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 +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output # ---------------------------------------------------------------------------- -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac -fi +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + 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" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" -# 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" + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 fi fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi 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 +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" done + printf %x\\n $h +} - saveddir=`pwd` +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } - M2_HOME=`dirname "$PRG"`/.. +die() { + printf %s\\n "$1" >&2 + exit 1 +} - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac -# 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 +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} -# 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)`" +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" 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 +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac -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 +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" fi -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi +mkdir -p -- "${MAVEN_HOME%/*}" -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" fi -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 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 +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" 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 + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +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 +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" - 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 +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + 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"` +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f 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 +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd index c8d43372..5761d948 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -1,182 +1,189 @@ -@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% +<# : batch portion +@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 Apache Maven Wrapper startup batch script, version 3.3.4 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..05872d76 --- /dev/null +++ b/renovate.json @@ -0,0 +1,27 @@ +{ + "extends": [ + "config:recommended" + ], + "forkProcessing": "enabled", + "packageRules": [ + { + "matchUpdateTypes": [ + "minor", + "patch", + "pin", + "digest" + ], + "automerge": true + } + ], + "labels": [ + "dependencies" + ], + "cloneSubmodules": true, + "vulnerabilityAlerts": { + "labels": [ + "security" + ], + "automerge": true + } +} diff --git a/run-em-all.sh b/run-em-all.sh index 02b12bf3..2aa8f851 100755 --- a/run-em-all.sh +++ b/run-em-all.sh @@ -1,12 +1,27 @@ #!/usr/bin/env bash ## Author: Mohamed Taman -## version: v4.2 -#### FIXME need to start up infra structure database and message services -echo -e "Starting [Springy Store] μServices ....\n\ +## version: v4.3 + +echo -e "Starting [Springy Store] Infrastructure Services....\n\ +---------------------------------------\n" + +# Check if Docker is running +if ! docker info > /dev/null 2>&1; then + echo "Docker is not running. Please start Docker and try again." + exit 1 +fi + +# Start infrastructure services using docker-compose +echo "Starting MongoDB, MySQL, zipkin and RabbitMQ..." +docker compose up -d mongodb mysql zipkin rabbitmq +echo "Waiting for infrastructure services to be healthy..." +sleep 10 + +echo -e "\nStarting [Springy Store] μServices ....\n\ ---------------------------------------\n" function runService(){ - ./mvnw --quiet spring-boot:run -Dspring-boot.run.jvmArguments="--enable-preview" -pl $1 + ./mvnw --quiet compile spring-boot:run -Dspring-boot.run.jvmArguments="--enable-preview" -pl $1 } for dir in `find store-services/*-service -maxdepth 0 -type d` diff --git a/stop-em-all.sh b/stop-em-all.sh index 3fdbabae..39dda766 100755 --- a/stop-em-all.sh +++ b/stop-em-all.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash ## Author: Mohamed Taman -## version: v1.0 +## version: v1.1 echo -e "Stopping [Springy Store] μServices ....\n\ ---------------------------------------\n" @@ -10,3 +10,18 @@ do curl -X POST localhost:${port}/actuator/shutdown echo -e "\nμService at port ${port} stopped successfully .... \n" done + +echo -e "\nStopping [Springy Store] Infrastructure Services....\n\ +---------------------------------------\n" + +# Check if Docker is running +if ! docker info > /dev/null 2>&1; then + echo "Docker is not running. No infrastructure services to stop." + exit 0 +fi + +# Stop infrastructure services using docker-compose +echo "Stopping MongoDB, MySQL, zipkin and RabbitMQ..." +docker compose down + +echo -e "\nAll infrastructure services stopped successfully." diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml index 161800ea..31424362 100644 --- a/store-base/store-build-chassis/pom.xml +++ b/store-base/store-build-chassis/pom.xml @@ -18,7 +18,7 @@ pom - 15 + 11 2020.0.0-M3 UTF-8 UTF-8 @@ -26,15 +26,14 @@ ../../config/maven/store.properties - 3.8.1 - 3.0.0-M4 - 3.0.0-M4 - 1.0.0 - 2.7 + 3.14.1 + 3.5.3 + 3.5.4 + 1.2.1 + 2.19.1 1.4.13 - 3.0.0-SNAPSHOT - 1.4.0.Beta1 - 1.18.12 + 3.0.0 + 1.6.3 true @@ -42,13 +41,7 @@ - - - io.springfox - springfox-swagger2 - ${springfox.swagger.version} - - + org.springframework.cloud @@ -85,13 +78,6 @@ runtime - - - org.projectlombok - lombok - true - - @@ -110,18 +96,12 @@ ${maven.compiler.plugin.version} ${java.version} - --enable-preview org.mapstruct mapstruct-processor ${org.mapstruct.version} - - org.projectlombok - lombok - ${org.lombok.version} - @@ -129,7 +109,6 @@ maven-surefire-plugin ${maven.surefire.plugin.version} - --enable-preview **/*Tests.java **/*Test.java @@ -140,7 +119,6 @@ maven-failsafe-plugin ${maven.failsafe.plugin.version} - --enable-preview diff --git a/store-base/store-cloud-chassis/pom.xml b/store-base/store-cloud-chassis/pom.xml index 1beefd42..224cf11d 100644 --- a/store-base/store-cloud-chassis/pom.xml +++ b/store-base/store-cloud-chassis/pom.xml @@ -44,12 +44,6 @@ spring-cloud-starter-sleuth - - - org.springframework.cloud - spring-cloud-starter-zipkin - - diff --git a/store-cloud-infra/authorization-server/Dockerfile b/store-cloud-infra/authorization-server/Dockerfile index de4da04d..2ee2cf33 100644 --- a/store-cloud-infra/authorization-server/Dockerfile +++ b/store-cloud-infra/authorization-server/Dockerfile @@ -1,7 +1,7 @@ #### Start of builder image # ------------------------ # Builder stage to prepare application for final image -FROM openjdk:15-slim-buster as builder +FROM openjdk:11-slim-buster AS builder WORKDIR temp # Fatjar location, but could be set to different location from command line @@ -11,7 +11,7 @@ ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} application.jar # Extract the jar file layers -RUN java -Djarmode=layertools -jar --enable-preview application.jar extract +RUN java -Djarmode=layertools -jar application.jar extract # Workaround to avoid Copy command failure when directory is not exists. RUN if test ! -d ./snapshot-dependencies; \ @@ -22,8 +22,8 @@ else echo "Directory [snapshot-deps] already exists."; fi #### Start of actual image # ------------------------ -# Build image based on latest JDK 15 base image, based on latest debian buster OS -FROM openjdk:15-slim-buster +# Build image based on latest JDK 11 base image, based on latest debian buster OS +FROM openjdk:11-slim-buster # Set image information, but could be set to different location from command line ARG IMAGE_VERSION="1.0-SNAPSHOT" @@ -54,6 +54,6 @@ ARG JAVA_OPTS="" # Run the application with JVM configs if any ENTRYPOINT ["bash", "-c", \ -"java -server --enable-preview -XX:+UseContainerSupport -XX:+ShowCodeDetailsInExceptionMessages \ +"java -server -XX:+UseContainerSupport \ -XX:+AlwaysActAsServerClassMachine -XX:+UseG1GC -XX:+UseStringDeduplication ${JAVA_OPTS} \ org.springframework.boot.loader.JarLauncher ${0} ${@}"] \ No newline at end of file diff --git a/store-cloud-infra/authorization-server/pom.xml b/store-cloud-infra/authorization-server/pom.xml index 8969be8b..91f13d4b 100644 --- a/store-cloud-infra/authorization-server/pom.xml +++ b/store-cloud-infra/authorization-server/pom.xml @@ -17,10 +17,6 @@ OAuth2 Authorization Server, based on Spring boot. jar - - 5.0.0.M5 - - @@ -41,8 +37,7 @@ org.springframework.security - spring-security-jwt-jose - ${spring.security.jwt.jose.version} + spring-security-oauth2-jose diff --git a/store-cloud-infra/config-server/Dockerfile b/store-cloud-infra/config-server/Dockerfile index 4fca376e..31089094 100644 --- a/store-cloud-infra/config-server/Dockerfile +++ b/store-cloud-infra/config-server/Dockerfile @@ -1,7 +1,7 @@ #### Start of builder image # ------------------------ # Builder stage to prepare application for final image -FROM openjdk:15-slim-buster as builder +FROM openjdk:11-slim-buster AS builder WORKDIR temp # Fatjar location, but could be set to different location from command line @@ -11,7 +11,7 @@ ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} application.jar # Extract the jar file layers -RUN java -Djarmode=layertools -jar --enable-preview application.jar extract +RUN java -Djarmode=layertools -jar application.jar extract # Workaround to avoid Copy command failure when directory is not exists. RUN if test ! -d ./snapshot-dependencies; \ @@ -22,8 +22,8 @@ else echo "Directory [snapshot-deps] already exists."; fi #### Start of actual image # ------------------------ -# Build image based on latest JDK 15 base image, based on latest debian buster OS -FROM openjdk:15-slim-buster +# Build image based on latest JDK 11 base image, based on latest debian buster OS +FROM openjdk:11-slim-buster # Set image information, but could be set to different location from command line ARG IMAGE_VERSION="1.0-SNAPSHOT" @@ -54,6 +54,6 @@ ARG JAVA_OPTS="" # Run the application with JVM configs if any ENTRYPOINT ["bash", "-c", \ -"java -server --enable-preview -XX:+UseContainerSupport -XX:+ShowCodeDetailsInExceptionMessages \ +"java -server -XX:+UseContainerSupport \ -XX:+AlwaysActAsServerClassMachine -XX:+UseG1GC -XX:+UseStringDeduplication ${JAVA_OPTS} \ org.springframework.boot.loader.JarLauncher ${0} ${@}"] \ No newline at end of file diff --git a/store-cloud-infra/edge-server/Dockerfile b/store-cloud-infra/edge-server/Dockerfile index b4f92547..57d9bf27 100644 --- a/store-cloud-infra/edge-server/Dockerfile +++ b/store-cloud-infra/edge-server/Dockerfile @@ -1,7 +1,7 @@ #### Start of builder image # ------------------------ # Builder stage to prepare application for final image -FROM openjdk:15-slim-buster as builder +FROM openjdk:11-slim-buster AS builder WORKDIR temp # Fatjar location, but could be set to different location from command line @@ -11,7 +11,7 @@ ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} application.jar # Extract the jar file layers -RUN java -Djarmode=layertools -jar --enable-preview application.jar extract +RUN java -Djarmode=layertools -jar application.jar extract # Workaround to avoid Copy command failure when directory is not exists. RUN if test ! -d ./snapshot-dependencies; \ @@ -22,8 +22,8 @@ else echo "Directory [snapshot-deps] already exists."; fi #### Start of actual image # ------------------------ -# Build image based on latest JDK 15 base image, based on latest debian buster OS -FROM openjdk:15-slim-buster +# Build image based on latest JDK 11 base image, based on latest debian buster OS +FROM openjdk:11-slim-buster # Set image information, but could be set to different location from command line ARG IMAGE_VERSION="1.0-SNAPSHOT" @@ -54,6 +54,6 @@ ARG JAVA_OPTS="" # Run the application with JVM configs if any ENTRYPOINT ["bash", "-c", \ -"java -server --enable-preview -XX:+UseContainerSupport -XX:+ShowCodeDetailsInExceptionMessages \ +"java -server -XX:+UseContainerSupport \ -XX:+AlwaysActAsServerClassMachine -XX:+UseG1GC -XX:+UseStringDeduplication ${JAVA_OPTS} \ org.springframework.boot.loader.JarLauncher ${0} ${@}"] \ No newline at end of file diff --git a/store-cloud-infra/edge-server/src/main/java/com/siriusxi/cloud/infra/gateway/config/GatewayConfiguration.java b/store-cloud-infra/edge-server/src/main/java/com/siriusxi/cloud/infra/gateway/config/GatewayConfiguration.java index 4af8cad4..aba7e389 100644 --- a/store-cloud-infra/edge-server/src/main/java/com/siriusxi/cloud/infra/gateway/config/GatewayConfiguration.java +++ b/store-cloud-infra/edge-server/src/main/java/com/siriusxi/cloud/infra/gateway/config/GatewayConfiguration.java @@ -1,6 +1,7 @@ package com.siriusxi.cloud.infra.gateway.config; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.health.CompositeReactiveHealthContributor; import org.springframework.boot.actuate.health.Health; @@ -15,9 +16,10 @@ // TODO add swagger API @Configuration -@Log4j2 public class GatewayConfiguration { + private static final Logger log = LogManager.getLogger(GatewayConfiguration.class); + private final WebClient.Builder webClientBuilder; private WebClient webClient; diff --git a/store-cloud-infra/eureka-server/Dockerfile b/store-cloud-infra/eureka-server/Dockerfile index d665e788..2f9fd2bb 100644 --- a/store-cloud-infra/eureka-server/Dockerfile +++ b/store-cloud-infra/eureka-server/Dockerfile @@ -1,7 +1,7 @@ #### Start of builder image # ------------------------ # Builder stage to prepare application for final image -FROM openjdk:15-slim-buster as builder +FROM openjdk:11-slim-buster AS builder WORKDIR temp # Fatjar location, but could be set to different location from command line @@ -11,7 +11,7 @@ ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} application.jar # Extract the jar file layers -RUN java -Djarmode=layertools -jar --enable-preview application.jar extract +RUN java -Djarmode=layertools -jar application.jar extract # Workaround to avoid Copy command failure when directory is not exists. RUN if test ! -d ./snapshot-dependencies; \ @@ -22,8 +22,8 @@ else echo "Directory [snapshot-deps] already exists."; fi #### Start of actual image # ------------------------ -# Build image based on latest JDK 15 base image, based on latest debian buster OS -FROM openjdk:15-slim-buster +# Build image based on latest JDK 11 base image, based on latest debian buster OS +FROM openjdk:11-slim-buster # Set image information, but could be set to different location from command line ARG IMAGE_VERSION="1.0-SNAPSHOT" @@ -54,6 +54,6 @@ ARG JAVA_OPTS="" # Run the application with JVM configs if any ENTRYPOINT ["bash", "-c", \ -"java -server --enable-preview -XX:+UseContainerSupport -XX:+ShowCodeDetailsInExceptionMessages \ +"java -server -XX:+UseContainerSupport \ -XX:+AlwaysActAsServerClassMachine -XX:+UseG1GC -XX:+UseStringDeduplication ${JAVA_OPTS} \ org.springframework.boot.loader.JarLauncher ${0} ${@}"] \ No newline at end of file diff --git a/store-common/store-api/pom.xml b/store-common/store-api/pom.xml index 9a3dcd84..6da56b11 100644 --- a/store-common/store-api/pom.xml +++ b/store-common/store-api/pom.xml @@ -19,7 +19,7 @@ - 2.3.0.M4 + 2.4.0-M1 @@ -37,8 +37,10 @@ - io.springfox - springfox-swagger2 + org.springdoc + springdoc-openapi-webflux-ui + 1.8.0 + \ No newline at end of file diff --git a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/StoreEndpoint.java b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/StoreEndpoint.java index 2ad6ee43..65a8d060 100644 --- a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/StoreEndpoint.java +++ b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/StoreEndpoint.java @@ -1,10 +1,10 @@ package com.siriusxi.ms.store.api.composite; import com.siriusxi.ms.store.api.composite.dto.ProductAggregate; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; import org.springframework.web.bind.annotation.*; import reactor.core.publisher.Mono; @@ -20,7 +20,7 @@ * @version v5.8 * @since v3.0 codename Storm */ -@Api("REST API for Springy Store products information.") +@Tag(name = "Store", description = "REST API for Springy Store products information.") @RequestMapping("store/api/v1") public interface StoreEndpoint extends StoreService { @@ -33,25 +33,14 @@ public interface StoreEndpoint extends StoreService { * @return the composite product info, if found, else null. * @since v3.0 codename Storm. */ - @ApiOperation( - value = "${api.product-composite.get-composite-product.description}", - notes = "${api.product-composite.get-composite-product.notes}") - @ApiResponses( - value = { - @ApiResponse( - code = 400, - message = """ - Bad Request, invalid format of the request. - See response message for more information. - """), - @ApiResponse(code = 404, message = "Not found, the specified id does not exist."), - @ApiResponse( - code = 422, - message = """ - Unprocessable entity, input parameters caused the processing to fails. - See response message for more information. - """) - }) + @Operation( + summary = "${api.product-composite.get-composite-product.description}", + description = "${api.product-composite.get-composite-product.notes}") + @ApiResponses(value = { + @ApiResponse(responseCode = "400", description = "Bad Request, invalid format of the request. See response message for more information."), + @ApiResponse(responseCode = "404", description = "Not found, the specified id does not exist."), + @ApiResponse(responseCode = "422", description = "Unprocessable entity, input parameters caused the processing to fails. See response message for more information.") + }) @GetMapping(value = "products/{id}", produces = APPLICATION_JSON_VALUE) @Override @@ -70,24 +59,13 @@ Mono getProduct( * @since v3.0 codename Storm. * @return Nothing. */ - @ApiOperation( - value = "${api.product-composite.create-composite-product.description}", - notes = "${api.product-composite.create-composite-product.notes}") - @ApiResponses( - value = { - @ApiResponse( - code = 400, - message = """ - Bad Request, invalid format of the request. - See response message for more information. - """), - @ApiResponse( - code = 422, - message = """ - Unprocessable entity, input parameters caused the processing to fail. - See response message for more information. - """) - }) + @Operation( + summary = "${api.product-composite.create-composite-product.description}", + description = "${api.product-composite.create-composite-product.notes}") + @ApiResponses(value = { + @ApiResponse(responseCode = "400", description = "Bad Request, invalid format of the request. See response message for more information."), + @ApiResponse(responseCode = "422", description = "Unprocessable entity, input parameters caused the processing to fail. See response message for more information.") + }) @PostMapping( value = "products", consumes = APPLICATION_JSON_VALUE) @@ -103,25 +81,14 @@ Mono getProduct( * @since v3.0 codename Storm. * @return Nothing. */ - @ApiOperation( - value = "${api.product-composite.delete-composite-product.description}", - notes = "${api.product-composite.delete-composite-product.notes}") - @ApiResponses( - value = { - @ApiResponse( - code = 400, - message =""" - Bad Request, invalid format of the request. - See response message for more information. - """), - @ApiResponse( - code = 422, - message =""" - Unprocessable entity, input parameters caused the processing to fail. - See response message for more information. - """) - }) - @DeleteMapping("products/{id}") + @Operation( + summary = "${api.product-composite.delete-composite-product.description}", + description = "${api.product-composite.delete-composite-product.notes}") + @ApiResponses(value = { + @ApiResponse(responseCode = "400", description = "Bad Request, invalid format of the request. See response message for more information."), + @ApiResponse(responseCode = "422", description = "Unprocessable entity, input parameters caused the processing to fail. See response message for more information.") + }) + @DeleteMapping(value = "products/{id}") @Override Mono deleteProduct(@PathVariable int id); } diff --git a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/ProductAggregate.java b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/ProductAggregate.java index 8c179809..d374fce8 100644 --- a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/ProductAggregate.java +++ b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/ProductAggregate.java @@ -1,6 +1,7 @@ package com.siriusxi.ms.store.api.composite.dto; import java.util.List; +import java.util.Objects; /** * Record ProductAggregate that hold all the product aggregate information. * @@ -14,10 +15,59 @@ * @version v4.6 * @since v0.1 */ -public record ProductAggregate (int productId, - String name, - int weight, - List recommendations, - Listreviews, - ServiceAddresses serviceAddresses) { +public class ProductAggregate { + private final int productId; + private final String name; + private final int weight; + private final List recommendations; + private final List reviews; + private final ServiceAddresses serviceAddresses; + + public ProductAggregate(int productId, String name, int weight, + List recommendations, List reviews, + ServiceAddresses serviceAddresses) { + this.productId = productId; + this.name = name; + this.weight = weight; + this.recommendations = recommendations; + this.reviews = reviews; + this.serviceAddresses = serviceAddresses; + } + + public int productId() { return productId; } + public String name() { return name; } + public int weight() { return weight; } + public List recommendations() { return recommendations; } + public List reviews() { return reviews; } + public ServiceAddresses serviceAddresses() { return serviceAddresses; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof ProductAggregate)) return false; + ProductAggregate that = (ProductAggregate) o; + return productId == that.productId + && weight == that.weight + && Objects.equals(name, that.name) + && Objects.equals(recommendations, that.recommendations) + && Objects.equals(reviews, that.reviews) + && Objects.equals(serviceAddresses, that.serviceAddresses); + } + + @Override + public int hashCode() { + return Objects.hash(productId, name, weight, recommendations, reviews, serviceAddresses); + } + + @Override + public String toString() { + return "ProductAggregate{" + + "productId=" + productId + + ", name='" + name + "'" + + ", weight=" + weight + + ", recommendations=" + recommendations + + ", reviews=" + reviews + + ", serviceAddresses=" + serviceAddresses + + '}'; + } } \ No newline at end of file diff --git a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/RecommendationSummary.java b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/RecommendationSummary.java index e9ad8a2d..617d7405 100644 --- a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/RecommendationSummary.java +++ b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/RecommendationSummary.java @@ -13,8 +13,21 @@ * @version v4.6 * @since v0.1 */ -public record RecommendationSummary(int recommendationId, - String author, - int rate, - String content) { +public class RecommendationSummary { + private final int recommendationId; + private final String author; + private final int rate; + private final String content; + + public RecommendationSummary(int recommendationId, String author, int rate, String content) { + this.recommendationId = recommendationId; + this.author = author; + this.rate = rate; + this.content = content; + } + + public int recommendationId() { return recommendationId; } + public String author() { return author; } + public int rate() { return rate; } + public String content() { return content; } } \ No newline at end of file diff --git a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/ReviewSummary.java b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/ReviewSummary.java index 25434a19..ec833a9b 100644 --- a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/ReviewSummary.java +++ b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/ReviewSummary.java @@ -13,8 +13,21 @@ * @version v4.6 * @since v0.1 */ -public record ReviewSummary(int reviewId, - String author, - String subject, - String content){ +public class ReviewSummary { + private final int reviewId; + private final String author; + private final String subject; + private final String content; + + public ReviewSummary(int reviewId, String author, String subject, String content) { + this.reviewId = reviewId; + this.author = author; + this.subject = subject; + this.content = content; + } + + public int reviewId() { return reviewId; } + public String author() { return author; } + public String subject() { return subject; } + public String content() { return content; } } diff --git a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/ServiceAddresses.java b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/ServiceAddresses.java index 41157523..a5d309f4 100644 --- a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/ServiceAddresses.java +++ b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/composite/dto/ServiceAddresses.java @@ -14,8 +14,22 @@ * @version v4.6 * @since v0.1 */ -public record ServiceAddresses( String storeService, - String productService, - String reviewService, - String recommendationService) { +public class ServiceAddresses { + private final String storeService; + private final String productService; + private final String reviewService; + private final String recommendationService; + + public ServiceAddresses(String storeService, String productService, + String reviewService, String recommendationService) { + this.storeService = storeService; + this.productService = productService; + this.reviewService = reviewService; + this.recommendationService = recommendationService; + } + + public String storeService() { return storeService; } + public String productService() { return productService; } + public String reviewService() { return reviewService; } + public String recommendationService() { return recommendationService; } } diff --git a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/core/product/dto/Product.java b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/core/product/dto/Product.java index 73e61000..7cb43ceb 100644 --- a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/core/product/dto/Product.java +++ b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/core/product/dto/Product.java @@ -1,15 +1,75 @@ package com.siriusxi.ms.store.api.core.product.dto; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor public class Product { private int productId; private String name; private int weight; private String serviceAddress; + + public Product() {} + + public Product(int productId, String name, int weight, String serviceAddress) { + this.productId = productId; + this.name = name; + this.weight = weight; + this.serviceAddress = serviceAddress; + } + + public int getProductId() { + return productId; + } + + public void setProductId(int productId) { + this.productId = productId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getWeight() { + return weight; + } + + public void setWeight(int weight) { + this.weight = weight; + } + + public String getServiceAddress() { + return serviceAddress; + } + + public void setServiceAddress(String serviceAddress) { + this.serviceAddress = serviceAddress; + } + + @Override + public String toString() { + return "Product{" + + "productId=" + productId + + ", name='" + name + '\'' + + ", weight=" + weight + + ", serviceAddress='" + serviceAddress + '\'' + + '}'; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Product product = (Product) o; + return productId == product.productId && + weight == product.weight && + java.util.Objects.equals(name, product.name) && + java.util.Objects.equals(serviceAddress, product.serviceAddress); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(productId, name, weight, serviceAddress); + } } diff --git a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/core/recommendation/dto/Recommendation.java b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/core/recommendation/dto/Recommendation.java index d96eeff0..3b4c2dab 100644 --- a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/core/recommendation/dto/Recommendation.java +++ b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/core/recommendation/dto/Recommendation.java @@ -1,12 +1,5 @@ package com.siriusxi.ms.store.api.core.recommendation.dto; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor(force = true) -@AllArgsConstructor public class Recommendation { private int productId; private int recommendationId; @@ -14,4 +7,93 @@ public class Recommendation { private int rate; private String content; private String serviceAddress; + + public Recommendation() {} + + public Recommendation(int productId, int recommendationId, String author, int rate, String content, String serviceAddress) { + this.productId = productId; + this.recommendationId = recommendationId; + this.author = author; + this.rate = rate; + this.content = content; + this.serviceAddress = serviceAddress; + } + + public int getProductId() { + return productId; + } + + public void setProductId(int productId) { + this.productId = productId; + } + + public int getRecommendationId() { + return recommendationId; + } + + public void setRecommendationId(int recommendationId) { + this.recommendationId = recommendationId; + } + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public int getRate() { + return rate; + } + + public void setRate(int rate) { + this.rate = rate; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getServiceAddress() { + return serviceAddress; + } + + public void setServiceAddress(String serviceAddress) { + this.serviceAddress = serviceAddress; + } + + @Override + public String toString() { + return "Recommendation{" + + "productId=" + productId + + ", recommendationId=" + recommendationId + + ", author='" + author + '\'' + + ", rate=" + rate + + ", content='" + content + '\'' + + ", serviceAddress='" + serviceAddress + '\'' + + '}'; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Recommendation that = (Recommendation) o; + return productId == that.productId && + recommendationId == that.recommendationId && + rate == that.rate && + java.util.Objects.equals(author, that.author) && + java.util.Objects.equals(content, that.content) && + java.util.Objects.equals(serviceAddress, that.serviceAddress); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(productId, recommendationId, author, rate, content, serviceAddress); + } } diff --git a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/core/review/dto/Review.java b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/core/review/dto/Review.java index 6827af73..a4804c93 100644 --- a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/core/review/dto/Review.java +++ b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/core/review/dto/Review.java @@ -1,12 +1,5 @@ package com.siriusxi.ms.store.api.core.review.dto; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor public class Review { private int productId; private int reviewId; @@ -14,4 +7,93 @@ public class Review { private String subject; private String content; private String serviceAddress; + + public Review() {} + + public Review(int productId, int reviewId, String author, String subject, String content, String serviceAddress) { + this.productId = productId; + this.reviewId = reviewId; + this.author = author; + this.subject = subject; + this.content = content; + this.serviceAddress = serviceAddress; + } + + public int getProductId() { + return productId; + } + + public void setProductId(int productId) { + this.productId = productId; + } + + public int getReviewId() { + return reviewId; + } + + public void setReviewId(int reviewId) { + this.reviewId = reviewId; + } + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public String getSubject() { + return subject; + } + + public void setSubject(String subject) { + this.subject = subject; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getServiceAddress() { + return serviceAddress; + } + + public void setServiceAddress(String serviceAddress) { + this.serviceAddress = serviceAddress; + } + + @Override + public String toString() { + return "Review{" + + "productId=" + productId + + ", reviewId=" + reviewId + + ", author='" + author + '\'' + + ", subject='" + subject + '\'' + + ", content='" + content + '\'' + + ", serviceAddress='" + serviceAddress + '\'' + + '}'; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Review review = (Review) o; + return productId == review.productId && + reviewId == review.reviewId && + java.util.Objects.equals(author, review.author) && + java.util.Objects.equals(subject, review.subject) && + java.util.Objects.equals(content, review.content) && + java.util.Objects.equals(serviceAddress, review.serviceAddress); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(productId, reviewId, author, subject, content, serviceAddress); + } } diff --git a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/event/Event.java b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/event/Event.java index dbcd437d..f0078afa 100644 --- a/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/event/Event.java +++ b/store-common/store-api/src/main/java/com/siriusxi/ms/store/api/event/Event.java @@ -1,26 +1,18 @@ package com.siriusxi.ms.store.api.event; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.Setter; - import java.time.LocalDateTime; import static java.time.LocalDateTime.now; -import static lombok.AccessLevel.NONE; -@Data -@NoArgsConstructor -@AllArgsConstructor -@Setter(NONE) public class Event { - private Event.Type eventType; + private Type eventType; private K key; private T data; private LocalDateTime eventCreatedAt; + public Event() {} + public Event(Type eventType, K key, T data) { this.eventType = eventType; this.key = key; @@ -28,6 +20,71 @@ public Event(Type eventType, K key, T data) { this.eventCreatedAt = now(); } + public Event(Type eventType, K key, T data, LocalDateTime eventCreatedAt) { + this.eventType = eventType; + this.key = key; + this.data = data; + this.eventCreatedAt = eventCreatedAt; + } + + public Type getEventType() { + return eventType; + } + + public void setEventType(Type eventType) { + this.eventType = eventType; + } + + public K getKey() { + return key; + } + + public void setKey(K key) { + this.key = key; + } + + public T getData() { + return data; + } + + public void setData(T data) { + this.data = data; + } + + public LocalDateTime getEventCreatedAt() { + return eventCreatedAt; + } + + public void setEventCreatedAt(LocalDateTime eventCreatedAt) { + this.eventCreatedAt = eventCreatedAt; + } + + @Override + public String toString() { + return "Event{" + + "eventType=" + eventType + + ", key=" + key + + ", data=" + data + + ", eventCreatedAt=" + eventCreatedAt + + '}'; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Event event = (Event) o; + return eventType == event.eventType && + java.util.Objects.equals(key, event.key) && + java.util.Objects.equals(data, event.data) && + java.util.Objects.equals(eventCreatedAt, event.eventCreatedAt); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(eventType, key, data, eventCreatedAt); + } + public enum Type { CREATE, DELETE diff --git a/store-common/store-utils/src/main/java/com/siriusxi/ms/store/util/http/GlobalControllerExceptionHandler.java b/store-common/store-utils/src/main/java/com/siriusxi/ms/store/util/http/GlobalControllerExceptionHandler.java index a36584fb..4a2cacd1 100644 --- a/store-common/store-utils/src/main/java/com/siriusxi/ms/store/util/http/GlobalControllerExceptionHandler.java +++ b/store-common/store-utils/src/main/java/com/siriusxi/ms/store/util/http/GlobalControllerExceptionHandler.java @@ -2,7 +2,8 @@ import com.siriusxi.ms.store.util.exceptions.InvalidInputException; import com.siriusxi.ms.store.util.exceptions.NotFoundException; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.http.HttpStatus; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.web.bind.annotation.ExceptionHandler; @@ -26,9 +27,10 @@ * @since v0.1 */ @RestControllerAdvice -@Log4j2 class GlobalControllerExceptionHandler { + private static final Logger log = LogManager.getLogger(GlobalControllerExceptionHandler.class); + /** * Method to handle not found exceptions http error info. * diff --git a/store-common/store-utils/src/main/java/com/siriusxi/ms/store/util/http/HttpErrorInfo.java b/store-common/store-utils/src/main/java/com/siriusxi/ms/store/util/http/HttpErrorInfo.java index 2a6b7881..bee9f3a0 100644 --- a/store-common/store-utils/src/main/java/com/siriusxi/ms/store/util/http/HttpErrorInfo.java +++ b/store-common/store-utils/src/main/java/com/siriusxi/ms/store/util/http/HttpErrorInfo.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.datatype.jsr310.ser.ZonedDateTimeSerializer; import org.springframework.http.HttpStatus; +import java.util.Objects; import java.time.ZonedDateTime; @@ -20,13 +21,24 @@ * @version v4.6 * @since v0.1 */ -public record HttpErrorInfo( - HttpStatus httpStatus, - String message, - String path, - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd@HH:mm:ss.SSSZ") - @JsonSerialize(using = ZonedDateTimeSerializer.class) - ZonedDateTime timestamp) { +public class HttpErrorInfo { + private final HttpStatus httpStatus; + private final String message; + private final String path; + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd@HH:mm:ss.SSSZ") + @JsonSerialize(using = ZonedDateTimeSerializer.class) + private final ZonedDateTime timestamp; + + public HttpErrorInfo( + HttpStatus httpStatus, + String message, + String path, + ZonedDateTime timestamp) { + this.httpStatus = httpStatus; + this.message = message; + this.path = path; + this.timestamp = timestamp; + } /** * Instantiates a new Http error info. @@ -35,7 +47,38 @@ public record HttpErrorInfo( * @param path the request path. * @param message the error message. */ -public HttpErrorInfo(HttpStatus httpStatus, String path, String message) { + public HttpErrorInfo(HttpStatus httpStatus, String path, String message) { this(httpStatus, message, path, ZonedDateTime.now()); } + + public HttpStatus httpStatus() { return httpStatus; } + public String message() { return message; } + public String path() { return path; } + public ZonedDateTime timestamp() { return timestamp; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof HttpErrorInfo)) return false; + HttpErrorInfo that = (HttpErrorInfo) o; + return httpStatus == that.httpStatus + && Objects.equals(message, that.message) + && Objects.equals(path, that.path) + && Objects.equals(timestamp, that.timestamp); + } + + @Override + public int hashCode() { + return Objects.hash(httpStatus, message, path, timestamp); + } + + @Override + public String toString() { + return "HttpErrorInfo{" + + "httpStatus=" + httpStatus + + ", message='" + message + "'" + + ", path='" + path + "'" + + ", timestamp=" + timestamp + + '}'; + } } diff --git a/store-common/store-utils/src/main/java/com/siriusxi/ms/store/util/http/ServiceUtil.java b/store-common/store-utils/src/main/java/com/siriusxi/ms/store/util/http/ServiceUtil.java index ee6c86d9..410a1183 100644 --- a/store-common/store-utils/src/main/java/com/siriusxi/ms/store/util/http/ServiceUtil.java +++ b/store-common/store-utils/src/main/java/com/siriusxi/ms/store/util/http/ServiceUtil.java @@ -1,6 +1,7 @@ package com.siriusxi.ms.store.util.http; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -9,8 +10,8 @@ import java.net.UnknownHostException; @Component -@Log4j2 public class ServiceUtil { + private static final Logger log = LogManager.getLogger(ServiceUtil.class); private final String port; private String serviceAddress = null; diff --git a/store-services/product-service/Dockerfile b/store-services/product-service/Dockerfile index 0f3770b2..81696517 100644 --- a/store-services/product-service/Dockerfile +++ b/store-services/product-service/Dockerfile @@ -1,7 +1,7 @@ #### Start of builder image # ------------------------ # Builder stage to prepare application for final image -FROM openjdk:15-slim-buster as builder +FROM openjdk:11-slim-buster AS builder WORKDIR temp # Fatjar location, but could be set to different location from command line @@ -11,13 +11,13 @@ ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} application.jar # Extract the jar file layers -RUN java -Djarmode=layertools -jar --enable-preview application.jar extract +RUN java -Djarmode=layertools -jar application.jar extract #### End of builder stage #### Start of actual image # ------------------------ -# Build image based on latest JDK 15 base image, based on latest debian buster OS -FROM openjdk:15-slim-buster +# Build image based on latest JDK 11 base image, based on latest debian buster OS +FROM openjdk:11-slim-buster # Set image information, but could be set to different location from command line ARG IMAGE_VERSION="0.0.1-SNAPSHOT" @@ -48,6 +48,6 @@ ARG JAVA_OPTS="" # Run the application with JVM configs if any ENTRYPOINT ["bash", "-c", \ -"java -server --enable-preview -XX:+UseContainerSupport -XX:+ShowCodeDetailsInExceptionMessages \ +"java -server -XX:+UseContainerSupport \ -XX:+AlwaysActAsServerClassMachine -XX:+UseG1GC -XX:+UseStringDeduplication ${JAVA_OPTS} \ org.springframework.boot.loader.JarLauncher ${0} ${@}"] \ No newline at end of file diff --git a/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/ProductServiceApplication.java b/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/ProductServiceApplication.java index 789980e3..a2062e8b 100644 --- a/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/ProductServiceApplication.java +++ b/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/ProductServiceApplication.java @@ -1,16 +1,18 @@ package com.siriusxi.ms.store.ps; -import lombok.extern.log4j.Log4j2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; @SpringBootApplication @ComponentScan("com.siriusxi.ms.store") -@Log4j2 public class ProductServiceApplication { + private static final Logger log = LogManager.getLogger(ProductServiceApplication.class); + public static void main(String[] args) { ConfigurableApplicationContext ctx = SpringApplication.run(ProductServiceApplication.class, args); diff --git a/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/api/ProductController.java b/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/api/ProductController.java index b2fefde4..0fc80447 100644 --- a/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/api/ProductController.java +++ b/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/api/ProductController.java @@ -3,7 +3,8 @@ import com.siriusxi.ms.store.api.core.product.ProductEndpoint; import com.siriusxi.ms.store.api.core.product.ProductService; import com.siriusxi.ms.store.api.core.product.dto.Product; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.RestController; @@ -19,9 +20,10 @@ * @since v3.0 codename Storm */ @RestController -@Log4j2 public class ProductController implements ProductEndpoint { + private static final Logger log = LogManager.getLogger(ProductController.class); + /** Product service business logic interface. */ private final ProductService prodService; diff --git a/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/infra/MessageProcessor.java b/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/infra/MessageProcessor.java index c1d6396e..7ff069e6 100644 --- a/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/infra/MessageProcessor.java +++ b/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/infra/MessageProcessor.java @@ -4,7 +4,8 @@ import com.siriusxi.ms.store.api.core.product.dto.Product; import com.siriusxi.ms.store.api.event.Event; import com.siriusxi.ms.store.util.exceptions.EventProcessingException; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.cloud.stream.annotation.EnableBinding; @@ -12,9 +13,10 @@ import org.springframework.cloud.stream.messaging.Sink; @EnableBinding(Sink.class) -@Log4j2 public class MessageProcessor { + private static final Logger log = LogManager.getLogger(MessageProcessor.class); + private final ProductService productService; @Autowired @@ -28,16 +30,18 @@ public void process(Event event) { log.info("Process message created at {}...", event.getEventCreatedAt()); switch (event.getEventType()) { - case CREATE -> { + case CREATE: { Product product = event.getData(); log.info("Create product with ID: {}", product.getProductId()); productService.createProduct(product); + break; } - case DELETE -> { + case DELETE: { log.info("Delete product with Product Id: {}", event.getKey()); productService.deleteProduct(event.getKey()); + break; } - default -> { + default: { String errorMessage = "Incorrect event type: " .concat(event.getEventType().toString()) diff --git a/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/persistence/ProductEntity.java b/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/persistence/ProductEntity.java index 185c46a3..21e4191f 100644 --- a/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/persistence/ProductEntity.java +++ b/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/persistence/ProductEntity.java @@ -1,30 +1,62 @@ package com.siriusxi.ms.store.ps.persistence; -import lombok.Data; -import lombok.NoArgsConstructor; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Version; import org.springframework.data.mongodb.core.index.Indexed; import org.springframework.data.mongodb.core.mapping.Document; @Document(collection = "products") -@Data -@NoArgsConstructor public class ProductEntity { @Id private String id; - @Version private Integer version; - @Indexed(unique = true) private int productId; - private String name; - private int weight; + public ProductEntity() {} + public ProductEntity(int productId, String name, int weight) { this.productId = productId; this.name = name; this.weight = weight; } + + public String getId() { return id; } + public void setId(String id) { this.id = id; } + public Integer getVersion() { return version; } + public void setVersion(Integer version) { this.version = version; } + public int getProductId() { return productId; } + public void setProductId(int productId) { this.productId = productId; } + public String getName() { return name; } + public void setName(String name) { this.name = name; } + public int getWeight() { return weight; } + public void setWeight(int weight) { this.weight = weight; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ProductEntity that = (ProductEntity) o; + return productId == that.productId && weight == that.weight && + java.util.Objects.equals(id, that.id) && + java.util.Objects.equals(version, that.version) && + java.util.Objects.equals(name, that.name); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(id, version, productId, name, weight); + } + + @Override + public String toString() { + return "ProductEntity{" + + "id='" + id + '\'' + + ", version=" + version + + ", productId=" + productId + + ", name='" + name + '\'' + + ", weight=" + weight + + '}'; + } } diff --git a/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/service/ProductServiceImpl.java b/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/service/ProductServiceImpl.java index fa507867..7014b63e 100644 --- a/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/service/ProductServiceImpl.java +++ b/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/service/ProductServiceImpl.java @@ -6,7 +6,8 @@ import com.siriusxi.ms.store.util.exceptions.InvalidInputException; import com.siriusxi.ms.store.util.exceptions.NotFoundException; import com.siriusxi.ms.store.util.http.ServiceUtil; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; @@ -18,9 +19,10 @@ import static reactor.core.publisher.Mono.error; @Service("ProductServiceImpl") -@Log4j2 public class ProductServiceImpl implements ProductService { + private static final Logger log = LogManager.getLogger(ProductServiceImpl.class); + private final ServiceUtil serviceUtil; private final ProductRepository repository; diff --git a/store-services/product-service/src/test/java/com/siriusxi/ms/store/ps/ProductServiceApplicationTests.java b/store-services/product-service/src/test/java/com/siriusxi/ms/store/ps/ProductServiceApplicationTests.java index 02f13652..c00171a7 100644 --- a/store-services/product-service/src/test/java/com/siriusxi/ms/store/ps/ProductServiceApplicationTests.java +++ b/store-services/product-service/src/test/java/com/siriusxi/ms/store/ps/ProductServiceApplicationTests.java @@ -85,7 +85,8 @@ public void duplicateError() { sendCreateProductEvent(productId); fail("Expected a MessagingException here!"); } catch (MessagingException me) { - if (me.getCause() instanceof InvalidInputException iie){ + if (me.getCause() instanceof InvalidInputException) { + InvalidInputException iie = (InvalidInputException) me.getCause(); assertEquals("Duplicate key, Product Id: ".concat(String.valueOf(productId)), iie.getMessage()); } else { fail("Expected a InvalidInputException as the root cause!"); diff --git a/store-services/recommendation-service/Dockerfile b/store-services/recommendation-service/Dockerfile index 4a6481b6..a107c22a 100644 --- a/store-services/recommendation-service/Dockerfile +++ b/store-services/recommendation-service/Dockerfile @@ -1,7 +1,7 @@ #### Start of builder image # ------------------------ # Builder stage to prepare application for final image -FROM openjdk:15-slim-buster as builder +FROM openjdk:11-slim-buster AS builder WORKDIR temp # Could be set to different jar file location @@ -11,13 +11,13 @@ ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} application.jar # Extract the jar file layers -RUN java -Djarmode=layertools -jar --enable-preview application.jar extract +RUN java -Djarmode=layertools -jar application.jar extract #### End of builder stage #### Start of actual image # ------------------------ -# Build image based on latest JDK 15 base image, based on latest debian buster OS -FROM openjdk:15-slim-buster +# Build image based on latest JDK 11 base image, based on latest debian buster OS +FROM openjdk:11-slim-buster # Set image information, but could be set to different location from command line ARG IMAGE_VERSION="0.0.1-SNAPSHOT" @@ -48,6 +48,6 @@ ARG JAVA_OPTS="" # Run the application with JVM configs if any ENTRYPOINT ["bash", "-c", \ -"java -server --enable-preview -XX:+UseContainerSupport -XX:+ShowCodeDetailsInExceptionMessages \ +"java -server -XX:+UseContainerSupport \ -XX:+AlwaysActAsServerClassMachine -XX:+UseG1GC -XX:+UseStringDeduplication ${JAVA_OPTS} \ org.springframework.boot.loader.JarLauncher ${0} ${@}"] \ No newline at end of file diff --git a/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/RecommendationServiceApplication.java b/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/RecommendationServiceApplication.java index 918c8ca6..71e78c6b 100644 --- a/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/RecommendationServiceApplication.java +++ b/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/RecommendationServiceApplication.java @@ -1,16 +1,18 @@ package com.siriusxi.ms.store.rs; -import lombok.extern.log4j.Log4j2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; @SpringBootApplication @ComponentScan("com.siriusxi.ms.store") -@Log4j2 public class RecommendationServiceApplication { + private static final Logger log = LogManager.getLogger(RecommendationServiceApplication.class); + public static void main(String[] args) { ConfigurableApplicationContext ctx = SpringApplication.run(RecommendationServiceApplication.class, args); diff --git a/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/api/RecommendationController.java b/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/api/RecommendationController.java index 191e43d8..253e5d4c 100644 --- a/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/api/RecommendationController.java +++ b/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/api/RecommendationController.java @@ -3,7 +3,8 @@ import com.siriusxi.ms.store.api.core.recommendation.RecommendationEndpoint; import com.siriusxi.ms.store.api.core.recommendation.RecommendationService; import com.siriusxi.ms.store.api.core.recommendation.dto.Recommendation; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.RestController; @@ -19,9 +20,10 @@ * @since v3.0 codename Storm */ @RestController -@Log4j2 public class RecommendationController implements RecommendationEndpoint { + private static final Logger log = LogManager.getLogger(RecommendationController.class); + /** Recommendation service business logic interface. */ private final RecommendationService recommendationService; diff --git a/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/infra/MessageProcessor.java b/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/infra/MessageProcessor.java index 6000edfa..0b13ee4b 100644 --- a/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/infra/MessageProcessor.java +++ b/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/infra/MessageProcessor.java @@ -4,7 +4,8 @@ import com.siriusxi.ms.store.api.core.recommendation.dto.Recommendation; import com.siriusxi.ms.store.api.event.Event; import com.siriusxi.ms.store.util.exceptions.EventProcessingException; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.cloud.stream.annotation.EnableBinding; @@ -14,9 +15,10 @@ import static java.lang.String.*; @EnableBinding(Sink.class) -@Log4j2 public class MessageProcessor { + private static final Logger log = LogManager.getLogger(MessageProcessor.class); + private final RecommendationService service; @Autowired @@ -30,18 +32,20 @@ public void process(Event event) { log.info("Process message created at {}...", event.getEventCreatedAt()); switch (event.getEventType()) { - case CREATE -> { + case CREATE: { Recommendation recommendation = event.getData(); log.info("Create recommendation with ID: {}/{}", recommendation.getProductId(), recommendation.getRecommendationId()); service.createRecommendation(recommendation); + break; } - case DELETE -> { + case DELETE: { int productId = event.getKey(); log.info("Delete recommendations with ProductID: {}", productId); service.deleteRecommendations(productId); + break; } - default -> { + default: { String errorMessage = "Incorrect event type: " .concat(valueOf(event.getEventType())) diff --git a/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/persistence/RecommendationEntity.java b/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/persistence/RecommendationEntity.java index dfc33662..164e30c6 100644 --- a/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/persistence/RecommendationEntity.java +++ b/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/persistence/RecommendationEntity.java @@ -1,7 +1,5 @@ package com.siriusxi.ms.store.rs.persistence; -import lombok.Data; -import lombok.NoArgsConstructor; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Version; import org.springframework.data.mongodb.core.index.CompoundIndex; @@ -14,20 +12,18 @@ name = "prod-rec-id", unique = true, def = "{'productId': 1, 'recommendationId' : 1}") -@Data -@NoArgsConstructor public class RecommendationEntity { @Id private String id; - @Version private Integer version; - private int productId; private int recommendationId; private String author; private int rating; private String content; + public RecommendationEntity() {} + public RecommendationEntity( int productId, int recommendationId, String author, int rating, String content) { this.productId = productId; @@ -36,4 +32,49 @@ public RecommendationEntity( this.rating = rating; this.content = content; } + + public String getId() { return id; } + public void setId(String id) { this.id = id; } + public Integer getVersion() { return version; } + public void setVersion(Integer version) { this.version = version; } + public int getProductId() { return productId; } + public void setProductId(int productId) { this.productId = productId; } + public int getRecommendationId() { return recommendationId; } + public void setRecommendationId(int recommendationId) { this.recommendationId = recommendationId; } + public String getAuthor() { return author; } + public void setAuthor(String author) { this.author = author; } + public int getRating() { return rating; } + public void setRating(int rating) { this.rating = rating; } + public String getContent() { return content; } + public void setContent(String content) { this.content = content; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + RecommendationEntity that = (RecommendationEntity) o; + return productId == that.productId && recommendationId == that.recommendationId && rating == that.rating && + java.util.Objects.equals(id, that.id) && + java.util.Objects.equals(version, that.version) && + java.util.Objects.equals(author, that.author) && + java.util.Objects.equals(content, that.content); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(id, version, productId, recommendationId, author, rating, content); + } + + @Override + public String toString() { + return "RecommendationEntity{" + + "id='" + id + '\'' + + ", version=" + version + + ", productId=" + productId + + ", recommendationId=" + recommendationId + + ", author='" + author + '\'' + + ", rating=" + rating + + ", content='" + content + '\'' + + '}'; + } } diff --git a/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/service/RecommendationServiceImpl.java b/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/service/RecommendationServiceImpl.java index 55d2dc83..cfc770e0 100644 --- a/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/service/RecommendationServiceImpl.java +++ b/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/service/RecommendationServiceImpl.java @@ -5,16 +5,18 @@ import com.siriusxi.ms.store.rs.persistence.RecommendationRepository; import com.siriusxi.ms.store.util.exceptions.InvalidInputException; import com.siriusxi.ms.store.util.http.ServiceUtil; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; import org.springframework.stereotype.Service; import reactor.core.publisher.Flux; @Service("RecommendationServiceImpl") -@Log4j2 public class RecommendationServiceImpl implements RecommendationService { + private static final Logger log = LogManager.getLogger(RecommendationServiceImpl.class); + private final RecommendationRepository repository; private final RecommendationMapper mapper; @@ -67,16 +69,10 @@ public Flux getRecommendations(int productId) { public void deleteRecommendations(int productId) { isValidProductId(productId); - log.debug( - """ - deleteRecommendations: tries to delete recommendations - for the product with productId: {} - """, - productId); - + log.debug("deleteRecommendations: tries to delete recommendations for the product with productId: {}", productId); repository - .deleteAll(repository.findByProductId(productId)) - .block(); + .deleteAll(repository.findByProductId(productId)) + .block(); } private void isValidProductId(int productId) { diff --git a/store-services/recommendation-service/src/test/java/com/siriusxi/ms/store/rs/RecommendationServiceApplicationTests.java b/store-services/recommendation-service/src/test/java/com/siriusxi/ms/store/rs/RecommendationServiceApplicationTests.java index e6e9470a..e7911919 100644 --- a/store-services/recommendation-service/src/test/java/com/siriusxi/ms/store/rs/RecommendationServiceApplicationTests.java +++ b/store-services/recommendation-service/src/test/java/com/siriusxi/ms/store/rs/RecommendationServiceApplicationTests.java @@ -85,7 +85,8 @@ public void duplicateError() { sendCreateRecommendationEvent(productId, recommendationId); fail("Expected a MessagingException here!"); } catch (MessagingException me) { - if (me.getCause() instanceof InvalidInputException iie) { + if (me.getCause() instanceof InvalidInputException) { + InvalidInputException iie = (InvalidInputException) me.getCause(); assertEquals("Duplicate key, Product Id: 1, Recommendation Id:1", iie.getMessage()); } else { fail("Expected a InvalidInputException as the root cause!"); diff --git a/store-services/review-service/Dockerfile b/store-services/review-service/Dockerfile index 52c97562..2d7297e2 100644 --- a/store-services/review-service/Dockerfile +++ b/store-services/review-service/Dockerfile @@ -1,7 +1,7 @@ #### Start of builder image # ------------------------ # Builder stage to prepare application for final image -FROM openjdk:15-slim-buster as builder +FROM openjdk:11-slim-buster AS builder WORKDIR temp # Could be set to different jar file location @@ -11,13 +11,13 @@ ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} application.jar # Extract the jar file layers -RUN java -Djarmode=layertools -jar --enable-preview application.jar extract +RUN java -Djarmode=layertools -jar application.jar extract #### End of builder stage #### Start of actual image # ------------------------ -# Build image based on latest JDK 15 base image, based on latest debian buster OS -FROM openjdk:15-slim-buster +# Build image based on latest JDK 11 base image, based on latest debian buster OS +FROM openjdk:11-slim-buster # Set image information, but could be set to different location from command line ARG IMAGE_VERSION="0.0.1-SNAPSHOT" @@ -48,6 +48,6 @@ ARG JAVA_OPTS="" # Run the application with JVM configs if any ENTRYPOINT ["bash", "-c", \ -"java -server --enable-preview -XX:+UseContainerSupport -XX:+ShowCodeDetailsInExceptionMessages \ +"java -server -XX:+UseContainerSupport \ -XX:+AlwaysActAsServerClassMachine -XX:+UseG1GC -XX:+UseStringDeduplication ${JAVA_OPTS} \ org.springframework.boot.loader.JarLauncher ${0} ${@}"] \ No newline at end of file diff --git a/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/ReviewServiceApplication.java b/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/ReviewServiceApplication.java index 4fee3462..b3413c6d 100644 --- a/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/ReviewServiceApplication.java +++ b/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/ReviewServiceApplication.java @@ -1,6 +1,7 @@ package com.siriusxi.ms.store.revs; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; @@ -10,9 +11,10 @@ @SpringBootApplication @ComponentScan("com.siriusxi.ms.store") -@Log4j2 public class ReviewServiceApplication { + private static final Logger log = LogManager.getLogger(ReviewServiceApplication.class); + public static void main(String[] args) { var mysqlUri = run(ReviewServiceApplication.class, args) diff --git a/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/api/ReviewController.java b/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/api/ReviewController.java index 8c0ceebd..fee49256 100644 --- a/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/api/ReviewController.java +++ b/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/api/ReviewController.java @@ -4,7 +4,8 @@ import com.siriusxi.ms.store.api.core.review.ReviewEndpoint; import com.siriusxi.ms.store.api.core.review.ReviewService; import com.siriusxi.ms.store.api.core.review.dto.Review; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.RestController; @@ -20,9 +21,10 @@ * @since v3.0 codename Storm */ @RestController -@Log4j2 public class ReviewController implements ReviewEndpoint { + private static final Logger log = LogManager.getLogger(ReviewController.class); + /** Review service business logic interface. */ private final ReviewService reviewService; diff --git a/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/config/ReviewServiceConfiguration.java b/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/config/ReviewServiceConfiguration.java index 6a04b201..b2699e77 100644 --- a/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/config/ReviewServiceConfiguration.java +++ b/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/config/ReviewServiceConfiguration.java @@ -1,6 +1,7 @@ package com.siriusxi.ms.store.revs.config; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -10,9 +11,10 @@ import java.util.concurrent.Executors; @Configuration -@Log4j2 public class ReviewServiceConfiguration { + private static final Logger log = LogManager.getLogger(ReviewServiceConfiguration.class); + @Value("${spring.datasource.hikari.maximum-pool-size:10}") Integer connectionPoolSize; diff --git a/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/infra/MessageProcessor.java b/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/infra/MessageProcessor.java index 00a44cbf..94982df4 100644 --- a/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/infra/MessageProcessor.java +++ b/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/infra/MessageProcessor.java @@ -4,7 +4,8 @@ import com.siriusxi.ms.store.api.core.review.dto.Review; import com.siriusxi.ms.store.api.event.Event; import com.siriusxi.ms.store.util.exceptions.EventProcessingException; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.cloud.stream.annotation.EnableBinding; @@ -14,9 +15,10 @@ import static java.lang.String.valueOf; @EnableBinding(Sink.class) -@Log4j2 public class MessageProcessor { + private static final Logger log = LogManager.getLogger(MessageProcessor.class); + private final ReviewService service; @Autowired @@ -30,18 +32,20 @@ public void process(Event event) { log.info("Process message created at {}...", event.getEventCreatedAt()); switch (event.getEventType()) { - case CREATE -> { + case CREATE: { Review review = event.getData(); log.info("Create review with ID: {}/{}", review.getProductId(), review.getReviewId()); service.createReview(review); + break; } - case DELETE -> { + case DELETE: { int productId = event.getKey(); log.info("Delete review with Product Id: {}", productId); service.deleteReviews(productId); + break; } - default -> { + default: { String errorMessage = "Incorrect event type: " .concat(valueOf(event.getEventType())) diff --git a/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/persistence/ReviewEntity.java b/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/persistence/ReviewEntity.java index e20f902c..f685b2df 100644 --- a/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/persistence/ReviewEntity.java +++ b/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/persistence/ReviewEntity.java @@ -1,10 +1,5 @@ package com.siriusxi.ms.store.revs.persistence; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.NonNull; -import lombok.RequiredArgsConstructor; - import javax.persistence.*; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; @@ -17,9 +12,6 @@ indexes = { @Index(name = "review_unique_idx", unique = true, columnList = "productId, reviewId") }) -@Data -@NoArgsConstructor -@RequiredArgsConstructor public class ReviewEntity { @Id @@ -28,18 +20,67 @@ public class ReviewEntity { @Version private int version; - @NonNull private int productId; - @NonNull private int reviewId; - @NonNull @NotBlank @Size(min = 6, max = 50) private String author; - @NonNull @NotBlank private String subject; - @NonNull @NotBlank private String content; + + public ReviewEntity() {} + + public ReviewEntity(int productId, int reviewId, String author, String subject, String content) { + this.productId = productId; + this.reviewId = reviewId; + this.author = author; + this.subject = subject; + this.content = content; + } + + public int getId() { return id; } + public void setId(int id) { this.id = id; } + public int getVersion() { return version; } + public void setVersion(int version) { this.version = version; } + public int getProductId() { return productId; } + public void setProductId(int productId) { this.productId = productId; } + public int getReviewId() { return reviewId; } + public void setReviewId(int reviewId) { this.reviewId = reviewId; } + public String getAuthor() { return author; } + public void setAuthor(String author) { this.author = author; } + public String getSubject() { return subject; } + public void setSubject(String subject) { this.subject = subject; } + public String getContent() { return content; } + public void setContent(String content) { this.content = content; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ReviewEntity that = (ReviewEntity) o; + return productId == that.productId && reviewId == that.reviewId && + java.util.Objects.equals(author, that.author) && + java.util.Objects.equals(subject, that.subject) && + java.util.Objects.equals(content, that.content); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(productId, reviewId, author, subject, content); + } + + @Override + public String toString() { + return "ReviewEntity{" + + "id=" + id + + ", version=" + version + + ", productId=" + productId + + ", reviewId=" + reviewId + + ", author='" + author + '\'' + + ", subject='" + subject + '\'' + + ", content='" + content + '\'' + + '}'; + } } diff --git a/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/service/ReviewServiceImpl.java b/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/service/ReviewServiceImpl.java index b15af62c..a6c6320b 100644 --- a/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/service/ReviewServiceImpl.java +++ b/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/service/ReviewServiceImpl.java @@ -6,7 +6,8 @@ import com.siriusxi.ms.store.revs.persistence.ReviewRepository; import com.siriusxi.ms.store.util.exceptions.InvalidInputException; import com.siriusxi.ms.store.util.http.ServiceUtil; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.reactivestreams.Publisher; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; @@ -20,9 +21,10 @@ import static java.util.logging.Level.FINE; @Service("ReviewServiceImpl") -@Log4j2 public class ReviewServiceImpl implements ReviewService { + private static final Logger log = LogManager.getLogger(ReviewServiceImpl.class); + private final ReviewRepository repository; private final ReviewMapper mapper; private final ServiceUtil serviceUtil; diff --git a/store-services/review-service/src/test/java/com/siriusxi/ms/store/revs/ReviewServiceApplicationTests.java b/store-services/review-service/src/test/java/com/siriusxi/ms/store/revs/ReviewServiceApplicationTests.java index cb0c3654..44e18cbc 100644 --- a/store-services/review-service/src/test/java/com/siriusxi/ms/store/revs/ReviewServiceApplicationTests.java +++ b/store-services/review-service/src/test/java/com/siriusxi/ms/store/revs/ReviewServiceApplicationTests.java @@ -83,7 +83,8 @@ public void duplicateError() { sendCreateReviewEvent(productId, reviewId); fail("Expected a MessagingException here!"); } catch (MessagingException me) { - if (me.getCause() instanceof InvalidInputException iie) { + if (me.getCause() instanceof InvalidInputException) { + InvalidInputException iie = (InvalidInputException) me.getCause(); assertEquals("Duplicate key, Product Id: 1, Review Id:1", iie.getMessage()); } else { fail("Expected a InvalidInputException as the root cause!"); diff --git a/store-services/store-service/Dockerfile b/store-services/store-service/Dockerfile index 6320d6ea..6e578676 100644 --- a/store-services/store-service/Dockerfile +++ b/store-services/store-service/Dockerfile @@ -1,7 +1,7 @@ #### Start of builder image # ------------------------ # Builder stage to prepare application for final image -FROM openjdk:15-slim-buster as builder +FROM openjdk:11-slim-buster AS builder WORKDIR temp # Could be set to different jar file location @@ -11,13 +11,13 @@ ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} application.jar # Extract the jar file layers -RUN java -Djarmode=layertools -jar --enable-preview application.jar extract +RUN java -Djarmode=layertools -jar application.jar extract #### End of builder stage #### Start of actual image # ------------------------ -# Build image based on latest JDK 15 base image, based on latest debian buster OS -FROM openjdk:15-slim-buster +# Build image based on latest JDK 11 base image, based on latest debian buster OS +FROM openjdk:11-slim-buster # Set image information, but could be set to different location from command line ARG IMAGE_VERSION="0.0.1-SNAPSHOT" @@ -48,6 +48,6 @@ ARG JAVA_OPTS="" # Run the application with JVM configs if any ENTRYPOINT ["bash", "-c", \ -"java -server --enable-preview -XX:+UseContainerSupport -XX:+ShowCodeDetailsInExceptionMessages \ +"java -server -XX:+UseContainerSupport \ -XX:+AlwaysActAsServerClassMachine -XX:+UseG1GC -XX:+UseStringDeduplication ${JAVA_OPTS} \ org.springframework.boot.loader.JarLauncher ${0} ${@}"] \ No newline at end of file diff --git a/store-services/store-service/pom.xml b/store-services/store-service/pom.xml index 1d84b133..8a7f604a 100644 --- a/store-services/store-service/pom.xml +++ b/store-services/store-service/pom.xml @@ -24,18 +24,9 @@ - io.springfox - springfox-swagger2 - - - io.springfox - springfox-spring-webflux - ${springfox.swagger.version} - - - io.springfox - springfox-swagger-ui - ${springfox.swagger.version} + org.springdoc + springdoc-openapi-webflux-ui + 1.8.0 diff --git a/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/StoreServiceApplication.java b/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/StoreServiceApplication.java index 1c1cc1c1..446a4760 100644 --- a/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/StoreServiceApplication.java +++ b/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/StoreServiceApplication.java @@ -3,10 +3,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ComponentScan; -import springfox.documentation.swagger2.annotations.EnableSwagger2WebFlux; @SpringBootApplication -@EnableSwagger2WebFlux // Starting point for initiating SpringFox @ComponentScan("com.siriusxi.ms.store") public class StoreServiceApplication { public static void main(String[] args) { diff --git a/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/api/StoreController.java b/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/api/StoreController.java index 76e8218e..bb879156 100644 --- a/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/api/StoreController.java +++ b/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/api/StoreController.java @@ -3,16 +3,18 @@ import com.siriusxi.ms.store.api.composite.StoreEndpoint; import com.siriusxi.ms.store.api.composite.StoreService; import com.siriusxi.ms.store.api.composite.dto.ProductAggregate; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.RestController; import reactor.core.publisher.Mono; @RestController -@Log4j2 public class StoreController implements StoreEndpoint { + private static final Logger log = LogManager.getLogger(StoreController.class); + /** Store service business logic interface. */ private final StoreService storeService; diff --git a/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/config/StoreServiceConfiguration.java b/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/config/StoreServiceConfiguration.java index 15992f29..d30e1e08 100644 --- a/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/config/StoreServiceConfiguration.java +++ b/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/config/StoreServiceConfiguration.java @@ -5,15 +5,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.reactive.function.client.WebClient; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.Contact; -import springfox.documentation.spring.web.plugins.Docket; - -import static java.util.Collections.emptyList; -import static org.springframework.web.bind.annotation.RequestMethod.*; -import static springfox.documentation.builders.RequestHandlerSelectors.basePackage; -import static springfox.documentation.spi.DocumentationType.SWAGGER_2; @Configuration public class StoreServiceConfiguration { @@ -45,48 +36,6 @@ public class StoreServiceConfiguration { @Value("${api.common.contact.email}") private String apiContactEmail; - /** - * Will exposed on $HOST:$PORT/swagger-ui.html - * - * @return Docket swagger configuration - */ - @Bean - public Docket apiDocumentation() { - - return new Docket(SWAGGER_2) - .select() - /* - Using the apis() and paths() methods, - we can specify where SpringFox shall look for API documentation. - */ - .apis(basePackage("com.siriusxi.ms.store")) - .paths(PathSelectors.any()) - .build() - /* - Using the globalResponseMessage() method, we ask SpringFox not to add any default HTTP - response codes to the API documentation, such as 401 and 403, - which we don't currently use. - */ - .globalResponseMessage(POST, emptyList()) - .globalResponseMessage(GET, emptyList()) - .globalResponseMessage(DELETE, emptyList()) - /* - The api* variables that are used to configure the Docket bean with general - information about the API are initialized from the property file using - Spring @Value annotations. - */ - .apiInfo( - new ApiInfo( - apiTitle, - apiDescription, - apiVersion, - apiTermsOfServiceUrl, - new Contact(apiContactName, apiContactUrl, apiContactEmail), - apiLicense, - apiLicenseUrl, - emptyList())); - } - @Bean @LoadBalanced public WebClient.Builder loadBalancedWebClientBuilder() { diff --git a/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/integration/StoreIntegration.java b/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/integration/StoreIntegration.java index 9d9477d0..60160d74 100644 --- a/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/integration/StoreIntegration.java +++ b/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/integration/StoreIntegration.java @@ -13,7 +13,8 @@ import com.siriusxi.ms.store.util.http.HttpErrorInfo; import io.github.resilience4j.circuitbreaker.annotation.CircuitBreaker; import io.github.resilience4j.retry.annotation.Retry; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.stream.annotation.EnableBinding; @@ -38,9 +39,10 @@ @EnableBinding(MessageSources.class) @Component -@Log4j2 public class StoreIntegration implements ProductService, RecommendationService, ReviewService { + private static final Logger log = LogManager.getLogger(StoreIntegration.class); + private final String PRODUCT_ID_QUERY_PARAM = "?productId="; private final WebClient.Builder webClientBuilder; private final ObjectMapper mapper; @@ -195,19 +197,25 @@ private WebClient getWebClient() { } private Throwable handleException(Throwable ex) { - if (!(ex instanceof WebClientResponseException wcre)) { + if (!(ex instanceof WebClientResponseException)) { log.warn("Got a unexpected error: {}, will rethrow it", ex.toString()); return ex; } - return switch (wcre.getStatusCode()) { - case NOT_FOUND -> new NotFoundException(getErrorMessage(wcre)); - case UNPROCESSABLE_ENTITY -> new InvalidInputException(getErrorMessage(wcre)); - default -> { + WebClientResponseException wcre = (WebClientResponseException) ex; + + switch (wcre.getStatusCode()) { + case NOT_FOUND: + return new NotFoundException(getErrorMessage(wcre)); + + case UNPROCESSABLE_ENTITY: + return new InvalidInputException(getErrorMessage(wcre)); + + default: log.warn("Got a unexpected HTTP error: {}, will rethrow it", wcre.getStatusCode()); log.warn("Error body: {}", wcre.getResponseBodyAsString()); - throw wcre;} - }; + throw wcre; + } } private String getErrorMessage(WebClientResponseException ex) { diff --git a/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/service/StoreServiceImpl.java b/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/service/StoreServiceImpl.java index fbd46f76..f2f6771f 100644 --- a/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/service/StoreServiceImpl.java +++ b/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/service/StoreServiceImpl.java @@ -13,7 +13,8 @@ import com.siriusxi.ms.store.util.http.ServiceUtil; import io.github.resilience4j.circuitbreaker.CircuitBreakerOpenException; import io.github.resilience4j.reactor.retry.RetryExceptionWrapper; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextImpl; @@ -31,9 +32,10 @@ import static org.springframework.security.core.context.ReactiveSecurityContextHolder.getContext; @Service("StoreServiceImpl") -@Log4j2 public class StoreServiceImpl implements StoreService { + private static final Logger log = LogManager.getLogger(StoreServiceImpl.class); + private final ServiceUtil serviceUtil; private final StoreIntegration integration; private final SecurityContext nullSC = new SecurityContextImpl(); diff --git a/store-services/store-service/src/test/java/com/siriusxi/ms/store/pcs/IsSameEvent.java b/store-services/store-service/src/test/java/com/siriusxi/ms/store/pcs/IsSameEvent.java index e9da0aa8..7aaf395e 100644 --- a/store-services/store-service/src/test/java/com/siriusxi/ms/store/pcs/IsSameEvent.java +++ b/store-services/store-service/src/test/java/com/siriusxi/ms/store/pcs/IsSameEvent.java @@ -5,7 +5,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.siriusxi.ms.store.api.event.Event; -import lombok.extern.log4j.Log4j2; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; @@ -14,9 +15,10 @@ import java.util.HashMap; import java.util.Map; -@Log4j2 class IsSameEvent extends TypeSafeMatcher { + private static final Logger log = LogManager.getLogger(IsSameEvent.class); + private final ObjectMapper mapper = new ObjectMapper(); private final Event expectedEvent; diff --git a/test-em-all.sh b/test-em-all.sh index d51c29ad..f0f4e1ca 100755 --- a/test-em-all.sh +++ b/test-em-all.sh @@ -182,7 +182,7 @@ function testCircuitBreaker() { echo "Start Circuit Breaker tests!" - EXEC="docker run --rm -it --network=ssm_default alpine" + EXEC="docker run --rm --network=ssm_default alpine" # First, use the health - endpoint to verify that the circuit breaker is closed assertEqual "CLOSED" "$(${EXEC} wget store:8080/actuator/health -qO - | \ @@ -211,12 +211,25 @@ function testCircuitBreaker() { assertEqual "Product Id: $PROD_ID_NOT_FOUND not found in fallback cache!" "$(echo ${RESPONSE} | jq -r .message)" # Wait for the circuit breaker to transition to the half open state (i.e. max 10 sec) - echo "Will sleep for 10 sec waiting for the CB to go Half Open..." - sleep 10 - - # Verify that the circuit breaker is in half open state - assertEqual "HALF_OPEN" "$(${EXEC} wget store:8080/actuator/health -qO - | \ - jq -r .components.productCircuitBreaker.details.state)" + echo "Will wait up to 20 sec for the CB to go Half Open..." + + # Wait and verify that the circuit breaker transitions to half open state + # with retries for up to 20 seconds + for i in {1..5}; do + sleep 4 + CB_STATE="$(${EXEC} wget store:8080/actuator/health -qO - | jq -r .components.productCircuitBreaker.details.state)" + if [ "$CB_STATE" = "HALF_OPEN" ]; then + break + fi + if [ $i -eq 5 ]; then + echo "Circuit breaker did not transition to HALF_OPEN state within 15 seconds. Current state: $CB_STATE" + exit 1 + fi + echo "Circuit breaker state is $CB_STATE, waiting..." + done + + # Final verification + assertEqual "HALF_OPEN" "$CB_STATE" # Close the circuit breaker by running three normal calls in a row # Also, verify that we get 200 back and a response based on information in the product database @@ -252,10 +265,10 @@ echo "PORT=${PORT}" if [[ $@ == *"start"* ]] then echo "Restarting the test environment..." - echo "$ docker-compose -p ssm down --remove-orphans" - docker-compose -p ssm down --remove-orphans - echo "$ docker-compose -p ssm up -d" - docker-compose -p ssm up -d + echo "$ docker compose -p ssm down --remove-orphans" + docker compose -p ssm down --remove-orphans + echo "$ docker compose -p ssm up -d" + docker compose -p ssm up -d fi waitForService curl -k https://${HOST}:${PORT}/actuator/health @@ -320,6 +333,6 @@ echo "End, all tests OK:" `date` if [[ $@ == *"stop"* ]] then echo "We are done, stopping the test environment..." - echo "$ docker-compose -p ssm down --remove-orphans" - docker-compose -p ssm down --remove-orphans -fi \ No newline at end of file + echo "$ docker compose -p ssm down --remove-orphans" + docker compose -p ssm down --remove-orphans +fi