From 458a6859527f10feec8a426476522755105d37b8 Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Fri, 8 Mar 2024 12:45:38 +0000 Subject: [PATCH 01/30] feat : adds workflow for dependency upgradation --- .github/workflows/maven.yml | 28 ++++++++++++++++++++++++++++ renovate.json | 16 ++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 .github/workflows/maven.yml create mode 100644 renovate.json diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 00000000..830aecd5 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,28 @@ +# 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@v4 + - name: Set up JDK 15 + uses: actions/setup-java@v4 + with: + java-version: '15' + distribution: 'adopt' + cache: maven + - name: Build with Maven + run: | + ./setup.sh + ./mvnw clean verify -Ddockerfile.skip + ./test-em-all.sh start \ No newline at end of file diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000..6aea6c7c --- /dev/null +++ b/renovate.json @@ -0,0 +1,16 @@ +{ + "extends": ["config:base"], + "includeForks": true, + "packageRules": [ + { + "updateTypes": ["minor", "patch", "pin", "digest"], + "automerge": true + } + ], + "labels": ["dependencies"], + "cloneSubmodules" : true, + "vulnerabilityAlerts": { + "labels": ["security"], + "automerge": true + } + } \ No newline at end of file From a8617eaa50c5a9170d9346d3c48d858e766d8fab Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Fri, 8 Mar 2024 12:53:28 +0000 Subject: [PATCH 02/30] feat : fix issue with building application Snapshot versions are unavailable. Hence migrating to stable versions --- store-base/store-build-chassis/pom.xml | 8 ++++---- store-common/store-api/pom.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml index 161800ea..b1221e43 100644 --- a/store-base/store-build-chassis/pom.xml +++ b/store-base/store-build-chassis/pom.xml @@ -27,13 +27,13 @@ ../../config/maven/store.properties 3.8.1 - 3.0.0-M4 - 3.0.0-M4 + 3.0.0 + 3.0.0 1.0.0 2.7 1.4.13 - 3.0.0-SNAPSHOT - 1.4.0.Beta1 + 3.0.0 + 1.4.0.Final 1.18.12 diff --git a/store-common/store-api/pom.xml b/store-common/store-api/pom.xml index 9a3dcd84..59626a83 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 From c265b2f3c039dee61be82e40f2b6be57c1fea012 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 15:59:16 +0000 Subject: [PATCH 03/30] chore(config): migrate config renovate.json --- renovate.json | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/renovate.json b/renovate.json index 6aea6c7c..05872d76 100644 --- a/renovate.json +++ b/renovate.json @@ -1,16 +1,27 @@ -{ - "extends": ["config:base"], - "includeForks": true, - "packageRules": [ - { - "updateTypes": ["minor", "patch", "pin", "digest"], - "automerge": true - } - ], - "labels": ["dependencies"], - "cloneSubmodules" : true, - "vulnerabilityAlerts": { - "labels": ["security"], - "automerge": true - } - } \ No newline at end of file +{ + "extends": [ + "config:recommended" + ], + "forkProcessing": "enabled", + "packageRules": [ + { + "matchUpdateTypes": [ + "minor", + "patch", + "pin", + "digest" + ], + "automerge": true + } + ], + "labels": [ + "dependencies" + ], + "cloneSubmodules": true, + "vulnerabilityAlerts": { + "labels": [ + "security" + ], + "automerge": true + } +} From d2ce423834c97ed781825841fa1c1ba6ccf0a2a0 Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Mon, 19 May 2025 22:33:21 +0530 Subject: [PATCH 04/30] fix issue with running pipeline (#14) * fix : issue with running end to end tests * upgrade maven wrapper * fix issue with running circuit breaker --- .mvn/wrapper/MavenWrapperDownloader.java | 115 ------ .mvn/wrapper/maven-wrapper.jar | Bin 50710 -> 0 bytes .mvn/wrapper/maven-wrapper.properties | 21 +- mvnw | 453 ++++++++++------------- mvnw.cmd | 331 ++++++++--------- test-em-all.sh | 14 +- 6 files changed, 376 insertions(+), 558 deletions(-) delete mode 100644 .mvn/wrapper/MavenWrapperDownloader.java delete mode 100644 .mvn/wrapper/maven-wrapper.jar 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 2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 50710 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 EfAhh=DF6Tf diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 642d572c..d58dfb70 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,19 @@ -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 +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/mvnw b/mvnw index a16b5431..19529ddf 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,241 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# 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.2 # # 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 +# 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 <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.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${0##*/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%/*}" + +# 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" -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." +# 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 - - if command -v wget > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found wget ... using wget" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget "$jarUrl" -O "$wrapperJarPath" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - if [ "$MVNW_VERBOSE" = true ]; then - echo "Found curl ... using curl" - fi - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl -o "$wrapperJarPath" "$jarUrl" -f - else - curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f - fi - - else - if [ "$MVNW_VERBOSE" = true ]; then - echo "Falling back to using Java to download" - fi - javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaClass=`cygpath --path --windows "$javaClass"` - fi - if [ -e "$javaClass" ]; then - if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Compiling MavenWrapperDownloader.java ..." - fi - # Compiling the Java class - ("$JAVA_HOME/bin/javac" "$javaClass") - fi - if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then - # Running the downloader - if [ "$MVNW_VERBOSE" = true ]; then - echo " - Running MavenWrapperDownloader.java ..." - fi - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") - fi - fi - fi -fi -########################################################################################## -# End of extension -########################################################################################## - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -if [ "$MVNW_VERBOSE" = true ]; then - echo $MAVEN_PROJECTBASEDIR + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$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..b150b91e 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -1,182 +1,149 @@ -@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.2 +@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) { "/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_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::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 +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -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/test-em-all.sh b/test-em-all.sh index d51c29ad..f0acfa01 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 - | \ @@ -252,10 +252,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 +320,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 + echo "$ docker compose -p ssm down --remove-orphans" + docker compose -p ssm down --remove-orphans fi \ No newline at end of file From 685f80cf12ca53906308ad926daca235adf044e7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 22:39:28 +0530 Subject: [PATCH 05/30] chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.14.0 (#6) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- store-base/store-build-chassis/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml index b1221e43..c7d81630 100644 --- a/store-base/store-build-chassis/pom.xml +++ b/store-base/store-build-chassis/pom.xml @@ -26,7 +26,7 @@ ../../config/maven/store.properties - 3.8.1 + 3.14.0 3.0.0 3.0.0 1.0.0 From 60bcab108954ae0ea63cf9917433ca350eab6746 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 22:39:58 +0530 Subject: [PATCH 06/30] chore(deps): update dependency org.codehaus.mojo:properties-maven-plugin to v1.2.1 (#9) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- store-base/store-build-chassis/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml index c7d81630..85d9d39d 100644 --- a/store-base/store-build-chassis/pom.xml +++ b/store-base/store-build-chassis/pom.xml @@ -29,7 +29,7 @@ 3.14.0 3.0.0 3.0.0 - 1.0.0 + 1.2.1 2.7 1.4.13 3.0.0 From 81b14725cb69e3f94c32c3912c9fec4d4c62dce7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 22:46:47 +0530 Subject: [PATCH 07/30] fix(deps): update mapstruct monorepo to v1.6.3 (#17) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- store-base/store-build-chassis/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml index 85d9d39d..9f4055b5 100644 --- a/store-base/store-build-chassis/pom.xml +++ b/store-base/store-build-chassis/pom.xml @@ -33,7 +33,7 @@ 2.7 1.4.13 3.0.0 - 1.4.0.Final + 1.6.3 1.18.12 From 919809de5fb832192574ef962ba57fa0755e0504 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 22:48:05 +0530 Subject: [PATCH 08/30] chore(deps): update dependency org.apache.maven.plugins:maven-failsafe-plugin to v3.5.3 (#7) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- store-base/store-build-chassis/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml index 9f4055b5..407b301a 100644 --- a/store-base/store-build-chassis/pom.xml +++ b/store-base/store-build-chassis/pom.xml @@ -28,7 +28,7 @@ 3.14.0 3.0.0 - 3.0.0 + 3.5.3 1.2.1 2.7 1.4.13 From 6f8f201ef8dab99ce4b32fbab4de42c61014efd5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 22:54:59 +0530 Subject: [PATCH 09/30] chore(deps): update mongo docker tag to v4.2.24 (#11) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- docker-compose-kafka.yml | 2 +- docker-compose-partitions.yml | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose-kafka.yml b/docker-compose-kafka.yml index 00dd2988..7ed74df1 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: diff --git a/docker-compose-partitions.yml b/docker-compose-partitions.yml index 70a7f13a..5bf52386 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: diff --git a/docker-compose.yml b/docker-compose.yml index 74ac457c..87dadaec 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: From b6f9bcb961bd07e0272701408262b87e9fab7d31 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 22:55:20 +0530 Subject: [PATCH 10/30] chore(deps): update mysql docker tag to v8.4.5 (#15) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- docker-compose-kafka.yml | 2 +- docker-compose-partitions.yml | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose-kafka.yml b/docker-compose-kafka.yml index 7ed74df1..3b1ac983 100644 --- a/docker-compose-kafka.yml +++ b/docker-compose-kafka.yml @@ -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.5 ports: - "3306:3306" environment: diff --git a/docker-compose-partitions.yml b/docker-compose-partitions.yml index 5bf52386..6271d848 100644 --- a/docker-compose-partitions.yml +++ b/docker-compose-partitions.yml @@ -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.5 ports: - "3306:3306" environment: diff --git a/docker-compose.yml b/docker-compose.yml index 87dadaec..eb3a1648 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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.5 ports: - "3306:3306" environment: From 436c3ff5aea4b0877daf8d2c6bf075df937b8b18 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 23:00:34 +0530 Subject: [PATCH 11/30] chore(deps): update dependency org.codehaus.mojo:versions-maven-plugin to v2.18.0 (#10) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- store-base/store-build-chassis/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml index 407b301a..32f2cfed 100644 --- a/store-base/store-build-chassis/pom.xml +++ b/store-base/store-build-chassis/pom.xml @@ -30,7 +30,7 @@ 3.0.0 3.5.3 1.2.1 - 2.7 + 2.18.0 1.4.13 3.0.0 1.6.3 From 97bbaa95053efbd84a38884a44b6d196d4ecb591 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 23:07:45 +0530 Subject: [PATCH 12/30] fix(deps): update dependency org.springframework.security:spring-security-jwt-jose to v5.0.0.build-snapshot (#4) * fix(deps): update dependency org.springframework.security:spring-security-jwt-jose to v5.0.0.build-snapshot * use replacement --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Raja Kolli --- store-cloud-infra/authorization-server/pom.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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 From 31e12ee99d4c8fc747d2ffc840bd76c773342d82 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 23:14:02 +0530 Subject: [PATCH 13/30] chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.5.3 (#8) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- store-base/store-build-chassis/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml index 32f2cfed..dddcd876 100644 --- a/store-base/store-build-chassis/pom.xml +++ b/store-base/store-build-chassis/pom.xml @@ -27,7 +27,7 @@ ../../config/maven/store.properties 3.14.0 - 3.0.0 + 3.5.3 3.5.3 1.2.1 2.18.0 From 022027bdbf59edb69cac7ef8107fc6d3f6274ad1 Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Mon, 19 May 2025 23:52:48 +0530 Subject: [PATCH 14/30] Refactor logging implementation across services to use Log4j2 (#22) - Replaced Lombok's @Log4j2 annotation with explicit Log4j2 Logger instantiation in various classes across the project. - Updated GatewayConfiguration, GlobalControllerExceptionHandler, ServiceUtil, and multiple service implementations to use LogManager and Logger for logging. - Removed Lombok annotations from Product, Recommendation, Review, Event, and entity classes, replacing them with manual getter, setter, equals, hashCode, and toString methods. - Ensured consistent logging practices across all services, enhancing maintainability and readability of the codebase. --- store-base/store-build-chassis/pom.xml | 13 --- .../gateway/config/GatewayConfiguration.java | 6 +- .../store/api/core/product/dto/Product.java | 74 ++++++++++++-- .../recommendation/dto/Recommendation.java | 96 +++++++++++++++++-- .../ms/store/api/core/review/dto/Review.java | 96 +++++++++++++++++-- .../siriusxi/ms/store/api/event/Event.java | 79 ++++++++++++--- .../GlobalControllerExceptionHandler.java | 6 +- .../ms/store/util/http/ServiceUtil.java | 5 +- .../store/ps/ProductServiceApplication.java | 6 +- .../ms/store/ps/api/ProductController.java | 6 +- .../ms/store/ps/infra/MessageProcessor.java | 6 +- .../store/ps/persistence/ProductEntity.java | 48 ++++++++-- .../store/ps/service/ProductServiceImpl.java | 6 +- .../rs/RecommendationServiceApplication.java | 6 +- .../rs/api/RecommendationController.java | 6 +- .../ms/store/rs/infra/MessageProcessor.java | 6 +- .../rs/persistence/RecommendationEntity.java | 53 ++++++++-- .../rs/service/RecommendationServiceImpl.java | 6 +- .../store/revs/ReviewServiceApplication.java | 6 +- .../ms/store/revs/api/ReviewController.java | 6 +- .../config/ReviewServiceConfiguration.java | 6 +- .../ms/store/revs/infra/MessageProcessor.java | 6 +- .../store/revs/persistence/ReviewEntity.java | 67 ++++++++++--- .../store/revs/service/ReviewServiceImpl.java | 6 +- .../ms/store/pcs/api/StoreController.java | 6 +- .../pcs/integration/StoreIntegration.java | 6 +- .../store/pcs/service/StoreServiceImpl.java | 6 +- .../siriusxi/ms/store/pcs/IsSameEvent.java | 6 +- 28 files changed, 533 insertions(+), 112 deletions(-) diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml index dddcd876..9b9b061c 100644 --- a/store-base/store-build-chassis/pom.xml +++ b/store-base/store-build-chassis/pom.xml @@ -34,7 +34,6 @@ 1.4.13 3.0.0 1.6.3 - 1.18.12 true @@ -85,13 +84,6 @@ runtime - - - org.projectlombok - lombok - true - - @@ -117,11 +109,6 @@ mapstruct-processor ${org.mapstruct.version} - - org.projectlombok - lombok - ${org.lombok.version} - 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-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/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/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..51d9d4d5 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 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/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..7ffa3c83 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 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..ddb92e01 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; 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..6543d833 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 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/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/integration/StoreIntegration.java b/store-services/store-service/src/main/java/com/siriusxi/ms/store/pcs/integration/StoreIntegration.java index 9d9477d0..b5d9bebf 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; 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; From 8a15b54dbc1251328605345490bd439e24c74cdd Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Tue, 20 May 2025 00:04:32 +0530 Subject: [PATCH 15/30] refactor: migrate from SpringFox to Springdoc OpenAPI for API documentation (#20) --- store-base/store-build-chassis/pom.xml | 8 +- store-common/store-api/pom.xml | 6 +- .../ms/store/api/composite/StoreEndpoint.java | 89 ++++++------------- store-services/store-service/pom.xml | 15 +--- .../ms/store/pcs/StoreServiceApplication.java | 2 - .../pcs/config/StoreServiceConfiguration.java | 51 ----------- 6 files changed, 36 insertions(+), 135 deletions(-) diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml index 9b9b061c..5fb9720f 100644 --- a/store-base/store-build-chassis/pom.xml +++ b/store-base/store-build-chassis/pom.xml @@ -41,13 +41,7 @@ - - - io.springfox - springfox-swagger2 - ${springfox.swagger.version} - - + org.springframework.cloud diff --git a/store-common/store-api/pom.xml b/store-common/store-api/pom.xml index 59626a83..6da56b11 100644 --- a/store-common/store-api/pom.xml +++ b/store-common/store-api/pom.xml @@ -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-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/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() { From 3f390168becb65589feeedf998a8e95913861c02 Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Tue, 20 May 2025 10:04:23 +0530 Subject: [PATCH 16/30] refactor: remove Zipkin dependency from project configuration (#28) --- docker-compose.yml | 2 +- store-base/store-cloud-chassis/pom.xml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index eb3a1648..c271b61f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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/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 - - From df521f51ffccd852d36ace4a80ac19708d5810c0 Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Sat, 24 May 2025 21:24:59 +0530 Subject: [PATCH 17/30] feat : adds script ro start and stop docker --- run-em-all.sh | 23 +++++++++++++++++++---- stop-em-all.sh | 17 ++++++++++++++++- 2 files changed, 35 insertions(+), 5 deletions(-) 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." From 9c09ec0de8dea8b3cd9da11a42158af565899eae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 23 Jul 2025 03:06:24 +0000 Subject: [PATCH 18/30] chore(deps): update mysql docker tag to v8.4.6 (#36) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- docker-compose-kafka.yml | 2 +- docker-compose-partitions.yml | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose-kafka.yml b/docker-compose-kafka.yml index 3b1ac983..b5f221ef 100644 --- a/docker-compose-kafka.yml +++ b/docker-compose-kafka.yml @@ -186,7 +186,7 @@ services: ## Start - MySql database definition ### $ mysql -uroot -h127.0.0.1 -p mysql: - image: mysql:8.4.5 + image: mysql:8.4.6 ports: - "3306:3306" environment: diff --git a/docker-compose-partitions.yml b/docker-compose-partitions.yml index 6271d848..d3dfca7d 100644 --- a/docker-compose-partitions.yml +++ b/docker-compose-partitions.yml @@ -185,7 +185,7 @@ services: ## Start - MySql database definition ### $ mysql -uroot -h127.0.0.1 -p mysql: - image: mysql:8.4.5 + image: mysql:8.4.6 ports: - "3306:3306" environment: diff --git a/docker-compose.yml b/docker-compose.yml index c271b61f..40c01bf0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -147,7 +147,7 @@ services: ## Start - MySql database definition ### $ mysql -uroot -h127.0.0.1 -p mysql: - image: mysql:8.4.5 + image: mysql:8.4.6 ports: - "3306:3306" environment: From b3de08c8a756ed1916f772d5d8c452fb6f3f0f25 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Aug 2025 18:47:03 +0530 Subject: [PATCH 19/30] chore(deps): update actions/checkout action to v5 (#37) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 830aecd5..5787fb4a 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Set up JDK 15 uses: actions/setup-java@v4 with: From 96979b141103457c1651b9da21ea5917b5634726 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Aug 2025 18:55:05 +0530 Subject: [PATCH 20/30] chore(deps): update actions/setup-java action to v5 (#38) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5787fb4a..15d788bd 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/checkout@v5 - name: Set up JDK 15 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: '15' distribution: 'adopt' From 6142329833bf4b0f189515e3ebbe7947b1bd21c9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Aug 2025 19:13:24 +0530 Subject: [PATCH 21/30] chore(deps): update dependency maven to v3.9.11 (#32) * chore(deps): update dependency maven to v3.9.11 * Increase timeout --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Raja Kolli --- .mvn/wrapper/maven-wrapper.properties | 2 +- test-em-all.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index d58dfb70..12fbe1e9 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -16,4 +16,4 @@ # under the License. wrapperVersion=3.3.2 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +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/test-em-all.sh b/test-em-all.sh index f0acfa01..b12319fa 100755 --- a/test-em-all.sh +++ b/test-em-all.sh @@ -211,8 +211,8 @@ 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 + echo "Will sleep for 15 sec waiting for the CB to go Half Open..." + sleep 15 # Verify that the circuit breaker is in half open state assertEqual "HALF_OPEN" "$(${EXEC} wget store:8080/actuator/health -qO - | \ @@ -322,4 +322,4 @@ 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 +fi From 1511979982791647a416f0f105356740df5aa919 Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Fri, 29 Aug 2025 08:52:42 +0530 Subject: [PATCH 22/30] chore : update time for the circuit breaker to transition to the half open state --- test-em-all.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test-em-all.sh b/test-em-all.sh index b12319fa..e1a91c17 100755 --- a/test-em-all.sh +++ b/test-em-all.sh @@ -210,9 +210,9 @@ function testCircuitBreaker() { assertCurl 404 "curl -k https://${HOST}:${PORT}${BASE_URL}/$PROD_ID_NOT_FOUND $AUTH -s" 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 15 sec waiting for the CB to go Half Open..." - sleep 15 + # Wait for the circuit breaker to transition to the half open state (i.e. max 25 sec) + echo "Will sleep for 25 sec waiting for the CB to go Half Open..." + sleep 25 # Verify that the circuit breaker is in half open state assertEqual "HALF_OPEN" "$(${EXEC} wget store:8080/actuator/health -qO - | \ From 9c990c664379dfc6fb913d852aece8724e8ac217 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 01:09:55 +0000 Subject: [PATCH 23/30] chore(deps): update dependency org.codehaus.mojo:versions-maven-plugin to v2.19.0 (#42) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- store-base/store-build-chassis/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml index 5fb9720f..34ef1266 100644 --- a/store-base/store-build-chassis/pom.xml +++ b/store-base/store-build-chassis/pom.xml @@ -30,7 +30,7 @@ 3.5.3 3.5.3 1.2.1 - 2.18.0 + 2.19.0 1.4.13 3.0.0 1.6.3 From 55c54e5692d03e6265472ce7379c8d475e0edc79 Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Sat, 27 Sep 2025 10:59:47 +0000 Subject: [PATCH 24/30] Attempt to fix build issues --- .github/workflows/maven.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 15d788bd..40aa801a 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -23,6 +23,25 @@ jobs: 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 - ./test-em-all.sh start \ No newline at end of file + + # 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 From f211da79676609377f001b092147da610ccb1a8b Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Sat, 27 Sep 2025 19:36:15 +0530 Subject: [PATCH 25/30] feat : downgrade to java 11 for debugging the issue (#44) * feat : downgrade to Java 11 for debugging the build issue. * fix : compilation issues * fix issue with starting application * fix warning while building docker image * fix: add equals, hashCode, and toString to maintain value semantics --- .github/workflows/maven.yml | 6 +- store-base/store-build-chassis/pom.xml | 5 +- .../authorization-server/Dockerfile | 10 +-- store-cloud-infra/config-server/Dockerfile | 10 +-- store-cloud-infra/edge-server/Dockerfile | 10 +-- store-cloud-infra/eureka-server/Dockerfile | 10 +-- .../api/composite/dto/ProductAggregate.java | 62 +++++++++++++++++-- .../composite/dto/RecommendationSummary.java | 21 +++++-- .../api/composite/dto/ReviewSummary.java | 21 +++++-- .../api/composite/dto/ServiceAddresses.java | 22 +++++-- .../ms/store/util/http/HttpErrorInfo.java | 59 +++++++++++++++--- store-services/product-service/Dockerfile | 10 +-- .../ms/store/ps/infra/MessageProcessor.java | 8 ++- .../ps/ProductServiceApplicationTests.java | 3 +- .../recommendation-service/Dockerfile | 10 +-- .../ms/store/rs/infra/MessageProcessor.java | 8 ++- .../rs/service/RecommendationServiceImpl.java | 12 +--- ...RecommendationServiceApplicationTests.java | 3 +- store-services/review-service/Dockerfile | 10 +-- .../ms/store/revs/infra/MessageProcessor.java | 8 ++- .../revs/ReviewServiceApplicationTests.java | 3 +- store-services/store-service/Dockerfile | 10 +-- .../pcs/integration/StoreIntegration.java | 20 +++--- test-em-all.sh | 6 +- 24 files changed, 243 insertions(+), 104 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 40aa801a..49bd28f2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -15,11 +15,11 @@ jobs: steps: - uses: actions/checkout@v5 - - name: Set up JDK 15 + - name: Set up JDK 11 uses: actions/setup-java@v5 with: - java-version: '15' - distribution: 'adopt' + java-version: '11' + distribution: 'temurin' cache: maven - name: Build with Maven run: | diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml index 34ef1266..f6682539 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 @@ -96,7 +96,6 @@ ${maven.compiler.plugin.version} ${java.version} - --enable-preview org.mapstruct @@ -110,7 +109,6 @@ maven-surefire-plugin ${maven.surefire.plugin.version} - --enable-preview **/*Tests.java **/*Test.java @@ -121,7 +119,6 @@ maven-failsafe-plugin ${maven.failsafe.plugin.version} - --enable-preview 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/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/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/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-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-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/infra/MessageProcessor.java b/store-services/product-service/src/main/java/com/siriusxi/ms/store/ps/infra/MessageProcessor.java index 51d9d4d5..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 @@ -30,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/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/infra/MessageProcessor.java b/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/infra/MessageProcessor.java index 7ffa3c83..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 @@ -32,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/service/RecommendationServiceImpl.java b/store-services/recommendation-service/src/main/java/com/siriusxi/ms/store/rs/service/RecommendationServiceImpl.java index ddb92e01..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 @@ -69,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/infra/MessageProcessor.java b/store-services/review-service/src/main/java/com/siriusxi/ms/store/revs/infra/MessageProcessor.java index 6543d833..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 @@ -32,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/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/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 b5d9bebf..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 @@ -197,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/test-em-all.sh b/test-em-all.sh index e1a91c17..f8a398fa 100755 --- a/test-em-all.sh +++ b/test-em-all.sh @@ -210,9 +210,9 @@ function testCircuitBreaker() { assertCurl 404 "curl -k https://${HOST}:${PORT}${BASE_URL}/$PROD_ID_NOT_FOUND $AUTH -s" 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 25 sec) - echo "Will sleep for 25 sec waiting for the CB to go Half Open..." - sleep 25 + # 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 - | \ From eb0b983622950a0d48d292f61e3481973401493a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 27 Sep 2025 19:47:15 +0530 Subject: [PATCH 26/30] chore(deps): update dependency org.apache.maven.plugins:maven-failsafe-plugin to v3.5.4 (#43) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- store-base/store-build-chassis/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml index f6682539..b9efcd1e 100644 --- a/store-base/store-build-chassis/pom.xml +++ b/store-base/store-build-chassis/pom.xml @@ -28,7 +28,7 @@ 3.14.0 3.5.3 - 3.5.3 + 3.5.4 1.2.1 2.19.0 1.4.13 From 3d3108d8c880e8ae4729416f87fc47fb269ab793 Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Sat, 4 Oct 2025 23:02:35 +0000 Subject: [PATCH 27/30] run for 20 sec --- test-em-all.sh | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/test-em-all.sh b/test-em-all.sh index f8a398fa..f0f4e1ca 100755 --- a/test-em-all.sh +++ b/test-em-all.sh @@ -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 From e2ac8ec318934ae8f32aadcdd874b63d8dee1df4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 Oct 2025 04:42:19 +0530 Subject: [PATCH 28/30] chore(deps): update dependency maven-wrapper to v3.3.4 (#41) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .mvn/wrapper/maven-wrapper.properties | 18 +-------- mvnw | 50 ++++++++++++++++++++---- mvnw.cmd | 56 +++++++++++++++++++++++---- 3 files changed, 92 insertions(+), 32 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 12fbe1e9..c0bcafe9 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,19 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -wrapperVersion=3.3.2 +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/mvnw b/mvnw index 19529ddf..bd8896bf 100755 --- a/mvnw +++ b/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 +# Apache Maven Wrapper startup batch script, version 3.3.4 # # Optional ENV vars # ----------------- @@ -105,14 +105,17 @@ trim() { printf "%s" "${1}" | tr -d '[:space:]' } +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 <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" -[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" +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.*) @@ -130,7 +133,7 @@ maven-mvnd-*bin.*) distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" ;; maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; -*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; esac # apply MVNW_REPOURL and calculate MAVEN_HOME @@ -227,7 +230,7 @@ if [ -n "${distributionSha256Sum-}" ]; then 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 + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then distributionSha256Result=true fi elif command -v shasum >/dev/null; then @@ -252,8 +255,41 @@ if command -v unzip >/dev/null; then else tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" fi -printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" -mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# 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 + +# 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 + +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 + +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" clean || : exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd index b150b91e..5761d948 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -19,7 +19,7 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@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 @@ -40,7 +40,7 @@ @SET __MVNW_ARG0_NAME__= @SET MVNW_USERNAME= @SET MVNW_PASSWORD= -@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) @echo Cannot start maven from wrapper >&2 && exit /b 1 @GOTO :EOF : end batch / begin powershell #> @@ -73,16 +73,30 @@ switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { # 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) { "/org/apache/maven/" } else { "/maven/mvnd/" } - $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" + $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_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" + +$MAVEN_M2_PATH = "$HOME/.m2" if ($env:MAVEN_USER_HOME) { - $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" + $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_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' + +$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) { @@ -134,7 +148,33 @@ if ($distributionSha256Sum) { # unzip and move Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null -Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | 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 { From 7cc58b6ca531b8f8c8abc8dec7a29be88cdce0f2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 Oct 2025 04:42:40 +0530 Subject: [PATCH 29/30] chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.14.1 (#45) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- store-base/store-build-chassis/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml index b9efcd1e..718ab528 100644 --- a/store-base/store-build-chassis/pom.xml +++ b/store-base/store-build-chassis/pom.xml @@ -26,7 +26,7 @@ ../../config/maven/store.properties - 3.14.0 + 3.14.1 3.5.3 3.5.4 1.2.1 From dbb6e0aeb49442d6a743209c9597c17f33392ba9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 Oct 2025 04:50:37 +0530 Subject: [PATCH 30/30] chore(deps): update dependency org.codehaus.mojo:versions-maven-plugin to v2.19.1 (#47) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- store-base/store-build-chassis/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store-base/store-build-chassis/pom.xml b/store-base/store-build-chassis/pom.xml index 718ab528..31424362 100644 --- a/store-base/store-build-chassis/pom.xml +++ b/store-base/store-build-chassis/pom.xml @@ -30,7 +30,7 @@ 3.5.3 3.5.4 1.2.1 - 2.19.0 + 2.19.1 1.4.13 3.0.0 1.6.3