diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 8449af943..4fd3ae6c4 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -13,7 +13,7 @@ // maven and gradle wrappers are used by default, we don't need them installed globally // "INSTALL_MAVEN": "true", // "INSTALL_GRADLE": "false", - "NODE_VERSION": "20.12.2" + "NODE_VERSION": "20.14.0" } }, diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 346d645fd..f3ad4ba3f 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar +wrapperVersion=3.3.2 +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip diff --git a/.prettierignore b/.prettierignore index fec4ac0ae..7d1ec5e72 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,9 +3,9 @@ package-lock.json .git target/ -# Generated by jhipster:client -target/classes/static/ - # Generated by jhipster:maven target .mvn + +# Generated by jhipster:client +target/classes/static/ diff --git a/.yo-rc.json b/.yo-rc.json index ad475ebaa..31db99ad8 100644 --- a/.yo-rc.json +++ b/.yo-rc.json @@ -26,7 +26,7 @@ "entitySuffix": "", "hibernateCache": "ehcache", "jhiPrefix": "jhi", - "jhipsterVersion": "8.4.0", + "jhipsterVersion": "8.5.0", "jwtSecretKey": "bXktc2VjcmV0LWtleS13aGljaC1zaG91bGQtYmUtY2hhbmdlZC1pbi1wcm9kdWN0aW9uLWFuZC1iZS1iYXNlNjQtZW5jb2RlZAo=", "languages": ["en"], "messageBroker": false, diff --git a/README.md b/README.md index dbb0bac82..ba60328fb 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # jhipsterSampleApplication -This application was generated using JHipster 8.4.0, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v8.4.0](https://www.jhipster.tech/documentation-archive/v8.4.0). +This application was generated using JHipster 8.5.0, you can find documentation and help at [https://www.jhipster.tech/documentation-archive/v8.5.0](https://www.jhipster.tech/documentation-archive/v8.5.0). ## Project Structure @@ -148,23 +148,6 @@ docker compose -f src/main/docker/jhipster-control-center.yml up ## Testing -### Client tests - -Unit tests are run by [Jest][]. They're located in [src/test/javascript/](src/test/javascript/) and can be run with: - -``` -npm test -``` - -UI end-to-end tests are powered by [Cypress][]. They're located in [src/test/javascript/cypress](src/test/javascript/cypress) -and can be run by starting Spring Boot in one terminal (`./mvnw spring-boot:run`) and running the tests (`npm run e2e`) in a second one. - -#### Lighthouse audits - -You can execute automated [lighthouse audits][https://developers.google.com/web/tools/lighthouse/] with [cypress audits][https://github.com/mfrachet/cypress-audit] by running `npm run e2e:cypress:audits`. -You should only run the audits when your application is packaged with the production profile. -The lighthouse report is created in `target/cypress/lhreport.html` - ### Spring Boot tests To launch your application's tests, run: @@ -183,6 +166,23 @@ You can execute all Gatling tests with ./mvnw gatling:test ``` +### Client tests + +Unit tests are run by [Jest][]. They're located in [src/test/javascript/](src/test/javascript/) and can be run with: + +``` +npm test +``` + +UI end-to-end tests are powered by [Cypress][]. They're located in [src/test/javascript/cypress](src/test/javascript/cypress) +and can be run by starting Spring Boot in one terminal (`./mvnw spring-boot:run`) and running the tests (`npm run e2e`) in a second one. + +#### Lighthouse audits + +You can execute automated [lighthouse audits][https://developers.google.com/web/tools/lighthouse/] with [cypress audits][https://github.com/mfrachet/cypress-audit] by running `npm run e2e:cypress:audits`. +You should only run the audits when your application is packaged with the production profile. +The lighthouse report is created in `target/cypress/lhreport.html` + ## Others ### Code quality using Sonar @@ -262,15 +262,16 @@ For more information refer to [Using Docker and Docker-Compose][], this page als To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information. [JHipster Homepage and latest documentation]: https://www.jhipster.tech -[JHipster 8.4.0 archive]: https://www.jhipster.tech/documentation-archive/v8.4.0 -[Using JHipster in development]: https://www.jhipster.tech/documentation-archive/v8.4.0/development/ -[Using Docker and Docker-Compose]: https://www.jhipster.tech/documentation-archive/v8.4.0/docker-compose -[Using JHipster in production]: https://www.jhipster.tech/documentation-archive/v8.4.0/production/ -[Running tests page]: https://www.jhipster.tech/documentation-archive/v8.4.0/running-tests/ -[Code quality page]: https://www.jhipster.tech/documentation-archive/v8.4.0/code-quality/ -[Setting up Continuous Integration]: https://www.jhipster.tech/documentation-archive/v8.4.0/setting-up-ci/ +[JHipster 8.5.0 archive]: https://www.jhipster.tech/documentation-archive/v8.5.0 +[Using JHipster in development]: https://www.jhipster.tech/documentation-archive/v8.5.0/development/ +[Using Docker and Docker-Compose]: https://www.jhipster.tech/documentation-archive/v8.5.0/docker-compose +[Using JHipster in production]: https://www.jhipster.tech/documentation-archive/v8.5.0/production/ +[Running tests page]: https://www.jhipster.tech/documentation-archive/v8.5.0/running-tests/ +[Code quality page]: https://www.jhipster.tech/documentation-archive/v8.5.0/code-quality/ +[Setting up Continuous Integration]: https://www.jhipster.tech/documentation-archive/v8.5.0/setting-up-ci/ [Node.js]: https://nodejs.org/ [NPM]: https://www.npmjs.com/ +[Gatling]: https://gatling.io/ [Webpack]: https://webpack.github.io/ [BrowserSync]: https://www.browsersync.io/ [Jest]: https://facebook.github.io/jest/ @@ -278,4 +279,3 @@ To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`) [Leaflet]: https://leafletjs.com/ [DefinitelyTyped]: https://definitelytyped.org/ [Angular CLI]: https://cli.angular.io/ -[Gatling]: https://gatling.io/ diff --git a/mvnw b/mvnw index 8d937f4c1..ac8e247e1 100755 --- a/mvnw +++ b/mvnw @@ -19,290 +19,232 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.2.0 -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir +# Apache Maven Wrapper startup batch script, version 3.3.1 # # Optional ENV vars # ----------------- -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# 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 /usr/local/etc/mavenrc ] ; then - . /usr/local/etc/mavenrc - fi - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false +# OS specific support. +native_path() { printf %s\\n "$1"; } case "$(uname)" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME - else - JAVA_HOME="/Library/Java/Home"; export JAVA_HOME - fi - fi - ;; +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; esac -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=$(java-config --jre-home) - fi -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --unix "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --unix "$CLASSPATH") -fi - -# For Mingw, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && - JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="$(which javac)" - if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=$(which readlink) - if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then - if $darwin ; then - javaHome="$(dirname "\"$javaExecutable\"")" - javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" - else - javaExecutable="$(readlink -f "\"$javaExecutable\"")" - fi - javaHome="$(dirname "\"$javaExecutable\"")" - javaHome=$(expr "$javaHome" : '\(.*\)/bin') - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +# 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" + + 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 else - JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 + 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 +} - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=$(cd "$wdir/.." || exit 1; pwd) - fi - # end of workaround +# 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 '%s' "$(cd "$basedir" || exit 1; pwd)" + printf %x\\n $h } -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - # Remove \r in case we run on Windows within Git Bash - # and check out the repository with auto CRLF management - # enabled. Otherwise, we may read lines that are delimited with - # \r\n and produce $'-Xarg\r' rather than -Xarg due to word - # splitting rules. - tr -s '\r\n' ' ' < "$1" - fi +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 } -log() { - if [ "$MVNW_VERBOSE" = true ]; then - printf '%s\n' "$1" - fi +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl="${value-}" ;; + distributionSha256Sum) distributionSha256Sum="${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 + +# 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_HOME="$HOME/.m2/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" } -BASE_DIR=$(find_maven_basedir "$(dirname "$0")") -if [ -z "$BASE_DIR" ]; then - exit 1; +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" fi -MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR -log "$MAVEN_PROJECTBASEDIR" +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 -########################################################################################## -# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -# This allows using the maven wrapper in projects that prohibit checking in binary data. -########################################################################################## -wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" -if [ -r "$wrapperJarPath" ]; then - log "Found $wrapperJarPath" +# 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 - log "Couldn't find $wrapperJarPath, downloading it ..." + die "cannot create temp dir" +fi - if [ -n "$MVNW_REPOURL" ]; then - wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - else - wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - fi - while IFS="=" read -r key value; do - # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) - safeValue=$(echo "$value" | tr -d '\r') - case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; - esac - done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" - log "Downloading from: $wrapperUrl" +mkdir -p -- "${MAVEN_HOME%/*}" - if $cygwin; then - wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") - fi +# 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 command -v wget > /dev/null; then - log "Found wget ... using wget" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - else - wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" - fi - elif command -v curl > /dev/null; then - log "Found curl ... using curl" - [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" - if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then - curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - else - curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" - fi - else - log "Falling back to using Java to download" - javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" - javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" - # For Cygwin, switch paths to Windows format before running javac - if $cygwin; then - javaSource=$(cygpath --path --windows "$javaSource") - javaClass=$(cygpath --path --windows "$javaClass") - fi - if [ -e "$javaSource" ]; then - if [ ! -e "$javaClass" ]; then - log " - Compiling MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/javac" "$javaSource") - fi - if [ -e "$javaClass" ]; then - log " - Running MavenWrapperDownloader.java ..." - ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" - fi - fi - fi +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" fi -########################################################################################## -# End of extension -########################################################################################## -# If specified, validate the SHA-256 sum of the Maven wrapper jar file -wrapperSha256Sum="" -while IFS="=" read -r key value; do - case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; - esac -done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" -if [ -n "$wrapperSha256Sum" ]; then - wrapperSha256Result=false - if command -v sha256sum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then - wrapperSha256Result=true +# 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 + +# 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 "${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 + +# 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 - elif command -v shasum > /dev/null; then - if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then - wrapperSha256Result=true + 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 else - echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." - echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + 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 [ $wrapperSha256Result = false ]; then - echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 - echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 - echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + 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 fi -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$JAVA_HOME" ] && - JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") - [ -n "$CLASSPATH" ] && - CLASSPATH=$(cygpath --path --windows "$CLASSPATH") - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +# 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 + 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" -# Provide a "standardized" way to retrieve the CLI args that will -# work with both Windows and non-Windows executions. -MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" -export MAVEN_CMD_LINE_ARGS - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -# shellcheck disable=SC2086 # safe args -exec "$JAVACMD" \ - $MAVEN_OPTS \ - $MAVEN_DEBUG_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd index c4586b564..7b0c0943b 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -1,3 +1,4 @@ +<# : batch portion @REM ---------------------------------------------------------------------------- @REM Licensed to the Apache Software Foundation (ASF) under one @REM or more contributor license agreements. See the NOTICE file @@ -18,188 +19,128 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.2.0 -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir +@REM Apache Maven Wrapper startup batch script, version 3.3.1 @REM @REM Optional ENV vars -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM 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 ---------------------------------------------------------------------------- -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM set title of command window -title %0 -@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* -if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B -) - -@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central -@REM This allows using the maven wrapper in projects that prohibit checking in binary data. -if exist %WRAPPER_JAR% ( - if "%MVNW_VERBOSE%" == "true" ( - echo Found %WRAPPER_JAR% - ) -) else ( - if not "%MVNW_REPOURL%" == "" ( - SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" - ) - if "%MVNW_VERBOSE%" == "true" ( - echo Couldn't find %WRAPPER_JAR%, downloading it ... - echo Downloading from: %WRAPPER_URL% - ) - - powershell -Command "&{"^ - "$webclient = new-object System.Net.WebClient;"^ - "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ - "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ - "}"^ - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ - "}" - if "%MVNW_VERBOSE%" == "true" ( - echo Finished downloading %WRAPPER_JAR% - ) -) -@REM End of extension - -@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file -SET WRAPPER_SHA_256_SUM="" -FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( - IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +@IF "%__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) ) -IF NOT %WRAPPER_SHA_256_SUM%=="" ( - powershell -Command "&{"^ - "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ - "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ - " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ - " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ - " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ - " exit 1;"^ - "}"^ - "}" - if ERRORLEVEL 1 goto error -) - -@REM Provide a "standardized" way to retrieve the CLI args that will -@REM work with both Windows and non-Windows executions. -set MAVEN_CMD_LINE_ARGS=%* - -%MAVEN_JAVA_EXE% ^ - %JVM_CONFIG_MAVEN_PROPS% ^ - %MAVEN_OPTS% ^ - %MAVEN_DEBUG_OPTS% ^ - -classpath %WRAPPER_JAR% ^ - "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ - %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" -if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%"=="on" pause - -if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% - -cmd /C exit /B %ERROR_CODE% +@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" +$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/package.json b/package.json index 630fc7694..189c3b1ed 100644 --- a/package.json +++ b/package.json @@ -83,14 +83,14 @@ "packaging": "jar" }, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/localize": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "17.3.9", + "@angular/compiler": "17.3.9", + "@angular/core": "17.3.9", + "@angular/forms": "17.3.9", + "@angular/localize": "17.3.9", + "@angular/platform-browser": "17.3.9", + "@angular/platform-browser-dynamic": "17.3.9", + "@angular/router": "17.3.9", "@fortawesome/angular-fontawesome": "0.14.1", "@fortawesome/fontawesome-svg-core": "6.5.2", "@fortawesome/free-solid-svg-icons": "6.5.2", @@ -103,49 +103,49 @@ "ngx-infinite-scroll": "17.0.0", "rxjs": "7.8.1", "tslib": "2.6.2", - "zone.js": "0.14.4" + "zone.js": "0.14.6" }, "devDependencies": { "@angular-builders/custom-webpack": "17.0.2", "@angular-builders/jest": "17.0.3", - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", - "@angular/service-worker": "17.3.6", + "@angular-devkit/build-angular": "17.3.7", + "@angular-eslint/eslint-plugin": "17.5.2", + "@angular/cli": "17.3.7", + "@angular/compiler-cli": "17.3.9", + "@angular/service-worker": "17.3.9", "@types/jest": "29.5.12", "@types/node": "20.11.25", - "@typescript-eslint/eslint-plugin": "7.7.1", - "@typescript-eslint/parser": "7.7.1", + "@typescript-eslint/eslint-plugin": "7.11.0", + "@typescript-eslint/parser": "7.11.0", "browser-sync": "3.0.2", "browser-sync-webpack-plugin": "2.3.0", "buffer": "6.0.3", "concurrently": "8.2.2", "copy-webpack-plugin": "12.0.2", - "cypress": "13.8.1", + "cypress": "13.10.0", "cypress-audit": "1.1.0", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", - "eslint-plugin-cypress": "3.0.2", - "eslint-webpack-plugin": "4.1.0", + "eslint-plugin-cypress": "3.3.0", + "eslint-webpack-plugin": "4.2.0", "folder-hash": "4.0.4", - "generator-jhipster": "8.4.0", + "generator-jhipster": "8.5.0", "husky": "9.0.11", "jest": "29.7.0", "jest-date-mock": "1.0.10", "jest-environment-jsdom": "29.7.0", "jest-junit": "16.0.0", - "jest-preset-angular": "14.0.3", + "jest-preset-angular": "14.1.0", "jest-sonar": "0.2.16", "lighthouse": "12.0.0", - "lint-staged": "15.2.2", + "lint-staged": "15.2.5", "merge-jsons-webpack-plugin": "2.0.1", "prettier": "3.2.5", "prettier-plugin-java": "2.6.0", "prettier-plugin-packagejson": "2.5.0", - "rimraf": "5.0.5", - "swagger-ui-dist": "5.17.2", - "ts-jest": "29.1.2", + "rimraf": "5.0.7", + "swagger-ui-dist": "5.17.14", + "ts-jest": "29.1.4", "typescript": "5.4.5", "wait-on": "7.2.0", "webpack-bundle-analyzer": "4.10.2", @@ -153,7 +153,7 @@ "webpack-notifier": "1.15.0" }, "engines": { - "node": ">=20.12.2" + "node": ">=20.14.0" }, "cacheDirectories": [ "node_modules" diff --git a/pom.xml b/pom.xml index 238dacdb7..17d663f45 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 @@ -24,8 +24,8 @@ --> 3.2.5 17 - v20.12.2 - 10.6.0 + v20.14.0 + 10.8.1 UTF-8 UTF-8 yyyyMMddHHmmss @@ -37,14 +37,14 @@ false ${project.parent.version} 1.3.0 - 10.16.0 + 10.17.0 1.11 1.15.0 - 4.9.0 - 3.11.1 + 4.9.1 + 3.11.3 8.0.2 0.8.12 - 8.4.0 + 8.5.0 amd64 eclipse-temurin:17-jre-focal 3.4.2 @@ -59,7 +59,7 @@ 3.3.1 3.3.2 3.13.0 - 3.4.1 + 3.5.0 3.2.5 3.4.1 3.6.3 @@ -67,7 +67,7 @@ 3.12.1 3.2.5 3.4.0 - 2.8.0 + 2.9.0 0.0.11 @@ -207,10 +207,6 @@ com.zaxxer HikariCP - - io.dropwizard.metrics - metrics-core - io.gatling.highcharts gatling-charts-highcharts @@ -219,7 +215,7 @@ io.micrometer - micrometer-registry-prometheus + micrometer-registry-prometheus-simpleclient jakarta.annotation diff --git a/src/main/docker/monitoring.yml b/src/main/docker/monitoring.yml index 21ab8f0af..4ceeaf7b5 100644 --- a/src/main/docker/monitoring.yml +++ b/src/main/docker/monitoring.yml @@ -2,7 +2,7 @@ name: jhipstersampleapplication services: prometheus: - image: prom/prometheus:v2.51.2 + image: prom/prometheus:v2.52.0 volumes: - ./prometheus/:/etc/prometheus/ command: @@ -15,7 +15,7 @@ services: # grafana/provisioning/datasources/datasource.yml network_mode: 'host' # to test locally running service grafana: - image: grafana/grafana:10.4.2 + image: grafana/grafana:11.0.0 volumes: - ./grafana/provisioning/:/etc/grafana/provisioning/ environment: diff --git a/src/main/docker/postgresql.yml b/src/main/docker/postgresql.yml index 5f09d44d9..539e55541 100644 --- a/src/main/docker/postgresql.yml +++ b/src/main/docker/postgresql.yml @@ -2,7 +2,7 @@ name: jhipstersampleapplication services: postgresql: - image: postgres:16.2 + image: postgres:16.3 # volumes: # - ~/volumes/jhipster/jhipsterSampleApplication/postgresql/:/var/lib/postgresql/data/ environment: diff --git a/src/main/docker/sonar.yml b/src/main/docker/sonar.yml index 4e8191061..19444782e 100644 --- a/src/main/docker/sonar.yml +++ b/src/main/docker/sonar.yml @@ -3,7 +3,7 @@ name: jhipstersampleapplication services: sonar: container_name: sonarqube - image: sonarqube:10.5.0-community + image: sonarqube:10.5.1-community # Forced authentication redirect for UI is turned off for out of the box experience while trying out SonarQube # For real use cases delete SONAR_FORCEAUTHENTICATION variable or set SONAR_FORCEAUTHENTICATION=true environment: diff --git a/src/main/java/io/github/jhipster/sample/GeneratedByJHipster.java b/src/main/java/io/github/jhipster/sample/GeneratedByJHipster.java index c8f14900a..22db64cdf 100644 --- a/src/main/java/io/github/jhipster/sample/GeneratedByJHipster.java +++ b/src/main/java/io/github/jhipster/sample/GeneratedByJHipster.java @@ -6,7 +6,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -@Generated(value = "JHipster", comments = "Generated by JHipster 8.4.0") +@Generated(value = "JHipster", comments = "Generated by JHipster 8.5.0") @Retention(RetentionPolicy.SOURCE) @Target({ ElementType.TYPE }) public @interface GeneratedByJHipster { diff --git a/src/main/java/io/github/jhipster/sample/config/SecurityJwtConfiguration.java b/src/main/java/io/github/jhipster/sample/config/SecurityJwtConfiguration.java index 1397f6f65..4e6dc0205 100644 --- a/src/main/java/io/github/jhipster/sample/config/SecurityJwtConfiguration.java +++ b/src/main/java/io/github/jhipster/sample/config/SecurityJwtConfiguration.java @@ -1,6 +1,5 @@ package io.github.jhipster.sample.config; -import static io.github.jhipster.sample.security.SecurityUtils.AUTHORITIES_KEY; import static io.github.jhipster.sample.security.SecurityUtils.JWT_ALGORITHM; import com.nimbusds.jose.jwk.source.ImmutableSecret; @@ -17,8 +16,6 @@ import org.springframework.security.oauth2.jwt.JwtEncoder; import org.springframework.security.oauth2.jwt.NimbusJwtDecoder; import org.springframework.security.oauth2.jwt.NimbusJwtEncoder; -import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter; -import org.springframework.security.oauth2.server.resource.authentication.JwtGrantedAuthoritiesConverter; @Configuration public class SecurityJwtConfiguration { @@ -58,17 +55,6 @@ public JwtEncoder jwtEncoder() { return new NimbusJwtEncoder(new ImmutableSecret<>(getSecretKey())); } - @Bean - public JwtAuthenticationConverter jwtAuthenticationConverter() { - JwtGrantedAuthoritiesConverter grantedAuthoritiesConverter = new JwtGrantedAuthoritiesConverter(); - grantedAuthoritiesConverter.setAuthorityPrefix(""); - grantedAuthoritiesConverter.setAuthoritiesClaimName(AUTHORITIES_KEY); - - JwtAuthenticationConverter jwtAuthenticationConverter = new JwtAuthenticationConverter(); - jwtAuthenticationConverter.setJwtGrantedAuthoritiesConverter(grantedAuthoritiesConverter); - return jwtAuthenticationConverter; - } - private SecretKey getSecretKey() { byte[] keyBytes = Base64.from(jwtKey).decode(); return new SecretKeySpec(keyBytes, 0, keyBytes.length, JWT_ALGORITHM.getName()); diff --git a/src/main/java/io/github/jhipster/sample/service/dto/UserDTO.java b/src/main/java/io/github/jhipster/sample/service/dto/UserDTO.java index 0a269b45f..feb7656f8 100644 --- a/src/main/java/io/github/jhipster/sample/service/dto/UserDTO.java +++ b/src/main/java/io/github/jhipster/sample/service/dto/UserDTO.java @@ -2,6 +2,7 @@ import io.github.jhipster.sample.domain.User; import java.io.Serializable; +import java.util.Objects; /** * A DTO representing a user, with only the public attributes. @@ -40,6 +41,23 @@ public void setLogin(String login) { this.login = login; } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + UserDTO userDTO = (UserDTO) o; + if (userDTO.getId() == null || getId() == null) { + return false; + } + + return Objects.equals(getId(), userDTO.getId()) && Objects.equals(getLogin(), userDTO.getLogin()); + } + // prettier-ignore @Override public String toString() { diff --git a/src/main/java/io/github/jhipster/sample/service/mapper/UserMapper.java b/src/main/java/io/github/jhipster/sample/service/mapper/UserMapper.java index 98fc9e525..52a426705 100644 --- a/src/main/java/io/github/jhipster/sample/service/mapper/UserMapper.java +++ b/src/main/java/io/github/jhipster/sample/service/mapper/UserMapper.java @@ -51,6 +51,10 @@ public User userDTOToUser(AdminUserDTO userDTO) { user.setLastName(userDTO.getLastName()); user.setEmail(userDTO.getEmail()); user.setImageUrl(userDTO.getImageUrl()); + user.setCreatedBy(userDTO.getCreatedBy()); + user.setCreatedDate(userDTO.getCreatedDate()); + user.setLastModifiedBy(userDTO.getLastModifiedBy()); + user.setLastModifiedDate(userDTO.getLastModifiedDate()); user.setActivated(userDTO.isActivated()); user.setLangKey(userDTO.getLangKey()); Set authorities = this.authoritiesFromStrings(userDTO.getAuthorities()); diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml index b04c0bb61..f0b9c3217 100644 --- a/src/main/resources/config/application.yml +++ b/src/main/resources/config/application.yml @@ -137,6 +137,12 @@ spring: mvc: problemdetails: enabled: true + security: + oauth2: + resourceserver: + jwt: + authority-prefix: '' + authorities-claim-name: auth task: execution: thread-name-prefix: jhipster-sample-application-task- diff --git a/src/main/resources/config/tls/keystore.p12 b/src/main/resources/config/tls/keystore.p12 index 5c4c1ce4d..150c575a6 100644 Binary files a/src/main/resources/config/tls/keystore.p12 and b/src/main/resources/config/tls/keystore.p12 differ diff --git a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts index aa229f01d..44f7ffd12 100644 --- a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts +++ b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts @@ -1,4 +1,4 @@ -import { ElementRef } from '@angular/core'; +import { ElementRef, signal } from '@angular/core'; import { ComponentFixture, TestBed, inject, tick, fakeAsync } from '@angular/core/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormBuilder } from '@angular/forms'; @@ -42,7 +42,7 @@ describe('PasswordResetFinishComponent', () => { const node = { focus: jest.fn(), }; - comp.newPassword = new ElementRef(node); + comp.newPassword = signal(new ElementRef(node)); comp.ngAfterViewInit(); diff --git a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts index ba9295ad9..061db1feb 100644 --- a/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts +++ b/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts @@ -1,4 +1,4 @@ -import { Component, inject, OnInit, AfterViewInit, ElementRef, ViewChild, signal } from '@angular/core'; +import { Component, inject, OnInit, AfterViewInit, ElementRef, signal, viewChild } from '@angular/core'; import { FormGroup, FormControl, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ActivatedRoute, RouterModule } from '@angular/router'; import PasswordStrengthBarComponent from 'app/account/password/password-strength-bar/password-strength-bar.component'; @@ -13,8 +13,7 @@ import { PasswordResetFinishService } from './password-reset-finish.service'; templateUrl: './password-reset-finish.component.html', }) export default class PasswordResetFinishComponent implements OnInit, AfterViewInit { - @ViewChild('newPassword', { static: false }) - newPassword?: ElementRef; + newPassword = viewChild.required('newPassword'); initialized = signal(false); doNotMatch = signal(false); @@ -46,9 +45,7 @@ export default class PasswordResetFinishComponent implements OnInit, AfterViewIn } ngAfterViewInit(): void { - if (this.newPassword) { - this.newPassword.nativeElement.focus(); - } + this.newPassword().nativeElement.focus(); } finishReset(): void { diff --git a/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts b/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts index 47f6e5b64..c3b9e99e6 100644 --- a/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts +++ b/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts @@ -1,4 +1,4 @@ -import { ElementRef } from '@angular/core'; +import { ElementRef, signal } from '@angular/core'; import { ComponentFixture, TestBed, inject } from '@angular/core/testing'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { FormBuilder } from '@angular/forms'; @@ -25,7 +25,7 @@ describe('PasswordResetInitComponent', () => { const node = { focus: jest.fn(), }; - comp.email = new ElementRef(node); + comp.email = signal(new ElementRef(node)); comp.ngAfterViewInit(); diff --git a/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts b/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts index af68346c7..27c53b46e 100644 --- a/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts +++ b/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts @@ -1,4 +1,4 @@ -import { Component, AfterViewInit, ElementRef, inject, ViewChild, signal } from '@angular/core'; +import { Component, AfterViewInit, ElementRef, inject, signal, viewChild } from '@angular/core'; import { FormBuilder, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms'; import SharedModule from 'app/shared/shared.module'; @@ -11,8 +11,7 @@ import { PasswordResetInitService } from './password-reset-init.service'; templateUrl: './password-reset-init.component.html', }) export default class PasswordResetInitComponent implements AfterViewInit { - @ViewChild('email', { static: false }) - email?: ElementRef; + email = viewChild.required('email'); success = signal(false); resetRequestForm; @@ -27,9 +26,7 @@ export default class PasswordResetInitComponent implements AfterViewInit { } ngAfterViewInit(): void { - if (this.email) { - this.email.nativeElement.focus(); - } + this.email().nativeElement.focus(); } requestReset(): void { diff --git a/src/main/webapp/app/account/register/register.component.ts b/src/main/webapp/app/account/register/register.component.ts index ab6f316f5..52a567449 100644 --- a/src/main/webapp/app/account/register/register.component.ts +++ b/src/main/webapp/app/account/register/register.component.ts @@ -1,4 +1,4 @@ -import { Component, AfterViewInit, ElementRef, inject, ViewChild, signal } from '@angular/core'; +import { Component, AfterViewInit, ElementRef, inject, signal, viewChild } from '@angular/core'; import { HttpErrorResponse } from '@angular/common/http'; import { RouterModule } from '@angular/router'; import { FormGroup, FormControl, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms'; @@ -16,8 +16,7 @@ import { RegisterService } from './register.service'; templateUrl: './register.component.html', }) export default class RegisterComponent implements AfterViewInit { - @ViewChild('login', { static: false }) - login?: ElementRef; + login = viewChild.required('login'); doNotMatch = signal(false); error = signal(false); @@ -53,9 +52,7 @@ export default class RegisterComponent implements AfterViewInit { private registerService = inject(RegisterService); ngAfterViewInit(): void { - if (this.login) { - this.login.nativeElement.focus(); - } + this.login().nativeElement.focus(); } register(): void { diff --git a/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html b/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html index f52b2f1e4..65e2a847a 100644 --- a/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html +++ b/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html @@ -1,45 +1,61 @@

Threads dump

- +
- + - + - + - + - +
@for (thread of getThreads(); track $index) { diff --git a/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html b/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html index b82f6d5fb..124f70f1e 100644 --- a/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html +++ b/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html @@ -2,8 +2,6 @@

Confirm delete operation

- -
diff --git a/src/main/webapp/app/core/auth/user-route-access.service.ts b/src/main/webapp/app/core/auth/user-route-access.service.ts index 6bdf53bd4..66883edf3 100644 --- a/src/main/webapp/app/core/auth/user-route-access.service.ts +++ b/src/main/webapp/app/core/auth/user-route-access.service.ts @@ -19,7 +19,7 @@ export const UserRouteAccessService: CanActivateFn = (next: ActivatedRouteSnapsh } if (isDevMode()) { - console.error('User has not any of required authorities: ', authorities); + console.error('User does not have any of the required authorities:', authorities); } router.navigate(['accessdenied']); return false; diff --git a/src/main/webapp/app/entities/admin/authority/authority.test-samples.ts b/src/main/webapp/app/entities/admin/authority/authority.test-samples.ts index 99d73be68..ee18dcc8e 100644 --- a/src/main/webapp/app/entities/admin/authority/authority.test-samples.ts +++ b/src/main/webapp/app/entities/admin/authority/authority.test-samples.ts @@ -1,15 +1,15 @@ import { IAuthority, NewAuthority } from './authority.model'; export const sampleWithRequiredData: IAuthority = { - name: 'b3700b3c-0da9-4a58-b524-bc34f51d2324', + name: 'b829a0b1-993c-4200-9281-18a1cf1b455f', }; export const sampleWithPartialData: IAuthority = { - name: 'c76ca8f4-38e0-4c20-8ec1-59f576c54d2d', + name: '587deef2-ca94-4aac-9dd7-500c399681f0', }; export const sampleWithFullData: IAuthority = { - name: '550f6642-b211-4a47-a177-e77193935c4d', + name: 'd175073c-a0b2-474b-8172-68756d141f45', }; export const sampleWithNewData: NewAuthority = { diff --git a/src/main/webapp/app/entities/admin/authority/delete/authority-delete-dialog.component.html b/src/main/webapp/app/entities/admin/authority/delete/authority-delete-dialog.component.html index 2b96d1ce9..9b597fb0f 100644 --- a/src/main/webapp/app/entities/admin/authority/delete/authority-delete-dialog.component.html +++ b/src/main/webapp/app/entities/admin/authority/delete/authority-delete-dialog.component.html @@ -2,8 +2,6 @@

Confirm delete operation

- -
diff --git a/src/main/webapp/app/entities/admin/authority/route/authority-routing-resolve.service.spec.ts b/src/main/webapp/app/entities/admin/authority/route/authority-routing-resolve.service.spec.ts index 094cba26c..4b7d844e9 100644 --- a/src/main/webapp/app/entities/admin/authority/route/authority-routing-resolve.service.spec.ts +++ b/src/main/webapp/app/entities/admin/authority/route/authority-routing-resolve.service.spec.ts @@ -52,7 +52,7 @@ describe('Authority routing resolve service', () => { }); // THEN - expect(service.find).toBeCalledWith('ABC'); + expect(service.find).toHaveBeenCalledWith('ABC'); expect(resultAuthority).toEqual({ name: 'ABC' }); }); @@ -90,7 +90,7 @@ describe('Authority routing resolve service', () => { }); // THEN - expect(service.find).toBeCalledWith('ABC'); + expect(service.find).toHaveBeenCalledWith('ABC'); expect(resultAuthority).toEqual(undefined); expect(mockRouter.navigate).toHaveBeenCalledWith(['404']); }); diff --git a/src/main/webapp/app/entities/bank-account/bank-account.test-samples.ts b/src/main/webapp/app/entities/bank-account/bank-account.test-samples.ts index 2b55fc86d..896717b20 100644 --- a/src/main/webapp/app/entities/bank-account/bank-account.test-samples.ts +++ b/src/main/webapp/app/entities/bank-account/bank-account.test-samples.ts @@ -1,26 +1,26 @@ import { IBankAccount, NewBankAccount } from './bank-account.model'; export const sampleWithRequiredData: IBankAccount = { - id: 362, - name: 'repress considering playfully', - balance: 6428.55, + id: 7094, + name: 'solemnly', + balance: 11058.15, }; export const sampleWithPartialData: IBankAccount = { - id: 8547, - name: 'that enormous leveret', - balance: 22512.49, + id: 9797, + name: 'woot er', + balance: 6523.78, }; export const sampleWithFullData: IBankAccount = { - id: 11188, - name: 'doubt huzzah', - balance: 16097.63, + id: 17714, + name: 'phew', + balance: 21828.46, }; export const sampleWithNewData: NewBankAccount = { - name: 'likely apud uh-huh', - balance: 12440.4, + name: 'duh ice', + balance: 9789.22, id: null, }; diff --git a/src/main/webapp/app/entities/bank-account/delete/bank-account-delete-dialog.component.html b/src/main/webapp/app/entities/bank-account/delete/bank-account-delete-dialog.component.html index 070b23533..098d2fee9 100644 --- a/src/main/webapp/app/entities/bank-account/delete/bank-account-delete-dialog.component.html +++ b/src/main/webapp/app/entities/bank-account/delete/bank-account-delete-dialog.component.html @@ -2,8 +2,6 @@

Confirm delete operation

- -
diff --git a/src/main/webapp/app/entities/bank-account/route/bank-account-routing-resolve.service.spec.ts b/src/main/webapp/app/entities/bank-account/route/bank-account-routing-resolve.service.spec.ts index 0cde54712..78d3faec5 100644 --- a/src/main/webapp/app/entities/bank-account/route/bank-account-routing-resolve.service.spec.ts +++ b/src/main/webapp/app/entities/bank-account/route/bank-account-routing-resolve.service.spec.ts @@ -52,7 +52,7 @@ describe('BankAccount routing resolve service', () => { }); // THEN - expect(service.find).toBeCalledWith(123); + expect(service.find).toHaveBeenCalledWith(123); expect(resultBankAccount).toEqual({ id: 123 }); }); @@ -90,7 +90,7 @@ describe('BankAccount routing resolve service', () => { }); // THEN - expect(service.find).toBeCalledWith(123); + expect(service.find).toHaveBeenCalledWith(123); expect(resultBankAccount).toEqual(undefined); expect(mockRouter.navigate).toHaveBeenCalledWith(['404']); }); diff --git a/src/main/webapp/app/entities/bank-account/update/bank-account-update.component.spec.ts b/src/main/webapp/app/entities/bank-account/update/bank-account-update.component.spec.ts index 196152332..01bc0270f 100644 --- a/src/main/webapp/app/entities/bank-account/update/bank-account-update.component.spec.ts +++ b/src/main/webapp/app/entities/bank-account/update/bank-account-update.component.spec.ts @@ -49,10 +49,10 @@ describe('BankAccount Management Update Component', () => { describe('ngOnInit', () => { it('Should call User query and add missing value', () => { const bankAccount: IBankAccount = { id: 456 }; - const user: IUser = { id: 19560 }; + const user: IUser = { id: 23912 }; bankAccount.user = user; - const userCollection: IUser[] = [{ id: 32469 }]; + const userCollection: IUser[] = [{ id: 8940 }]; jest.spyOn(userService, 'query').mockReturnValue(of(new HttpResponse({ body: userCollection }))); const additionalUsers = [user]; const expectedCollection: IUser[] = [...additionalUsers, ...userCollection]; @@ -71,7 +71,7 @@ describe('BankAccount Management Update Component', () => { it('Should update editForm', () => { const bankAccount: IBankAccount = { id: 456 }; - const user: IUser = { id: 13561 }; + const user: IUser = { id: 25052 }; bankAccount.user = user; activatedRoute.data = of({ bankAccount }); diff --git a/src/main/webapp/app/entities/label/delete/label-delete-dialog.component.html b/src/main/webapp/app/entities/label/delete/label-delete-dialog.component.html index b6c77b2ae..d3d23a46a 100644 --- a/src/main/webapp/app/entities/label/delete/label-delete-dialog.component.html +++ b/src/main/webapp/app/entities/label/delete/label-delete-dialog.component.html @@ -2,8 +2,6 @@

Confirm delete operation

- -
diff --git a/src/main/webapp/app/entities/label/label.test-samples.ts b/src/main/webapp/app/entities/label/label.test-samples.ts index 134f935d3..8ca420de1 100644 --- a/src/main/webapp/app/entities/label/label.test-samples.ts +++ b/src/main/webapp/app/entities/label/label.test-samples.ts @@ -1,22 +1,22 @@ import { ILabel, NewLabel } from './label.model'; export const sampleWithRequiredData: ILabel = { - id: 12930, - label: 'interestingly wound wave', + id: 3315, + label: 'deceivingly', }; export const sampleWithPartialData: ILabel = { - id: 14220, - label: 'spin', + id: 5191, + label: 'greens lever', }; export const sampleWithFullData: ILabel = { - id: 21802, - label: 'agile', + id: 15375, + label: 'ha imitation', }; export const sampleWithNewData: NewLabel = { - label: 'mid', + label: 'because unto', id: null, }; diff --git a/src/main/webapp/app/entities/label/route/label-routing-resolve.service.spec.ts b/src/main/webapp/app/entities/label/route/label-routing-resolve.service.spec.ts index a49728bf2..322727da5 100644 --- a/src/main/webapp/app/entities/label/route/label-routing-resolve.service.spec.ts +++ b/src/main/webapp/app/entities/label/route/label-routing-resolve.service.spec.ts @@ -52,7 +52,7 @@ describe('Label routing resolve service', () => { }); // THEN - expect(service.find).toBeCalledWith(123); + expect(service.find).toHaveBeenCalledWith(123); expect(resultLabel).toEqual({ id: 123 }); }); @@ -90,7 +90,7 @@ describe('Label routing resolve service', () => { }); // THEN - expect(service.find).toBeCalledWith(123); + expect(service.find).toHaveBeenCalledWith(123); expect(resultLabel).toEqual(undefined); expect(mockRouter.navigate).toHaveBeenCalledWith(['404']); }); diff --git a/src/main/webapp/app/entities/label/update/label-update.component.spec.ts b/src/main/webapp/app/entities/label/update/label-update.component.spec.ts index 118925e1e..3aa1ad174 100644 --- a/src/main/webapp/app/entities/label/update/label-update.component.spec.ts +++ b/src/main/webapp/app/entities/label/update/label-update.component.spec.ts @@ -49,10 +49,10 @@ describe('Label Management Update Component', () => { describe('ngOnInit', () => { it('Should call Operation query and add missing value', () => { const label: ILabel = { id: 456 }; - const operations: IOperation[] = [{ id: 1022 }]; + const operations: IOperation[] = [{ id: 17097 }]; label.operations = operations; - const operationCollection: IOperation[] = [{ id: 17395 }]; + const operationCollection: IOperation[] = [{ id: 9648 }]; jest.spyOn(operationService, 'query').mockReturnValue(of(new HttpResponse({ body: operationCollection }))); const additionalOperations = [...operations]; const expectedCollection: IOperation[] = [...additionalOperations, ...operationCollection]; @@ -71,7 +71,7 @@ describe('Label Management Update Component', () => { it('Should update editForm', () => { const label: ILabel = { id: 456 }; - const operation: IOperation = { id: 30603 }; + const operation: IOperation = { id: 507 }; label.operations = [operation]; activatedRoute.data = of({ label }); diff --git a/src/main/webapp/app/entities/operation/delete/operation-delete-dialog.component.html b/src/main/webapp/app/entities/operation/delete/operation-delete-dialog.component.html index 8646fb7da..65fb6cf98 100644 --- a/src/main/webapp/app/entities/operation/delete/operation-delete-dialog.component.html +++ b/src/main/webapp/app/entities/operation/delete/operation-delete-dialog.component.html @@ -2,8 +2,6 @@

Confirm delete operation

- -
diff --git a/src/main/webapp/app/entities/operation/operation.test-samples.ts b/src/main/webapp/app/entities/operation/operation.test-samples.ts index e27121f12..940a8d1a9 100644 --- a/src/main/webapp/app/entities/operation/operation.test-samples.ts +++ b/src/main/webapp/app/entities/operation/operation.test-samples.ts @@ -3,28 +3,28 @@ import dayjs from 'dayjs/esm'; import { IOperation, NewOperation } from './operation.model'; export const sampleWithRequiredData: IOperation = { - id: 10963, - date: dayjs('2015-08-04T15:20'), - amount: 3283.88, + id: 8055, + date: dayjs('2015-08-04T16:23'), + amount: 3284.82, }; export const sampleWithPartialData: IOperation = { - id: 25435, - date: dayjs('2015-08-05T09:29'), - description: 'bah stickybeak ouch', - amount: 18017.83, + id: 11493, + date: dayjs('2015-08-05T08:45'), + description: 'usefully', + amount: 26572.51, }; export const sampleWithFullData: IOperation = { - id: 27253, - date: dayjs('2015-08-05T03:26'), - description: 'over', - amount: 12825.14, + id: 23559, + date: dayjs('2015-08-04T19:15'), + description: 'promptly envy so', + amount: 25068.34, }; export const sampleWithNewData: NewOperation = { - date: dayjs('2015-08-04T20:26'), - amount: 23191.97, + date: dayjs('2015-08-05T03:42'), + amount: 9171.56, id: null, }; diff --git a/src/main/webapp/app/entities/operation/route/operation-routing-resolve.service.spec.ts b/src/main/webapp/app/entities/operation/route/operation-routing-resolve.service.spec.ts index 53cbe0465..5fde41d8a 100644 --- a/src/main/webapp/app/entities/operation/route/operation-routing-resolve.service.spec.ts +++ b/src/main/webapp/app/entities/operation/route/operation-routing-resolve.service.spec.ts @@ -52,7 +52,7 @@ describe('Operation routing resolve service', () => { }); // THEN - expect(service.find).toBeCalledWith(123); + expect(service.find).toHaveBeenCalledWith(123); expect(resultOperation).toEqual({ id: 123 }); }); @@ -90,7 +90,7 @@ describe('Operation routing resolve service', () => { }); // THEN - expect(service.find).toBeCalledWith(123); + expect(service.find).toHaveBeenCalledWith(123); expect(resultOperation).toEqual(undefined); expect(mockRouter.navigate).toHaveBeenCalledWith(['404']); }); diff --git a/src/main/webapp/app/entities/operation/update/operation-update.component.spec.ts b/src/main/webapp/app/entities/operation/update/operation-update.component.spec.ts index 5c400bb46..c6c278f3e 100644 --- a/src/main/webapp/app/entities/operation/update/operation-update.component.spec.ts +++ b/src/main/webapp/app/entities/operation/update/operation-update.component.spec.ts @@ -53,10 +53,10 @@ describe('Operation Management Update Component', () => { describe('ngOnInit', () => { it('Should call BankAccount query and add missing value', () => { const operation: IOperation = { id: 456 }; - const bankAccount: IBankAccount = { id: 22754 }; + const bankAccount: IBankAccount = { id: 21320 }; operation.bankAccount = bankAccount; - const bankAccountCollection: IBankAccount[] = [{ id: 7983 }]; + const bankAccountCollection: IBankAccount[] = [{ id: 14791 }]; jest.spyOn(bankAccountService, 'query').mockReturnValue(of(new HttpResponse({ body: bankAccountCollection }))); const additionalBankAccounts = [bankAccount]; const expectedCollection: IBankAccount[] = [...additionalBankAccounts, ...bankAccountCollection]; @@ -75,10 +75,10 @@ describe('Operation Management Update Component', () => { it('Should call Label query and add missing value', () => { const operation: IOperation = { id: 456 }; - const labels: ILabel[] = [{ id: 12021 }]; + const labels: ILabel[] = [{ id: 21293 }]; operation.labels = labels; - const labelCollection: ILabel[] = [{ id: 1961 }]; + const labelCollection: ILabel[] = [{ id: 8783 }]; jest.spyOn(labelService, 'query').mockReturnValue(of(new HttpResponse({ body: labelCollection }))); const additionalLabels = [...labels]; const expectedCollection: ILabel[] = [...additionalLabels, ...labelCollection]; @@ -97,9 +97,9 @@ describe('Operation Management Update Component', () => { it('Should update editForm', () => { const operation: IOperation = { id: 456 }; - const bankAccount: IBankAccount = { id: 21321 }; + const bankAccount: IBankAccount = { id: 6174 }; operation.bankAccount = bankAccount; - const label: ILabel = { id: 10019 }; + const label: ILabel = { id: 25360 }; operation.labels = [label]; activatedRoute.data = of({ operation }); diff --git a/src/main/webapp/app/entities/user/user.test-samples.ts b/src/main/webapp/app/entities/user/user.test-samples.ts index 63366fd71..bf1c8453f 100644 --- a/src/main/webapp/app/entities/user/user.test-samples.ts +++ b/src/main/webapp/app/entities/user/user.test-samples.ts @@ -1,18 +1,18 @@ import { IUser } from './user.model'; export const sampleWithRequiredData: IUser = { - id: 7665, - login: 'XsgD', + id: 9396, + login: 'qj4pT8@fThe2\\qHnO\\YH7tyC', }; export const sampleWithPartialData: IUser = { - id: 32722, - login: '2`{@7f\\&Wq\\4gbOs\\CwDh\\&mr\\5-n', + id: 1979, + login: 'm8_OM', }; export const sampleWithFullData: IUser = { - id: 30499, - login: '-PIP', + id: 30730, + login: 'SZ2@6fZn\\]Ggso', }; Object.freeze(sampleWithRequiredData); Object.freeze(sampleWithPartialData); diff --git a/src/main/webapp/app/layouts/navbar/active-menu.directive.ts b/src/main/webapp/app/layouts/navbar/active-menu.directive.ts index 3a95c1823..c02595fc1 100644 --- a/src/main/webapp/app/layouts/navbar/active-menu.directive.ts +++ b/src/main/webapp/app/layouts/navbar/active-menu.directive.ts @@ -1,4 +1,4 @@ -import { Directive, OnInit, ElementRef, Renderer2, inject, Input } from '@angular/core'; +import { Directive, OnInit, ElementRef, Renderer2, inject, input } from '@angular/core'; import { TranslateService, LangChangeEvent } from '@ngx-translate/core'; @Directive({ @@ -6,7 +6,7 @@ import { TranslateService, LangChangeEvent } from '@ngx-translate/core'; selector: '[jhiActiveMenu]', }) export default class ActiveMenuDirective implements OnInit { - @Input() jhiActiveMenu?: string; + jhiActiveMenu = input(); private el = inject(ElementRef); private renderer = inject(Renderer2); @@ -21,7 +21,7 @@ export default class ActiveMenuDirective implements OnInit { } updateActiveFlag(selectedLanguage: string): void { - if (this.jhiActiveMenu === selectedLanguage) { + if (this.jhiActiveMenu() === selectedLanguage) { this.renderer.addClass(this.el.nativeElement, 'active'); } else { this.renderer.removeClass(this.el.nativeElement, 'active'); diff --git a/src/main/webapp/app/login/login.component.spec.ts b/src/main/webapp/app/login/login.component.spec.ts index 2cc553da4..2eaaa84f2 100644 --- a/src/main/webapp/app/login/login.component.spec.ts +++ b/src/main/webapp/app/login/login.component.spec.ts @@ -1,7 +1,7 @@ jest.mock('app/core/auth/account.service'); jest.mock('app/login/login.service'); -import { ElementRef } from '@angular/core'; +import { ElementRef, signal } from '@angular/core'; import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { FormBuilder } from '@angular/forms'; import { Router, Navigation } from '@angular/router'; @@ -90,7 +90,7 @@ describe('LoginComponent', () => { const node = { focus: jest.fn(), }; - comp.username = new ElementRef(node); + comp.username = signal(new ElementRef(node)); // WHEN comp.ngAfterViewInit(); diff --git a/src/main/webapp/app/login/login.component.ts b/src/main/webapp/app/login/login.component.ts index 539f7e382..55efb36fa 100644 --- a/src/main/webapp/app/login/login.component.ts +++ b/src/main/webapp/app/login/login.component.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, OnInit, AfterViewInit, ElementRef, inject, signal } from '@angular/core'; +import { Component, OnInit, AfterViewInit, ElementRef, inject, signal, viewChild } from '@angular/core'; import { FormGroup, FormControl, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { Router, RouterModule } from '@angular/router'; @@ -13,8 +13,7 @@ import { AccountService } from 'app/core/auth/account.service'; templateUrl: './login.component.html', }) export default class LoginComponent implements OnInit, AfterViewInit { - @ViewChild('username', { static: false }) - username!: ElementRef; + username = viewChild.required('username'); authenticationError = signal(false); @@ -38,7 +37,7 @@ export default class LoginComponent implements OnInit, AfterViewInit { } ngAfterViewInit(): void { - this.username.nativeElement.focus(); + this.username().nativeElement.focus(); } login(): void { diff --git a/src/main/webapp/app/shared/alert/alert-error.component.spec.ts b/src/main/webapp/app/shared/alert/alert-error.component.spec.ts index 82dd29940..575de637e 100644 --- a/src/main/webapp/app/shared/alert/alert-error.component.spec.ts +++ b/src/main/webapp/app/shared/alert/alert-error.component.spec.ts @@ -70,7 +70,7 @@ describe('Alert Error Component', () => { status: 400, statusText: 'Bad Request', error: { - type: 'https://www.jhipster.tech/problem/constraint-violation', + type: 'https://www.jhipster.tech/problem/problem-with-message', title: 'Bad Request', status: 400, path: '/api/foos', @@ -105,7 +105,7 @@ describe('Alert Error Component', () => { status: 400, statusText: 'Bad Request', error: { - type: 'https://www.jhipster.tech/problem/constraint-violation', + type: 'https://www.jhipster.tech/problem/problem-with-message', title: 'Method argument not valid', status: 400, path: '/api/foos', diff --git a/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts b/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts index c4d6a6682..560cb935d 100644 --- a/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts +++ b/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts @@ -1,7 +1,9 @@ jest.mock('app/core/auth/account.service'); -import { Component, ElementRef, ViewChild, WritableSignal, signal } from '@angular/core'; +import { Component, ElementRef, WritableSignal, signal, viewChild } from '@angular/core'; +import { HttpClientTestingModule } from '@angular/common/http/testing'; import { TestBed, waitForAsync } from '@angular/core/testing'; +import { TranslateModule } from '@ngx-translate/core'; import { AccountService } from 'app/core/auth/account.service'; import { Account } from 'app/core/auth/account.model'; @@ -12,8 +14,7 @@ import HasAnyAuthorityDirective from './has-any-authority.directive'; template: `
`, }) class TestHasAnyAuthorityDirectiveComponent { - @ViewChild('content', { static: false }) - content?: ElementRef; + content = viewChild('content'); } describe('HasAnyAuthorityDirective tests', () => { @@ -22,7 +23,7 @@ describe('HasAnyAuthorityDirective tests', () => { beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [HasAnyAuthorityDirective], + imports: [HasAnyAuthorityDirective, HttpClientTestingModule, TranslateModule.forRoot()], declarations: [TestHasAnyAuthorityDirectiveComponent], providers: [AccountService], }); @@ -60,7 +61,7 @@ describe('HasAnyAuthorityDirective tests', () => { fixture.detectChanges(); // THEN - expect(comp.content).toBeUndefined(); + expect(comp.content()).toBeUndefined(); }); }); @@ -76,7 +77,7 @@ describe('HasAnyAuthorityDirective tests', () => { fixture.detectChanges(); // THEN - expect(comp.content).toBeDefined(); + expect(comp.content()).toBeDefined(); // GIVEN currentAccount.set(null); @@ -85,7 +86,7 @@ describe('HasAnyAuthorityDirective tests', () => { fixture.detectChanges(); // THEN - expect(comp.content).toBeUndefined(); + expect(comp.content()).toBeUndefined(); // WHEN currentAccount.set({ activated: true, authorities: ['foo'] } as any); diff --git a/src/main/webapp/app/shared/auth/has-any-authority.directive.ts b/src/main/webapp/app/shared/auth/has-any-authority.directive.ts index 5f4172ee3..1b5e9ced3 100644 --- a/src/main/webapp/app/shared/auth/has-any-authority.directive.ts +++ b/src/main/webapp/app/shared/auth/has-any-authority.directive.ts @@ -1,4 +1,4 @@ -import { Directive, inject, Input, TemplateRef, ViewContainerRef, effect, signal, computed } from '@angular/core'; +import { Directive, inject, input, TemplateRef, ViewContainerRef, effect, computed } from '@angular/core'; import { AccountService } from 'app/core/auth/account.service'; @@ -18,7 +18,7 @@ import { AccountService } from 'app/core/auth/account.service'; selector: '[jhiHasAnyAuthority]', }) export default class HasAnyAuthorityDirective { - private authorities = signal([]); + public authorities = input([], { alias: 'jhiHasAnyAuthority' }); private templateRef = inject(TemplateRef); private viewContainerRef = inject(ViewContainerRef); @@ -28,17 +28,15 @@ export default class HasAnyAuthorityDirective { const currentAccount = accountService.trackCurrentAccount(); const hasPermission = computed(() => currentAccount()?.authorities && accountService.hasAnyAuthority(this.authorities())); - effect(() => { - if (hasPermission()) { - this.viewContainerRef.createEmbeddedView(this.templateRef); - } else { - this.viewContainerRef.clear(); - } - }); - } - - @Input() - set jhiHasAnyAuthority(value: string | string[]) { - this.authorities.set(value); + effect( + () => { + if (hasPermission()) { + this.viewContainerRef.createEmbeddedView(this.templateRef); + } else { + this.viewContainerRef.clear(); + } + }, + { allowSignalWrites: true }, + ); } } diff --git a/src/main/webapp/app/shared/filter/filter.component.html b/src/main/webapp/app/shared/filter/filter.component.html index 5184cc4e4..fef69f8d1 100644 --- a/src/main/webapp/app/shared/filter/filter.component.html +++ b/src/main/webapp/app/shared/filter/filter.component.html @@ -1,17 +1,17 @@ @if (filters.hasAnyFilterSet()) {
Following filters are set - +
    @for (filterOption of filters.filterOptions; track filterOption.name) { @for (value of filterOption.values; track value) {
  • {{ filterOption.name }}: {{ value }} - +
    • } } diff --git a/src/test/java/gatling/simulations/BankAccountGatlingTest.java b/src/test/java/gatling/simulations/BankAccountGatlingTest.java index d309077ee..8f3eadb94 100644 --- a/src/test/java/gatling/simulations/BankAccountGatlingTest.java +++ b/src/test/java/gatling/simulations/BankAccountGatlingTest.java @@ -9,7 +9,6 @@ import static io.gatling.javaapi.http.HttpDsl.http; import static io.gatling.javaapi.http.HttpDsl.status; -import ch.qos.logback.classic.LoggerContext; import io.gatling.javaapi.core.ChainBuilder; import io.gatling.javaapi.core.ScenarioBuilder; import io.gatling.javaapi.core.Simulation; @@ -17,22 +16,14 @@ import java.time.Duration; import java.util.Map; import java.util.Optional; -import org.slf4j.LoggerFactory; /** * Performance test for the BankAccount entity. + * + * @see Logging tips */ public class BankAccountGatlingTest extends Simulation { - LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); - - { - // Log all HTTP requests - //context.getLogger("io.gatling.http").setLevel(Level.valueOf("TRACE")); - // Log failed HTTP requests - //context.getLogger("io.gatling.http").setLevel(Level.valueOf("DEBUG")); - } - String baseURL = Optional.ofNullable(System.getProperty("baseURL")).orElse("http://localhost:8080"); HttpProtocolBuilder httpConf = http diff --git a/src/test/java/gatling/simulations/LabelGatlingTest.java b/src/test/java/gatling/simulations/LabelGatlingTest.java index 5405044e8..61761c52e 100644 --- a/src/test/java/gatling/simulations/LabelGatlingTest.java +++ b/src/test/java/gatling/simulations/LabelGatlingTest.java @@ -9,7 +9,6 @@ import static io.gatling.javaapi.http.HttpDsl.http; import static io.gatling.javaapi.http.HttpDsl.status; -import ch.qos.logback.classic.LoggerContext; import io.gatling.javaapi.core.ChainBuilder; import io.gatling.javaapi.core.ScenarioBuilder; import io.gatling.javaapi.core.Simulation; @@ -17,22 +16,14 @@ import java.time.Duration; import java.util.Map; import java.util.Optional; -import org.slf4j.LoggerFactory; /** * Performance test for the Label entity. + * + * @see Logging tips */ public class LabelGatlingTest extends Simulation { - LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); - - { - // Log all HTTP requests - //context.getLogger("io.gatling.http").setLevel(Level.valueOf("TRACE")); - // Log failed HTTP requests - //context.getLogger("io.gatling.http").setLevel(Level.valueOf("DEBUG")); - } - String baseURL = Optional.ofNullable(System.getProperty("baseURL")).orElse("http://localhost:8080"); HttpProtocolBuilder httpConf = http diff --git a/src/test/java/gatling/simulations/OperationGatlingTest.java b/src/test/java/gatling/simulations/OperationGatlingTest.java index 7cfb22ba9..b39b60a13 100644 --- a/src/test/java/gatling/simulations/OperationGatlingTest.java +++ b/src/test/java/gatling/simulations/OperationGatlingTest.java @@ -9,7 +9,6 @@ import static io.gatling.javaapi.http.HttpDsl.http; import static io.gatling.javaapi.http.HttpDsl.status; -import ch.qos.logback.classic.LoggerContext; import io.gatling.javaapi.core.ChainBuilder; import io.gatling.javaapi.core.ScenarioBuilder; import io.gatling.javaapi.core.Simulation; @@ -17,22 +16,14 @@ import java.time.Duration; import java.util.Map; import java.util.Optional; -import org.slf4j.LoggerFactory; /** * Performance test for the Operation entity. + * + * @see Logging tips */ public class OperationGatlingTest extends Simulation { - LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); - - { - // Log all HTTP requests - //context.getLogger("io.gatling.http").setLevel(Level.valueOf("TRACE")); - // Log failed HTTP requests - //context.getLogger("io.gatling.http").setLevel(Level.valueOf("DEBUG")); - } - String baseURL = Optional.ofNullable(System.getProperty("baseURL")).orElse("http://localhost:8080"); HttpProtocolBuilder httpConf = http diff --git a/src/test/java/io/github/jhipster/sample/config/PostgreSqlTestContainer.java b/src/test/java/io/github/jhipster/sample/config/PostgreSqlTestContainer.java index 33320e7fe..38f118d72 100644 --- a/src/test/java/io/github/jhipster/sample/config/PostgreSqlTestContainer.java +++ b/src/test/java/io/github/jhipster/sample/config/PostgreSqlTestContainer.java @@ -23,7 +23,7 @@ public void destroy() { @Override public void afterPropertiesSet() { if (null == postgreSQLContainer) { - postgreSQLContainer = new PostgreSQLContainer<>("postgres:16.2") + postgreSQLContainer = new PostgreSQLContainer<>("postgres:16.3") .withDatabaseName("jhipsterSampleApplication") .withTmpFs(Collections.singletonMap("/testtmpfs", "rw")) .withLogConsumer(new Slf4jLogConsumer(log)) diff --git a/src/test/java/io/github/jhipster/sample/config/SqlTestContainersSpringContextCustomizerFactory.java b/src/test/java/io/github/jhipster/sample/config/SqlTestContainersSpringContextCustomizerFactory.java index 7e2dd379a..752ddec88 100644 --- a/src/test/java/io/github/jhipster/sample/config/SqlTestContainersSpringContextCustomizerFactory.java +++ b/src/test/java/io/github/jhipster/sample/config/SqlTestContainersSpringContextCustomizerFactory.java @@ -41,7 +41,9 @@ public void customizeContext(ConfigurableApplicationContext context, MergedConte ); prodTestContainer = beanFactory.createBean(containerClass); beanFactory.registerSingleton(containerClass.getName(), prodTestContainer); - // ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(containerClass.getName(), prodTestContainer); + /** + * ((DefaultListableBeanFactory)beanFactory).registerDisposableBean(containerClass.getName(), prodTestContainer); + */ } catch (ClassNotFoundException e) { throw new RuntimeException(e); } diff --git a/src/test/java/io/github/jhipster/sample/domain/AuthorityTest.java b/src/test/java/io/github/jhipster/sample/domain/AuthorityTest.java index a505f0590..63033af00 100644 --- a/src/test/java/io/github/jhipster/sample/domain/AuthorityTest.java +++ b/src/test/java/io/github/jhipster/sample/domain/AuthorityTest.java @@ -23,7 +23,7 @@ void equalsVerifier() throws Exception { } @Test - void hashCodeVerifier() throws Exception { + void hashCodeVerifier() { Authority authority = new Authority(); assertThat(authority.hashCode()).isZero(); diff --git a/src/test/java/io/github/jhipster/sample/domain/BankAccountTest.java b/src/test/java/io/github/jhipster/sample/domain/BankAccountTest.java index b047ee143..36659eb88 100644 --- a/src/test/java/io/github/jhipster/sample/domain/BankAccountTest.java +++ b/src/test/java/io/github/jhipster/sample/domain/BankAccountTest.java @@ -26,7 +26,7 @@ void equalsVerifier() throws Exception { } @Test - void operationTest() throws Exception { + void operationTest() { BankAccount bankAccount = getBankAccountRandomSampleGenerator(); Operation operationBack = getOperationRandomSampleGenerator(); diff --git a/src/test/java/io/github/jhipster/sample/domain/LabelTest.java b/src/test/java/io/github/jhipster/sample/domain/LabelTest.java index d94ad9557..ea7ba32bc 100644 --- a/src/test/java/io/github/jhipster/sample/domain/LabelTest.java +++ b/src/test/java/io/github/jhipster/sample/domain/LabelTest.java @@ -26,7 +26,7 @@ void equalsVerifier() throws Exception { } @Test - void operationTest() throws Exception { + void operationTest() { Label label = getLabelRandomSampleGenerator(); Operation operationBack = getOperationRandomSampleGenerator(); diff --git a/src/test/java/io/github/jhipster/sample/domain/OperationTest.java b/src/test/java/io/github/jhipster/sample/domain/OperationTest.java index fc2b416ae..02227da4d 100644 --- a/src/test/java/io/github/jhipster/sample/domain/OperationTest.java +++ b/src/test/java/io/github/jhipster/sample/domain/OperationTest.java @@ -27,7 +27,7 @@ void equalsVerifier() throws Exception { } @Test - void bankAccountTest() throws Exception { + void bankAccountTest() { Operation operation = getOperationRandomSampleGenerator(); BankAccount bankAccountBack = getBankAccountRandomSampleGenerator(); @@ -39,7 +39,7 @@ void bankAccountTest() throws Exception { } @Test - void labelTest() throws Exception { + void labelTest() { Operation operation = getOperationRandomSampleGenerator(); Label labelBack = getLabelRandomSampleGenerator(); diff --git a/src/test/java/io/github/jhipster/sample/security/DomainUserDetailsServiceIT.java b/src/test/java/io/github/jhipster/sample/security/DomainUserDetailsServiceIT.java index eea336d78..4fda8e735 100644 --- a/src/test/java/io/github/jhipster/sample/security/DomainUserDetailsServiceIT.java +++ b/src/test/java/io/github/jhipster/sample/security/DomainUserDetailsServiceIT.java @@ -6,8 +6,10 @@ import io.github.jhipster.sample.IntegrationTest; import io.github.jhipster.sample.domain.User; import io.github.jhipster.sample.repository.UserRepository; +import io.github.jhipster.sample.service.UserService; import java.util.Locale; import org.apache.commons.lang3.RandomStringUtils; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -33,12 +35,14 @@ class DomainUserDetailsServiceIT { @Autowired private UserRepository userRepository; + @Autowired + private UserService userService; + @Autowired @Qualifier("userDetailsService") private UserDetailsService domainUserDetailsService; - @BeforeEach - public void init() { + public User getUserOne() { User userOne = new User(); userOne.setLogin(USER_ONE_LOGIN); userOne.setPassword(RandomStringUtils.randomAlphanumeric(60)); @@ -47,8 +51,10 @@ public void init() { userOne.setFirstName("userOne"); userOne.setLastName("doe"); userOne.setLangKey("en"); - userRepository.save(userOne); + return userOne; + } + public User getUserTwo() { User userTwo = new User(); userTwo.setLogin(USER_TWO_LOGIN); userTwo.setPassword(RandomStringUtils.randomAlphanumeric(60)); @@ -57,8 +63,10 @@ public void init() { userTwo.setFirstName("userTwo"); userTwo.setLastName("doe"); userTwo.setLangKey("en"); - userRepository.save(userTwo); + return userTwo; + } + public User getUserThree() { User userThree = new User(); userThree.setLogin(USER_THREE_LOGIN); userThree.setPassword(RandomStringUtils.randomAlphanumeric(60)); @@ -67,7 +75,21 @@ public void init() { userThree.setFirstName("userThree"); userThree.setLastName("doe"); userThree.setLangKey("en"); - userRepository.save(userThree); + return userThree; + } + + @BeforeEach + public void init() { + userRepository.save(getUserOne()); + userRepository.save(getUserTwo()); + userRepository.save(getUserThree()); + } + + @AfterEach + public void cleanup() { + userService.deleteUser(USER_ONE_LOGIN); + userService.deleteUser(USER_TWO_LOGIN); + userService.deleteUser(USER_THREE_LOGIN); } @Test diff --git a/src/test/java/io/github/jhipster/sample/service/UserServiceIT.java b/src/test/java/io/github/jhipster/sample/service/UserServiceIT.java index 6c979561f..86aacd0bf 100644 --- a/src/test/java/io/github/jhipster/sample/service/UserServiceIT.java +++ b/src/test/java/io/github/jhipster/sample/service/UserServiceIT.java @@ -10,12 +10,16 @@ import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; import java.util.List; +import java.util.Objects; import java.util.Optional; import org.apache.commons.lang3.RandomStringUtils; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.cache.Cache; +import org.springframework.cache.CacheManager; import org.springframework.data.auditing.AuditingHandler; import org.springframework.data.auditing.DateTimeProvider; import org.springframework.transaction.annotation.Transactional; @@ -28,14 +32,17 @@ @Transactional class UserServiceIT { - private static final String DEFAULT_LOGIN = "johndoe"; + private static final String DEFAULT_LOGIN = "johndoe_service"; - private static final String DEFAULT_EMAIL = "johndoe@localhost"; + private static final String DEFAULT_EMAIL = "johndoe_service@localhost"; private static final String DEFAULT_FIRSTNAME = "john"; private static final String DEFAULT_LASTNAME = "doe"; + @Autowired + private CacheManager cacheManager; + private static final String DEFAULT_IMAGEURL = "http://placehold.it/50x50"; private static final String DEFAULT_LANGKEY = "dummy"; @@ -54,6 +61,13 @@ class UserServiceIT { private User user; + private Long numberOfUsers; + + @BeforeEach + public void countUsers() { + numberOfUsers = userRepository.count(); + } + @BeforeEach public void init() { user = new User(); @@ -70,6 +84,19 @@ public void init() { auditingHandler.setDateTimeProvider(dateTimeProvider); } + @AfterEach + public void cleanupAndCheck() { + cacheManager + .getCacheNames() + .stream() + .map(cacheName -> this.cacheManager.getCache(cacheName)) + .filter(Objects::nonNull) + .forEach(Cache::clear); + userService.deleteUser(DEFAULT_LOGIN); + assertThat(userRepository.count()).isEqualTo(numberOfUsers); + numberOfUsers = null; + } + @Test @Transactional void assertThatUserMustExistToResetPassword() { diff --git a/src/test/java/io/github/jhipster/sample/service/mapper/UserMapperTest.java b/src/test/java/io/github/jhipster/sample/service/mapper/UserMapperTest.java index 079b603ce..c9a6d8721 100644 --- a/src/test/java/io/github/jhipster/sample/service/mapper/UserMapperTest.java +++ b/src/test/java/io/github/jhipster/sample/service/mapper/UserMapperTest.java @@ -2,9 +2,12 @@ import static org.assertj.core.api.Assertions.assertThat; +import io.github.jhipster.sample.domain.Authority; import io.github.jhipster.sample.domain.User; +import io.github.jhipster.sample.security.AuthoritiesConstants; import io.github.jhipster.sample.service.dto.AdminUserDTO; import io.github.jhipster.sample.service.dto.UserDTO; +import java.time.Instant; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -36,11 +39,59 @@ public void init() { user.setFirstName("john"); user.setLastName("doe"); user.setImageUrl("image_url"); + user.setCreatedBy(DEFAULT_LOGIN); + user.setCreatedDate(Instant.now()); + user.setLastModifiedBy(DEFAULT_LOGIN); + user.setLastModifiedDate(Instant.now()); user.setLangKey("en"); + Set authorities = new HashSet<>(); + Authority authority = new Authority(); + authority.setName(AuthoritiesConstants.USER); + authorities.add(authority); + user.setAuthorities(authorities); + userDto = new AdminUserDTO(user); } + @Test + void testUserToUserDTO() { + AdminUserDTO convertedUserDto = userMapper.userToAdminUserDTO(user); + + assertThat(convertedUserDto.getId()).isEqualTo(user.getId()); + assertThat(convertedUserDto.getLogin()).isEqualTo(user.getLogin()); + assertThat(convertedUserDto.getFirstName()).isEqualTo(user.getFirstName()); + assertThat(convertedUserDto.getLastName()).isEqualTo(user.getLastName()); + assertThat(convertedUserDto.getEmail()).isEqualTo(user.getEmail()); + assertThat(convertedUserDto.isActivated()).isEqualTo(user.isActivated()); + assertThat(convertedUserDto.getImageUrl()).isEqualTo(user.getImageUrl()); + assertThat(convertedUserDto.getCreatedBy()).isEqualTo(user.getCreatedBy()); + assertThat(convertedUserDto.getCreatedDate()).isEqualTo(user.getCreatedDate()); + assertThat(convertedUserDto.getLastModifiedBy()).isEqualTo(user.getLastModifiedBy()); + assertThat(convertedUserDto.getLastModifiedDate()).isEqualTo(user.getLastModifiedDate()); + assertThat(convertedUserDto.getLangKey()).isEqualTo(user.getLangKey()); + assertThat(convertedUserDto.getAuthorities()).containsExactly(AuthoritiesConstants.USER); + } + + @Test + void testUserDTOtoUser() { + User convertedUser = userMapper.userDTOToUser(userDto); + + assertThat(convertedUser.getId()).isEqualTo(userDto.getId()); + assertThat(convertedUser.getLogin()).isEqualTo(userDto.getLogin()); + assertThat(convertedUser.getFirstName()).isEqualTo(userDto.getFirstName()); + assertThat(convertedUser.getLastName()).isEqualTo(userDto.getLastName()); + assertThat(convertedUser.getEmail()).isEqualTo(userDto.getEmail()); + assertThat(convertedUser.isActivated()).isEqualTo(userDto.isActivated()); + assertThat(convertedUser.getImageUrl()).isEqualTo(userDto.getImageUrl()); + assertThat(convertedUser.getLangKey()).isEqualTo(userDto.getLangKey()); + assertThat(convertedUser.getCreatedBy()).isEqualTo(userDto.getCreatedBy()); + assertThat(convertedUser.getCreatedDate()).isEqualTo(userDto.getCreatedDate()); + assertThat(convertedUser.getLastModifiedBy()).isEqualTo(userDto.getLastModifiedBy()); + assertThat(convertedUser.getLastModifiedDate()).isEqualTo(userDto.getLastModifiedDate()); + assertThat(convertedUser.getAuthorities()).extracting("name").containsExactly(AuthoritiesConstants.USER); + } + @Test void usersToUserDTOsShouldMapOnlyNonNullUsers() { List users = new ArrayList<>(); @@ -96,27 +147,23 @@ void userDTOsToUsersMapWithNullAuthoritiesStringShouldReturnUserWithEmptyAuthori @Test void userDTOToUserMapWithAuthoritiesStringShouldReturnUserWithAuthorities() { - Set authoritiesAsString = new HashSet<>(); - authoritiesAsString.add("ADMIN"); - userDto.setAuthorities(authoritiesAsString); - - User user = userMapper.userDTOToUser(userDto); + User convertedUser = userMapper.userDTOToUser(userDto); - assertThat(user).isNotNull(); - assertThat(user.getAuthorities()).isNotNull(); - assertThat(user.getAuthorities()).isNotEmpty(); - assertThat(user.getAuthorities().iterator().next().getName()).isEqualTo("ADMIN"); + assertThat(convertedUser).isNotNull(); + assertThat(convertedUser.getAuthorities()).isNotNull(); + assertThat(convertedUser.getAuthorities()).isNotEmpty(); + assertThat(convertedUser.getAuthorities().iterator().next().getName()).isEqualTo(AuthoritiesConstants.USER); } @Test void userDTOToUserMapWithNullAuthoritiesStringShouldReturnUserWithEmptyAuthorities() { userDto.setAuthorities(null); - User user = userMapper.userDTOToUser(userDto); + User persistUser = userMapper.userDTOToUser(userDto); - assertThat(user).isNotNull(); - assertThat(user.getAuthorities()).isNotNull(); - assertThat(user.getAuthorities()).isEmpty(); + assertThat(persistUser).isNotNull(); + assertThat(persistUser.getAuthorities()).isNotNull(); + assertThat(persistUser.getAuthorities()).isEmpty(); } @Test diff --git a/src/test/java/io/github/jhipster/sample/web/rest/AccountResourceIT.java b/src/test/java/io/github/jhipster/sample/web/rest/AccountResourceIT.java index 993acb0fc..fd5dd5fca 100644 --- a/src/test/java/io/github/jhipster/sample/web/rest/AccountResourceIT.java +++ b/src/test/java/io/github/jhipster/sample/web/rest/AccountResourceIT.java @@ -20,6 +20,8 @@ import java.util.*; import java.util.stream.Stream; import org.apache.commons.lang3.RandomStringUtils; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -58,6 +60,19 @@ class AccountResourceIT { @Autowired private MockMvc restAccountMockMvc; + private Long numberOfUsers; + + @BeforeEach + public void countUsers() { + numberOfUsers = userRepository.count(); + } + + @AfterEach + public void cleanupAndCheck() { + assertThat(userRepository.count()).isEqualTo(numberOfUsers); + numberOfUsers = null; + } + @Test @WithUnauthenticatedMockUser void testNonAuthenticatedUser() throws Exception { @@ -103,6 +118,8 @@ void testGetExistingAccount() throws Exception { .andExpect(jsonPath("$.imageUrl").value("http://placehold.it/50x50")) .andExpect(jsonPath("$.langKey").value("en")) .andExpect(jsonPath("$.authorities").value(AuthoritiesConstants.ADMIN)); + + userService.deleteUser(TEST_USER_LOGIN); } @Test @@ -129,6 +146,8 @@ void testRegisterValid() throws Exception { .andExpect(status().isCreated()); assertThat(userRepository.findOneByLogin("test-register-valid")).isPresent(); + + userService.deleteUser("test-register-valid"); } @Test @@ -242,6 +261,8 @@ void testRegisterDuplicateLogin() throws Exception { restAccountMockMvc .perform(post("/api/register").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(secondUser))) .andExpect(status().is4xxClientError()); + + userService.deleteUser("alice"); } @Test @@ -316,6 +337,8 @@ void testRegisterDuplicateEmail() throws Exception { restAccountMockMvc .perform(post("/api/register").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(secondUser))) .andExpect(status().is4xxClientError()); + + userService.deleteUser("test-register-duplicate-email-3"); } @Test @@ -341,6 +364,8 @@ void testRegisterAdminIsIgnored() throws Exception { assertThat(userDup.orElseThrow().getAuthorities()) .hasSize(1) .containsExactly(authorityRepository.findById(AuthoritiesConstants.USER).orElseThrow()); + + userService.deleteUser("badguy"); } @Test @@ -360,6 +385,8 @@ void testActivateAccount() throws Exception { user = userRepository.findOneByLogin(user.getLogin()).orElse(null); assertThat(user.isActivated()).isTrue(); + + userService.deleteUser("activate-account"); } @Test @@ -402,6 +429,8 @@ void testSaveAccount() throws Exception { assertThat(updatedUser.getImageUrl()).isEqualTo(userDTO.getImageUrl()); assertThat(updatedUser.isActivated()).isTrue(); assertThat(updatedUser.getAuthorities()).isEmpty(); + + userService.deleteUser("save-account"); } @Test @@ -431,6 +460,8 @@ void testSaveInvalidEmail() throws Exception { .andExpect(status().isBadRequest()); assertThat(userRepository.findOneByEmailIgnoreCase("invalid email")).isNotPresent(); + + userService.deleteUser("save-invalid-email"); } @Test @@ -466,8 +497,11 @@ void testSaveExistingEmail() throws Exception { .perform(post("/api/account").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(userDTO))) .andExpect(status().isBadRequest()); - User updatedUser = userRepository.findOneByLogin("save-existing-email").orElse(null); + User updatedUser = userRepository.findOneByLogin("save-existing-email").orElseThrow(); assertThat(updatedUser.getEmail()).isEqualTo("save-existing-email@example.com"); + + userService.deleteUser("save-existing-email"); + userService.deleteUser("save-existing-email2"); } @Test @@ -497,6 +531,8 @@ void testSaveExistingEmailAndLogin() throws Exception { User updatedUser = userRepository.findOneByLogin("save-existing-email-and-login").orElse(null); assertThat(updatedUser.getEmail()).isEqualTo("save-existing-email-and-login@example.com"); + + userService.deleteUser("save-existing-email-and-login"); } @Test @@ -521,6 +557,8 @@ void testChangePasswordWrongExistingPassword() throws Exception { User updatedUser = userRepository.findOneByLogin("change-password-wrong-existing-password").orElse(null); assertThat(passwordEncoder.matches("new password", updatedUser.getPassword())).isFalse(); assertThat(passwordEncoder.matches(currentPassword, updatedUser.getPassword())).isTrue(); + + userService.deleteUser("change-password-wrong-existing-password"); } @Test @@ -544,6 +582,8 @@ void testChangePassword() throws Exception { User updatedUser = userRepository.findOneByLogin("change-password").orElse(null); assertThat(passwordEncoder.matches("new password", updatedUser.getPassword())).isTrue(); + + userService.deleteUser("change-password"); } @Test @@ -569,6 +609,8 @@ void testChangePasswordTooSmall() throws Exception { User updatedUser = userRepository.findOneByLogin("change-password-too-small").orElse(null); assertThat(updatedUser.getPassword()).isEqualTo(user.getPassword()); + + userService.deleteUser("change-password-too-small"); } @Test @@ -594,6 +636,8 @@ void testChangePasswordTooLong() throws Exception { User updatedUser = userRepository.findOneByLogin("change-password-too-long").orElse(null); assertThat(updatedUser.getPassword()).isEqualTo(user.getPassword()); + + userService.deleteUser("change-password-too-long"); } @Test @@ -617,6 +661,8 @@ void testChangePasswordEmpty() throws Exception { User updatedUser = userRepository.findOneByLogin("change-password-empty").orElse(null); assertThat(updatedUser.getPassword()).isEqualTo(user.getPassword()); + + userService.deleteUser("change-password-empty"); } @Test @@ -633,6 +679,8 @@ void testRequestPasswordReset() throws Exception { restAccountMockMvc .perform(post("/api/account/reset-password/init").content("password-reset@example.com")) .andExpect(status().isOk()); + + userService.deleteUser("password-reset"); } @Test @@ -649,6 +697,8 @@ void testRequestPasswordResetUpperCaseEmail() throws Exception { restAccountMockMvc .perform(post("/api/account/reset-password/init").content("password-reset-upper-case@EXAMPLE.COM")) .andExpect(status().isOk()); + + userService.deleteUser("password-reset-upper-case"); } @Test @@ -683,6 +733,8 @@ void testFinishPasswordReset() throws Exception { User updatedUser = userRepository.findOneByLogin(user.getLogin()).orElse(null); assertThat(passwordEncoder.matches(keyAndPassword.getNewPassword(), updatedUser.getPassword())).isTrue(); + + userService.deleteUser("finish-password-reset"); } @Test @@ -710,6 +762,8 @@ void testFinishPasswordResetTooSmall() throws Exception { User updatedUser = userRepository.findOneByLogin(user.getLogin()).orElse(null); assertThat(passwordEncoder.matches(keyAndPassword.getNewPassword(), updatedUser.getPassword())).isFalse(); + + userService.deleteUser("finish-password-reset-too-small"); } @Test diff --git a/src/test/java/io/github/jhipster/sample/web/rest/AuthorityResourceIT.java b/src/test/java/io/github/jhipster/sample/web/rest/AuthorityResourceIT.java index 9d2ab27fd..8aa19857f 100644 --- a/src/test/java/io/github/jhipster/sample/web/rest/AuthorityResourceIT.java +++ b/src/test/java/io/github/jhipster/sample/web/rest/AuthorityResourceIT.java @@ -12,6 +12,7 @@ import io.github.jhipster.sample.repository.AuthorityRepository; import jakarta.persistence.EntityManager; import java.util.UUID; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -46,6 +47,8 @@ class AuthorityResourceIT { private Authority authority; + private Authority insertedAuthority; + /** * Create an entity for this test. * @@ -73,6 +76,14 @@ public void initTest() { authority = createEntity(em); } + @AfterEach + public void cleanup() { + if (insertedAuthority != null) { + authorityRepository.delete(insertedAuthority); + insertedAuthority = null; + } + } + @Test @Transactional void createAuthority() throws Exception { @@ -91,13 +102,15 @@ void createAuthority() throws Exception { // Validate the Authority in the database assertIncrementedRepositoryCount(databaseSizeBeforeCreate); assertAuthorityUpdatableFieldsEquals(returnedAuthority, getPersistedAuthority(returnedAuthority)); + + insertedAuthority = returnedAuthority; } @Test @Transactional void createAuthorityWithExistingId() throws Exception { // Create the Authority with an existing ID - authorityRepository.saveAndFlush(authority); + insertedAuthority = authorityRepository.saveAndFlush(authority); long databaseSizeBeforeCreate = getRepositoryCount(); @@ -115,7 +128,7 @@ void createAuthorityWithExistingId() throws Exception { void getAllAuthorities() throws Exception { // Initialize the database authority.setName(UUID.randomUUID().toString()); - authorityRepository.saveAndFlush(authority); + insertedAuthority = authorityRepository.saveAndFlush(authority); // Get all the authorityList restAuthorityMockMvc @@ -130,7 +143,7 @@ void getAllAuthorities() throws Exception { void getAuthority() throws Exception { // Initialize the database authority.setName(UUID.randomUUID().toString()); - authorityRepository.saveAndFlush(authority); + insertedAuthority = authorityRepository.saveAndFlush(authority); // Get the authority restAuthorityMockMvc @@ -152,7 +165,7 @@ void getNonExistingAuthority() throws Exception { void deleteAuthority() throws Exception { // Initialize the database authority.setName(UUID.randomUUID().toString()); - authorityRepository.saveAndFlush(authority); + insertedAuthority = authorityRepository.saveAndFlush(authority); long databaseSizeBeforeDelete = getRepositoryCount(); diff --git a/src/test/java/io/github/jhipster/sample/web/rest/BankAccountResourceIT.java b/src/test/java/io/github/jhipster/sample/web/rest/BankAccountResourceIT.java index 73d562031..b82b9f281 100644 --- a/src/test/java/io/github/jhipster/sample/web/rest/BankAccountResourceIT.java +++ b/src/test/java/io/github/jhipster/sample/web/rest/BankAccountResourceIT.java @@ -13,11 +13,13 @@ import io.github.jhipster.sample.IntegrationTest; import io.github.jhipster.sample.domain.BankAccount; import io.github.jhipster.sample.repository.BankAccountRepository; +import io.github.jhipster.sample.repository.UserRepository; import jakarta.persistence.EntityManager; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Random; import java.util.concurrent.atomic.AtomicLong; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -59,6 +61,9 @@ class BankAccountResourceIT { @Autowired private BankAccountRepository bankAccountRepository; + @Autowired + private UserRepository userRepository; + @Mock private BankAccountRepository bankAccountRepositoryMock; @@ -70,6 +75,8 @@ class BankAccountResourceIT { private BankAccount bankAccount; + private BankAccount insertedBankAccount; + /** * Create an entity for this test. * @@ -97,6 +104,14 @@ public void initTest() { bankAccount = createEntity(em); } + @AfterEach + public void cleanup() { + if (insertedBankAccount != null) { + bankAccountRepository.delete(insertedBankAccount); + insertedBankAccount = null; + } + } + @Test @Transactional void createBankAccount() throws Exception { @@ -115,6 +130,8 @@ void createBankAccount() throws Exception { // Validate the BankAccount in the database assertIncrementedRepositoryCount(databaseSizeBeforeCreate); assertBankAccountUpdatableFieldsEquals(returnedBankAccount, getPersistedBankAccount(returnedBankAccount)); + + insertedBankAccount = returnedBankAccount; } @Test @@ -170,7 +187,7 @@ void checkBalanceIsRequired() throws Exception { @Transactional void getAllBankAccounts() throws Exception { // Initialize the database - bankAccountRepository.saveAndFlush(bankAccount); + insertedBankAccount = bankAccountRepository.saveAndFlush(bankAccount); // Get all the bankAccountList restBankAccountMockMvc @@ -203,7 +220,7 @@ void getAllBankAccountsWithEagerRelationshipsIsNotEnabled() throws Exception { @Transactional void getBankAccount() throws Exception { // Initialize the database - bankAccountRepository.saveAndFlush(bankAccount); + insertedBankAccount = bankAccountRepository.saveAndFlush(bankAccount); // Get the bankAccount restBankAccountMockMvc @@ -226,7 +243,7 @@ void getNonExistingBankAccount() throws Exception { @Transactional void putExistingBankAccount() throws Exception { // Initialize the database - bankAccountRepository.saveAndFlush(bankAccount); + insertedBankAccount = bankAccountRepository.saveAndFlush(bankAccount); long databaseSizeBeforeUpdate = getRepositoryCount(); @@ -306,7 +323,7 @@ void putWithMissingIdPathParamBankAccount() throws Exception { @Transactional void partialUpdateBankAccountWithPatch() throws Exception { // Initialize the database - bankAccountRepository.saveAndFlush(bankAccount); + insertedBankAccount = bankAccountRepository.saveAndFlush(bankAccount); long databaseSizeBeforeUpdate = getRepositoryCount(); @@ -314,8 +331,6 @@ void partialUpdateBankAccountWithPatch() throws Exception { BankAccount partialUpdatedBankAccount = new BankAccount(); partialUpdatedBankAccount.setId(bankAccount.getId()); - partialUpdatedBankAccount.name(UPDATED_NAME); - restBankAccountMockMvc .perform( patch(ENTITY_API_URL_ID, partialUpdatedBankAccount.getId()) @@ -337,7 +352,7 @@ void partialUpdateBankAccountWithPatch() throws Exception { @Transactional void fullUpdateBankAccountWithPatch() throws Exception { // Initialize the database - bankAccountRepository.saveAndFlush(bankAccount); + insertedBankAccount = bankAccountRepository.saveAndFlush(bankAccount); long databaseSizeBeforeUpdate = getRepositoryCount(); @@ -418,7 +433,7 @@ void patchWithMissingIdPathParamBankAccount() throws Exception { @Transactional void deleteBankAccount() throws Exception { // Initialize the database - bankAccountRepository.saveAndFlush(bankAccount); + insertedBankAccount = bankAccountRepository.saveAndFlush(bankAccount); long databaseSizeBeforeDelete = getRepositoryCount(); diff --git a/src/test/java/io/github/jhipster/sample/web/rest/LabelResourceIT.java b/src/test/java/io/github/jhipster/sample/web/rest/LabelResourceIT.java index 041948f00..01de3a7bf 100644 --- a/src/test/java/io/github/jhipster/sample/web/rest/LabelResourceIT.java +++ b/src/test/java/io/github/jhipster/sample/web/rest/LabelResourceIT.java @@ -14,6 +14,7 @@ import jakarta.persistence.EntityManager; import java.util.Random; import java.util.concurrent.atomic.AtomicLong; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -54,6 +55,8 @@ class LabelResourceIT { private Label label; + private Label insertedLabel; + /** * Create an entity for this test. * @@ -81,6 +84,14 @@ public void initTest() { label = createEntity(em); } + @AfterEach + public void cleanup() { + if (insertedLabel != null) { + labelRepository.delete(insertedLabel); + insertedLabel = null; + } + } + @Test @Transactional void createLabel() throws Exception { @@ -99,6 +110,8 @@ void createLabel() throws Exception { // Validate the Label in the database assertIncrementedRepositoryCount(databaseSizeBeforeCreate); assertLabelUpdatableFieldsEquals(returnedLabel, getPersistedLabel(returnedLabel)); + + insertedLabel = returnedLabel; } @Test @@ -138,7 +151,7 @@ void checkLabelIsRequired() throws Exception { @Transactional void getAllLabels() throws Exception { // Initialize the database - labelRepository.saveAndFlush(label); + insertedLabel = labelRepository.saveAndFlush(label); // Get all the labelList restLabelMockMvc @@ -153,7 +166,7 @@ void getAllLabels() throws Exception { @Transactional void getLabel() throws Exception { // Initialize the database - labelRepository.saveAndFlush(label); + insertedLabel = labelRepository.saveAndFlush(label); // Get the label restLabelMockMvc @@ -175,7 +188,7 @@ void getNonExistingLabel() throws Exception { @Transactional void putExistingLabel() throws Exception { // Initialize the database - labelRepository.saveAndFlush(label); + insertedLabel = labelRepository.saveAndFlush(label); long databaseSizeBeforeUpdate = getRepositoryCount(); @@ -251,7 +264,7 @@ void putWithMissingIdPathParamLabel() throws Exception { @Transactional void partialUpdateLabelWithPatch() throws Exception { // Initialize the database - labelRepository.saveAndFlush(label); + insertedLabel = labelRepository.saveAndFlush(label); long databaseSizeBeforeUpdate = getRepositoryCount(); @@ -277,7 +290,7 @@ void partialUpdateLabelWithPatch() throws Exception { @Transactional void fullUpdateLabelWithPatch() throws Exception { // Initialize the database - labelRepository.saveAndFlush(label); + insertedLabel = labelRepository.saveAndFlush(label); long databaseSizeBeforeUpdate = getRepositoryCount(); @@ -356,7 +369,7 @@ void patchWithMissingIdPathParamLabel() throws Exception { @Transactional void deleteLabel() throws Exception { // Initialize the database - labelRepository.saveAndFlush(label); + insertedLabel = labelRepository.saveAndFlush(label); long databaseSizeBeforeDelete = getRepositoryCount(); diff --git a/src/test/java/io/github/jhipster/sample/web/rest/OperationResourceIT.java b/src/test/java/io/github/jhipster/sample/web/rest/OperationResourceIT.java index 16c07a3f3..957a9b76d 100644 --- a/src/test/java/io/github/jhipster/sample/web/rest/OperationResourceIT.java +++ b/src/test/java/io/github/jhipster/sample/web/rest/OperationResourceIT.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Random; import java.util.concurrent.atomic.AtomicLong; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -75,6 +76,8 @@ class OperationResourceIT { private Operation operation; + private Operation insertedOperation; + /** * Create an entity for this test. * @@ -102,6 +105,14 @@ public void initTest() { operation = createEntity(em); } + @AfterEach + public void cleanup() { + if (insertedOperation != null) { + operationRepository.delete(insertedOperation); + insertedOperation = null; + } + } + @Test @Transactional void createOperation() throws Exception { @@ -120,6 +131,8 @@ void createOperation() throws Exception { // Validate the Operation in the database assertIncrementedRepositoryCount(databaseSizeBeforeCreate); assertOperationUpdatableFieldsEquals(returnedOperation, getPersistedOperation(returnedOperation)); + + insertedOperation = returnedOperation; } @Test @@ -175,7 +188,7 @@ void checkAmountIsRequired() throws Exception { @Transactional void getAllOperations() throws Exception { // Initialize the database - operationRepository.saveAndFlush(operation); + insertedOperation = operationRepository.saveAndFlush(operation); // Get all the operationList restOperationMockMvc @@ -209,7 +222,7 @@ void getAllOperationsWithEagerRelationshipsIsNotEnabled() throws Exception { @Transactional void getOperation() throws Exception { // Initialize the database - operationRepository.saveAndFlush(operation); + insertedOperation = operationRepository.saveAndFlush(operation); // Get the operation restOperationMockMvc @@ -233,7 +246,7 @@ void getNonExistingOperation() throws Exception { @Transactional void putExistingOperation() throws Exception { // Initialize the database - operationRepository.saveAndFlush(operation); + insertedOperation = operationRepository.saveAndFlush(operation); long databaseSizeBeforeUpdate = getRepositoryCount(); @@ -311,7 +324,7 @@ void putWithMissingIdPathParamOperation() throws Exception { @Transactional void partialUpdateOperationWithPatch() throws Exception { // Initialize the database - operationRepository.saveAndFlush(operation); + insertedOperation = operationRepository.saveAndFlush(operation); long databaseSizeBeforeUpdate = getRepositoryCount(); @@ -319,7 +332,7 @@ void partialUpdateOperationWithPatch() throws Exception { Operation partialUpdatedOperation = new Operation(); partialUpdatedOperation.setId(operation.getId()); - partialUpdatedOperation.description(UPDATED_DESCRIPTION); + partialUpdatedOperation.date(UPDATED_DATE); restOperationMockMvc .perform( @@ -342,7 +355,7 @@ void partialUpdateOperationWithPatch() throws Exception { @Transactional void fullUpdateOperationWithPatch() throws Exception { // Initialize the database - operationRepository.saveAndFlush(operation); + insertedOperation = operationRepository.saveAndFlush(operation); long databaseSizeBeforeUpdate = getRepositoryCount(); @@ -423,7 +436,7 @@ void patchWithMissingIdPathParamOperation() throws Exception { @Transactional void deleteOperation() throws Exception { // Initialize the database - operationRepository.saveAndFlush(operation); + insertedOperation = operationRepository.saveAndFlush(operation); long databaseSizeBeforeDelete = getRepositoryCount(); diff --git a/src/test/java/io/github/jhipster/sample/web/rest/PublicUserResourceIT.java b/src/test/java/io/github/jhipster/sample/web/rest/PublicUserResourceIT.java index 63f56ecf7..12a85849b 100644 --- a/src/test/java/io/github/jhipster/sample/web/rest/PublicUserResourceIT.java +++ b/src/test/java/io/github/jhipster/sample/web/rest/PublicUserResourceIT.java @@ -1,6 +1,6 @@ package io.github.jhipster.sample.web.rest; -import static org.hamcrest.Matchers.hasItem; +import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; @@ -8,11 +8,16 @@ import io.github.jhipster.sample.domain.User; import io.github.jhipster.sample.repository.UserRepository; import io.github.jhipster.sample.security.AuthoritiesConstants; +import io.github.jhipster.sample.service.UserService; import jakarta.persistence.EntityManager; +import java.util.Objects; +import java.util.Set; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; import org.springframework.http.MediaType; import org.springframework.security.test.context.support.WithMockUser; @@ -32,6 +37,9 @@ class PublicUserResourceIT { @Autowired private UserRepository userRepository; + @Autowired + private UserService userService; + @Autowired private EntityManager em; @@ -42,16 +50,29 @@ class PublicUserResourceIT { private MockMvc restUserMockMvc; private User user; + private Long numberOfUsers; @BeforeEach - public void setup() { - cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).clear(); - cacheManager.getCache(UserRepository.USERS_BY_EMAIL_CACHE).clear(); + public void countUsers() { + numberOfUsers = userRepository.count(); } @BeforeEach public void initTest() { - user = UserResourceIT.initTestUser(userRepository, em); + user = UserResourceIT.initTestUser(em); + } + + @AfterEach + public void cleanupAndCheck() { + cacheManager + .getCacheNames() + .stream() + .map(cacheName -> this.cacheManager.getCache(cacheName)) + .filter(Objects::nonNull) + .forEach(Cache::clear); + userService.deleteUser(user.getLogin()); + assertThat(userRepository.count()).isEqualTo(numberOfUsers); + numberOfUsers = null; } @Test @@ -65,10 +86,11 @@ void getAllPublicUsers() throws Exception { .perform(get("/api/users?sort=id,desc").accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE)) - .andExpect(jsonPath("$.[*].login").value(hasItem(DEFAULT_LOGIN))) - .andExpect(jsonPath("$.[*].email").doesNotExist()) - .andExpect(jsonPath("$.[*].imageUrl").doesNotExist()) - .andExpect(jsonPath("$.[*].langKey").doesNotExist()); + .andExpect(jsonPath("$.[?(@.id == %d)].login", user.getId()).value(user.getLogin())) + .andExpect(jsonPath("$.[?(@.id == %d)].keys()", user.getId()).value(Set.of("id", "login"))) + .andExpect(jsonPath("$.[*].email").doesNotHaveJsonPath()) + .andExpect(jsonPath("$.[*].imageUrl").doesNotHaveJsonPath()) + .andExpect(jsonPath("$.[*].langKey").doesNotHaveJsonPath()); } @Test diff --git a/src/test/java/io/github/jhipster/sample/web/rest/UserResourceIT.java b/src/test/java/io/github/jhipster/sample/web/rest/UserResourceIT.java index b8e96ea20..69de58d00 100644 --- a/src/test/java/io/github/jhipster/sample/web/rest/UserResourceIT.java +++ b/src/test/java/io/github/jhipster/sample/web/rest/UserResourceIT.java @@ -7,21 +7,23 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.github.jhipster.sample.IntegrationTest; -import io.github.jhipster.sample.domain.Authority; import io.github.jhipster.sample.domain.User; import io.github.jhipster.sample.repository.UserRepository; import io.github.jhipster.sample.security.AuthoritiesConstants; +import io.github.jhipster.sample.service.UserService; import io.github.jhipster.sample.service.dto.AdminUserDTO; import io.github.jhipster.sample.service.mapper.UserMapper; import jakarta.persistence.EntityManager; -import java.time.Instant; import java.util.*; +import java.util.Objects; import java.util.function.Consumer; import org.apache.commons.lang3.RandomStringUtils; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; import org.springframework.http.MediaType; import org.springframework.security.test.context.support.WithMockUser; @@ -65,6 +67,9 @@ class UserResourceIT { @Autowired private UserRepository userRepository; + @Autowired + private UserService userService; + @Autowired private UserMapper userMapper; @@ -79,10 +84,11 @@ class UserResourceIT { private User user; + private Long numberOfUsers; + @BeforeEach - public void setup() { - cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).clear(); - cacheManager.getCache(UserRepository.USERS_BY_EMAIL_CACHE).clear(); + public void countUsers() { + numberOfUsers = userRepository.count(); } /** @@ -92,65 +98,81 @@ public void setup() { * if they test an entity which has a required relationship to the User entity. */ public static User createEntity(EntityManager em) { - User user = new User(); - user.setLogin(DEFAULT_LOGIN + RandomStringUtils.randomAlphabetic(5)); - user.setPassword(RandomStringUtils.randomAlphanumeric(60)); - user.setActivated(true); - user.setEmail(RandomStringUtils.randomAlphabetic(5) + DEFAULT_EMAIL); - user.setFirstName(DEFAULT_FIRSTNAME); - user.setLastName(DEFAULT_LASTNAME); - user.setImageUrl(DEFAULT_IMAGEURL); - user.setLangKey(DEFAULT_LANGKEY); - return user; + User persistUser = new User(); + persistUser.setLogin(DEFAULT_LOGIN + RandomStringUtils.randomAlphabetic(5)); + persistUser.setPassword(RandomStringUtils.randomAlphanumeric(60)); + persistUser.setActivated(true); + persistUser.setEmail(RandomStringUtils.randomAlphabetic(5) + DEFAULT_EMAIL); + persistUser.setFirstName(DEFAULT_FIRSTNAME); + persistUser.setLastName(DEFAULT_LASTNAME); + persistUser.setImageUrl(DEFAULT_IMAGEURL); + persistUser.setLangKey(DEFAULT_LANGKEY); + return persistUser; } /** * Setups the database with one user. */ - public static User initTestUser(UserRepository userRepository, EntityManager em) { - userRepository.deleteAll(); - User user = createEntity(em); - user.setLogin(DEFAULT_LOGIN); - user.setEmail(DEFAULT_EMAIL); - return user; + public static User initTestUser(EntityManager em) { + User persistUser = createEntity(em); + persistUser.setLogin(DEFAULT_LOGIN); + persistUser.setEmail(DEFAULT_EMAIL); + return persistUser; } @BeforeEach public void initTest() { - user = initTestUser(userRepository, em); + user = initTestUser(em); + } + + @AfterEach + public void cleanupAndCheck() { + cacheManager + .getCacheNames() + .stream() + .map(cacheName -> this.cacheManager.getCache(cacheName)) + .filter(Objects::nonNull) + .forEach(Cache::clear); + userService.deleteUser(DEFAULT_LOGIN); + userService.deleteUser(UPDATED_LOGIN); + userService.deleteUser(user.getLogin()); + userService.deleteUser("anotherlogin"); + assertThat(userRepository.count()).isEqualTo(numberOfUsers); + numberOfUsers = null; } @Test @Transactional void createUser() throws Exception { - int databaseSizeBeforeCreate = userRepository.findAll().size(); - // Create the User - AdminUserDTO user = new AdminUserDTO(); - user.setLogin(DEFAULT_LOGIN); - user.setFirstName(DEFAULT_FIRSTNAME); - user.setLastName(DEFAULT_LASTNAME); - user.setEmail(DEFAULT_EMAIL); - user.setActivated(true); - user.setImageUrl(DEFAULT_IMAGEURL); - user.setLangKey(DEFAULT_LANGKEY); - user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); - - restUserMockMvc - .perform(post("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(user))) - .andExpect(status().isCreated()); + AdminUserDTO userDTO = new AdminUserDTO(); + userDTO.setLogin(DEFAULT_LOGIN); + userDTO.setFirstName(DEFAULT_FIRSTNAME); + userDTO.setLastName(DEFAULT_LASTNAME); + userDTO.setEmail(DEFAULT_EMAIL); + userDTO.setActivated(true); + userDTO.setImageUrl(DEFAULT_IMAGEURL); + userDTO.setLangKey(DEFAULT_LANGKEY); + userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); - // Validate the User in the database - assertPersistedUsers(users -> { - assertThat(users).hasSize(databaseSizeBeforeCreate + 1); - User testUser = users.get(users.size() - 1); - assertThat(testUser.getLogin()).isEqualTo(DEFAULT_LOGIN); - assertThat(testUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME); - assertThat(testUser.getLastName()).isEqualTo(DEFAULT_LASTNAME); - assertThat(testUser.getEmail()).isEqualTo(DEFAULT_EMAIL); - assertThat(testUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL); - assertThat(testUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY); - }); + var returnedUserDTO = om.readValue( + restUserMockMvc + .perform(post("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(userDTO))) + .andExpect(status().isCreated()) + .andReturn() + .getResponse() + .getContentAsString(), + AdminUserDTO.class + ); + + User convertedUser = userMapper.userDTOToUser(returnedUserDTO); + // Validate the returned User + assertThat(convertedUser.getLogin()).isEqualTo(DEFAULT_LOGIN); + assertThat(convertedUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME); + assertThat(convertedUser.getLastName()).isEqualTo(DEFAULT_LASTNAME); + assertThat(convertedUser.getEmail()).isEqualTo(DEFAULT_EMAIL); + assertThat(convertedUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL); + assertThat(convertedUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY); } @Test @@ -158,20 +180,20 @@ void createUser() throws Exception { void createUserWithExistingId() throws Exception { int databaseSizeBeforeCreate = userRepository.findAll().size(); - AdminUserDTO user = new AdminUserDTO(); - user.setId(DEFAULT_ID); - user.setLogin(DEFAULT_LOGIN); - user.setFirstName(DEFAULT_FIRSTNAME); - user.setLastName(DEFAULT_LASTNAME); - user.setEmail(DEFAULT_EMAIL); - user.setActivated(true); - user.setImageUrl(DEFAULT_IMAGEURL); - user.setLangKey(DEFAULT_LANGKEY); - user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); + AdminUserDTO userDTO = new AdminUserDTO(); + userDTO.setId(DEFAULT_ID); + userDTO.setLogin(DEFAULT_LOGIN); + userDTO.setFirstName(DEFAULT_FIRSTNAME); + userDTO.setLastName(DEFAULT_LASTNAME); + userDTO.setEmail(DEFAULT_EMAIL); + userDTO.setActivated(true); + userDTO.setImageUrl(DEFAULT_IMAGEURL); + userDTO.setLangKey(DEFAULT_LANGKEY); + userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); // An entity with an existing ID cannot be created, so this API call must fail restUserMockMvc - .perform(post("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(user))) + .perform(post("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(userDTO))) .andExpect(status().isBadRequest()); // Validate the User in the database @@ -185,19 +207,19 @@ void createUserWithExistingLogin() throws Exception { userRepository.saveAndFlush(user); int databaseSizeBeforeCreate = userRepository.findAll().size(); - AdminUserDTO user = new AdminUserDTO(); - user.setLogin(DEFAULT_LOGIN); // this login should already be used - user.setFirstName(DEFAULT_FIRSTNAME); - user.setLastName(DEFAULT_LASTNAME); - user.setEmail("anothermail@localhost"); - user.setActivated(true); - user.setImageUrl(DEFAULT_IMAGEURL); - user.setLangKey(DEFAULT_LANGKEY); - user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); + AdminUserDTO userDTO = new AdminUserDTO(); + userDTO.setLogin(DEFAULT_LOGIN); // this login should already be used + userDTO.setFirstName(DEFAULT_FIRSTNAME); + userDTO.setLastName(DEFAULT_LASTNAME); + userDTO.setEmail("anothermail@localhost"); + userDTO.setActivated(true); + userDTO.setImageUrl(DEFAULT_IMAGEURL); + userDTO.setLangKey(DEFAULT_LANGKEY); + userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); // Create the User restUserMockMvc - .perform(post("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(user))) + .perform(post("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(userDTO))) .andExpect(status().isBadRequest()); // Validate the User in the database @@ -211,19 +233,19 @@ void createUserWithExistingEmail() throws Exception { userRepository.saveAndFlush(user); int databaseSizeBeforeCreate = userRepository.findAll().size(); - AdminUserDTO user = new AdminUserDTO(); - user.setLogin("anotherlogin"); - user.setFirstName(DEFAULT_FIRSTNAME); - user.setLastName(DEFAULT_LASTNAME); - user.setEmail(DEFAULT_EMAIL); // this email should already be used - user.setActivated(true); - user.setImageUrl(DEFAULT_IMAGEURL); - user.setLangKey(DEFAULT_LANGKEY); - user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); + AdminUserDTO userDTO = new AdminUserDTO(); + userDTO.setLogin("anotherlogin"); + userDTO.setFirstName(DEFAULT_FIRSTNAME); + userDTO.setLastName(DEFAULT_LASTNAME); + userDTO.setEmail(DEFAULT_EMAIL); // this email should already be used + userDTO.setActivated(true); + userDTO.setImageUrl(DEFAULT_IMAGEURL); + userDTO.setLangKey(DEFAULT_LANGKEY); + userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); // Create the User restUserMockMvc - .perform(post("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(user))) + .perform(post("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(userDTO))) .andExpect(status().isBadRequest()); // Validate the User in the database @@ -288,23 +310,23 @@ void updateUser() throws Exception { // Update the user User updatedUser = userRepository.findById(user.getId()).orElseThrow(); - AdminUserDTO user = new AdminUserDTO(); - user.setId(updatedUser.getId()); - user.setLogin(updatedUser.getLogin()); - user.setFirstName(UPDATED_FIRSTNAME); - user.setLastName(UPDATED_LASTNAME); - user.setEmail(UPDATED_EMAIL); - user.setActivated(updatedUser.isActivated()); - user.setImageUrl(UPDATED_IMAGEURL); - user.setLangKey(UPDATED_LANGKEY); - user.setCreatedBy(updatedUser.getCreatedBy()); - user.setCreatedDate(updatedUser.getCreatedDate()); - user.setLastModifiedBy(updatedUser.getLastModifiedBy()); - user.setLastModifiedDate(updatedUser.getLastModifiedDate()); - user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); + AdminUserDTO userDTO = new AdminUserDTO(); + userDTO.setId(updatedUser.getId()); + userDTO.setLogin(updatedUser.getLogin()); + userDTO.setFirstName(UPDATED_FIRSTNAME); + userDTO.setLastName(UPDATED_LASTNAME); + userDTO.setEmail(UPDATED_EMAIL); + userDTO.setActivated(updatedUser.isActivated()); + userDTO.setImageUrl(UPDATED_IMAGEURL); + userDTO.setLangKey(UPDATED_LANGKEY); + userDTO.setCreatedBy(updatedUser.getCreatedBy()); + userDTO.setCreatedDate(updatedUser.getCreatedDate()); + userDTO.setLastModifiedBy(updatedUser.getLastModifiedBy()); + userDTO.setLastModifiedDate(updatedUser.getLastModifiedDate()); + userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); restUserMockMvc - .perform(put("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(user))) + .perform(put("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(userDTO))) .andExpect(status().isOk()); // Validate the User in the database @@ -329,23 +351,23 @@ void updateUserLogin() throws Exception { // Update the user User updatedUser = userRepository.findById(user.getId()).orElseThrow(); - AdminUserDTO user = new AdminUserDTO(); - user.setId(updatedUser.getId()); - user.setLogin(UPDATED_LOGIN); - user.setFirstName(UPDATED_FIRSTNAME); - user.setLastName(UPDATED_LASTNAME); - user.setEmail(UPDATED_EMAIL); - user.setActivated(updatedUser.isActivated()); - user.setImageUrl(UPDATED_IMAGEURL); - user.setLangKey(UPDATED_LANGKEY); - user.setCreatedBy(updatedUser.getCreatedBy()); - user.setCreatedDate(updatedUser.getCreatedDate()); - user.setLastModifiedBy(updatedUser.getLastModifiedBy()); - user.setLastModifiedDate(updatedUser.getLastModifiedDate()); - user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); + AdminUserDTO userDTO = new AdminUserDTO(); + userDTO.setId(updatedUser.getId()); + userDTO.setLogin(UPDATED_LOGIN); + userDTO.setFirstName(UPDATED_FIRSTNAME); + userDTO.setLastName(UPDATED_LASTNAME); + userDTO.setEmail(UPDATED_EMAIL); + userDTO.setActivated(updatedUser.isActivated()); + userDTO.setImageUrl(UPDATED_IMAGEURL); + userDTO.setLangKey(UPDATED_LANGKEY); + userDTO.setCreatedBy(updatedUser.getCreatedBy()); + userDTO.setCreatedDate(updatedUser.getCreatedDate()); + userDTO.setLastModifiedBy(updatedUser.getLastModifiedBy()); + userDTO.setLastModifiedDate(updatedUser.getLastModifiedDate()); + userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); restUserMockMvc - .perform(put("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(user))) + .perform(put("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(userDTO))) .andExpect(status().isOk()); // Validate the User in the database @@ -381,23 +403,23 @@ void updateUserExistingEmail() throws Exception { // Update the user User updatedUser = userRepository.findById(user.getId()).orElseThrow(); - AdminUserDTO user = new AdminUserDTO(); - user.setId(updatedUser.getId()); - user.setLogin(updatedUser.getLogin()); - user.setFirstName(updatedUser.getFirstName()); - user.setLastName(updatedUser.getLastName()); - user.setEmail("jhipster@localhost"); // this email should already be used by anotherUser - user.setActivated(updatedUser.isActivated()); - user.setImageUrl(updatedUser.getImageUrl()); - user.setLangKey(updatedUser.getLangKey()); - user.setCreatedBy(updatedUser.getCreatedBy()); - user.setCreatedDate(updatedUser.getCreatedDate()); - user.setLastModifiedBy(updatedUser.getLastModifiedBy()); - user.setLastModifiedDate(updatedUser.getLastModifiedDate()); - user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); + AdminUserDTO userDTO = new AdminUserDTO(); + userDTO.setId(updatedUser.getId()); + userDTO.setLogin(updatedUser.getLogin()); + userDTO.setFirstName(updatedUser.getFirstName()); + userDTO.setLastName(updatedUser.getLastName()); + userDTO.setEmail("jhipster@localhost"); // this email should already be used by anotherUser + userDTO.setActivated(updatedUser.isActivated()); + userDTO.setImageUrl(updatedUser.getImageUrl()); + userDTO.setLangKey(updatedUser.getLangKey()); + userDTO.setCreatedBy(updatedUser.getCreatedBy()); + userDTO.setCreatedDate(updatedUser.getCreatedDate()); + userDTO.setLastModifiedBy(updatedUser.getLastModifiedBy()); + userDTO.setLastModifiedDate(updatedUser.getLastModifiedDate()); + userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); restUserMockMvc - .perform(put("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(user))) + .perform(put("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(userDTO))) .andExpect(status().isBadRequest()); } @@ -421,23 +443,23 @@ void updateUserExistingLogin() throws Exception { // Update the user User updatedUser = userRepository.findById(user.getId()).orElseThrow(); - AdminUserDTO user = new AdminUserDTO(); - user.setId(updatedUser.getId()); - user.setLogin("jhipster"); // this login should already be used by anotherUser - user.setFirstName(updatedUser.getFirstName()); - user.setLastName(updatedUser.getLastName()); - user.setEmail(updatedUser.getEmail()); - user.setActivated(updatedUser.isActivated()); - user.setImageUrl(updatedUser.getImageUrl()); - user.setLangKey(updatedUser.getLangKey()); - user.setCreatedBy(updatedUser.getCreatedBy()); - user.setCreatedDate(updatedUser.getCreatedDate()); - user.setLastModifiedBy(updatedUser.getLastModifiedBy()); - user.setLastModifiedDate(updatedUser.getLastModifiedDate()); - user.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); + AdminUserDTO userDTO = new AdminUserDTO(); + userDTO.setId(updatedUser.getId()); + userDTO.setLogin("jhipster"); // this login should already be used by anotherUser + userDTO.setFirstName(updatedUser.getFirstName()); + userDTO.setLastName(updatedUser.getLastName()); + userDTO.setEmail(updatedUser.getEmail()); + userDTO.setActivated(updatedUser.isActivated()); + userDTO.setImageUrl(updatedUser.getImageUrl()); + userDTO.setLangKey(updatedUser.getLangKey()); + userDTO.setCreatedBy(updatedUser.getCreatedBy()); + userDTO.setCreatedDate(updatedUser.getCreatedDate()); + userDTO.setLastModifiedBy(updatedUser.getLastModifiedBy()); + userDTO.setLastModifiedDate(updatedUser.getLastModifiedDate()); + userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); restUserMockMvc - .perform(put("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(user))) + .perform(put("/api/admin/users").contentType(MediaType.APPLICATION_JSON).content(om.writeValueAsBytes(userDTO))) .andExpect(status().isBadRequest()); } @@ -473,68 +495,6 @@ void testUserEquals() throws Exception { assertThat(user1).isNotEqualTo(user2); } - @Test - void testUserDTOtoUser() { - AdminUserDTO userDTO = new AdminUserDTO(); - userDTO.setId(DEFAULT_ID); - userDTO.setLogin(DEFAULT_LOGIN); - userDTO.setFirstName(DEFAULT_FIRSTNAME); - userDTO.setLastName(DEFAULT_LASTNAME); - userDTO.setEmail(DEFAULT_EMAIL); - userDTO.setActivated(true); - userDTO.setImageUrl(DEFAULT_IMAGEURL); - userDTO.setLangKey(DEFAULT_LANGKEY); - userDTO.setCreatedBy(DEFAULT_LOGIN); - userDTO.setLastModifiedBy(DEFAULT_LOGIN); - userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.USER)); - - User user = userMapper.userDTOToUser(userDTO); - assertThat(user.getId()).isEqualTo(DEFAULT_ID); - assertThat(user.getLogin()).isEqualTo(DEFAULT_LOGIN); - assertThat(user.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME); - assertThat(user.getLastName()).isEqualTo(DEFAULT_LASTNAME); - assertThat(user.getEmail()).isEqualTo(DEFAULT_EMAIL); - assertThat(user.isActivated()).isTrue(); - assertThat(user.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL); - assertThat(user.getLangKey()).isEqualTo(DEFAULT_LANGKEY); - assertThat(user.getCreatedBy()).isNull(); - assertThat(user.getCreatedDate()).isNotNull(); - assertThat(user.getLastModifiedBy()).isNull(); - assertThat(user.getLastModifiedDate()).isNotNull(); - assertThat(user.getAuthorities()).extracting("name").containsExactly(AuthoritiesConstants.USER); - } - - @Test - void testUserToUserDTO() { - user.setId(DEFAULT_ID); - user.setCreatedBy(DEFAULT_LOGIN); - user.setCreatedDate(Instant.now()); - user.setLastModifiedBy(DEFAULT_LOGIN); - user.setLastModifiedDate(Instant.now()); - Set authorities = new HashSet<>(); - Authority authority = new Authority(); - authority.setName(AuthoritiesConstants.USER); - authorities.add(authority); - user.setAuthorities(authorities); - - AdminUserDTO userDTO = userMapper.userToAdminUserDTO(user); - - assertThat(userDTO.getId()).isEqualTo(DEFAULT_ID); - assertThat(userDTO.getLogin()).isEqualTo(DEFAULT_LOGIN); - assertThat(userDTO.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME); - assertThat(userDTO.getLastName()).isEqualTo(DEFAULT_LASTNAME); - assertThat(userDTO.getEmail()).isEqualTo(DEFAULT_EMAIL); - assertThat(userDTO.isActivated()).isTrue(); - assertThat(userDTO.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL); - assertThat(userDTO.getLangKey()).isEqualTo(DEFAULT_LANGKEY); - assertThat(userDTO.getCreatedBy()).isEqualTo(DEFAULT_LOGIN); - assertThat(userDTO.getCreatedDate()).isEqualTo(user.getCreatedDate()); - assertThat(userDTO.getLastModifiedBy()).isEqualTo(DEFAULT_LOGIN); - assertThat(userDTO.getLastModifiedDate()).isEqualTo(user.getLastModifiedDate()); - assertThat(userDTO.getAuthorities()).containsExactly(AuthoritiesConstants.USER); - assertThat(userDTO.toString()).isNotNull(); - } - private void assertPersistedUsers(Consumer> userAssertion) { userAssertion.accept(userRepository.findAll()); } diff --git a/src/test/javascript/cypress/e2e/account/login-page.cy.ts b/src/test/javascript/cypress/e2e/account/login-page.cy.ts index 0d2a0259d..6f5132fc7 100644 --- a/src/test/javascript/cypress/e2e/account/login-page.cy.ts +++ b/src/test/javascript/cypress/e2e/account/login-page.cy.ts @@ -31,7 +31,7 @@ describe('login modal', () => { it('requires username', () => { cy.get(passwordLoginSelector).type('a-password'); cy.get(submitLoginSelector).click(); - cy.wait('@authenticate').then(({ response }) => expect(response.statusCode).to.equal(400)); + cy.wait('@authenticate').then(({ response }) => expect(response?.statusCode).to.equal(400)); // login page should stay open when login fails cy.get(titleLoginSelector).should('be.visible'); }); @@ -39,7 +39,7 @@ describe('login modal', () => { it('requires password', () => { cy.get(usernameLoginSelector).type('a-login'); cy.get(submitLoginSelector).click(); - cy.wait('@authenticate').then(({ response }) => expect(response.statusCode).to.equal(400)); + cy.wait('@authenticate').then(({ response }) => expect(response?.statusCode).to.equal(400)); cy.get(errorLoginSelector).should('be.visible'); }); @@ -47,7 +47,7 @@ describe('login modal', () => { cy.get(usernameLoginSelector).type(username); cy.get(passwordLoginSelector).type('bad-password'); cy.get(submitLoginSelector).click(); - cy.wait('@authenticate').then(({ response }) => expect(response.statusCode).to.equal(401)); + cy.wait('@authenticate').then(({ response }) => expect(response?.statusCode).to.equal(401)); cy.get(errorLoginSelector).should('be.visible'); }); @@ -55,7 +55,7 @@ describe('login modal', () => { cy.get(usernameLoginSelector).type(username); cy.get(passwordLoginSelector).type(password); cy.get(submitLoginSelector).click(); - cy.wait('@authenticate').then(({ response }) => expect(response.statusCode).to.equal(200)); + cy.wait('@authenticate').then(({ response }) => expect(response?.statusCode).to.equal(200)); cy.hash().should('eq', ''); }); }); diff --git a/src/test/javascript/cypress/e2e/account/password-page.cy.ts b/src/test/javascript/cypress/e2e/account/password-page.cy.ts index f84eee602..7ddb6d053 100644 --- a/src/test/javascript/cypress/e2e/account/password-page.cy.ts +++ b/src/test/javascript/cypress/e2e/account/password-page.cy.ts @@ -53,7 +53,7 @@ describe('/account/password', () => { cy.get(newPasswordSelector).type('jhipster'); cy.get(confirmPasswordSelector).type('jhipster'); cy.get(submitPasswordSelector).click(); - cy.wait('@passwordSave').then(({ response }) => expect(response.statusCode).to.equal(400)); + cy.wait('@passwordSave').then(({ response }) => expect(response?.statusCode).to.equal(400)); }); it('should be able to update password', () => { @@ -61,6 +61,6 @@ describe('/account/password', () => { cy.get(newPasswordSelector).type(password); cy.get(confirmPasswordSelector).type(password); cy.get(submitPasswordSelector).click(); - cy.wait('@passwordSave').then(({ response }) => expect(response.statusCode).to.equal(200)); + cy.wait('@passwordSave').then(({ response }) => expect(response?.statusCode).to.equal(200)); }); }); diff --git a/src/test/javascript/cypress/e2e/account/register-page.cy.ts b/src/test/javascript/cypress/e2e/account/register-page.cy.ts index 62adda373..6a322d551 100644 --- a/src/test/javascript/cypress/e2e/account/register-page.cy.ts +++ b/src/test/javascript/cypress/e2e/account/register-page.cy.ts @@ -84,6 +84,6 @@ describe('/account/register', () => { cy.get(firstPasswordRegisterSelector).type('jondoe'); cy.get(secondPasswordRegisterSelector).type('jondoe'); cy.get(submitRegisterSelector).click(); - cy.wait('@registerSave').then(({ response }) => expect(response.statusCode).to.equal(201)); + cy.wait('@registerSave').then(({ response }) => expect(response?.statusCode).to.equal(201)); }); }); diff --git a/src/test/javascript/cypress/e2e/account/reset-password-page.cy.ts b/src/test/javascript/cypress/e2e/account/reset-password-page.cy.ts index dbe3ef2e5..930be8943 100644 --- a/src/test/javascript/cypress/e2e/account/reset-password-page.cy.ts +++ b/src/test/javascript/cypress/e2e/account/reset-password-page.cy.ts @@ -30,6 +30,6 @@ describe('forgot your password', () => { it('should be able to init reset password', () => { cy.get(emailResetPasswordSelector).type('user@gmail.com'); cy.get(submitInitResetPasswordSelector).click({ force: true }); - cy.wait('@initResetPassword').then(({ response }) => expect(response.statusCode).to.equal(200)); + cy.wait('@initResetPassword').then(({ response }) => expect(response?.statusCode).to.equal(200)); }); }); diff --git a/src/test/javascript/cypress/e2e/entity/authority.cy.ts b/src/test/javascript/cypress/e2e/entity/authority.cy.ts index 014942e47..2ccef84a7 100644 --- a/src/test/javascript/cypress/e2e/entity/authority.cy.ts +++ b/src/test/javascript/cypress/e2e/entity/authority.cy.ts @@ -14,7 +14,7 @@ describe('Authority e2e test', () => { const authorityPageUrlPattern = new RegExp('/authority(\\?.*)?$'); const username = Cypress.env('E2E_USERNAME') ?? 'admin'; const password = Cypress.env('E2E_PASSWORD') ?? 'admin'; - const authoritySample = { name: 'f904258e-dd7a-4eb3-acc3-3ae7129ce8f1' }; + const authoritySample = { name: '7eb1d401-e806-4956-bad5-314f6de4339e' }; let authority; @@ -43,7 +43,7 @@ describe('Authority e2e test', () => { cy.visit('/'); cy.clickOnEntityMenuItem('authority'); cy.wait('@entitiesRequest').then(({ response }) => { - if (response.body.length === 0) { + if (response?.body.length === 0) { cy.get(entityTableSelector).should('not.exist'); } else { cy.get(entityTableSelector).should('exist'); @@ -67,7 +67,7 @@ describe('Authority e2e test', () => { cy.get(entityCreateSaveButtonSelector).should('exist'); cy.get(entityCreateCancelButtonSelector).click(); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', authorityPageUrlPattern); }); @@ -105,7 +105,7 @@ describe('Authority e2e test', () => { cy.getEntityDetailsHeading('authority'); cy.get(entityDetailsBackButtonSelector).click(); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', authorityPageUrlPattern); }); @@ -115,10 +115,10 @@ describe('Authority e2e test', () => { cy.getEntityDeleteDialogHeading('authority').should('exist'); cy.get(entityConfirmDeleteButtonSelector).click(); cy.wait('@deleteEntityRequest').then(({ response }) => { - expect(response.statusCode).to.equal(204); + expect(response?.statusCode).to.equal(204); }); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', authorityPageUrlPattern); @@ -135,17 +135,17 @@ describe('Authority e2e test', () => { }); it('should create an instance of Authority', () => { - cy.get(`[data-cy="name"]`).type('8f7a9602-d6af-49e8-978c-332493d7fd7b'); - cy.get(`[data-cy="name"]`).should('have.value', '8f7a9602-d6af-49e8-978c-332493d7fd7b'); + cy.get(`[data-cy="name"]`).type('99c99966-5530-41d7-9fec-c2a362463a44'); + cy.get(`[data-cy="name"]`).should('have.value', '99c99966-5530-41d7-9fec-c2a362463a44'); cy.get(entityCreateSaveButtonSelector).click(); cy.wait('@postEntityRequest').then(({ response }) => { - expect(response.statusCode).to.equal(201); + expect(response?.statusCode).to.equal(201); authority = response.body; }); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', authorityPageUrlPattern); }); diff --git a/src/test/javascript/cypress/e2e/entity/bank-account.cy.ts b/src/test/javascript/cypress/e2e/entity/bank-account.cy.ts index 8b517a6ce..d1f8f6f7d 100644 --- a/src/test/javascript/cypress/e2e/entity/bank-account.cy.ts +++ b/src/test/javascript/cypress/e2e/entity/bank-account.cy.ts @@ -15,7 +15,7 @@ describe('BankAccount e2e test', () => { const bankAccountPageUrlPattern = new RegExp('/bank-account(\\?.*)?$'); const username = Cypress.env('E2E_USERNAME') ?? 'user'; const password = Cypress.env('E2E_PASSWORD') ?? 'user'; - const bankAccountSample = { name: 'hmph until', balance: 24706.21 }; + const bankAccountSample = { name: 'stamp gah', balance: 31518.71 }; let bankAccount; @@ -44,7 +44,7 @@ describe('BankAccount e2e test', () => { cy.visit('/'); cy.clickOnEntityMenuItem('bank-account'); cy.wait('@entitiesRequest').then(({ response }) => { - if (response.body.length === 0) { + if (response?.body.length === 0) { cy.get(entityTableSelector).should('not.exist'); } else { cy.get(entityTableSelector).should('exist'); @@ -68,7 +68,7 @@ describe('BankAccount e2e test', () => { cy.get(entityCreateSaveButtonSelector).should('exist'); cy.get(entityCreateCancelButtonSelector).click(); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', bankAccountPageUrlPattern); }); @@ -106,7 +106,7 @@ describe('BankAccount e2e test', () => { cy.getEntityDetailsHeading('bankAccount'); cy.get(entityDetailsBackButtonSelector).click(); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', bankAccountPageUrlPattern); }); @@ -117,7 +117,7 @@ describe('BankAccount e2e test', () => { cy.get(entityCreateSaveButtonSelector).should('exist'); cy.get(entityCreateCancelButtonSelector).click(); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', bankAccountPageUrlPattern); }); @@ -127,7 +127,7 @@ describe('BankAccount e2e test', () => { cy.getEntityCreateUpdateHeading('BankAccount'); cy.get(entityCreateSaveButtonSelector).click(); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', bankAccountPageUrlPattern); }); @@ -137,10 +137,10 @@ describe('BankAccount e2e test', () => { cy.getEntityDeleteDialogHeading('bankAccount').should('exist'); cy.get(entityConfirmDeleteButtonSelector).click(); cy.wait('@deleteEntityRequest').then(({ response }) => { - expect(response.statusCode).to.equal(204); + expect(response?.statusCode).to.equal(204); }); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', bankAccountPageUrlPattern); @@ -157,20 +157,20 @@ describe('BankAccount e2e test', () => { }); it('should create an instance of BankAccount', () => { - cy.get(`[data-cy="name"]`).type('denitrify disestablish'); - cy.get(`[data-cy="name"]`).should('have.value', 'denitrify disestablish'); + cy.get(`[data-cy="name"]`).type('quintessential lightly excited'); + cy.get(`[data-cy="name"]`).should('have.value', 'quintessential lightly excited'); - cy.get(`[data-cy="balance"]`).type('23325.08'); - cy.get(`[data-cy="balance"]`).should('have.value', '23325.08'); + cy.get(`[data-cy="balance"]`).type('24759.29'); + cy.get(`[data-cy="balance"]`).should('have.value', '24759.29'); cy.get(entityCreateSaveButtonSelector).click(); cy.wait('@postEntityRequest').then(({ response }) => { - expect(response.statusCode).to.equal(201); + expect(response?.statusCode).to.equal(201); bankAccount = response.body; }); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', bankAccountPageUrlPattern); }); diff --git a/src/test/javascript/cypress/e2e/entity/label.cy.ts b/src/test/javascript/cypress/e2e/entity/label.cy.ts index de162502e..4a605628a 100644 --- a/src/test/javascript/cypress/e2e/entity/label.cy.ts +++ b/src/test/javascript/cypress/e2e/entity/label.cy.ts @@ -15,7 +15,7 @@ describe('Label e2e test', () => { const labelPageUrlPattern = new RegExp('/label(\\?.*)?$'); const username = Cypress.env('E2E_USERNAME') ?? 'user'; const password = Cypress.env('E2E_PASSWORD') ?? 'user'; - const labelSample = { label: 'ouch frank auction' }; + const labelSample = { label: 'accomplished along following' }; let label; @@ -44,7 +44,7 @@ describe('Label e2e test', () => { cy.visit('/'); cy.clickOnEntityMenuItem('label'); cy.wait('@entitiesRequest').then(({ response }) => { - if (response.body.length === 0) { + if (response?.body.length === 0) { cy.get(entityTableSelector).should('not.exist'); } else { cy.get(entityTableSelector).should('exist'); @@ -68,7 +68,7 @@ describe('Label e2e test', () => { cy.get(entityCreateSaveButtonSelector).should('exist'); cy.get(entityCreateCancelButtonSelector).click(); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', labelPageUrlPattern); }); @@ -106,7 +106,7 @@ describe('Label e2e test', () => { cy.getEntityDetailsHeading('label'); cy.get(entityDetailsBackButtonSelector).click(); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', labelPageUrlPattern); }); @@ -117,7 +117,7 @@ describe('Label e2e test', () => { cy.get(entityCreateSaveButtonSelector).should('exist'); cy.get(entityCreateCancelButtonSelector).click(); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', labelPageUrlPattern); }); @@ -127,7 +127,7 @@ describe('Label e2e test', () => { cy.getEntityCreateUpdateHeading('Label'); cy.get(entityCreateSaveButtonSelector).click(); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', labelPageUrlPattern); }); @@ -137,10 +137,10 @@ describe('Label e2e test', () => { cy.getEntityDeleteDialogHeading('label').should('exist'); cy.get(entityConfirmDeleteButtonSelector).click(); cy.wait('@deleteEntityRequest').then(({ response }) => { - expect(response.statusCode).to.equal(204); + expect(response?.statusCode).to.equal(204); }); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', labelPageUrlPattern); @@ -157,17 +157,17 @@ describe('Label e2e test', () => { }); it('should create an instance of Label', () => { - cy.get(`[data-cy="label"]`).type('carelessly tensely on'); - cy.get(`[data-cy="label"]`).should('have.value', 'carelessly tensely on'); + cy.get(`[data-cy="label"]`).type('soX'); + cy.get(`[data-cy="label"]`).should('have.value', 'soX'); cy.get(entityCreateSaveButtonSelector).click(); cy.wait('@postEntityRequest').then(({ response }) => { - expect(response.statusCode).to.equal(201); + expect(response?.statusCode).to.equal(201); label = response.body; }); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', labelPageUrlPattern); }); diff --git a/src/test/javascript/cypress/e2e/entity/operation.cy.ts b/src/test/javascript/cypress/e2e/entity/operation.cy.ts index 9652b9bcf..b426844ca 100644 --- a/src/test/javascript/cypress/e2e/entity/operation.cy.ts +++ b/src/test/javascript/cypress/e2e/entity/operation.cy.ts @@ -15,7 +15,7 @@ describe('Operation e2e test', () => { const operationPageUrlPattern = new RegExp('/operation(\\?.*)?$'); const username = Cypress.env('E2E_USERNAME') ?? 'user'; const password = Cypress.env('E2E_PASSWORD') ?? 'user'; - const operationSample = { date: '2015-08-05T04:20:57.915Z', amount: 21503.17 }; + const operationSample = { date: '2015-08-05T08:14:11.129Z', amount: 16346.49 }; let operation; @@ -44,7 +44,7 @@ describe('Operation e2e test', () => { cy.visit('/'); cy.clickOnEntityMenuItem('operation'); cy.wait('@entitiesRequest').then(({ response }) => { - if (response.body.length === 0) { + if (response?.body.length === 0) { cy.get(entityTableSelector).should('not.exist'); } else { cy.get(entityTableSelector).should('exist'); @@ -68,7 +68,7 @@ describe('Operation e2e test', () => { cy.get(entityCreateSaveButtonSelector).should('exist'); cy.get(entityCreateCancelButtonSelector).click(); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', operationPageUrlPattern); }); @@ -109,7 +109,7 @@ describe('Operation e2e test', () => { cy.getEntityDetailsHeading('operation'); cy.get(entityDetailsBackButtonSelector).click(); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', operationPageUrlPattern); }); @@ -120,7 +120,7 @@ describe('Operation e2e test', () => { cy.get(entityCreateSaveButtonSelector).should('exist'); cy.get(entityCreateCancelButtonSelector).click(); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', operationPageUrlPattern); }); @@ -130,7 +130,7 @@ describe('Operation e2e test', () => { cy.getEntityCreateUpdateHeading('Operation'); cy.get(entityCreateSaveButtonSelector).click(); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', operationPageUrlPattern); }); @@ -140,10 +140,10 @@ describe('Operation e2e test', () => { cy.getEntityDeleteDialogHeading('operation').should('exist'); cy.get(entityConfirmDeleteButtonSelector).click(); cy.wait('@deleteEntityRequest').then(({ response }) => { - expect(response.statusCode).to.equal(204); + expect(response?.statusCode).to.equal(204); }); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', operationPageUrlPattern); @@ -160,24 +160,24 @@ describe('Operation e2e test', () => { }); it('should create an instance of Operation', () => { - cy.get(`[data-cy="date"]`).type('2015-08-05T09:37'); + cy.get(`[data-cy="date"]`).type('2015-08-05T01:32'); cy.get(`[data-cy="date"]`).blur(); - cy.get(`[data-cy="date"]`).should('have.value', '2015-08-05T09:37'); + cy.get(`[data-cy="date"]`).should('have.value', '2015-08-05T01:32'); - cy.get(`[data-cy="description"]`).type('oof'); - cy.get(`[data-cy="description"]`).should('have.value', 'oof'); + cy.get(`[data-cy="description"]`).type('dense'); + cy.get(`[data-cy="description"]`).should('have.value', 'dense'); - cy.get(`[data-cy="amount"]`).type('27579.12'); - cy.get(`[data-cy="amount"]`).should('have.value', '27579.12'); + cy.get(`[data-cy="amount"]`).type('28492.17'); + cy.get(`[data-cy="amount"]`).should('have.value', '28492.17'); cy.get(entityCreateSaveButtonSelector).click(); cy.wait('@postEntityRequest').then(({ response }) => { - expect(response.statusCode).to.equal(201); + expect(response?.statusCode).to.equal(201); operation = response.body; }); cy.wait('@entitiesRequest').then(({ response }) => { - expect(response.statusCode).to.equal(200); + expect(response?.statusCode).to.equal(200); }); cy.url().should('match', operationPageUrlPattern); }); diff --git a/src/test/resources/config/application.yml b/src/test/resources/config/application.yml index df98fc359..7f4b6fc5b 100644 --- a/src/test/resources/config/application.yml +++ b/src/test/resources/config/application.yml @@ -28,6 +28,12 @@ spring: allow-bean-definition-overriding: true messages: basename: i18n/messages + security: + oauth2: + resourceserver: + jwt: + authority-prefix: '' + authorities-claim-name: auth task: execution: thread-name-prefix: jhipster-sample-application-task-