diff --git a/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.jar b/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..7454180f2a Binary files /dev/null and b/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties b/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties index a4b4429748..ffed3a254e 100644 --- a/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/gradle-wrapper/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle/gradle-wrapper/gradlew b/gradle/gradle-wrapper/gradlew index 2fe81a7d95..1b6c787337 100755 --- a/gradle/gradle-wrapper/gradlew +++ b/gradle/gradle-wrapper/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,78 +17,113 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -105,79 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradle/gradle-wrapper/gradlew.bat b/gradle/gradle-wrapper/gradlew.bat index 9109989e3c..ac1b06f938 100644 --- a/gradle/gradle-wrapper/gradlew.bat +++ b/gradle/gradle-wrapper/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/gradle/gradle-wrapper/settings.gradle b/gradle/gradle-wrapper/settings.gradle new file mode 100644 index 0000000000..e90020b9e3 --- /dev/null +++ b/gradle/gradle-wrapper/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'gradle-wrapper' diff --git a/pom.xml b/pom.xml index de42d6947e..bb27e3938c 100644 --- a/pom.xml +++ b/pom.xml @@ -521,11 +521,7 @@ restx rsocket rule-engines - rxjava-core - rxjava-libraries - rxjava-observables - rxjava-operators - + rxjava-modules atomikos reactive-systems slack @@ -976,11 +972,7 @@ restx rsocket rule-engines - rxjava-core - rxjava-libraries - rxjava-observables - rxjava-operators - + rxjava-modules atomikos reactive-systems slack @@ -1057,9 +1049,7 @@ spring-caching-2 spring-cloud-modules - spring-cloud-bus - spring-cloud-data-flow spring-core spring-core-2 @@ -1101,7 +1091,6 @@ spring-scheduling spring-security-modules spring-shell - spring-sleuth spring-soap spring-spel spring-state-machine diff --git a/rxjava-core/pom.xml b/rxjava-core/pom.xml deleted file mode 100644 index 89ea1bf7a2..0000000000 --- a/rxjava-core/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - rxjava-core - 1.0-SNAPSHOT - rxjava-core - - - com.baeldung - parent-java - 0.0.1-SNAPSHOT - ../parent-java - - - - - io.reactivex - rxjava - ${rx.java.version} - - - io.reactivex.rxjava2 - rxjava - ${rx.java2.version} - - - com.jayway.awaitility - awaitility - ${awaitility.version} - - - - - 1.2.5 - 1.7.0 - 2.2.2 - - - \ No newline at end of file diff --git a/rxjava-operators/pom.xml b/rxjava-modules/pom.xml similarity index 73% rename from rxjava-operators/pom.xml rename to rxjava-modules/pom.xml index d833fb5d14..d43a65ed9c 100644 --- a/rxjava-operators/pom.xml +++ b/rxjava-modules/pom.xml @@ -3,9 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - rxjava-operators - 1.0-SNAPSHOT - rxjava-operators + com.baeldung.rxjava-modules + rxjava-modules + rxjava-modules + pom com.baeldung @@ -14,6 +15,13 @@ ../parent-java + + rxjava-core + rxjava-libraries + rxjava-observables + rxjava-operators + + io.reactivex @@ -25,11 +33,10 @@ rxjava ${rx.java2.version} - - com.github.akarnokd - rxjava2-extensions - ${rxjava2.ext.version} + io.reactivex + rxjava-string + ${rx.java.string.version} io.reactivex @@ -44,11 +51,11 @@ - 0.20.4 - 2.2.2 1.2.5 - 1.0.0 1.7.0 + 1.1.1 + 1.0.0 + 2.2.2 \ No newline at end of file diff --git a/rxjava-core/README.md b/rxjava-modules/rxjava-core/README.md similarity index 94% rename from rxjava-core/README.md rename to rxjava-modules/rxjava-core/README.md index 2773bd9423..148713c8e3 100644 --- a/rxjava-core/README.md +++ b/rxjava-modules/rxjava-core/README.md @@ -13,4 +13,3 @@ This module contains articles about RxJava. - [RxJava Maybe](https://www.baeldung.com/rxjava-maybe) - [Combining RxJava Completables](https://www.baeldung.com/rxjava-completable) - [RxJava Hooks](https://www.baeldung.com/rxjava-hooks) -- More articles: [[next -->]](/rxjava-2) diff --git a/rxjava-modules/rxjava-core/pom.xml b/rxjava-modules/rxjava-core/pom.xml new file mode 100644 index 0000000000..1ca940e501 --- /dev/null +++ b/rxjava-modules/rxjava-core/pom.xml @@ -0,0 +1,15 @@ + + + 4.0.0 + rxjava-core + 1.0-SNAPSHOT + rxjava-core + + com.baeldung.rxjava-modules + rxjava-modules + 0.0.1-SNAPSHOT + + + \ No newline at end of file diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/ComputeFunction.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ComputeFunction.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/ComputeFunction.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ComputeFunction.java diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ConnectableObservableImpl.java diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/ObservableImpl.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ObservableImpl.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/ObservableImpl.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ObservableImpl.java diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/ResourceManagement.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ResourceManagement.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/ResourceManagement.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/ResourceManagement.java diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/SingleImpl.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/SingleImpl.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/SingleImpl.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/SingleImpl.java diff --git a/rxjava-core/src/main/java/com/baeldung/rxjava/SubjectImpl.java b/rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/SubjectImpl.java similarity index 100% rename from rxjava-core/src/main/java/com/baeldung/rxjava/SubjectImpl.java rename to rxjava-modules/rxjava-core/src/main/java/com/baeldung/rxjava/SubjectImpl.java diff --git a/rxjava-core/src/main/resources/logback.xml b/rxjava-modules/rxjava-core/src/main/resources/logback.xml similarity index 100% rename from rxjava-core/src/main/resources/logback.xml rename to rxjava-modules/rxjava-core/src/main/resources/logback.xml diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/CompletableUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/ConnectableObservableIntegrationTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ConnectableObservableIntegrationTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/ConnectableObservableIntegrationTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ConnectableObservableIntegrationTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/MaybeUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/ObservableUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ObservableUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/ObservableUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ObservableUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/ResourceManagementUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ResourceManagementUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/ResourceManagementUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/ResourceManagementUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaBackpressureLongRunningUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaBackpressureLongRunningUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaBackpressureLongRunningUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaBackpressureLongRunningUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksManualTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksManualTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksManualTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksManualTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaHooksUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/RxJavaUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SchedulersLiveTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/SingleUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SingleUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/SingleUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SingleUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/SubjectUnitTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SubjectUnitTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/SubjectUnitTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/SubjectUnitTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/ExceptionHandlingIntegrationTest.java diff --git a/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java b/rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java similarity index 100% rename from rxjava-core/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java rename to rxjava-modules/rxjava-core/src/test/java/com/baeldung/rxjava/onerror/OnErrorRetryIntegrationTest.java diff --git a/rxjava-libraries/README.md b/rxjava-modules/rxjava-libraries/README.md similarity index 100% rename from rxjava-libraries/README.md rename to rxjava-modules/rxjava-libraries/README.md diff --git a/rxjava-libraries/pom.xml b/rxjava-modules/rxjava-libraries/pom.xml similarity index 67% rename from rxjava-libraries/pom.xml rename to rxjava-modules/rxjava-libraries/pom.xml index f8df78d741..f5ccbd2d3c 100644 --- a/rxjava-libraries/pom.xml +++ b/rxjava-modules/rxjava-libraries/pom.xml @@ -8,23 +8,12 @@ rxjava-libraries - com.baeldung - parent-java + com.baeldung.rxjava-modules + rxjava-modules 0.0.1-SNAPSHOT - ../parent-java - - io.reactivex - rxjava - ${rx.java.version} - - - io.reactivex.rxjava2 - rxjava - ${rx.java2.version} - com.jakewharton.rxrelay2 rxrelay @@ -45,9 +34,7 @@ 0.7.11 - 1.2.5 2.0.0 - 2.2.2 \ No newline at end of file diff --git a/rxjava-libraries/src/main/java/com/baeldung/rxjava/RandomRelay.java b/rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/RandomRelay.java similarity index 100% rename from rxjava-libraries/src/main/java/com/baeldung/rxjava/RandomRelay.java rename to rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/RandomRelay.java diff --git a/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Connector.java b/rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Connector.java similarity index 100% rename from rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Connector.java rename to rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Connector.java diff --git a/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Employee.java b/rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Employee.java similarity index 100% rename from rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Employee.java rename to rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Employee.java diff --git a/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Manager.java b/rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Manager.java similarity index 100% rename from rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Manager.java rename to rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Manager.java diff --git a/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Utils.java b/rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Utils.java similarity index 100% rename from rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Utils.java rename to rxjava-modules/rxjava-libraries/src/main/java/com/baeldung/rxjava/jdbc/Utils.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/FlowableIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/RxRelayIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapClassIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/AutomapInterfaceIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/BasicQueryTypesIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertBlobIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/InsertClobIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/ReturnKeysIntegrationTest.java diff --git a/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java b/rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java similarity index 100% rename from rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java rename to rxjava-modules/rxjava-libraries/src/test/java/com/baeldung/rxjava/jdbc/TransactionIntegrationTest.java diff --git a/rxjava-libraries/src/test/resources/actual_clob b/rxjava-modules/rxjava-libraries/src/test/resources/actual_clob similarity index 100% rename from rxjava-libraries/src/test/resources/actual_clob rename to rxjava-modules/rxjava-libraries/src/test/resources/actual_clob diff --git a/rxjava-libraries/src/test/resources/expected_clob b/rxjava-modules/rxjava-libraries/src/test/resources/expected_clob similarity index 100% rename from rxjava-libraries/src/test/resources/expected_clob rename to rxjava-modules/rxjava-libraries/src/test/resources/expected_clob diff --git a/rxjava-observables/README.md b/rxjava-modules/rxjava-observables/README.md similarity index 100% rename from rxjava-observables/README.md rename to rxjava-modules/rxjava-observables/README.md diff --git a/rxjava-modules/rxjava-observables/pom.xml b/rxjava-modules/rxjava-observables/pom.xml new file mode 100644 index 0000000000..c54df19fa8 --- /dev/null +++ b/rxjava-modules/rxjava-observables/pom.xml @@ -0,0 +1,14 @@ + + + 4.0.0 + rxjava-observables + 1.0-SNAPSHOT + rxjava-observables + + com.baeldung.rxjava-modules + rxjava-modules + 0.0.1-SNAPSHOT + + \ No newline at end of file diff --git a/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersColdObs.java b/rxjava-modules/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersColdObs.java similarity index 100% rename from rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersColdObs.java rename to rxjava-modules/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersColdObs.java diff --git a/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersHotObs.java b/rxjava-modules/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersHotObs.java similarity index 100% rename from rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersHotObs.java rename to rxjava-modules/rxjava-observables/src/main/java/com/baeldung/rxjava/MultipleSubscribersHotObs.java diff --git a/rxjava-observables/src/test/java/com/baeldung/rxjava/combine/ObservableCombineUnitTest.java b/rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/combine/ObservableCombineUnitTest.java similarity index 100% rename from rxjava-observables/src/test/java/com/baeldung/rxjava/combine/ObservableCombineUnitTest.java rename to rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/combine/ObservableCombineUnitTest.java diff --git a/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaFilterOperatorsIntegrationTest.java b/rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaFilterOperatorsIntegrationTest.java similarity index 100% rename from rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaFilterOperatorsIntegrationTest.java rename to rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaFilterOperatorsIntegrationTest.java diff --git a/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaSkipOperatorsIntegrationTest.java b/rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaSkipOperatorsIntegrationTest.java similarity index 100% rename from rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaSkipOperatorsIntegrationTest.java rename to rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaSkipOperatorsIntegrationTest.java diff --git a/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaTimeFilteringOperatorsIntegrationTest.java b/rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaTimeFilteringOperatorsIntegrationTest.java similarity index 100% rename from rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaTimeFilteringOperatorsIntegrationTest.java rename to rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/filters/RxJavaTimeFilteringOperatorsIntegrationTest.java diff --git a/rxjava-observables/src/test/java/com/baeldung/rxjava/operators/RxStringOperatorsUnitTest.java b/rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/operators/RxStringOperatorsUnitTest.java similarity index 100% rename from rxjava-observables/src/test/java/com/baeldung/rxjava/operators/RxStringOperatorsUnitTest.java rename to rxjava-modules/rxjava-observables/src/test/java/com/baeldung/rxjava/operators/RxStringOperatorsUnitTest.java diff --git a/rxjava-operators/README.md b/rxjava-modules/rxjava-operators/README.md similarity index 100% rename from rxjava-operators/README.md rename to rxjava-modules/rxjava-operators/README.md diff --git a/rxjava-modules/rxjava-operators/pom.xml b/rxjava-modules/rxjava-operators/pom.xml new file mode 100644 index 0000000000..1859edc23b --- /dev/null +++ b/rxjava-modules/rxjava-operators/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + rxjava-operators + 1.0-SNAPSHOT + rxjava-operators + + + com.baeldung.rxjava-modules + rxjava-modules + 0.0.1-SNAPSHOT + + + + + + com.github.akarnokd + rxjava2-extensions + ${rxjava2.ext.version} + + + + + 0.20.4 + + \ No newline at end of file diff --git a/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java b/rxjava-modules/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java similarity index 100% rename from rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java rename to rxjava-modules/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToCleanString.java diff --git a/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToLength.java b/rxjava-modules/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToLength.java similarity index 100% rename from rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToLength.java rename to rxjava-modules/rxjava-operators/src/main/java/com/baeldung/rxjava/operator/ToLength.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/AsyncAndSyncToObservableIntegrationTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/AsyncAndSyncToObservableIntegrationTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/AsyncAndSyncToObservableIntegrationTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/AsyncAndSyncToObservableIntegrationTest.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/RxJavaCustomOperatorUnitTest.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/UtilityOperatorsIntegrationTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/UtilityOperatorsIntegrationTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/UtilityOperatorsIntegrationTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/UtilityOperatorsIntegrationTest.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsUnitTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsUnitTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsUnitTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxAggregateOperatorsUnitTest.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxFlatmapAndSwitchmapUnitTest.java diff --git a/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsUnitTest.java b/rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsUnitTest.java similarity index 100% rename from rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsUnitTest.java rename to rxjava-modules/rxjava-operators/src/test/java/com/baeldung/rxjava/operators/RxMathematicalOperatorsUnitTest.java diff --git a/rxjava-observables/pom.xml b/rxjava-observables/pom.xml deleted file mode 100644 index bcc3c4bbce..0000000000 --- a/rxjava-observables/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - 4.0.0 - rxjava-observables - 1.0-SNAPSHOT - rxjava-observables - - - com.baeldung - parent-java - 0.0.1-SNAPSHOT - ../parent-java - - - - - io.reactivex - rxjava - ${rx.java.version} - - - io.reactivex - rxjava-string - ${rx.java.string.version} - - - - - 1.1.1 - 1.2.5 - - - \ No newline at end of file diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/Application.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/Application.java new file mode 100644 index 0000000000..25985780ad --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/Application.java @@ -0,0 +1,13 @@ +package com.baeldung.global.exceptionhandler; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + +} diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/controller/LoginController.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/controller/LoginController.java new file mode 100644 index 0000000000..1f0a56d6bf --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/controller/LoginController.java @@ -0,0 +1,25 @@ +package com.baeldung.global.exceptionhandler.controller; + +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baeldung.global.exceptionhandler.handler.RestResponse; + +@RestController +@RequestMapping +public class LoginController { + + @PostMapping(value = "/login", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity login() { + return ResponseEntity.ok(new RestResponse("Success")); + } + + @PostMapping(value = "/login-handler", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity loginWithExceptionHandler() { + return ResponseEntity.ok(new RestResponse("Success")); + } + +} diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/DefaultExceptionHandler.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/DefaultExceptionHandler.java new file mode 100644 index 0000000000..b47075c941 --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/DefaultExceptionHandler.java @@ -0,0 +1,22 @@ +package com.baeldung.global.exceptionhandler.handler; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.AuthenticationException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; + +@ControllerAdvice +public class DefaultExceptionHandler extends ResponseEntityExceptionHandler { + + @ExceptionHandler({ AuthenticationException.class }) + @ResponseBody + public ResponseEntity handleAuthenticationException(Exception ex) { + + RestError re = new RestError(HttpStatus.UNAUTHORIZED.toString(), "Authentication failed at controller advice"); + return ResponseEntity.status(HttpStatus.UNAUTHORIZED) + .body(re); + } +} diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/RestError.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/RestError.java new file mode 100644 index 0000000000..43f1b2e883 --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/RestError.java @@ -0,0 +1,30 @@ +package com.baeldung.global.exceptionhandler.handler; + +public class RestError { + + String errorCode; + String errorMessage; + + public RestError(String errorCode, String errorMessage) { + super(); + this.errorCode = errorCode; + this.errorMessage = errorMessage; + } + + public String getErrorCode() { + return errorCode; + } + + public void setErrorCode(String errorCode) { + this.errorCode = errorCode; + } + + public String getErrorMessage() { + return errorMessage; + } + + public void setErrorMessage(String errorMessage) { + this.errorMessage = errorMessage; + } + +} diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/RestResponse.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/RestResponse.java new file mode 100644 index 0000000000..74f8082a9d --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/handler/RestResponse.java @@ -0,0 +1,20 @@ +package com.baeldung.global.exceptionhandler.handler; + +public class RestResponse { + + String message; + + public RestResponse(String message) { + super(); + this.message = message; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + +} diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/CustomAuthenticationEntryPoint.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/CustomAuthenticationEntryPoint.java new file mode 100644 index 0000000000..39e6d87c2a --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/CustomAuthenticationEntryPoint.java @@ -0,0 +1,35 @@ +package com.baeldung.global.exceptionhandler.security; + +import java.io.IOException; +import java.io.OutputStream; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; + +import com.baeldung.global.exceptionhandler.handler.RestError; +import com.fasterxml.jackson.databind.ObjectMapper; + +@Component("customAuthenticationEntryPoint") +public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint { + + @Override + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { + + RestError re = new RestError(HttpStatus.UNAUTHORIZED.toString(), "Authentication failed"); + + response.setContentType(MediaType.APPLICATION_JSON_VALUE); + response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); + OutputStream responseStream = response.getOutputStream(); + ObjectMapper mapper = new ObjectMapper(); + mapper.writeValue(responseStream, re); + responseStream.flush(); + + } +} \ No newline at end of file diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/CustomSecurityConfig.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/CustomSecurityConfig.java new file mode 100644 index 0000000000..cee3e9b62b --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/CustomSecurityConfig.java @@ -0,0 +1,58 @@ +package com.baeldung.global.exceptionhandler.security; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.provisioning.InMemoryUserDetailsManager; +import org.springframework.security.web.AuthenticationEntryPoint; + +@Configuration +@EnableWebSecurity +public class CustomSecurityConfig extends WebSecurityConfigurerAdapter { + + @Autowired + @Qualifier("customAuthenticationEntryPoint") + AuthenticationEntryPoint authEntryPoint; + + @Bean + public UserDetailsService userDetailsService() { + UserDetails admin = User.withUsername("admin") + .password("password") + .roles("ADMIN") + .build(); + InMemoryUserDetailsManager userDetailsManager = new InMemoryUserDetailsManager(); + userDetailsManager.createUser(admin); + return userDetailsManager; + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.requestMatchers() + .antMatchers("/login") + .and() + .authorizeRequests() + .anyRequest() + .hasRole("ADMIN") + .and() + .httpBasic() + .and() + .exceptionHandling() + .authenticationEntryPoint(authEntryPoint); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.inMemoryAuthentication() + .withUser("admin") + .password("password") + .roles("ADMIN"); + } +} diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/DelegatedAuthenticationEntryPoint.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/DelegatedAuthenticationEntryPoint.java new file mode 100644 index 0000000000..d34ddfcdf3 --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/DelegatedAuthenticationEntryPoint.java @@ -0,0 +1,27 @@ +package com.baeldung.global.exceptionhandler.security; + +import java.io.IOException; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.HandlerExceptionResolver; + +@Component("delegatedAuthenticationEntryPoint") +public class DelegatedAuthenticationEntryPoint implements AuthenticationEntryPoint { + + @Autowired + @Qualifier("handlerExceptionResolver") + private HandlerExceptionResolver resolver; + + @Override + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException, ServletException { + resolver.resolveException(request, response, null, authException); + } +} \ No newline at end of file diff --git a/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/DelegatedSecurityConfig.java b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/DelegatedSecurityConfig.java new file mode 100644 index 0000000000..45582d3f5e --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/main/java/com/baeldung/global/exceptionhandler/security/DelegatedSecurityConfig.java @@ -0,0 +1,44 @@ +package com.baeldung.global.exceptionhandler.security; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.web.AuthenticationEntryPoint; + +@Configuration +@EnableWebSecurity +@Order(101) +public class DelegatedSecurityConfig extends WebSecurityConfigurerAdapter { + + @Autowired + @Qualifier("delegatedAuthenticationEntryPoint") + AuthenticationEntryPoint authEntryPoint; + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.requestMatchers() + .antMatchers("/login-handler") + .and() + .authorizeRequests() + .anyRequest() + .hasRole("ADMIN") + .and() + .httpBasic() + .and() + .exceptionHandling() + .authenticationEntryPoint(authEntryPoint); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth.inMemoryAuthentication() + .withUser("admin") + .password("password") + .roles("ADMIN"); + } +} diff --git a/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/global/exceptionhandler/DelegatedSecurityConfigUnitTest.java b/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/global/exceptionhandler/DelegatedSecurityConfigUnitTest.java new file mode 100644 index 0000000000..3346ade380 --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/global/exceptionhandler/DelegatedSecurityConfigUnitTest.java @@ -0,0 +1,52 @@ +package com.baeldung.global.exceptionhandler; + +import static org.hamcrest.Matchers.is; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.context.annotation.Import; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; + +import com.baeldung.global.exceptionhandler.controller.LoginController; +import com.baeldung.global.exceptionhandler.handler.RestError; +import com.baeldung.global.exceptionhandler.security.CustomAuthenticationEntryPoint; +import com.baeldung.global.exceptionhandler.security.DelegatedAuthenticationEntryPoint; +import com.baeldung.global.exceptionhandler.security.DelegatedSecurityConfig; + +@RunWith(SpringRunner.class) +@WebMvcTest(DelegatedSecurityConfig.class) +@Import({ LoginController.class, CustomAuthenticationEntryPoint.class, DelegatedAuthenticationEntryPoint.class }) +public class DelegatedSecurityConfigUnitTest { + + @Autowired + private MockMvc mvc; + + @Test + @WithMockUser(username = "admin", roles = { "ADMIN" }) + public void whenUserAccessLogin_shouldSucceed() throws Exception { + mvc.perform(formLogin("/login-handler").user("username", "admin") + .password("password", "password") + .acceptMediaType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + } + + @Test + public void whenUserAccessWithWrongCredentialsWithDelegatedEntryPoint_shouldFail() throws Exception { + RestError re = new RestError(HttpStatus.UNAUTHORIZED.toString(), "Authentication failed at controller advice"); + mvc.perform(formLogin("/login-handler").user("username", "admin") + .password("password", "wrong") + .acceptMediaType(MediaType.APPLICATION_JSON)) + .andExpect(status().isUnauthorized()) + .andExpect(jsonPath("$.errorMessage", is(re.getErrorMessage()))); + } + +} diff --git a/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/global/exceptionhandler/SecurityConfigUnitTest.java b/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/global/exceptionhandler/SecurityConfigUnitTest.java new file mode 100644 index 0000000000..b6a0252c2c --- /dev/null +++ b/spring-security-modules/spring-security-core-2/src/test/java/com/baeldung/global/exceptionhandler/SecurityConfigUnitTest.java @@ -0,0 +1,54 @@ +package com.baeldung.global.exceptionhandler; + +import static org.hamcrest.Matchers.is; +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.context.annotation.Import; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; + +import com.baeldung.global.exceptionhandler.controller.LoginController; +import com.baeldung.global.exceptionhandler.handler.RestError; +import com.baeldung.global.exceptionhandler.security.CustomAuthenticationEntryPoint; +import com.baeldung.global.exceptionhandler.security.CustomSecurityConfig; +import com.baeldung.global.exceptionhandler.security.DelegatedAuthenticationEntryPoint; + +@RunWith(SpringRunner.class) +@WebMvcTest(CustomSecurityConfig.class) +@Import({LoginController.class, CustomAuthenticationEntryPoint.class, DelegatedAuthenticationEntryPoint.class}) +public class SecurityConfigUnitTest { + + @Autowired + private MockMvc mvc; + + @Test + @WithMockUser(username = "admin", roles = { "ADMIN" }) + public void whenUserAccessLogin_shouldSucceed() throws Exception { + mvc.perform(formLogin("/login").user("username", "admin") + .password("password", "password") + .acceptMediaType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()); + } + + @Test + public void whenUserAccessWithWrongCredentialsWithDelegatedEntryPoint_shouldFail() throws Exception { + RestError re = new RestError(HttpStatus.UNAUTHORIZED.toString(), "Authentication failed"); + mvc.perform(formLogin("/login").user("username", "admin") + .password("password", "wrong") + .acceptMediaType(MediaType.APPLICATION_JSON)) + .andExpect(status().isUnauthorized()) + .andExpect(jsonPath("$.errorMessage", is(re.getErrorMessage()))); + } + + + +}