diff --git a/gusev_vladislav_lab_3/README.md b/gusev_vladislav_lab_3/README.md new file mode 100644 index 0000000..3981ce9 --- /dev/null +++ b/gusev_vladislav_lab_3/README.md @@ -0,0 +1,59 @@ +# Лабораторная работа №3 - RESTAPI, Gateway и синхронный обмен между микросервисами + +1) Создать 2 микросервиса, реализующих CRUD на связанных сущностях. +2) Реализовать механизм синхронного обмена сообщениями между микросервисами. +3) Реализовать шлюз на основе прозрачного прокси-сервера nginx. + +# Сущности: +- VKImages: +1) ID: Id автогенерируемый в программе. +2) Url: ссылка на фото пользователя. +3) Text: текст фото, не содержащийся на фото, а приложенный текст к фото в ВКонтакте. +- VKUsers: +1) ID: Id автогенерируемый в программе. +2) Url: ссылка на пользователя. +3) PhotoUrl: ссылка на фото пользователя. +# Как запустить +Командой "docker-compose up -d" в папке VKUsers/src/main/java/com/example/vkUsers + +# Работа программы +Так как скриншоты этой программы можно делать очень долго, то основная работа программы будет видна в видео, +в данном фотоотчете будут основные аспекты программы. + +Начнем с VKImages. Модель следующая: + +![img.png](images%2Fimg.png) + +Контроллер с url для оснонвых методов swagger (PUT, GET, POST, DELETE): + +![img_1.png](images%2Fimg_1.png) + +DockerFile: + +![img_2.png](images%2Fimg_2.png) + +Теперь VKUsers. Модель: + +![img_3.png](images%2Fimg_3.png) + +Контроллер с url для оснонвых методов swagger (PUT, GET, POST, DELETE): + +![img_4.png](images%2Fimg_4.png) + +DockerFile: + +![img_5.png](images%2Fimg_5.png) + +DockerCompose: + +![img_6.png](images%2Fimg_6.png) + +nginx-config: + +![img_7.png](images%2Fimg_7.png) + +Синхронный обмен в следующем методе: + +![img_8.png](images%2Fimg_8.png) + +Видео -> https://drive.google.com/file/d/1D-8urLmnXjgNRQJJWq9SKR35FF0sBSWL/view?usp=sharing \ No newline at end of file diff --git a/gusev_vladislav_lab_3/VKImages/.gitignore b/gusev_vladislav_lab_3/VKImages/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/gusev_vladislav_lab_3/VKImages/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### 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/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/gusev_vladislav_lab_3/VKImages/.mvn/wrapper/maven-wrapper.jar b/gusev_vladislav_lab_3/VKImages/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..bf82ff0 Binary files /dev/null and b/gusev_vladislav_lab_3/VKImages/.mvn/wrapper/maven-wrapper.jar differ diff --git a/gusev_vladislav_lab_3/VKImages/.mvn/wrapper/maven-wrapper.properties b/gusev_vladislav_lab_3/VKImages/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..ca5ab4b --- /dev/null +++ b/gusev_vladislav_lab_3/VKImages/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# 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. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/gusev_vladislav_lab_3/VKImages/mvnw b/gusev_vladislav_lab_3/VKImages/mvnw new file mode 100644 index 0000000..8a8fb22 --- /dev/null +++ b/gusev_vladislav_lab_3/VKImages/mvnw @@ -0,0 +1,316 @@ +#!/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 /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# 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="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +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/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$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 \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/gusev_vladislav_lab_3/VKImages/mvnw.cmd b/gusev_vladislav_lab_3/VKImages/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/gusev_vladislav_lab_3/VKImages/mvnw.cmd @@ -0,0 +1,188 @@ +@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 "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq 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%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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 "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/gusev_vladislav_lab_3/VKImages/pom.xml b/gusev_vladislav_lab_3/VKImages/pom.xml new file mode 100644 index 0000000..96a34bc --- /dev/null +++ b/gusev_vladislav_lab_3/VKImages/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.7.17 + + + com.example + VKImages + 0.0.1-SNAPSHOT + vk-images + Demo project for Spring Boot + + 17 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + com.h2database + h2 + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.springdoc + springdoc-openapi-ui + 1.7.0 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/Dockerfile b/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/Dockerfile new file mode 100644 index 0000000..9cde168 --- /dev/null +++ b/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/Dockerfile @@ -0,0 +1,14 @@ +# Используем базовый образ с Java и средой выполнения Spring Boot +FROM openjdk:17 + +# Устанавливаем рабочий каталог внутри контейнера +WORKDIR /app + +# Копируем JAR-файл приложения в контейнер (предполагается, что JAR-файл находится в каталоге target/) +COPY target/VKImages-0.0.1-SNAPSHOT.jar vkImages.jar + +# Экспонируем порт, на котором будет работать приложение +EXPOSE 8099 + +# Запускаем приложение при запуске контейнера +CMD ["java", "-jar", "vkImages.jar"] diff --git a/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/VKImagesApp.java b/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/VKImagesApp.java new file mode 100644 index 0000000..92218e5 --- /dev/null +++ b/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/VKImagesApp.java @@ -0,0 +1,11 @@ +package com.example.vkimages; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class VKImagesApp { + public static void main(String[] args) { + SpringApplication.run(VKImagesApp.class, args); + } +} diff --git a/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/controller/VKImagesController.java b/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/controller/VKImagesController.java new file mode 100644 index 0000000..8496504 --- /dev/null +++ b/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/controller/VKImagesController.java @@ -0,0 +1,57 @@ +package com.example.vkimages.controller; + +import com.example.vkimages.model.VKImages; +import com.example.vkimages.model.VKImagesDTO; +import com.example.vkimages.service.VKImagesService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/vkImages") +public class VKImagesController { + private final VKImagesService vkImagesService; + + @Autowired + public VKImagesController(VKImagesService vkImagesService) { + this.vkImagesService = vkImagesService; + } + + @GetMapping("/") + public List getAllApps() { + return vkImagesService.getAllVKImages(); + } + + @GetMapping("/{url}") + public ResponseEntity getAppByUuid(@PathVariable String url) { + return vkImagesService.getVkImagesByUrl(url) + .map(app -> ResponseEntity.ok().body(app)) + .orElse(ResponseEntity.notFound().build()); + } + + @PostMapping("/") + public ResponseEntity createApp(@RequestBody VKImagesDTO vkImagesDTO) { + VKImages createdApp = vkImagesService.createVKImages(vkImagesDTO); + return ResponseEntity.status(HttpStatus.CREATED).body(createdApp); + } + + @PutMapping("/{url}") + public ResponseEntity updateApp(@PathVariable String url, @RequestBody VKImagesDTO vkImagesDTO) { + VKImages updatedApp = vkImagesService.updateVKImages(url, vkImagesDTO); + if (updatedApp != null) { + return ResponseEntity.ok().body(updatedApp); + } else { + return ResponseEntity.notFound().build(); + } + } + + @DeleteMapping("/{url}") + public ResponseEntity deleteApp(@PathVariable String url) { + boolean deleted = vkImagesService.deleteVKImages(url); + return deleted ? ResponseEntity.noContent().build() : ResponseEntity.notFound().build(); + } +} + diff --git a/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/model/VKImages.java b/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/model/VKImages.java new file mode 100644 index 0000000..07ee53c --- /dev/null +++ b/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/model/VKImages.java @@ -0,0 +1,54 @@ +package com.example.vkimages.model; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "vk_images") +public class VKImages { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private String url; + private String text; + + // Конструктор по умолчанию + public VKImages() { + } + + // Конструктор для создания объекта с параметрами + public VKImages(String url, String text) { + this.url = url; + this.text = text; + + } + + + // Геттеры и сеттеры для полей + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } +} + diff --git a/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/model/VKImagesDTO.java b/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/model/VKImagesDTO.java new file mode 100644 index 0000000..91ca6a5 --- /dev/null +++ b/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/model/VKImagesDTO.java @@ -0,0 +1,36 @@ +package com.example.vkimages.model; + +public class VKImagesDTO { + private String url; + private String text; + + + // Конструктор по умолчанию + public VKImagesDTO() { + } + + // Конструктор для создания объекта с параметрами + public VKImagesDTO(String url, String text) { + this.url = url; + this.text = text; + + } + + // Геттеры и сеттеры для полей + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } +} diff --git a/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/repository/VKImagesRepository.java b/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/repository/VKImagesRepository.java new file mode 100644 index 0000000..5f66799 --- /dev/null +++ b/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/repository/VKImagesRepository.java @@ -0,0 +1,13 @@ +package com.example.vkimages.repository; + +import com.example.vkimages.model.VKImages; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; +import java.util.Optional; + +@Repository +public interface VKImagesRepository extends JpaRepository { + Optional findByUrl(String url); +} + + diff --git a/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/service/VKImagesService.java b/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/service/VKImagesService.java new file mode 100644 index 0000000..0f41697 --- /dev/null +++ b/gusev_vladislav_lab_3/VKImages/src/main/java/com/example/vkimages/service/VKImagesService.java @@ -0,0 +1,61 @@ +package com.example.vkimages.service; + +import com.example.vkimages.model.VKImages; +import com.example.vkimages.model.VKImagesDTO; +import com.example.vkimages.repository.VKImagesRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.Optional; + +@Service +public class VKImagesService { + private final VKImagesRepository vkImagesRepository; + + @Autowired + public VKImagesService(VKImagesRepository vkImagesRepository) { + this.vkImagesRepository = vkImagesRepository; + } + + @Transactional + public List getAllVKImages() { + return vkImagesRepository.findAll(); + } + + @Transactional + public Optional getVkImagesByUrl(String url) { + return vkImagesRepository.findByUrl(url); + } + + @Transactional + public VKImages createVKImages(VKImagesDTO vkImagesDTO) { + VKImages app = new VKImages(); + app.setUrl(vkImagesDTO.getUrl()); + app.setText(vkImagesDTO.getText()); + return vkImagesRepository.save(app); + } + + @Transactional + public VKImages updateVKImages(String url, VKImagesDTO vkImagesDTO) { + Optional existingApp = vkImagesRepository.findByUrl(url); + if (existingApp.isPresent()) { + VKImages vkImages = existingApp.get(); + vkImages.setText(vkImagesDTO.getText()); + + return vkImagesRepository.save(vkImages); + } + return null; + } + + @Transactional + public boolean deleteVKImages(String url) { + Optional existingApp = vkImagesRepository.findByUrl(url); + if (existingApp.isPresent()) { + vkImagesRepository.delete(existingApp.get()); + return true; + } + return false; + } +} + diff --git a/gusev_vladislav_lab_3/VKImages/src/main/resources/application.properties b/gusev_vladislav_lab_3/VKImages/src/main/resources/application.properties new file mode 100644 index 0000000..e51fdaa --- /dev/null +++ b/gusev_vladislav_lab_3/VKImages/src/main/resources/application.properties @@ -0,0 +1,8 @@ +spring.datasource.url=jdbc:h2:mem:testdb +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.username=sa +spring.datasource.password=password +spring.jpa.hibernate.ddl-auto=update +spring.h2.console.enabled=true + +server.port=8099 diff --git a/gusev_vladislav_lab_3/VKImages/src/test/java/com/example/vkImages/VKImagesTests.java b/gusev_vladislav_lab_3/VKImages/src/test/java/com/example/vkImages/VKImagesTests.java new file mode 100644 index 0000000..b82a946 --- /dev/null +++ b/gusev_vladislav_lab_3/VKImages/src/test/java/com/example/vkImages/VKImagesTests.java @@ -0,0 +1,13 @@ +package com.example.vkImages; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class VKImagesTests { + + @Test + void contextLoads() { + } + +} diff --git a/gusev_vladislav_lab_3/VKUsers/.gitignore b/gusev_vladislav_lab_3/VKUsers/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### 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/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/gusev_vladislav_lab_3/VKUsers/.mvn/wrapper/maven-wrapper.jar b/gusev_vladislav_lab_3/VKUsers/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..bf82ff0 Binary files /dev/null and b/gusev_vladislav_lab_3/VKUsers/.mvn/wrapper/maven-wrapper.jar differ diff --git a/gusev_vladislav_lab_3/VKUsers/.mvn/wrapper/maven-wrapper.properties b/gusev_vladislav_lab_3/VKUsers/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..ca5ab4b --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,18 @@ +# 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. +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.7/apache-maven-3.8.7-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar diff --git a/gusev_vladislav_lab_3/VKUsers/mvnw b/gusev_vladislav_lab_3/VKUsers/mvnw new file mode 100644 index 0000000..8a8fb22 --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/mvnw @@ -0,0 +1,316 @@ +#!/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 /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# 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="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +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/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$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 \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/gusev_vladislav_lab_3/VKUsers/mvnw.cmd b/gusev_vladislav_lab_3/VKUsers/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/mvnw.cmd @@ -0,0 +1,188 @@ +@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 "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq 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%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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 "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/gusev_vladislav_lab_3/VKUsers/pom.xml b/gusev_vladislav_lab_3/VKUsers/pom.xml new file mode 100644 index 0000000..8a58771 --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.7.17 + + + com.example + vkUsers + 0.0.1-SNAPSHOT + vkUsers + Demo project for Spring Boot + + 17 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + com.h2database + h2 + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springdoc + springdoc-openapi-ui + 1.7.0 + + + org.projectlombok + lombok + true + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/Dockerfile b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/Dockerfile new file mode 100644 index 0000000..97fb47e --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/Dockerfile @@ -0,0 +1,14 @@ +# Используем базовый образ с Java и средой выполнения Spring Boot +FROM openjdk:17 + +# Устанавливаем рабочий каталог внутри контейнера +WORKDIR /app + +# Копируем JAR-файл приложения в контейнер (предполагается, что JAR-файл находится в каталоге target/) +COPY target/vkUsers-0.0.1-SNAPSHOT.jar vkUsers.jar + +# Экспонируем порт, на котором будет работать приложение +EXPOSE 8090 + +# Запускаем приложение при запуске контейнера +CMD ["java", "-jar", "vkUsers.jar"] diff --git a/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/VKUsersApp.java b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/VKUsersApp.java new file mode 100644 index 0000000..fd6784b --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/VKUsersApp.java @@ -0,0 +1,18 @@ +package com.example.vkUsers; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.web.client.RestTemplate; + +@SpringBootApplication +public class VKUsersApp { + public static void main(String[] args) { + SpringApplication.run(VKUsersApp.class, args); + } + + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } +} diff --git a/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/controller/VKUsersController.java b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/controller/VKUsersController.java new file mode 100644 index 0000000..7d32750 --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/controller/VKUsersController.java @@ -0,0 +1,60 @@ +package com.example.vkUsers.controller; + +import com.example.vkUsers.dto.VKUsersDTO; +import com.example.vkUsers.dto.VKUsersDetailDTO; +import com.example.vkUsers.service.VKUsersService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/vkUsers") +public class VKUsersController { + private final VKUsersService VKUsersService; + + @Autowired + public VKUsersController(VKUsersService VKUsersService) { + this.VKUsersService = VKUsersService; + } + + @GetMapping("/") + public ResponseEntity> getVKUsers() { + List vkUsers = VKUsersService.getAllVKUsers(); + return ResponseEntity.ok(vkUsers); + } + + @GetMapping("/{url}") + public ResponseEntity getVKUser(@PathVariable String url) { + VKUsersDetailDTO vkusers = VKUsersService.getVKUsersByUrl(url); + if (vkusers != null) { + return ResponseEntity.ok(vkusers); + } + return ResponseEntity.notFound().build(); + } + + @PostMapping("/") + public ResponseEntity createVKUser(@RequestBody VKUsersDTO createDTO) { + VKUsersDetailDTO vkUsers = VKUsersService.createVKUsers(createDTO); + return ResponseEntity.ok(vkUsers); + } + + @PutMapping("/{url}") + public ResponseEntity updateVKUser(@PathVariable String url, @RequestBody VKUsersDTO updateDTO) { + VKUsersDetailDTO vkUsers = VKUsersService.updateVKUsers(url, updateDTO); + if (vkUsers != null) { + return ResponseEntity.ok(vkUsers); + } + return ResponseEntity.notFound().build(); + } + + @DeleteMapping("/{url}") + public ResponseEntity deleteVKUser(@PathVariable String url) { + boolean deleted = VKUsersService.deleteVKUsers(url); + if (deleted) { + return ResponseEntity.ok().build(); + } + return ResponseEntity.notFound().build(); + } +} diff --git a/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/docker-compose.yml b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/docker-compose.yml new file mode 100644 index 0000000..463bfdd --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/docker-compose.yml @@ -0,0 +1,31 @@ +version: '3' +services: + vkImages: + image: nordesio/sha256:0dac8e60a146 + ports: + - "8099:8099" + networks: + - network + + vkUsers: + image: nordesio/sha256:117391e0d493 + ports: + - "8090:8090" + networks: + - network + + nginx: + image: nginx:latest + ports: + - "80:80" + networks: + - network + volumes: + - ./nginx.conf:/etc/nginx/nginx.conf + depends_on: + - vkImages + - vkUsers + +networks: + network: + driver: bridge \ No newline at end of file diff --git a/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/dto/VKUsersDTO.java b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/dto/VKUsersDTO.java new file mode 100644 index 0000000..045ca68 --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/dto/VKUsersDTO.java @@ -0,0 +1,35 @@ +package com.example.vkUsers.dto; + +import lombok.Data; + +@Data +public class VKUsersDTO { + private String url; + private String name; + private String photoUrl; + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhotoUrl() { + return photoUrl; + } + + public void setPhotoUrl(String photoUrl) { + this.photoUrl = photoUrl; + } +} + diff --git a/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/dto/VKUsersDetailDTO.java b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/dto/VKUsersDetailDTO.java new file mode 100644 index 0000000..53a66c7 --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/dto/VKUsersDetailDTO.java @@ -0,0 +1,44 @@ +package com.example.vkUsers.dto; + +import lombok.Data; + +@Data +public class VKUsersDetailDTO { + private String url; + private String name; + private String photoUrl; + private VKUsersDetailInfoDTO photoInfo; + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhotoUrl() { + return photoUrl; + } + + public void setPhotoUrl(String photoUrl) { + this.photoUrl = photoUrl; + } + + public VKUsersDetailInfoDTO getPhotoInfo() { + return photoInfo; + } + + public void setPhotoInfo(VKUsersDetailInfoDTO photoInfo) { + this.photoInfo = photoInfo; + } +} + diff --git a/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/dto/VKUsersDetailInfoDTO.java b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/dto/VKUsersDetailInfoDTO.java new file mode 100644 index 0000000..d4c3f6f --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/dto/VKUsersDetailInfoDTO.java @@ -0,0 +1,10 @@ +package com.example.vkUsers.dto; + +import lombok.Data; + +@Data +public class VKUsersDetailInfoDTO { + private String url; + private String text; +} + diff --git a/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/model/VKUsers.java b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/model/VKUsers.java new file mode 100644 index 0000000..ab0b93a --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/model/VKUsers.java @@ -0,0 +1,43 @@ +package com.example.vkUsers.model; + +import lombok.Data; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; + +@Entity +@Data +public class VKUsers { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + private String url; + private String name; + private String photoUrl; + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhotoUrl() { + return photoUrl; + } + + public void setPhotoUrl(String photoUrl) { + this.photoUrl = photoUrl; + } +} + diff --git a/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/nginx.conf b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/nginx.conf new file mode 100644 index 0000000..a5b91f2 --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/nginx.conf @@ -0,0 +1,19 @@ +events { + worker_connections 1024; +} + +http { + server { + listen 80; + listen [::]:80; + server_name localhost; + + location /vkImages/ { + proxy_pass http://vkImages:8099; + } + + location /vkUsers/ { + proxy_pass http://vkUsers:8090; + } + } +} \ No newline at end of file diff --git a/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/repository/VKUsersRepository.java b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/repository/VKUsersRepository.java new file mode 100644 index 0000000..7a358d3 --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/repository/VKUsersRepository.java @@ -0,0 +1,10 @@ +package com.example.vkUsers.repository; + +import com.example.vkUsers.model.VKUsers; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface VKUsersRepository extends JpaRepository { + VKUsers findByUrl(String url); +} diff --git a/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/service/VKUsersService.java b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/service/VKUsersService.java new file mode 100644 index 0000000..0ba7885 --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/src/main/java/com/example/vkUsers/service/VKUsersService.java @@ -0,0 +1,100 @@ +package com.example.vkUsers.service; + +import com.example.vkUsers.dto.VKUsersDTO; +import com.example.vkUsers.dto.VKUsersDetailDTO; +import com.example.vkUsers.dto.VKUsersDetailInfoDTO; +import com.example.vkUsers.model.VKUsers; +import com.example.vkUsers.repository.VKUsersRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class VKUsersService { + private final VKUsersRepository VKUsersRepository; + private final RestTemplate restTemplate; + + @Autowired + public VKUsersService(VKUsersRepository VKUsersRepository, RestTemplate restTemplate) { + this.VKUsersRepository = VKUsersRepository; + this.restTemplate = restTemplate; + } + + public List getAllVKUsers() { + List VKUsers = VKUsersRepository.findAll(); + return VKUsers.stream() + .map(this::convertToVKUsersDTO) + .collect(Collectors.toList()); + } + + public VKUsersDetailDTO getVKUsersByUrl(String url) { + VKUsers VKUsers = VKUsersRepository.findByUrl(url); + if (VKUsers != null) { + return convertToVKUsersDetailDTO(VKUsers); + } + return null; + } + + public VKUsersDetailDTO createVKUsers(VKUsersDTO createDTO) { + VKUsers VKUsers = new VKUsers(); + updateVKUsersFromDTO(VKUsers, createDTO); + VKUsers = VKUsersRepository.save(VKUsers); + return convertToVKUsersDetailDTO(VKUsers); + } + + public VKUsersDetailDTO updateVKUsers(String url, VKUsersDTO updateDTO) { + VKUsers VKUsers = VKUsersRepository.findByUrl(url); + if (VKUsers != null) { + updateVKUsersFromDTO(VKUsers, updateDTO); + VKUsers = VKUsersRepository.save(VKUsers); + return convertToVKUsersDetailDTO(VKUsers); + } + return null; + } + + public boolean deleteVKUsers(String url) { + VKUsers VKUsers = VKUsersRepository.findByUrl(url); + if (VKUsers != null) { + VKUsersRepository.delete(VKUsers); + return true; + } + return false; + } + + private VKUsersDTO convertToVKUsersDTO(VKUsers VKUsers) { + VKUsersDTO dto = new VKUsersDTO(); + dto.setUrl(VKUsers.getUrl()); + dto.setName(VKUsers.getName()); + dto.setPhotoUrl(VKUsers.getPhotoUrl()); + return dto; + } + + private VKUsersDetailDTO convertToVKUsersDetailDTO(VKUsers VKUsers) { + VKUsersDetailDTO detailDTO = new VKUsersDetailDTO(); + detailDTO.setName(VKUsers.getName()); + detailDTO.setUrl(VKUsers.getUrl()); + detailDTO.setPhotoUrl(VKUsers.getPhotoUrl()); + + + VKUsersDetailInfoDTO photoInfo = getPhotoInfo(VKUsers.getPhotoUrl()); + detailDTO.setPhotoInfo(photoInfo); + + return detailDTO; + } + + private void updateVKUsersFromDTO(VKUsers VKUsers, VKUsersDTO dto) { + VKUsers.setName(dto.getName()); + VKUsers.setUrl(dto.getUrl()); + VKUsers.setPhotoUrl(dto.getPhotoUrl()); + } + + + private VKUsersDetailInfoDTO getPhotoInfo(String photoUrl) { + String photoInfoUrl = "http://nginx/vkImages/" + photoUrl; + return restTemplate.getForObject(photoInfoUrl, VKUsersDetailInfoDTO.class); + } +} + diff --git a/gusev_vladislav_lab_3/VKUsers/src/main/resources/application.properties b/gusev_vladislav_lab_3/VKUsers/src/main/resources/application.properties new file mode 100644 index 0000000..b00d2a6 --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/src/main/resources/application.properties @@ -0,0 +1,9 @@ +spring.datasource.url=jdbc:h2:mem:testdb +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.username=sa +spring.datasource.password=password +spring.jpa.hibernate.ddl-auto=update +spring.h2.console.enabled=true + +server.port=8090 + diff --git a/gusev_vladislav_lab_3/VKUsers/src/test/java/com/example/vkUsers/VKUsersApplicationTests.java b/gusev_vladislav_lab_3/VKUsers/src/test/java/com/example/vkUsers/VKUsersApplicationTests.java new file mode 100644 index 0000000..6c67773 --- /dev/null +++ b/gusev_vladislav_lab_3/VKUsers/src/test/java/com/example/vkUsers/VKUsersApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.vkUsers; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class VKUsersApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/gusev_vladislav_lab_3/images/img.png b/gusev_vladislav_lab_3/images/img.png new file mode 100644 index 0000000..63fa916 Binary files /dev/null and b/gusev_vladislav_lab_3/images/img.png differ diff --git a/gusev_vladislav_lab_3/images/img_1.png b/gusev_vladislav_lab_3/images/img_1.png new file mode 100644 index 0000000..7f9510e Binary files /dev/null and b/gusev_vladislav_lab_3/images/img_1.png differ diff --git a/gusev_vladislav_lab_3/images/img_2.png b/gusev_vladislav_lab_3/images/img_2.png new file mode 100644 index 0000000..5288418 Binary files /dev/null and b/gusev_vladislav_lab_3/images/img_2.png differ diff --git a/gusev_vladislav_lab_3/images/img_3.png b/gusev_vladislav_lab_3/images/img_3.png new file mode 100644 index 0000000..4d5f821 Binary files /dev/null and b/gusev_vladislav_lab_3/images/img_3.png differ diff --git a/gusev_vladislav_lab_3/images/img_4.png b/gusev_vladislav_lab_3/images/img_4.png new file mode 100644 index 0000000..990f7e6 Binary files /dev/null and b/gusev_vladislav_lab_3/images/img_4.png differ diff --git a/gusev_vladislav_lab_3/images/img_5.png b/gusev_vladislav_lab_3/images/img_5.png new file mode 100644 index 0000000..9d48544 Binary files /dev/null and b/gusev_vladislav_lab_3/images/img_5.png differ diff --git a/gusev_vladislav_lab_3/images/img_6.png b/gusev_vladislav_lab_3/images/img_6.png new file mode 100644 index 0000000..eddd4a6 Binary files /dev/null and b/gusev_vladislav_lab_3/images/img_6.png differ diff --git a/gusev_vladislav_lab_3/images/img_7.png b/gusev_vladislav_lab_3/images/img_7.png new file mode 100644 index 0000000..754855e Binary files /dev/null and b/gusev_vladislav_lab_3/images/img_7.png differ diff --git a/gusev_vladislav_lab_3/images/img_8.png b/gusev_vladislav_lab_3/images/img_8.png new file mode 100644 index 0000000..294f2e2 Binary files /dev/null and b/gusev_vladislav_lab_3/images/img_8.png differ