diff --git a/2023-03/spring-36-docker/docker-compose-example/.gitignore b/2023-03/spring-36-docker/docker-compose-example/.gitignore new file mode 100644 index 00000000..a2a3040a --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/.gitignore @@ -0,0 +1,31 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ + +### VS Code ### +.vscode/ diff --git a/2023-03/spring-36-docker/docker-compose-example/.mvn/wrapper/MavenWrapperDownloader.java b/2023-03/spring-36-docker/docker-compose-example/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..e76d1f32 --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.6"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/2023-03/spring-36-docker/docker-compose-example/.mvn/wrapper/maven-wrapper.jar b/2023-03/spring-36-docker/docker-compose-example/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..2cc7d4a5 Binary files /dev/null and b/2023-03/spring-36-docker/docker-compose-example/.mvn/wrapper/maven-wrapper.jar differ diff --git a/2023-03/spring-36-docker/docker-compose-example/.mvn/wrapper/maven-wrapper.properties b/2023-03/spring-36-docker/docker-compose-example/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..642d572c --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/2023-03/spring-36-docker/docker-compose-example/Dockerfile b/2023-03/spring-36-docker/docker-compose-example/Dockerfile new file mode 100644 index 00000000..daaf009e --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/Dockerfile @@ -0,0 +1,4 @@ +FROM openjdk:11-jre-slim +COPY /target/docker-compose-example.jar /app/app.jar +EXPOSE 8080 +ENTRYPOINT ["java", "-jar", "/app/app.jar"] diff --git a/2023-03/spring-36-docker/docker-compose-example/docker-compose.yml b/2023-03/spring-36-docker/docker-compose-example/docker-compose.yml new file mode 100644 index 00000000..32b3bb6c --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/docker-compose.yml @@ -0,0 +1,22 @@ +version: '3' +services: + app: + build: + context: . + dockerfile: Dockerfile + ports: + - "8080:8080" + # Эти свойства перегружают соответствующие в application.yml + environment: + - SPRING_DATASOURCE_URL=jdbc:postgresql://postgres:5432/db + - SPRING_DATASOURCE_USERNAME=postgres + - SPRING_DATASOURCE_PASSWORD=postgres + postgres: + image: "postgres:13" + ports: + - "5432:5432" + environment: + - POSTGRES_USER=postgres + - POSTGRES_PASSWORD=postgres + - POSTGRES_DB=db + diff --git a/2023-03/spring-36-docker/docker-compose-example/mvnw b/2023-03/spring-36-docker/docker-compose-example/mvnw new file mode 100755 index 00000000..a16b5431 --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/mvnw @@ -0,0 +1,310 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which 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 + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/2023-03/spring-36-docker/docker-compose-example/mvnw.cmd b/2023-03/spring-36-docker/docker-compose-example/mvnw.cmd new file mode 100644 index 00000000..c8d43372 --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/2023-03/spring-36-docker/docker-compose-example/pom.xml b/2023-03/spring-36-docker/docker-compose-example/pom.xml new file mode 100644 index 00000000..ff5f9c56 --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/pom.xml @@ -0,0 +1,69 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.1 + + + ru.otus.spring + docker-compose-example + 0.0.1-SNAPSHOT + docker-compose-example + Demo project for Spring Boot + + + 11 + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + org.postgresql + postgresql + runtime + + + org.projectlombok + lombok + true + + + test + com.h2database + h2 + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + docker-compose-example + + diff --git a/2023-03/spring-36-docker/docker-compose-example/readme.txt b/2023-03/spring-36-docker/docker-compose-example/readme.txt new file mode 100644 index 00000000..a70f6f9e --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/readme.txt @@ -0,0 +1,3 @@ +./mvnw package +docker-compose up +curl http://localhost:8080/api/persons \ No newline at end of file diff --git a/2023-03/spring-36-docker/docker-compose-example/src/main/java/ru/otus/spring/docker/DockerComposeExampleApplication.java b/2023-03/spring-36-docker/docker-compose-example/src/main/java/ru/otus/spring/docker/DockerComposeExampleApplication.java new file mode 100644 index 00000000..76f60e7d --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/src/main/java/ru/otus/spring/docker/DockerComposeExampleApplication.java @@ -0,0 +1,22 @@ +package ru.otus.spring.docker; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ApplicationContext; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import ru.otus.spring.docker.model.Person; +import ru.otus.spring.docker.repository.PersonRepository; + +@SpringBootApplication +@EnableJpaRepositories +public class DockerComposeExampleApplication { + + public static void main(String[] args) { + //Код для примера, делать так конечно нельзя :) + ApplicationContext context = SpringApplication.run(DockerComposeExampleApplication.class, args); + PersonRepository repository = context.getBean(PersonRepository.class); + repository.save(new Person("Ivan", "Ivanov")); + System.out.println(repository.findAll()); + } + +} diff --git a/2023-03/spring-36-docker/docker-compose-example/src/main/java/ru/otus/spring/docker/model/Person.java b/2023-03/spring-36-docker/docker-compose-example/src/main/java/ru/otus/spring/docker/model/Person.java new file mode 100644 index 00000000..9c55909b --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/src/main/java/ru/otus/spring/docker/model/Person.java @@ -0,0 +1,28 @@ +package ru.otus.spring.docker.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Data +@Entity +@AllArgsConstructor +@NoArgsConstructor +public class Person { + + @GeneratedValue(strategy = GenerationType.AUTO) + @Id + private Integer id; + private String name; + private String lastName; + + public Person(String name, String lastName) { + this.name = name; + this.lastName = lastName; + } +} diff --git a/2023-03/spring-36-docker/docker-compose-example/src/main/java/ru/otus/spring/docker/repository/PersonRepository.java b/2023-03/spring-36-docker/docker-compose-example/src/main/java/ru/otus/spring/docker/repository/PersonRepository.java new file mode 100644 index 00000000..11262d78 --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/src/main/java/ru/otus/spring/docker/repository/PersonRepository.java @@ -0,0 +1,7 @@ +package ru.otus.spring.docker.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import ru.otus.spring.docker.model.Person; + +public interface PersonRepository extends JpaRepository { +} diff --git a/2023-03/spring-36-docker/docker-compose-example/src/main/java/ru/otus/spring/docker/rest/PersonController.java b/2023-03/spring-36-docker/docker-compose-example/src/main/java/ru/otus/spring/docker/rest/PersonController.java new file mode 100644 index 00000000..4cfc6436 --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/src/main/java/ru/otus/spring/docker/rest/PersonController.java @@ -0,0 +1,21 @@ +package ru.otus.spring.docker.rest; + +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import ru.otus.spring.docker.model.Person; +import ru.otus.spring.docker.repository.PersonRepository; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +public class PersonController { + + private final PersonRepository repository; + + @GetMapping("/api/persons") + public List getAllPersons() { + return this.repository.findAll(); + } +} diff --git a/2023-03/spring-36-docker/docker-compose-example/src/main/resources/application.yml b/2023-03/spring-36-docker/docker-compose-example/src/main/resources/application.yml new file mode 100644 index 00000000..bf91784a --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/src/main/resources/application.yml @@ -0,0 +1,8 @@ +spring: + datasource: + # Эти свойства будут перегружены свойствами в docker-compose.yml + url: jdbc:postgresql://localhost:5432/db + username: postgres + password: postgres + jpa: + generate-ddl: true diff --git a/2023-03/spring-36-docker/docker-compose-example/src/main/resources/static/index.html b/2023-03/spring-36-docker/docker-compose-example/src/main/resources/static/index.html new file mode 100644 index 00000000..a80ea187 --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/src/main/resources/static/index.html @@ -0,0 +1,12 @@ + + + + + Главная страницв + + +

Главная страница

+

Список всех лиц доступен по ссылке.

+

Перезапустив приложение можно добавить ещё в БД.

+ + diff --git a/2023-03/spring-36-docker/docker-compose-example/src/test/java/ru/otus/spring/docker/DockerComposeExampleApplicationTests.java b/2023-03/spring-36-docker/docker-compose-example/src/test/java/ru/otus/spring/docker/DockerComposeExampleApplicationTests.java new file mode 100644 index 00000000..93fe13c4 --- /dev/null +++ b/2023-03/spring-36-docker/docker-compose-example/src/test/java/ru/otus/spring/docker/DockerComposeExampleApplicationTests.java @@ -0,0 +1,15 @@ +package ru.otus.spring.docker; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +@AutoConfigureTestDatabase +class DockerComposeExampleApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/2023-03/spring-36-docker/helloWorld.txt b/2023-03/spring-36-docker/helloWorld.txt new file mode 100644 index 00000000..f2c3689e --- /dev/null +++ b/2023-03/spring-36-docker/helloWorld.txt @@ -0,0 +1,20 @@ +docker image ls +docker pull hello-world +docker image ls +docker image rm hello-world +docker ps +docker run hello-world +docker ps +docker run hello-world +docker ps -all +docker run --rm hello-world + +docker run -it --name=ubuntu-run ubuntu bash +docker start ubuntu-run +docker exec -it ubuntu-run bash + +docker run -d -p:8080:80 --name=my-nginx nginx +docker ps -a +curl http://localhost:8080 +docker kill my-nginx +docker rm my-nginx diff --git a/2023-03/spring-36-docker/image/Dockerfile b/2023-03/spring-36-docker/image/Dockerfile new file mode 100644 index 00000000..c51e4bde --- /dev/null +++ b/2023-03/spring-36-docker/image/Dockerfile @@ -0,0 +1,4 @@ +FROM nginx:1.11-alpine +COPY index.html /usr/share/nginx/html/index.html +EXPOSE 80 +CMD ["nginx", "-g", "daemon off;"] diff --git a/2023-03/spring-36-docker/image/index.html b/2023-03/spring-36-docker/image/index.html new file mode 100644 index 00000000..f3e333e8 --- /dev/null +++ b/2023-03/spring-36-docker/image/index.html @@ -0,0 +1 @@ +

Hello World

diff --git a/2023-03/spring-36-docker/image/readme.txt b/2023-03/spring-36-docker/image/readme.txt new file mode 100644 index 00000000..9dde7083 --- /dev/null +++ b/2023-03/spring-36-docker/image/readme.txt @@ -0,0 +1,5 @@ +docker build -t my-demo-image:v1 . +docker images | grep my-demo-image +docker run -p:80:80 --rm my-demo-image:v1 +docker ps +curl http://localhost \ No newline at end of file diff --git a/2023-05/spring-21-reactor/.gitignore b/2023-05/spring-21-reactor/.gitignore new file mode 100644 index 00000000..fbe7a1ed --- /dev/null +++ b/2023-05/spring-21-reactor/.gitignore @@ -0,0 +1,7 @@ +.idea/ +*.iml + +target/ + +/node_modules +/output diff --git a/2023-05/spring-21-reactor/pom.xml b/2023-05/spring-21-reactor/pom.xml new file mode 100644 index 00000000..2c5cd688 --- /dev/null +++ b/2023-05/spring-21-reactor/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + ru.otus + spring-21-reactor + 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-parent + 3.1.0 + + + + 17 + 17 + + + + + + io.projectreactor + reactor-bom + 2022.0.7 + pom + import + + + org.springframework.boot + spring-boot-dependencies + 3.1.0 + pom + import + + + + + + + + io.projectreactor + reactor-core + + + + ch.qos.logback + logback-classic + + + + io.projectreactor + reactor-test + test + + + org.junit.jupiter + junit-jupiter + test + + + org.assertj + assertj-core + test + + + + diff --git a/2023-05/spring-21-reactor/src/main/java/ru/otus/CreateExample.java b/2023-05/spring-21-reactor/src/main/java/ru/otus/CreateExample.java new file mode 100644 index 00000000..70b161b4 --- /dev/null +++ b/2023-05/spring-21-reactor/src/main/java/ru/otus/CreateExample.java @@ -0,0 +1,74 @@ +package ru.otus; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import reactor.core.Disposable; +import reactor.core.publisher.Flux; + +public class CreateExample { + private static final Logger logger = LoggerFactory.getLogger(CreateExample.class); + + public static void main(String[] args) { + onEachNext(); + //lazyObservable(); + //creatorExample(); + } + + private static void onEachNext() { + Flux obs = Flux.just("one", "two", "three"); + obs.doFirst(() -> logger.info("Starring:")) + .doOnComplete(() -> logger.info("The end!")) + .doOnEach(item -> logger.info("item_1:{}", item.get())) + .subscribe(); + + logger.info("-----"); + + obs.doOnNext(item -> logger.info("item_2:{}", item)) + .map(String::length) + .doOnNext(item -> logger.info("length_2:{}", item)) + .subscribe(); + } + + private static void lazyObservable() { + Flux obs = Flux.defer(() -> { + logger.info("creating new Observable"); + return Flux.just("one", "two", "three"); + }); + + obs.doOnNext(item -> logger.info("item_1:{}", item)) + .subscribe(); + + logger.info("---------------"); + + obs.doOnNext(item -> logger.info("item_2:{}", item)) + .subscribe(); + } + + private static void creatorExample() { + Flux obs = Flux.create(emitter -> { + emitter.next("one"); + emitter.next("two"); + + emitter.error(new RuntimeException("Error!")); + + emitter.next("three"); + emitter.complete(); + }); + + obs.onErrorResume(e -> { + logger.error("error:{}", e.getMessage(), e); + return Flux.just("r1", "r2", "r3"); + }) + .doOnNext(item -> logger.info("item__1:{}", item)) + .subscribe(); + + logger.info("---------------"); + + Disposable disposable = obs.doOnNext(item -> logger.info("item__2:{}", item)) + .subscribe(next -> logger.info("next:{}", next), + error -> logger.info("error:{}", error.getMessage()), + () -> logger.info("onComplete")); + + logger.info("isDisposed:{}", disposable.isDisposed()); + } +} diff --git a/2023-05/spring-21-reactor/src/main/java/ru/otus/OperatorsExample.java b/2023-05/spring-21-reactor/src/main/java/ru/otus/OperatorsExample.java new file mode 100644 index 00000000..aa98d7d6 --- /dev/null +++ b/2023-05/spring-21-reactor/src/main/java/ru/otus/OperatorsExample.java @@ -0,0 +1,51 @@ +package ru.otus; + +import java.time.LocalDate; +import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import reactor.core.publisher.Flux; + + +public class OperatorsExample { + private static final Logger logger = LoggerFactory.getLogger(OperatorsExample.class); + + public static void main(String[] args) { + //merge(); + fromList(); + } + + private static void merge() { + var listFlux1 = Flux.fromIterable(List.of( + new Person("John", "Dow", "male", LocalDate.of(1992, 3, 12)), + new Person("Jane", "Dow", "female", LocalDate.of(2001, 6, 23)))); + + var listFlux2 = Flux.fromIterable(List.of( + new Person("Howard", "Lovecraft", "male", LocalDate.of(1890, 8, 20)), + new Person("Joanne", "Rowling", "female", LocalDate.of(1965, 6, 30)))); + + var listFlux3 = Flux.fromIterable(List.of( + new Person("Ivan", "Petrov", "male", LocalDate.of(1890, 2, 10)), + new Person("Joanne", "Stuard", "female", LocalDate.of(1965, 1, 3)))); + + Flux.merge(listFlux1, listFlux2, listFlux3) + .subscribe(person -> logger.info("person:{}", person)); + + } + + private static void fromList() { + var persons = List.of( + new Person("John", "Dow", "male", LocalDate.of(1992, 3, 12)), + new Person("Jane", "Dow", "female", LocalDate.of(2001, 6, 23)), + new Person("Howard", "Lovecraft", "male", LocalDate.of(1890, 8, 20)), + new Person("Joanne", "Rowling", "female", LocalDate.of(1965, 6, 30))); + + var disposable = Flux.fromIterable(persons) + .filter(person -> person.birth().isAfter(LocalDate.of(1990, 1, 1))) + .map(p -> p.firstName() + " " + p.lastName()) + .collectList() + .subscribe(item -> logger.info("item: {}", item)); + + logger.info("disposable.isDisposed:{}", disposable.isDisposed()); + } +} diff --git a/2023-05/spring-21-reactor/src/main/java/ru/otus/Person.java b/2023-05/spring-21-reactor/src/main/java/ru/otus/Person.java new file mode 100644 index 00000000..ddbe5422 --- /dev/null +++ b/2023-05/spring-21-reactor/src/main/java/ru/otus/Person.java @@ -0,0 +1,6 @@ +package ru.otus; + +import java.time.LocalDate; + +public record Person(String firstName, String lastName, String gender, LocalDate birth) { +} diff --git a/2023-05/spring-21-reactor/src/main/java/ru/otus/PublisherExample.java b/2023-05/spring-21-reactor/src/main/java/ru/otus/PublisherExample.java new file mode 100644 index 00000000..aaab7853 --- /dev/null +++ b/2023-05/spring-21-reactor/src/main/java/ru/otus/PublisherExample.java @@ -0,0 +1,56 @@ +package ru.otus; + +import java.time.Duration; +import java.util.function.BiFunction; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import reactor.core.publisher.ConnectableFlux; +import reactor.core.publisher.Flux; +import reactor.core.publisher.SynchronousSink; +import reactor.core.scheduler.Schedulers; + +public class PublisherExample { + private static final Logger logger = LoggerFactory.getLogger(PublisherExample.class); + + public static void main(String[] args) throws Exception { + publisherExample(); + } + + public static void publisherExample() throws InterruptedException { + Flux ob = magicPublisher(); + Thread.sleep(5000); + logger.info("First subscribed"); + var disposable1 = ob.subscribe(item -> logger.info("item: {}", item)); + + logger.info("disposable1.isDisposed:{}", disposable1.isDisposed()); + Thread.sleep(5000); + + logger.info("Second subscribed"); + var disposable2 = ob.subscribe(item -> logger.info("item second: {}", item)); + + + logger.info("disposable2.isDisposed():{}", disposable2.isDisposed()); + + Thread.sleep(60_000); + } + + public static Flux magicPublisher() { + var schedulerGenerator = Schedulers.newParallel("generator", 1); + var generator = Flux.generate( + () -> 0L, + (BiFunction, Long>) + (prev, sink) -> { + var newValue = prev + 1; + sink.next(newValue); + logger.info("newValue:{}", newValue); + return newValue; + }) + .delayElements(Duration.ofSeconds(5), schedulerGenerator) + .map(id -> "new id:" + id) + .doOnNext(val -> logger.info("val:{}", val)); + + ConnectableFlux generatorConnectable = generator.publish(); + + return generatorConnectable.autoConnect(0); + } +} diff --git a/2023-05/spring-22-webflux/.gitignore b/2023-05/spring-22-webflux/.gitignore new file mode 100644 index 00000000..e62c33c2 --- /dev/null +++ b/2023-05/spring-22-webflux/.gitignore @@ -0,0 +1,4 @@ +.idea/ +*.iml + +target/ diff --git a/2023-05/spring-22-webflux/HttpRequests.http b/2023-05/spring-22-webflux/HttpRequests.http new file mode 100644 index 00000000..3449be12 --- /dev/null +++ b/2023-05/spring-22-webflux/HttpRequests.http @@ -0,0 +1,47 @@ +### +GET http://localhost:8080/flux/one +Accept: */* +Content-Type: application/json +Cache-Control: no-cache + +### +GET http://localhost:8080/flux/ten +Accept: */* +Content-Type: application/json +Cache-Control: no-cache + +### +GET http://localhost:8080/stream +Accept: */* +Content-Type: application/json +Cache-Control: no-cache + +### +GET http://localhost:8080/person +Accept: */* +Content-Type: application/json +Cache-Control: no-cache + +### +GET http://localhost:8080/person/1 +Accept: */* +Content-Type: application/json +Cache-Control: no-cache + +### +GET http://localhost:8080/func/person?name=Lermontov +Accept: */* +Content-Type: application/json +Cache-Control: no-cache + +### +GET http://localhost:8080/func/person?age=22 +Accept: */* +Content-Type: application/json +Cache-Control: no-cache + +### +GET http://localhost:8080/func/person/1 +Accept: */* +Content-Type: application/json +Cache-Control: no-cache diff --git a/2023-05/spring-22-webflux/docker/runDb.src b/2023-05/spring-22-webflux/docker/runDb.src new file mode 100755 index 00000000..aa76bbc6 --- /dev/null +++ b/2023-05/spring-22-webflux/docker/runDb.src @@ -0,0 +1,6 @@ +docker run --rm --name pg-docker \ +-e POSTGRES_PASSWORD=pwd \ +-e POSTGRES_USER=usr \ +-e POSTGRES_DB=demoDB \ +-p 5430:5432 \ +postgres:13 \ No newline at end of file diff --git a/2023-05/spring-22-webflux/pom.xml b/2023-05/spring-22-webflux/pom.xml new file mode 100644 index 00000000..02b44b6d --- /dev/null +++ b/2023-05/spring-22-webflux/pom.xml @@ -0,0 +1,82 @@ + + + 4.0.0 + + ru.otus + spring-22-webflux + 1.0 + + + org.springframework.boot + spring-boot-starter-parent + 3.1.0 + + + + 17 + 17 + + + + + org.springframework.boot + spring-boot-starter-webflux + + + + org.springframework.boot + spring-boot-starter-data-jdbc + + + + org.springframework.boot + spring-boot-starter-data-r2dbc + + + + org.flywaydb + flyway-core + + + + io.r2dbc + r2dbc-postgresql + 0.8.13.RELEASE + + + + org.postgresql + postgresql + 42.6.0 + + + + org.jetbrains + annotations + 24.0.1 + + + + + io.projectreactor + reactor-test + test + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/DataFiller.java b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/DataFiller.java new file mode 100644 index 00000000..74236a47 --- /dev/null +++ b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/DataFiller.java @@ -0,0 +1,34 @@ +package ru.otus.spring; + +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.stereotype.Component; +import reactor.core.scheduler.Scheduler; +import ru.otus.spring.domain.Person; +import ru.otus.spring.repository.PersonRepository; + +@Component +public class DataFiller implements ApplicationRunner { + private static final Logger logger = LoggerFactory.getLogger(DataFiller.class); + + private final PersonRepository personRepository; + private final Scheduler workerPool; + + public DataFiller(PersonRepository personRepository, Scheduler workerPool) { + this.personRepository = personRepository; + this.workerPool = workerPool; + } + + @Override + public void run(ApplicationArguments args) { + personRepository.saveAll(Arrays.asList( + new Person("Pushkin", 22), + new Person("Lermontov", 22), + new Person("Tolstoy", 60) + )).publishOn(workerPool) + .subscribe(savedPerson -> logger.info("saved person:{}", savedPerson)); + } +} diff --git a/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/FunctionalEndpointsConfig.java b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/FunctionalEndpointsConfig.java new file mode 100644 index 00000000..0366526f --- /dev/null +++ b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/FunctionalEndpointsConfig.java @@ -0,0 +1,67 @@ +package ru.otus.spring; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.reactive.function.server.RouterFunction; +import org.springframework.web.reactive.function.server.ServerRequest; +import org.springframework.web.reactive.function.server.ServerResponse; +import reactor.core.publisher.Mono; +import ru.otus.spring.domain.Person; +import ru.otus.spring.repository.PersonRepository; + +import static org.springframework.http.MediaType.APPLICATION_JSON; +import static org.springframework.web.reactive.function.BodyInserters.fromValue; +import static org.springframework.web.reactive.function.server.RequestPredicates.accept; +import static org.springframework.web.reactive.function.server.RequestPredicates.queryParam; +import static org.springframework.web.reactive.function.server.RouterFunctions.route; +import static org.springframework.web.reactive.function.server.ServerResponse.badRequest; +import static org.springframework.web.reactive.function.server.ServerResponse.notFound; +import static org.springframework.web.reactive.function.server.ServerResponse.ok; + +@Configuration +public class FunctionalEndpointsConfig { + @Bean + public RouterFunction composedRoutes(PersonRepository repository) { + return route() + // эта функция должна стоять раньше findAll - порядок следования роутов - важен + .GET("/func/person", + queryParam("name", StringUtils::isNotEmpty), + request -> request.queryParam("name") + .map(name -> ok().body(repository.findAllByLastName(name), Person.class)) + .orElse(badRequest().build()) + ) + // пример другой реализации - начиная с запроса репозитория + .GET("/func/person", queryParam("age", StringUtils::isNotEmpty), + req -> + repository.findAllByAge(req.queryParam("age") + .map(Integer::parseInt) + .orElseThrow(IllegalArgumentException::new)) + .collectList() + .transform(persons -> ok().contentType(APPLICATION_JSON).body(persons, Person.class)) + ) + // Обратите внимание на использование хэндлера + .GET("/func/person", accept(APPLICATION_JSON), new PersonHandler(repository)::list) + // Обратите внимание на использование pathVariable + .GET("/func/person/{id}", accept(APPLICATION_JSON), + request -> repository.findById(Long.parseLong(request.pathVariable("id"))) + .flatMap(person -> ok().contentType(APPLICATION_JSON).body(fromValue(person))) + .switchIfEmpty(notFound().build()) + ).build(); + } + + // Это пример хэндлера, который даже не бин + static class PersonHandler { + + private final PersonRepository repository; + + PersonHandler(PersonRepository repository) { + this.repository = repository; + } + + Mono list(ServerRequest request) { + // Обратите внимание на пример другого порядка создания response от Flux + return ok().contentType(APPLICATION_JSON).body(repository.findAll(), Person.class); + } + } +} diff --git a/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/WebfluxDemo.java b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/WebfluxDemo.java new file mode 100644 index 00000000..5bd95469 --- /dev/null +++ b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/WebfluxDemo.java @@ -0,0 +1,16 @@ +package ru.otus.spring; + + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + + +@SpringBootApplication +public class WebfluxDemo { + + + public static void main(String[] args) { + SpringApplication.run(WebfluxDemo.class); + } +} + diff --git a/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/config/ApplConfig.java b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/config/ApplConfig.java new file mode 100644 index 00000000..9813876b --- /dev/null +++ b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/config/ApplConfig.java @@ -0,0 +1,39 @@ +package ru.otus.spring.config; + +import io.netty.channel.nio.NioEventLoopGroup; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicLong; +import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory; +import org.springframework.boot.web.reactive.server.ReactiveWebServerFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import reactor.core.scheduler.Scheduler; +import reactor.core.scheduler.Schedulers; +import reactor.util.annotation.NonNull; + +@Configuration +public class ApplConfig { + private static final int THREAD_POOL_SIZE = 2; + + @Bean + public ReactiveWebServerFactory reactiveWebServerFactory() { + var eventLoopGroup = new NioEventLoopGroup(THREAD_POOL_SIZE, + new ThreadFactory() { + private final AtomicLong threadIdGenerator = new AtomicLong(0); + @Override + public Thread newThread(@NonNull Runnable task) { + return new Thread(task, "server-thread-" + threadIdGenerator.incrementAndGet()); + } + }); + + var factory = new NettyReactiveWebServerFactory(); + factory.addServerCustomizers(builder -> builder.runOn(eventLoopGroup)); + + return factory; + } + + @Bean + public Scheduler workerPool() { + return Schedulers.newParallel("worker-thread", THREAD_POOL_SIZE); + } +} diff --git a/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/domain/Person.java b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/domain/Person.java new file mode 100644 index 00000000..9721a730 --- /dev/null +++ b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/domain/Person.java @@ -0,0 +1,53 @@ +package ru.otus.spring.domain; + +import org.jetbrains.annotations.NotNull; +import org.springframework.data.annotation.Id; +import org.springframework.data.annotation.PersistenceCreator; +import org.springframework.data.relational.core.mapping.Table; + +@Table("person") +public class Person { + + @Id + private final Long id; + + @NotNull + private final String lastName; + + private final int age; + + + @PersistenceCreator + private Person(Long id, @NotNull String lastName, int age) { + this.id = id; + this.lastName = lastName; + this.age = age; + } + + public Person(String lastName, int age) { + this(null, lastName, age); + } + + public Long getId() { + return id; + } + + + public @NotNull String getLastName() { + return lastName; + } + + + public int getAge() { + return age; + } + + @Override + public String toString() { + return "Person{" + + "id=" + id + + ", lastName='" + lastName + '\'' + + ", age=" + age + + '}'; + } +} diff --git a/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/domain/PersonDto.java b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/domain/PersonDto.java new file mode 100644 index 00000000..72630739 --- /dev/null +++ b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/domain/PersonDto.java @@ -0,0 +1,6 @@ +package ru.otus.spring.domain; + + +public record PersonDto(String id, String name, int age) { + +} diff --git a/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/repository/PersonRepository.java b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/repository/PersonRepository.java new file mode 100644 index 00000000..d420f092 --- /dev/null +++ b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/repository/PersonRepository.java @@ -0,0 +1,18 @@ +package ru.otus.spring.repository; + +import org.jetbrains.annotations.NotNull; +import org.springframework.data.repository.reactive.ReactiveCrudRepository; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import ru.otus.spring.domain.Person; + +public interface PersonRepository extends ReactiveCrudRepository { + + @NotNull Mono findById(@NotNull Long id); + + Mono save(Mono person); + + Flux findAllByLastName(String lastName); + + Flux findAllByAge(int age); +} diff --git a/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/rest/AnnotatedController.java b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/rest/AnnotatedController.java new file mode 100644 index 00000000..b37dcd86 --- /dev/null +++ b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/rest/AnnotatedController.java @@ -0,0 +1,49 @@ +package ru.otus.spring.rest; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + +import java.time.Duration; +import reactor.core.scheduler.Scheduler; + + +@RestController +public class AnnotatedController { + private static final Logger logger = LoggerFactory.getLogger(AnnotatedController.class); + + private final Scheduler workerPool; + + public AnnotatedController(Scheduler workerPool) { + this.workerPool = workerPool; + } + + @GetMapping("/flux/one") + public Mono one() { + return Mono.just("one"); + } + + @GetMapping(path ="/flux/ten", produces = MediaType.TEXT_EVENT_STREAM_VALUE) + public Flux list() { + logger.info("list request"); + return Flux.range(1, 10) + .delayElements(Duration.ofSeconds(1), workerPool) + .doOnNext(val -> logger.info("value:{}", val)); + } + + @GetMapping(path = "/stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE) + public Flux stream() { + logger.info("stream"); + return Flux.generate(() -> 0, (state, emitter) -> { + emitter.next(state); + return state + 1; + }) + .delayElements(Duration.ofSeconds(1L)) + .map(Object::toString) + .map(val -> String.format("valStr:%s", val)); + } +} diff --git a/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/rest/PersonController.java b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/rest/PersonController.java new file mode 100644 index 00000000..f5937ae2 --- /dev/null +++ b/2023-05/spring-22-webflux/src/main/java/ru/otus/spring/rest/PersonController.java @@ -0,0 +1,47 @@ +package ru.otus.spring.rest; + +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; +import ru.otus.spring.domain.Person; +import ru.otus.spring.domain.PersonDto; +import ru.otus.spring.repository.PersonRepository; + +@RestController +public class PersonController { + + private final PersonRepository repository; + + public PersonController(PersonRepository repository) { + this.repository = repository; + } + + @GetMapping("/person") + public Flux all() { + return repository.findAll() + .map(this::toDto); + } + + @GetMapping("/person/{id}") + public Mono> byId(@PathVariable("id") Long id) { + return repository.findById(id) + .map(this::toDto) + .map(ResponseEntity::ok) + .switchIfEmpty(Mono.fromCallable(() -> ResponseEntity.notFound().build())); + } + + @PostMapping("/person") + public Mono save(@RequestBody Mono dto) { + return repository.save(dto); + } + + @GetMapping("/person/find") + public Flux byName(@RequestParam("name") String name) { + return repository.findAllByLastName(name); + } + + private PersonDto toDto(Person person) { + return new PersonDto(String.valueOf(person.getId()), person.getLastName(), person.getAge()); + } +} diff --git a/2023-05/spring-22-webflux/src/main/resources/application.yml b/2023-05/spring-22-webflux/src/main/resources/application.yml new file mode 100644 index 00000000..5935fcc0 --- /dev/null +++ b/2023-05/spring-22-webflux/src/main/resources/application.yml @@ -0,0 +1,17 @@ +server: + port: 8080 + +spring: + r2dbc: + url: r2dbc:postgresql://localhost:5430/demoDB + username: usr + password: pwd + flyway: + url: jdbc:postgresql://localhost:5430/demoDB + user: usr + password: pwd + + +logging: + level: + org.springframework.jdbc.core.JdbcTemplate: TRACE diff --git a/2023-05/spring-22-webflux/src/main/resources/db/migration/V1__initial_schema.sql b/2023-05/spring-22-webflux/src/main/resources/db/migration/V1__initial_schema.sql new file mode 100644 index 00000000..06ee58a8 --- /dev/null +++ b/2023-05/spring-22-webflux/src/main/resources/db/migration/V1__initial_schema.sql @@ -0,0 +1,6 @@ +create table person +( + id bigserial not null primary key, + last_name varchar(50) not null, + age int not null +); diff --git a/2023-05/spring-22-webflux/src/main/resources/logback.xml b/2023-05/spring-22-webflux/src/main/resources/logback.xml new file mode 100644 index 00000000..b1f9bfe2 --- /dev/null +++ b/2023-05/spring-22-webflux/src/main/resources/logback.xml @@ -0,0 +1,11 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + + + + + diff --git a/2023-05/spring-22-webflux/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java b/2023-05/spring-22-webflux/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java new file mode 100644 index 00000000..5ed22cc5 --- /dev/null +++ b/2023-05/spring-22-webflux/src/test/java/ru/otus/spring/repository/PersonRepositoryTest.java @@ -0,0 +1,29 @@ +package ru.otus.spring.repository; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.data.mongo.DataMongoTest; +import org.springframework.boot.test.context.SpringBootTest; +import reactor.core.publisher.Mono; +import reactor.test.StepVerifier; +import ru.otus.spring.domain.Person; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +@SpringBootTest +class PersonRepositoryTest { + + @Autowired + private PersonRepository repository; + + @Test + void shouldSetIdOnSave() { + Mono personMono = repository.save(new Person("Bill", 12)); + + StepVerifier + .create(personMono) + .assertNext(person -> assertNotNull(person.getId())) + .expectComplete() + .verify(); + } +} diff --git a/2023-05/spring-22-webflux/src/test/java/ru/otus/spring/rest/AnnotatedControllerTest.java b/2023-05/spring-22-webflux/src/test/java/ru/otus/spring/rest/AnnotatedControllerTest.java new file mode 100644 index 00000000..95eb4d75 --- /dev/null +++ b/2023-05/spring-22-webflux/src/test/java/ru/otus/spring/rest/AnnotatedControllerTest.java @@ -0,0 +1,96 @@ +package ru.otus.spring.rest; + +import java.time.Duration; +import java.util.List; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.http.MediaType; +import org.springframework.test.web.reactive.server.WebTestClient; +import org.springframework.web.reactive.function.client.WebClient; +import reactor.test.StepVerifier; + +import static org.assertj.core.api.Assertions.assertThat; + + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +class AnnotatedControllerTest { + + @Autowired + private WebTestClient webTestClient; + @LocalServerPort + private int port; + + + @Test + void oneTest() { + //given + var client = WebClient.create(String.format("http://localhost:%d", port)); + + //when + var result = client + .get().uri("/flux/one") + .accept(MediaType.APPLICATION_JSON) + .retrieve() + .bodyToMono(String.class) + .timeout(Duration.ofSeconds(3)) + .block(); + + //then + assertThat(result).isEqualTo("one"); + } + + @Test + void streamTest() { + //given + var client = WebClient.create(String.format("http://localhost:%d", port)); + var expectedSize = 5; + + //when + List result = client + .get().uri("/stream") + .accept(MediaType.TEXT_EVENT_STREAM) + .retrieve() + .bodyToFlux(String.class) + .take(expectedSize) + .timeout(Duration.ofSeconds(3)) + .collectList() + .block(); + + //then + assertThat(result).hasSize(expectedSize) + .contains(String.format("valStr:%s", 0), + String.format("valStr:%s", 1), + String.format("valStr:%s", 2), + String.format("valStr:%s", 3), + String.format("valStr:%s", 4)); + } + + @Test + void dataTest() { + //given + var webTestClientForTest = webTestClient.mutate() + .responseTimeout(Duration.ofSeconds(20)) + .build(); + + //when + var result = webTestClientForTest + .get().uri("/flux/ten") + .accept(MediaType.TEXT_EVENT_STREAM) + .exchange() + .expectStatus().isOk() + .returnResult(Integer.class) + .getResponseBody(); + + //then + var step = StepVerifier.create(result); + StepVerifier.Step stepResult = null; + for (var idx = 1; idx <= 10; idx++) { + stepResult = step.expectNext(idx); + } + stepResult.verifyComplete(); + } + +} \ No newline at end of file diff --git a/2023-05/spring-22-webflux/src/test/java/ru/otus/spring/rest/PersonControllerTest.java b/2023-05/spring-22-webflux/src/test/java/ru/otus/spring/rest/PersonControllerTest.java new file mode 100644 index 00000000..71a31505 --- /dev/null +++ b/2023-05/spring-22-webflux/src/test/java/ru/otus/spring/rest/PersonControllerTest.java @@ -0,0 +1,28 @@ +package ru.otus.spring.rest; + +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.web.reactive.server.WebTestClient; +import org.springframework.web.reactive.function.server.RouterFunction; +import org.springframework.web.reactive.function.server.ServerResponse; + +@SpringBootTest +class PersonControllerTest { + + @Autowired + private RouterFunction route; + + @Test + void testRoute() { + WebTestClient client = WebTestClient + .bindToRouterFunction(route) + .build(); + + client.get() + .uri("/func/person") + .exchange() + .expectStatus() + .isOk(); + } +}