From a939a843079e8fde6fcd105e2436a13a781b9ee2 Mon Sep 17 00:00:00 2001 From: dmitry Date: Thu, 7 Nov 2024 02:52:34 +0400 Subject: [PATCH] afanasev_dmitry_lab_3 is ready --- afanasev_dmitry_lab_3/README.md | 41 +++ afanasev_dmitry_lab_3/docker-compose.yml | 25 ++ afanasev_dmitry_lab_3/melon/.gitattributes | 2 + afanasev_dmitry_lab_3/melon/.gitignore | 33 +++ .../.mvn/wrapper/maven-wrapper.properties | 19 ++ afanasev_dmitry_lab_3/melon/Dockerfile | 4 + afanasev_dmitry_lab_3/melon/mvnw | 259 ++++++++++++++++++ afanasev_dmitry_lab_3/melon/mvnw.cmd | 149 ++++++++++ afanasev_dmitry_lab_3/melon/pom.xml | 71 +++++ .../java/ru/ulstu/melon/MelonApplication.java | 13 + .../melon/config/RestTemplateConfig.java | 13 + .../melon/controller/MelonController.java | 54 ++++ .../ru/ulstu/melon/dto/CreateMelonDto.java | 14 + .../java/ru/ulstu/melon/dto/MelonDto.java | 28 ++ .../ru/ulstu/melon/dto/UpdateMelonDto.java | 11 + .../java/ru/ulstu/melon/dto/WaterDto.java | 23 ++ .../main/java/ru/ulstu/melon/model/Melon.java | 19 ++ .../main/java/ru/ulstu/melon/model/Water.java | 18 ++ .../ru/ulstu/melon/service/MelonService.java | 88 ++++++ .../src/main/resources/application.properties | 1 + .../ru/ulstu/melon/MelonApplicationTests.java | 13 + afanasev_dmitry_lab_3/nginx.conf | 19 ++ afanasev_dmitry_lab_3/water/.gitattributes | 2 + afanasev_dmitry_lab_3/water/.gitignore | 33 +++ .../.mvn/wrapper/maven-wrapper.properties | 19 ++ afanasev_dmitry_lab_3/water/Dockerfile | 4 + afanasev_dmitry_lab_3/water/mvnw | 259 ++++++++++++++++++ afanasev_dmitry_lab_3/water/mvnw.cmd | 149 ++++++++++ afanasev_dmitry_lab_3/water/pom.xml | 71 +++++ .../java/ru/ulstu/water/WaterApplication.java | 13 + .../water/controller/WaterController.java | 58 ++++ .../java/ru/ulstu/water/dto/WaterDto.java | 11 + .../main/java/ru/ulstu/water/model/Melon.java | 19 ++ .../main/java/ru/ulstu/water/model/Water.java | 20 ++ .../ru/ulstu/water/service/WaterService.java | 64 +++++ .../src/main/resources/application.properties | 2 + .../ru/ulstu/water/WaterApplicationTests.java | 13 + 37 files changed, 1654 insertions(+) create mode 100644 afanasev_dmitry_lab_3/README.md create mode 100644 afanasev_dmitry_lab_3/docker-compose.yml create mode 100644 afanasev_dmitry_lab_3/melon/.gitattributes create mode 100644 afanasev_dmitry_lab_3/melon/.gitignore create mode 100644 afanasev_dmitry_lab_3/melon/.mvn/wrapper/maven-wrapper.properties create mode 100644 afanasev_dmitry_lab_3/melon/Dockerfile create mode 100644 afanasev_dmitry_lab_3/melon/mvnw create mode 100644 afanasev_dmitry_lab_3/melon/mvnw.cmd create mode 100644 afanasev_dmitry_lab_3/melon/pom.xml create mode 100644 afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/MelonApplication.java create mode 100644 afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/config/RestTemplateConfig.java create mode 100644 afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/controller/MelonController.java create mode 100644 afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/CreateMelonDto.java create mode 100644 afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/MelonDto.java create mode 100644 afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/UpdateMelonDto.java create mode 100644 afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/WaterDto.java create mode 100644 afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/model/Melon.java create mode 100644 afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/model/Water.java create mode 100644 afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/service/MelonService.java create mode 100644 afanasev_dmitry_lab_3/melon/src/main/resources/application.properties create mode 100644 afanasev_dmitry_lab_3/melon/src/test/java/ru/ulstu/melon/MelonApplicationTests.java create mode 100644 afanasev_dmitry_lab_3/nginx.conf create mode 100644 afanasev_dmitry_lab_3/water/.gitattributes create mode 100644 afanasev_dmitry_lab_3/water/.gitignore create mode 100644 afanasev_dmitry_lab_3/water/.mvn/wrapper/maven-wrapper.properties create mode 100644 afanasev_dmitry_lab_3/water/Dockerfile create mode 100644 afanasev_dmitry_lab_3/water/mvnw create mode 100644 afanasev_dmitry_lab_3/water/mvnw.cmd create mode 100644 afanasev_dmitry_lab_3/water/pom.xml create mode 100644 afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/WaterApplication.java create mode 100644 afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/controller/WaterController.java create mode 100644 afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/dto/WaterDto.java create mode 100644 afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/model/Melon.java create mode 100644 afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/model/Water.java create mode 100644 afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/service/WaterService.java create mode 100644 afanasev_dmitry_lab_3/water/src/main/resources/application.properties create mode 100644 afanasev_dmitry_lab_3/water/src/test/java/ru/ulstu/water/WaterApplicationTests.java diff --git a/afanasev_dmitry_lab_3/README.md b/afanasev_dmitry_lab_3/README.md new file mode 100644 index 0000000..c0199a0 --- /dev/null +++ b/afanasev_dmitry_lab_3/README.md @@ -0,0 +1,41 @@ +# Лабораторная работа 3 + +## Описание +Данная лабораторная работа предназначена для настройки 3 сервисов — **Melon**, **Water** и прокси-сервер **Nginx** — с использованием Docker Compose. **Melon** — сервис с дынями, где для каждого свой арбуз, а **Water** — сервис с водой и связанных с ними арбузами. **Nginx** — прокси-сервер, работающий на Unix-подобных операционных системах. + +## Запуск проекта +1. Убедитесь, что у вас установлены **Docker** и **Docker Compose**. +2. Клонируйте репозиторий с данным проектом. +3. В командной строке перейдите в директорию с файлом `docker-compose.yml`. +4. Запустите команды: + ```bash + docker-compose up -d + ``` + Эта команда запустит контейнеры в фоновом режиме. +5. После запуска: + - Melon будет доступен по адресу: [http://localhost:8080](http://localhost:8080) + - Water будет доступен по адресу: [http://localhost:8081](http://localhost:8081) + +## Конфигурация +В файле `docker-compose.yml` определены следующие сервисы: +- **Melon**: + - Настроен на порту 8080 для веб-доступа. + - Обращается к **Nginx** для доступа к сервису **Water**. + - Реализует базовые CRUD-операции. +- **Water**: + - Настроен на порту 8081 для веб-доступа. + - Реализует базовые CRUD-операции. +- **Nginx**: + - Запускается из образа `nginx`. + - Используется для проксирования запросов. + +## Остановка проекта +Для остановки контейнеров запустите: +```bash +docker-compose down +``` +Это завершит работу всех контейнеров и освободит порты. + +## Примечания +- При необходимости вы можете изменить порты или другие параметры, отредактировав файл `docker-compose.yml`. +- Ссылка на демонстрацию работы программы: https://vk.com/video215756667_456239453?list=ln-6zVfNOSwMQtpVWKkGe \ No newline at end of file diff --git a/afanasev_dmitry_lab_3/docker-compose.yml b/afanasev_dmitry_lab_3/docker-compose.yml new file mode 100644 index 0000000..64248ea --- /dev/null +++ b/afanasev_dmitry_lab_3/docker-compose.yml @@ -0,0 +1,25 @@ +version: '3.9' +services: + melon: + build: ./melon + ports: + - "8080:8080" + expose: # Указывает, какой порт будет открыт внутри контейнера + - 8080 + + water: + build: ./water + ports: + - "8081:8081" + expose: # Указывает, какой порт будет открыт внутри контейнера + - 8081 + + nginx: + image: nginx + ports: + - "80:80" + volumes: + - ./nginx.conf:/etc/nginx/nginx.conf + depends_on: + - melon + - water \ No newline at end of file diff --git a/afanasev_dmitry_lab_3/melon/.gitattributes b/afanasev_dmitry_lab_3/melon/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/afanasev_dmitry_lab_3/melon/.gitignore b/afanasev_dmitry_lab_3/melon/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/.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/afanasev_dmitry_lab_3/melon/.mvn/wrapper/maven-wrapper.properties b/afanasev_dmitry_lab_3/melon/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d58dfb7 --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/afanasev_dmitry_lab_3/melon/Dockerfile b/afanasev_dmitry_lab_3/melon/Dockerfile new file mode 100644 index 0000000..18a11f9 --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/Dockerfile @@ -0,0 +1,4 @@ +FROM bellsoft/liberica-openjdk-alpine:17.0.8 +ADD target/melon-0.0.1-SNAPSHOT.jar /app/ +CMD ["java", "-Xmx200m", "-jar", "/app/melon-0.0.1-SNAPSHOT.jar"] +WORKDIR /app \ No newline at end of file diff --git a/afanasev_dmitry_lab_3/melon/mvnw b/afanasev_dmitry_lab_3/melon/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/mvnw @@ -0,0 +1,259 @@ +#!/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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/afanasev_dmitry_lab_3/melon/mvnw.cmd b/afanasev_dmitry_lab_3/melon/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/afanasev_dmitry_lab_3/melon/pom.xml b/afanasev_dmitry_lab_3/melon/pom.xml new file mode 100644 index 0000000..b91c076 --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/pom.xml @@ -0,0 +1,71 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.5 + + + ru.ulstu + melon + 0.0.1-SNAPSHOT + melon + Demo project for Spring Boot + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-web + + + org.projectlombok + lombok + true + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.5.0 + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/MelonApplication.java b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/MelonApplication.java new file mode 100644 index 0000000..35ab518 --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/MelonApplication.java @@ -0,0 +1,13 @@ +package ru.ulstu.melon; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class MelonApplication { + + public static void main(String[] args) { + SpringApplication.run(MelonApplication.class, args); + } + +} diff --git a/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/config/RestTemplateConfig.java b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/config/RestTemplateConfig.java new file mode 100644 index 0000000..86dcbff --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/config/RestTemplateConfig.java @@ -0,0 +1,13 @@ +package ru.ulstu.melon.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestTemplate; + +@Configuration +public class RestTemplateConfig { + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } +} diff --git a/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/controller/MelonController.java b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/controller/MelonController.java new file mode 100644 index 0000000..630fddc --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/controller/MelonController.java @@ -0,0 +1,54 @@ +package ru.ulstu.melon.controller; + +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import ru.ulstu.melon.dto.CreateMelonDto; +import ru.ulstu.melon.dto.MelonDto; +import ru.ulstu.melon.dto.UpdateMelonDto; +import ru.ulstu.melon.model.Melon; +import ru.ulstu.melon.service.MelonService; + +import java.util.Collection; +import java.util.UUID; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/melon") +public class MelonController { + private final MelonService melonService; + + @GetMapping + public ResponseEntity> get() { + return new ResponseEntity<>(melonService.get(), HttpStatus.OK); + } + + @GetMapping("/{id}") + public ResponseEntity get(@PathVariable UUID id) { + return new ResponseEntity<>(melonService.get(id), HttpStatus.OK); + } + + @PostMapping + public ResponseEntity add(@RequestBody CreateMelonDto dto) { + return new ResponseEntity<>(melonService.add(dto), HttpStatus.OK); + } + + @PutMapping("/{id}") + public ResponseEntity update(@PathVariable UUID id, @RequestBody UpdateMelonDto dto) { + return new ResponseEntity<>(melonService.update(id, dto), HttpStatus.OK); + } + + @DeleteMapping("/{id}") + public ResponseEntity delete(@PathVariable UUID id) { + melonService.delete(id); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/CreateMelonDto.java b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/CreateMelonDto.java new file mode 100644 index 0000000..b7081fa --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/CreateMelonDto.java @@ -0,0 +1,14 @@ +package ru.ulstu.melon.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.UUID; + +@AllArgsConstructor +@Getter +public class CreateMelonDto { + private Boolean isRipe; + private Double weight; + private UUID waterMelonId; +} diff --git a/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/MelonDto.java b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/MelonDto.java new file mode 100644 index 0000000..d1da480 --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/MelonDto.java @@ -0,0 +1,28 @@ +package ru.ulstu.melon.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import ru.ulstu.melon.model.Melon; +import ru.ulstu.melon.model.Water; + +import java.util.UUID; + +@AllArgsConstructor +@Getter +@Setter +public class MelonDto { + private UUID id; + private Boolean isRipe; + private Double weight; + private UUID waterMelonId; + private WaterDto waterMelon; + + public MelonDto(Melon melon, Water water) { + this.id = melon.getId(); + this.isRipe = melon.getIsRipe(); + this.weight = melon.getWeight(); + this.waterMelonId = melon.getWaterMelonId(); + this.waterMelon = new WaterDto(water); + } +} diff --git a/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/UpdateMelonDto.java b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/UpdateMelonDto.java new file mode 100644 index 0000000..8001dc1 --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/UpdateMelonDto.java @@ -0,0 +1,11 @@ +package ru.ulstu.melon.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public class UpdateMelonDto { + private Boolean isRipe; + private Double weight; +} diff --git a/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/WaterDto.java b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/WaterDto.java new file mode 100644 index 0000000..db4e7b6 --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/dto/WaterDto.java @@ -0,0 +1,23 @@ +package ru.ulstu.melon.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import ru.ulstu.melon.model.Water; + +import java.util.UUID; + +@Getter +@Setter +@AllArgsConstructor +public class WaterDto { + private UUID id; + private Boolean isSweetBottom; + private Double volume; + + public WaterDto(Water water) { + this.id = water.getId(); + this.isSweetBottom = water.getIsSweetBottom(); + this.volume = water.getVolume(); + } +} diff --git a/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/model/Melon.java b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/model/Melon.java new file mode 100644 index 0000000..4f5390b --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/model/Melon.java @@ -0,0 +1,19 @@ +package ru.ulstu.melon.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.util.UUID; + +@AllArgsConstructor +@NoArgsConstructor +@Getter +@Setter +public class Melon { + private UUID id; + private Boolean isRipe; + private Double weight; + private UUID waterMelonId; +} diff --git a/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/model/Water.java b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/model/Water.java new file mode 100644 index 0000000..73ecbc4 --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/model/Water.java @@ -0,0 +1,18 @@ +package ru.ulstu.melon.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.List; +import java.util.UUID; + +@AllArgsConstructor +@NoArgsConstructor +@Getter +public class Water { + private UUID id; + private Boolean isSweetBottom; + private Double volume; + private List waterMelons; +} diff --git a/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/service/MelonService.java b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/service/MelonService.java new file mode 100644 index 0000000..30dd2b9 --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/src/main/java/ru/ulstu/melon/service/MelonService.java @@ -0,0 +1,88 @@ +package ru.ulstu.melon.service; + +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestClientException; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.server.ResponseStatusException; +import ru.ulstu.melon.dto.CreateMelonDto; +import ru.ulstu.melon.dto.MelonDto; +import ru.ulstu.melon.dto.UpdateMelonDto; +import ru.ulstu.melon.model.Melon; +import ru.ulstu.melon.model.Water; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +@Service +@RequiredArgsConstructor +public class MelonService { + private final Map melons = new HashMap<>(); + private final RestTemplate restTemplate; + private static final String WATER_SERVICE_PATH = "http://nginx/water/water/"; + + public Collection get() { + return melons.values(); + } + + public MelonDto get(UUID id) { + if (!melons.containsKey(id)) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Melon not found"); + } + final Melon melon = melons.get(id); + return new MelonDto(melon, getWater(melon.getWaterMelonId())); + } + + public MelonDto add(CreateMelonDto dto) { + Melon melon = new Melon(UUID.randomUUID(), + dto.getIsRipe(), + dto.getWeight(), + dto.getWaterMelonId()); + melons.put(melon.getId(), melon); + Water water; + try { + String baseUrl = WATER_SERVICE_PATH + melon.getWaterMelonId() + "/addMelon"; + water = restTemplate.postForObject( + baseUrl, + melon, + Water.class + ); + } catch (RestClientException e) { + throw new RuntimeException("Failed to add melon to waterMelons: " + e.getMessage(), e); + } + return new MelonDto(melon, water); + } + + public MelonDto update(UUID id, UpdateMelonDto dto) { + if (!melons.containsKey(id)) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Melon not found"); + } + Melon melon = melons.get(id); + if (dto.getWeight() != null) + melon.setWeight(dto.getWeight()); + if (dto.getIsRipe() != null) + melon.setIsRipe(dto.getIsRipe()); + return new MelonDto(melon, getWater(melon.getWaterMelonId())); + } + + public void delete(UUID id) { + if (!melons.containsKey(id)) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Melon not found"); + } + melons.remove(id); + } + + private Water getWater(UUID id) { + Water water; + try { + String baseUrl = WATER_SERVICE_PATH + id; + water = restTemplate.getForEntity(baseUrl, Water.class).getBody(); + } catch (RestClientException e) { + throw new RuntimeException("Failed get waterMelon for melon: " + e.getMessage()); + } + return water; + } +} diff --git a/afanasev_dmitry_lab_3/melon/src/main/resources/application.properties b/afanasev_dmitry_lab_3/melon/src/main/resources/application.properties new file mode 100644 index 0000000..0d4dd41 --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=melon diff --git a/afanasev_dmitry_lab_3/melon/src/test/java/ru/ulstu/melon/MelonApplicationTests.java b/afanasev_dmitry_lab_3/melon/src/test/java/ru/ulstu/melon/MelonApplicationTests.java new file mode 100644 index 0000000..8d4d546 --- /dev/null +++ b/afanasev_dmitry_lab_3/melon/src/test/java/ru/ulstu/melon/MelonApplicationTests.java @@ -0,0 +1,13 @@ +package ru.ulstu.melon; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class MelonApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/afanasev_dmitry_lab_3/nginx.conf b/afanasev_dmitry_lab_3/nginx.conf new file mode 100644 index 0000000..957a6c2 --- /dev/null +++ b/afanasev_dmitry_lab_3/nginx.conf @@ -0,0 +1,19 @@ +events { + worker_connections 1024; +} + +http { + server { + listen 80; + listen [::]:80; + server_name localhost; + + location /melon/ { + proxy_pass http://melon:8080/; + } + + location /water/ { + proxy_pass http://water:8081/; + } + } +} \ No newline at end of file diff --git a/afanasev_dmitry_lab_3/water/.gitattributes b/afanasev_dmitry_lab_3/water/.gitattributes new file mode 100644 index 0000000..3b41682 --- /dev/null +++ b/afanasev_dmitry_lab_3/water/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/afanasev_dmitry_lab_3/water/.gitignore b/afanasev_dmitry_lab_3/water/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/afanasev_dmitry_lab_3/water/.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/afanasev_dmitry_lab_3/water/.mvn/wrapper/maven-wrapper.properties b/afanasev_dmitry_lab_3/water/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..d58dfb7 --- /dev/null +++ b/afanasev_dmitry_lab_3/water/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/afanasev_dmitry_lab_3/water/Dockerfile b/afanasev_dmitry_lab_3/water/Dockerfile new file mode 100644 index 0000000..1b9cebb --- /dev/null +++ b/afanasev_dmitry_lab_3/water/Dockerfile @@ -0,0 +1,4 @@ +FROM bellsoft/liberica-openjdk-alpine:17.0.8 +ADD target/water-0.0.1-SNAPSHOT.jar /app/ +CMD ["java", "-Xmx200m", "-jar", "/app/water-0.0.1-SNAPSHOT.jar"] +WORKDIR /app \ No newline at end of file diff --git a/afanasev_dmitry_lab_3/water/mvnw b/afanasev_dmitry_lab_3/water/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/afanasev_dmitry_lab_3/water/mvnw @@ -0,0 +1,259 @@ +#!/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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/afanasev_dmitry_lab_3/water/mvnw.cmd b/afanasev_dmitry_lab_3/water/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/afanasev_dmitry_lab_3/water/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/afanasev_dmitry_lab_3/water/pom.xml b/afanasev_dmitry_lab_3/water/pom.xml new file mode 100644 index 0000000..61f76ae --- /dev/null +++ b/afanasev_dmitry_lab_3/water/pom.xml @@ -0,0 +1,71 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.5 + + + ru.ulstu + water + 0.0.1-SNAPSHOT + water + Demo project for Spring Boot + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-web + + + org.projectlombok + lombok + true + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.5.0 + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + + + diff --git a/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/WaterApplication.java b/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/WaterApplication.java new file mode 100644 index 0000000..6e95500 --- /dev/null +++ b/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/WaterApplication.java @@ -0,0 +1,13 @@ +package ru.ulstu.water; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class WaterApplication { + + public static void main(String[] args) { + SpringApplication.run(WaterApplication.class, args); + } + +} diff --git a/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/controller/WaterController.java b/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/controller/WaterController.java new file mode 100644 index 0000000..29a5487 --- /dev/null +++ b/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/controller/WaterController.java @@ -0,0 +1,58 @@ +package ru.ulstu.water.controller; + +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import ru.ulstu.water.dto.WaterDto; +import ru.ulstu.water.model.Melon; +import ru.ulstu.water.model.Water; +import ru.ulstu.water.service.WaterService; + +import java.util.Collection; +import java.util.UUID; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/water") +public class WaterController { + private final WaterService waterService; + + @GetMapping + public ResponseEntity> get() { + return new ResponseEntity<>(waterService.get(), HttpStatus.OK); + } + + @GetMapping("/{id}") + public ResponseEntity get(@PathVariable UUID id) { + return new ResponseEntity<>(waterService.get(id), HttpStatus.OK); + } + + @PostMapping + public ResponseEntity add(@RequestBody WaterDto dto) { + return new ResponseEntity<>(waterService.add(dto), HttpStatus.OK); + } + + @PutMapping("/{id}") + public ResponseEntity update(@PathVariable UUID id, @RequestBody WaterDto dto) { + return new ResponseEntity<>(waterService.update(id, dto), HttpStatus.OK); + } + + @DeleteMapping("/{id}") + public ResponseEntity delete(@PathVariable UUID id) { + waterService.delete(id); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/{id}/addMelon") + public ResponseEntity addMelon(@PathVariable UUID id, @RequestBody Melon melon) { + return new ResponseEntity<>(waterService.addMelon(id, melon), HttpStatus.OK); + } +} diff --git a/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/dto/WaterDto.java b/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/dto/WaterDto.java new file mode 100644 index 0000000..0bc7dbf --- /dev/null +++ b/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/dto/WaterDto.java @@ -0,0 +1,11 @@ +package ru.ulstu.water.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public class WaterDto { + private Boolean isSweetBottom; + private Double volume; +} diff --git a/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/model/Melon.java b/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/model/Melon.java new file mode 100644 index 0000000..910e66a --- /dev/null +++ b/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/model/Melon.java @@ -0,0 +1,19 @@ +package ru.ulstu.water.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.util.UUID; + +@AllArgsConstructor +@NoArgsConstructor +@Getter +@Setter +public class Melon { + private UUID id; + private Boolean isRipe; + private Double weight; + private UUID waterMelonId; +} diff --git a/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/model/Water.java b/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/model/Water.java new file mode 100644 index 0000000..ced9cc6 --- /dev/null +++ b/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/model/Water.java @@ -0,0 +1,20 @@ +package ru.ulstu.water.model; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.util.List; +import java.util.UUID; + +@AllArgsConstructor +@NoArgsConstructor +@Getter +@Setter +public class Water { + private UUID id; + private Boolean isSweetBottom; + private Double volume; + private List waterMelons; +} diff --git a/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/service/WaterService.java b/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/service/WaterService.java new file mode 100644 index 0000000..ab5e14f --- /dev/null +++ b/afanasev_dmitry_lab_3/water/src/main/java/ru/ulstu/water/service/WaterService.java @@ -0,0 +1,64 @@ +package ru.ulstu.water.service; + +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; +import org.springframework.web.server.ResponseStatusException; +import ru.ulstu.water.dto.WaterDto; +import ru.ulstu.water.model.Melon; +import ru.ulstu.water.model.Water; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +@Service +public class WaterService { + private final Map waters = new HashMap<>(); + + public Collection get() { + return waters.values(); + } + + public Water get(UUID id) { + if (!waters.containsKey(id)) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Water not found"); + } + return waters.get(id); + } + + public Water add(WaterDto dto) { + Water water = new Water(UUID.randomUUID(), + dto.getIsSweetBottom(), + dto.getVolume(), + new ArrayList<>()); + waters.put(water.getId(), water); + return water; + } + + public Water update(UUID id, WaterDto dto) { + Water water = waters.get(id); + if (dto.getIsSweetBottom() != null) + water.setIsSweetBottom(dto.getIsSweetBottom()); + if (dto.getVolume() != null) + water.setVolume(dto.getVolume()); + return water; + } + + public void delete(UUID id) { + if (!waters.containsKey(id)) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Water not found"); + } + waters.remove(id); + } + + public Water addMelon(UUID id, Melon melon) { + if (!waters.containsKey(id)) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Water not found"); + } + final Water water = waters.get(id); + water.getWaterMelons().add(melon); + return water; + } +} diff --git a/afanasev_dmitry_lab_3/water/src/main/resources/application.properties b/afanasev_dmitry_lab_3/water/src/main/resources/application.properties new file mode 100644 index 0000000..81f6cca --- /dev/null +++ b/afanasev_dmitry_lab_3/water/src/main/resources/application.properties @@ -0,0 +1,2 @@ +spring.application.name=water +server.port=8081 diff --git a/afanasev_dmitry_lab_3/water/src/test/java/ru/ulstu/water/WaterApplicationTests.java b/afanasev_dmitry_lab_3/water/src/test/java/ru/ulstu/water/WaterApplicationTests.java new file mode 100644 index 0000000..4d99cec --- /dev/null +++ b/afanasev_dmitry_lab_3/water/src/test/java/ru/ulstu/water/WaterApplicationTests.java @@ -0,0 +1,13 @@ +package ru.ulstu.water; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class WaterApplicationTests { + + @Test + void contextLoads() { + } + +}