belyaeva_ekaterina_lab_1/README.md

@@ -1,60 +0,0 @@
-# Лабораторная работа №1
-
-## Задание
-
-Цель: изучение современных технологий контейнеризации.
-
-Задачи:
-
-- Установить средство контейнеризации docker.
-- Изучить применение и принципы docker.
-- Изучить утилиту docker-compose и структуру файла docker-compose.yml.
-- Развернуть не менее 3х различных сервисов при помощи docker-compose.
-- Оформить отчёт в формате Markdown и создать Pull Request в git-репозитории.
-
-## Ход работы
-
-### Разворачивание сервисов
-
-Были выбраны три сервиса:
-
-- mediawiki 
-- drupal 
-- wordpress 
-
-### docker-compose.yml
-Был создан файл docker-compose.yml для разворачивания сервисов:
-
-```
-version: '3'
-services:
-mediawiki:
-image: mediawiki
-ports:
-- 8080:80
-volumes:
-- mediawiki_data:/var/www/html/images
-
-drupal:
-image: drupal
-ports:
-- 3000:80
-volumes:
-- drupal_data:/var/www/html/sites/default/files
-
-wordpress:
-image: wordpress
-ports:
-- 8000:80
-volumes:
-- wordpress_data:/var/www/html/wp-content
-
-volumes:
-mediawiki_data:
-drupal_data:
-wordpress_data:
-```
-
-Для каждого сервиса присутствует проброс портов, образ и хотя бы один volume.
-
-Работоспособность показана в видео: [lab1.mp4](lab1.mp4)

belyaeva_ekaterina_lab_1/docker-compose.yml

@@ -1,27 +0,0 @@
-version: '3'
-services:
-  mediawiki:
-    image: mediawiki
-    ports:
-      - 8080:80
-    volumes:
-      - mediawiki_data:/var/www/html/images
-
-  drupal:
-    image: drupal
-    ports:
-      - 3000:80
-    volumes:
-      - drupal_data:/var/www/html/sites/default/files
-
-  wordpress:
-    image: wordpress
-    ports:
-      - 8000:80
-    volumes:
-      - wordpress_data:/var/www/html/wp-content
-
-volumes:
-  mediawiki_data:
-  drupal_data:
-  wordpress_data:

belyaeva_ekaterina_lab_3/README.md

@@ -1,112 +0,0 @@
-# Лабораторная работа №3
-
-## Задание
-
-Цель: изучение шаблона проектирования gateway, построения синхронного обмена между микросервисами и архитектурного стиля RESTful API.
-
-Задачи:
-
-- Создать 2 микросервиса, реализующих CRUD на связанных сущностях.
-- Реализовать механизм синхронного обмена сообщениями между микросервисами.
-- Реализовать шлюз на основе прозрачного прокси-сервера nginx.
-
-## Ход работы
-
-### Разворачивание сервисов:
-
-Были разработаны два приложения на Java с использованием средства автоматизации сборки проектов Gradle и с использованием библиотеки spring-boot:
-
-- disciplineService - работа с дисциплинами (crud)
-- learningPlanService - работа с планами обучения (crud). При создании плана обучения выбирается id дисциплины, и через nginx и rest template происходит получение данных о дисциплины с этим id
-
-### Обмен сообщениями
-При создании плана обучения выбирается id дисциплины, и через nginx и rest template происходит получение данных о дисциплины с этим id
-
-![img.png](img.png)
-
-### Dockerfile
-Идентичные докерфайлы для приложений:
-```
-FROM openjdk:17
-RUN mkdir -p /usr/src/app/ 
-WORKDIR /usr/src/app/ 
-COPY . /usr/src/app/ 
-RUN ./gradlew clean build 
-EXPOSE 8089 
-ENTRYPOINT ["java","-jar","build/libs/lab3-0.0.1-SNAPSHOT.jar"]
-```
-### docker-compose.yml
-Файл, соединяющий сервисы (содержащий настройку Docker):
-```
-version: "3" #формат конфигурации Docker Compose версии 3
-services: #определение сервисов
-  discipline:
-    build:
-      context: /disciplineService #путь к контексту сборки
-      dockerfile: Dockerfile #имя докерфайла
-    ports:
-      - "8089:8089" #проброс портов
-    networks:
-      - netwrk #сеть
-
-  learning_plan:
-    build:
-      context: /learningPlanService #путь к контексту сборки
-      dockerfile: Dockerfile #имя докерфайла
-    ports:
-      - "8090:8090" #проброс портов
-    networks:
-      - netwrk #сеть
-
-  nginx:
-    image: nginx:latest #образ для контейнера
-    ports:
-      - "8091:80" #проброс портов
-    networks:
-      - netwrk #сеть
-    volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf #монтирует локальный файл конфигурации
-    depends_on: #зависимость от сервисов
-      - discipline
-      - learning_plan
-
-networks:
-  netwrk:
-    driver: bridge #изолированная сеть
-```
-### nginx.conf
-Настройка nginx:
-```
-http {
-    server {
-        listen 80;
-        listen [::]:80;
-        server_name localhost;
-
-        location /disciplineService/ {
-            proxy_pass http://discipline:8089/;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header X-Forwarded-Prefix /disciplineService;
-        }
-
-        location /learningPlanService/ {
-            proxy_pass http://learning_plan:8090/;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header X-Forwarded-Prefix /learningPlanService;
-        }
-    }
-}
-
-events {
-    worker_connections  1024;
-}
-```
-
-
-## Результат
-
-Работоспособность и взаимодействие сервисов показаны в видео: [lab3.mp4](lab3.mp4)

belyaeva_ekaterina_lab_3/disciplineService/.gitignore

@@ -1,42 +0,0 @@
-.gradle
-build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
-*.iws
-*.iml
-*.ipr
-out/
-!**/src/main/**/out/
-!**/src/test/**/out/
-
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-
-### VS Code ###
-.vscode/
-
-### Mac OS ###
-.DS_Store

belyaeva_ekaterina_lab_3/disciplineService/.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

belyaeva_ekaterina_lab_3/disciplineService/.idea/.name

@@ -1 +0,0 @@
-lab3

belyaeva_ekaterina_lab_3/disciplineService/.idea/gradle.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

belyaeva_ekaterina_lab_3/disciplineService/.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

belyaeva_ekaterina_lab_3/disciplineService/Dockerfile

@@ -1,7 +0,0 @@
-FROM openjdk:17
-RUN mkdir -p /usr/src/app/ 
-WORKDIR /usr/src/app/ 
-COPY . /usr/src/app/ 
-RUN ./gradlew clean build 
-EXPOSE 8089 
-ENTRYPOINT ["java","-jar","build/libs/lab3-0.0.1-SNAPSHOT.jar"]

belyaeva_ekaterina_lab_3/disciplineService/build.gradle

@@ -1,34 +0,0 @@
-plugins {
-    id 'org.springframework.boot' version '2.6.3'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
-    id 'java'
-}
-
-group = 'disciplineApp'
-version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '17'
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-web'
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
-
-    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'com.h2database:h2:2.1.210'
-
-    implementation 'org.hibernate.validator:hibernate-validator'
-
-    implementation 'org.springdoc:springdoc-openapi-ui:1.6.5'
-
-    compileOnly 'org.projectlombok:lombok'
-    annotationProcessor 'org.projectlombok:lombok'
-
-    implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.5'
-}
-
-tasks.named('test') {
-    useJUnitPlatform()
-}

belyaeva_ekaterina_lab_3/disciplineService/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Wed Jan 10 18:16:23 GMT+04:00 2024
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

belyaeva_ekaterina_lab_3/disciplineService/gradlew

@@ -1,234 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# 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.
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"

belyaeva_ekaterina_lab_3/disciplineService/gradlew.bat

@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem 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, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

belyaeva_ekaterina_lab_3/disciplineService/settings.gradle

@@ -1,2 +0,0 @@
-rootProject.name = "lab3"
-

belyaeva_ekaterina_lab_3/disciplineService/src/main/java/disciplineApp/Application.java

@@ -1,12 +0,0 @@
-package disciplineApp;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class Application {
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-}

belyaeva_ekaterina_lab_3/disciplineService/src/main/java/disciplineApp/controller/DisciplineController.java

@@ -1,48 +0,0 @@
-package disciplineApp.controller;
-
-import disciplineApp.model.DisciplineDto;
-import org.springframework.web.bind.annotation.*;
-import disciplineApp.service.*;
-
-import javax.validation.Valid;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@RestController
-@RequestMapping("/")
-public class DisciplineController {
-    private final DisciplineService disciplineService;
-
-    public DisciplineController(DisciplineService disciplineService) {
-        this.disciplineService = disciplineService;
-    }
-
-    @GetMapping("/{id}")
-    public DisciplineDto getDiscipline(@PathVariable Long id) {
-        return new DisciplineDto(disciplineService.findDiscipline(id));
-    }
-
-    @GetMapping("/")
-    public List<DisciplineDto> getDisciplines() {
-        return disciplineService.findAllDisciplines().stream()
-                .map(DisciplineDto::new)
-                .collect(Collectors.toList());
-    }
-
-    @PostMapping("/")
-    public DisciplineDto createDiscipline(@RequestBody @Valid DisciplineDto disciplineDto) {
-        return new DisciplineDto(disciplineService.addDiscipline(disciplineDto));
-    }
-
-    @PutMapping("/{id}")
-    public DisciplineDto updateDiscipline(@RequestBody @Valid DisciplineDto disciplineDto) {
-        return new DisciplineDto(disciplineService.updateDiscipline(disciplineDto));
-    }
-
-
-    @DeleteMapping("/{id}")
-    public DisciplineDto deleteDiscipline(@PathVariable Long id) {
-        return new DisciplineDto(disciplineService.deleteDiscipline(id));
-    }
-
-}

belyaeva_ekaterina_lab_3/disciplineService/src/main/java/disciplineApp/model/Discipline.java

@@ -1,53 +0,0 @@
-package disciplineApp.model;
-
-import javax.persistence.*;
-
-@Entity
-public class Discipline {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
-    private String name;
-    private String description;
-
-    public Discipline() {
-    }
-
-    public Discipline(String name, String description) {
-        this.name = name;
-        this.description = description;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @Override
-    public String toString() {
-        return "Discipline {" +
-                "id =" + id +
-                ", name ='" + name + '\'' +
-                ", desc ='" + description + '\'' +
-                '}';
-    }
-}

belyaeva_ekaterina_lab_3/disciplineService/src/main/java/disciplineApp/model/DisciplineDto.java

@@ -1,40 +0,0 @@
-package disciplineApp.model;
-
-public class DisciplineDto {
-    private Long id;
-    private String name;
-    private String description;
-
-    public DisciplineDto() {
-    }
-
-    public DisciplineDto(Discipline discipline) {
-        this.id = discipline.getId();
-        this.name = String.format("%s", discipline.getName());
-        this.description = discipline.getDescription();
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-}

belyaeva_ekaterina_lab_3/disciplineService/src/main/java/disciplineApp/repository/DisciplineRepository.java

@@ -1,7 +0,0 @@
-package disciplineApp.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import disciplineApp.model.Discipline;
-
-public interface DisciplineRepository extends JpaRepository<Discipline, Long> {
-}

belyaeva_ekaterina_lab_3/disciplineService/src/main/java/disciplineApp/service/DisciplineNotFoundException.java

@@ -1,7 +0,0 @@
-package disciplineApp.service;
-
-public class DisciplineNotFoundException extends RuntimeException{
-    public DisciplineNotFoundException(Long id) {
-        super(String.format("Discipline with id [%s] is not found", id));
-    }
-}

belyaeva_ekaterina_lab_3/disciplineService/src/main/java/disciplineApp/service/DisciplineService.java

@@ -1,49 +0,0 @@
-package disciplineApp.service;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import disciplineApp.model.*;
-import disciplineApp.repository.*;
-
-import java.util.*;
-
-@Service
-public class DisciplineService {
-    private final DisciplineRepository disciplineRepository;
-
-    public DisciplineService(DisciplineRepository disciplineRepository) {
-        this.disciplineRepository = disciplineRepository;
-    }
-
-    @Transactional
-    public Discipline addDiscipline(DisciplineDto disciplineDto) {
-        final Discipline discipline = new Discipline(disciplineDto.getName(), disciplineDto.getDescription());
-        return disciplineRepository.save(discipline);
-    }
-
-    @Transactional(readOnly = true)
-    public Discipline findDiscipline(Long id) {
-        final Optional<Discipline> discipline = disciplineRepository.findById(id);
-        return discipline.orElseThrow(() -> new DisciplineNotFoundException(id));
-    }
-
-    @Transactional(readOnly = true)
-    public List<Discipline> findAllDisciplines() {
-        return disciplineRepository.findAll();
-    }
-
-    @Transactional
-    public Discipline updateDiscipline(DisciplineDto disciplineDto) {
-        final Discipline currentDiscipline = findDiscipline(disciplineDto.getId());
-        currentDiscipline.setName(disciplineDto.getName());
-        currentDiscipline.setDescription(disciplineDto.getDescription());
-        return disciplineRepository.save(currentDiscipline);
-    }
-
-    @Transactional
-    public Discipline deleteDiscipline(Long id) {
-        final Discipline currentDiscipline = findDiscipline(id);
-        disciplineRepository.delete(currentDiscipline);
-        return currentDiscipline;
-    }
-}

belyaeva_ekaterina_lab_3/disciplineService/src/main/resources/application.properties

@@ -1,11 +0,0 @@
-spring.main.banner-mode=off
-spring.datasource.url=jdbc:h2:file:./data
-spring.datasource.driverClassName=org.h2.Driver
-spring.datasource.username=sa
-spring.datasource.password=password
-spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
-spring.jpa.hibernate.ddl-auto=update
-spring.h2.console.enabled=true
-spring.h2.console.settings.trace=false
-spring.h2.console.settings.web-allow-others=false
-server.port=8089

belyaeva_ekaterina_lab_3/docker-compose.yml

@@ -1,35 +0,0 @@
-version: "3" #формат конфигурации Docker Compose версии 3
-services: #определение сервисов
-  discipline:
-    build:
-      context: /disciplineService #путь к контексту сборки
-      dockerfile: Dockerfile #имя докерфайла
-    ports:
-      - "8089:8089" #проброс портов
-    networks:
-      - netwrk #сеть
-
-  learning_plan:
-    build:
-      context: /learningPlanService #путь к контексту сборки
-      dockerfile: Dockerfile #имя докерфайла
-    ports:
-      - "8090:8090" #проброс портов
-    networks:
-      - netwrk #сеть
-
-  nginx:
-    image: nginx:latest #образ для контейнера
-    ports:
-      - "8091:80" #проброс портов
-    networks:
-      - netwrk #сеть
-    volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf #монтирует локальный файл конфигурации
-    depends_on: #зависимость от сервисов
-      - discipline
-      - learning_plan
-
-networks:
-  netwrk:
-    driver: bridge #изолированная сеть

belyaeva_ekaterina_lab_3/learningPlanService/.gitignore

@@ -1,42 +0,0 @@
-.gradle
-build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
-*.iws
-*.iml
-*.ipr
-out/
-!**/src/main/**/out/
-!**/src/test/**/out/
-
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-
-### VS Code ###
-.vscode/
-
-### Mac OS ###
-.DS_Store

belyaeva_ekaterina_lab_3/learningPlanService/.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

belyaeva_ekaterina_lab_3/learningPlanService/.idea/.name

@@ -1 +0,0 @@
-lab3

belyaeva_ekaterina_lab_3/learningPlanService/.idea/gradle.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

belyaeva_ekaterina_lab_3/learningPlanService/.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

belyaeva_ekaterina_lab_3/learningPlanService/Dockerfile

@@ -1,7 +0,0 @@
-FROM openjdk:17
-RUN mkdir -p /usr/src/app/ 
-WORKDIR /usr/src/app/ 
-COPY . /usr/src/app/ 
-RUN ./gradlew clean build 
-EXPOSE 8089 
-ENTRYPOINT ["java","-jar","build/libs/lab3-0.0.1-SNAPSHOT.jar"]

belyaeva_ekaterina_lab_3/learningPlanService/build.gradle

@@ -1,34 +0,0 @@
-plugins {
-    id 'org.springframework.boot' version '2.6.3'
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
-    id 'java'
-}
-
-group = 'disciplineApp'
-version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '17'
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-web'
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
-
-    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'com.h2database:h2:2.1.210'
-
-    implementation 'org.hibernate.validator:hibernate-validator'
-
-    implementation 'org.springdoc:springdoc-openapi-ui:1.6.5'
-
-    compileOnly 'org.projectlombok:lombok'
-    annotationProcessor 'org.projectlombok:lombok'
-
-    implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.5'
-}
-
-tasks.named('test') {
-    useJUnitPlatform()
-}

belyaeva_ekaterina_lab_3/learningPlanService/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Wed Jan 10 18:23:35 GMT+04:00 2024
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

belyaeva_ekaterina_lab_3/learningPlanService/gradlew

@@ -1,234 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# 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.
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"

belyaeva_ekaterina_lab_3/learningPlanService/gradlew.bat

@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem 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, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

belyaeva_ekaterina_lab_3/learningPlanService/settings.gradle

@@ -1,2 +0,0 @@
-rootProject.name = "lab3"
-

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/Application.java

@@ -1,19 +0,0 @@
-package learningPlanApp;
-
-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 Application {
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-
-    @Bean
-    public RestTemplate restTemplate() {
-        return new RestTemplate();
-    }
-}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/controller/LearningPlanController.java

@@ -1,48 +0,0 @@
-package learningPlanApp.controller;
-
-import learningPlanApp.model.*;
-import org.springframework.web.bind.annotation.*;
-import learningPlanApp.service.*;
-
-import javax.validation.Valid;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@RestController
-@RequestMapping("/")
-public class LearningPlanController {
-    private final LearningPlanService learningPlanService;
-
-    public LearningPlanController(LearningPlanService learningPlanService) {
-        this.learningPlanService = learningPlanService;
-    }
-
-    @GetMapping("/{id}")
-    public LearningPlanFullInfoDto getLearningPlan(@PathVariable Long id) {
-        return learningPlanService.findLearningPlan(id);
-    }
-
-    @GetMapping("/")
-    public List<LearningPlanDto> getLearningPlans() {
-        return learningPlanService.findAllLearningPlans().stream()
-                .map(LearningPlanDto::new)
-                .collect(Collectors.toList());
-    }
-
-    @PostMapping("/")
-    public LearningPlanFullInfoDto createLearningPlan(@RequestBody @Valid LearningPlanDto learningPlanDto) {
-        return learningPlanService.addLearningPlan(learningPlanDto);
-    }
-
-    @PutMapping("/{id}")
-    public LearningPlanFullInfoDto updateLearningPlan(@RequestBody @Valid LearningPlanDto learningPlanDto) {
-        return learningPlanService.updateLearningPlan(learningPlanDto);
-    }
-
-
-    @DeleteMapping("/{id}")
-    public LearningPlanDto deleteClient(@PathVariable Long id) {
-        return new LearningPlanDto(learningPlanService.deleteLearningPlan(id));
-    }
-
-}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/model/DisciplineInfoDto.java

@@ -1,34 +0,0 @@
-package learningPlanApp.model;
-
-import lombok.Data;
-
-@Data
-public class DisciplineInfoDto {
-    private Long id;
-    private String name;
-    private String description;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/model/LearningPlan.java

@@ -1,71 +0,0 @@
-package learningPlanApp.model;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import io.swagger.v3.oas.annotations.media.Schema;
-
-import javax.persistence.*;
-
-import lombok.Data;
-
-@Data
-@Entity
-public class LearningPlan {
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private Long id;
-    private String name;
-    private String description;
-    private Long disciplineId;
-
-    public LearningPlan() {
-    }
-
-    public LearningPlan(String name, String description, Long disciplineId) {
-        this.name = name;
-        this.description = description;
-        this.disciplineId = disciplineId;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Long getDisciplineId() {
-        return disciplineId;
-    }
-
-    public void setDisciplineId(Long disciplineId) {
-        this.disciplineId = disciplineId;
-    }
-
-    @Override
-    public String toString() {
-        return "Discipline {" +
-                "id =" + id +
-                ", time =" + name +
-                ", description='" + description + '\'' +
-                ", disciplineId=" + disciplineId +
-                '}';
-    }
-}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/model/LearningPlanDto.java

@@ -1,52 +0,0 @@
-package learningPlanApp.model;
-import lombok.Data;
-
-@Data
-public class LearningPlanDto {
-    private Long id;
-    private String name;
-    private String description;
-    private Long disciplineId;
-
-    public LearningPlanDto() {
-    }
-
-    public LearningPlanDto(LearningPlan learningPlan) {
-        this.id = learningPlan.getId();
-        this.name = learningPlan.getName();
-        this.description = String.format("%s", learningPlan.getDescription());
-        this.disciplineId = learningPlan.getDisciplineId();
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Long getDisciplineId() {
-        return disciplineId;
-    }
-
-    public void setDisciplineId(Long disciplineId) {
-        this.disciplineId = disciplineId;
-    }
-}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/model/LearningPlanFullInfoDto.java

@@ -1,62 +0,0 @@
-package learningPlanApp.model;
-import lombok.Data;
-
-@Data
-public class LearningPlanFullInfoDto {
-    private Long id;
-    private String name;
-    private String description;
-    private Long disciplineId;
-    private DisciplineInfoDto disciplineInfo;
-
-    public LearningPlanFullInfoDto() {
-    }
-
-    public LearningPlanFullInfoDto(LearningPlan learningPlan, DisciplineInfoDto disciplineInfo) {
-        this.id = learningPlan.getId();
-        this.name = learningPlan.getName();
-        this.description = learningPlan.getDescription();
-        this.disciplineId = learningPlan.getDisciplineId();
-        this.disciplineInfo = disciplineInfo;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Long getDisciplineId() {
-        return disciplineId;
-    }
-
-    public void setDisciplineId(Long disciplineId) {
-        this.disciplineId = disciplineId;
-    }
-
-    /*public DisciplineInfoDto getDisciplineInfo() {
-        return disciplineInfo;
-    }
-
-    public void setDisciplineInfo(DisciplineInfoDto disciplineInfo) {
-        this.disciplineInfo = disciplineInfo;
-    }*/
-}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/repository/LearningPlanRepository.java

@@ -1,7 +0,0 @@
-package learningPlanApp.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import learningPlanApp.model.LearningPlan;
-
-public interface LearningPlanRepository extends JpaRepository<LearningPlan, Long> {
-}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/service/LearningPlanNotFoundException.java

@@ -1,7 +0,0 @@
-package learningPlanApp.service;
-
-public class LearningPlanNotFoundException extends RuntimeException{
-    public LearningPlanNotFoundException(Long id) {
-        super(String.format("Learning Plan with id [%s] is not found", id));
-    }
-}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/java/learningPlanApp/service/LearningPlanService.java

@@ -1,73 +0,0 @@
-package learningPlanApp.service;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import learningPlanApp.model.*;
-import learningPlanApp.repository.*;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.*;
-
-@Service
-public class LearningPlanService {
-    private final LearningPlanRepository learningPlanRepository;
-    private final RestTemplate restTemplate;
-    private final String NginxUrl = "http://nginx/disciplineService/";
-
-    @Autowired
-    public LearningPlanService(LearningPlanRepository learningPlanRepository, RestTemplate restTemplate) {
-        this.learningPlanRepository = learningPlanRepository;
-        this.restTemplate = restTemplate;
-    }
-
-    @Transactional
-    public LearningPlanFullInfoDto addLearningPlan(LearningPlanDto learningPlanDto) {
-        final LearningPlan learningPlan = new LearningPlan(learningPlanDto.getName(), learningPlanDto.getDescription(), learningPlanDto.getDisciplineId());
-        learningPlanRepository.save(learningPlan);
-
-        DisciplineInfoDto disciplineInfo = restTemplate.getForObject(NginxUrl + learningPlanDto.getDisciplineId(), DisciplineInfoDto.class);
-        return new LearningPlanFullInfoDto(learningPlan, disciplineInfo);
-    }
-
-    @Transactional(readOnly = true)
-    public LearningPlanFullInfoDto findLearningPlan(Long id) {
-        final LearningPlan learningPlan = learningPlanRepository.findById(id).orElse(null);
-        if (learningPlan == null) {
-            throw new LearningPlanNotFoundException(id);
-        }
-
-        DisciplineInfoDto disciplineInfo = restTemplate.getForObject(NginxUrl + learningPlan.getDisciplineId(), DisciplineInfoDto.class);
-        return new LearningPlanFullInfoDto(learningPlan, disciplineInfo);
-    }
-
-    @Transactional(readOnly = true)
-    public LearningPlan findLearningPlanClear(Long id) {
-        final Optional<LearningPlan> learningPlan = learningPlanRepository.findById(id);
-        return learningPlan.orElseThrow(() -> new LearningPlanNotFoundException(id));
-    }
-
-    @Transactional(readOnly = true)
-    public List<LearningPlan> findAllLearningPlans() {
-        return learningPlanRepository.findAll();
-    }
-
-    @Transactional
-    public LearningPlanFullInfoDto updateLearningPlan(LearningPlanDto learningPlanDto) {
-        final LearningPlan currentLearningPlan = findLearningPlanClear(learningPlanDto.getId());
-        currentLearningPlan.setName(learningPlanDto.getName());
-        currentLearningPlan.setDescription(learningPlanDto.getDescription());
-        currentLearningPlan.setDisciplineId(learningPlanDto.getDisciplineId());
-        learningPlanRepository.save(currentLearningPlan);
-
-        DisciplineInfoDto disciplineInfo = restTemplate.getForObject(NginxUrl + learningPlanDto.getDisciplineId(), DisciplineInfoDto.class);
-        return new LearningPlanFullInfoDto(currentLearningPlan, disciplineInfo);
-    }
-
-    @Transactional
-    public LearningPlan deleteLearningPlan(Long id) {
-        final LearningPlan currentLearningPlan = findLearningPlanClear(id);
-        learningPlanRepository.delete(currentLearningPlan);
-        return currentLearningPlan;
-    }
-}

belyaeva_ekaterina_lab_3/learningPlanService/src/main/resources/application.properties

@@ -1,11 +0,0 @@
-spring.main.banner-mode=off
-spring.datasource.url=jdbc:h2:file:./data
-spring.datasource.driverClassName=org.h2.Driver
-spring.datasource.username=sa
-spring.datasource.password=password
-spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
-spring.jpa.hibernate.ddl-auto=update
-spring.h2.console.enabled=true
-spring.h2.console.settings.trace=false
-spring.h2.console.settings.web-allow-others=false
-server.port=8090

belyaeva_ekaterina_lab_3/nginx.conf

@@ -1,27 +0,0 @@
-http {
-    server {
-        listen 80;
-        listen [::]:80;
-        server_name localhost;
-
-        location /disciplineService/ {
-            proxy_pass http://discipline:8089/;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header X-Forwarded-Prefix /disciplineService;
-        }
-
-        location /learningPlanService/ {
-            proxy_pass http://learning_plan:8090/;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header X-Forwarded-Prefix /learningPlanService;
-        }
-    }
-}
-
-events {
-    worker_connections  1024;
-}

belyaeva_ekaterina_lab_4/.gitignore

@@ -1,42 +0,0 @@
-.gradle
-build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
-*.iws
-*.iml
-*.ipr
-out/
-!**/src/main/**/out/
-!**/src/test/**/out/
-
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-
-### VS Code ###
-.vscode/
-
-### Mac OS ###
-.DS_Store

belyaeva_ekaterina_lab_4/README.md

@@ -1,40 +0,0 @@
-# Лабораторная работа №4
-
-## Задание
-
-Цель: изучение проектирования приложений при помощи брокера сообщений.
-
-Задачи:
-
-- Установить брокер сообщений RabbitMQ.
-- Пройти уроки 1, 2 и 3 из RabbitMQ Tutorials на любом языке программирования.
-- Продемонстрировать работу брокера сообщений
-
-## Ход работы
-
-### RabbitMQ
-RabbitMQ был установлен на локальное устройство без использования Docker.
-
-### Работа брокера
-
-Было создано три приложения - publisher, consumer1, consumer2. 
-
-Задача publisher - осуществлять отправку сообщений
-![publisherConsole.png](screenshots%2FpublisherConsole.png)
-
-Задача consumer1 - принимать сообщения и обрабатывать его 3 секунды
-![consumer1Console.png](screenshots%2Fconsumer1Console.png)
-
-Задача consumer2 - получать сообщение и обрабатывать его моментально, без задержек
-![consumer2Console.png](screenshots%2Fconsumer2Console.png)
-
-### Результат процесса выполнения в RabbitMQ 
-Изначально графики были неровные, но программа выполнялась долго, они выровнялись и получились следующие графики:
-![overviewRMQ.png](screenshots%2FoverviewRMQ.png)
-![exchangeRMQ.png](screenshots%2FexchangeRMQ.png)
-![queue1RMQ.png](screenshots%2Fqueue1RMQ.png)
-![queue2RMQ.png](screenshots%2Fqueue2RMQ.png)
-
-## Результат
-
-Работоспособность показана в видео: [lab4.mp4](lab4.mp4)

belyaeva_ekaterina_lab_4/build.gradle

@@ -1,42 +0,0 @@
-plugins {
-    id 'java'
-}
-
-group = 'org.example'
-version = '1.0-SNAPSHOT'
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    testImplementation platform('org.junit:junit-bom:5.9.1')
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    implementation 'com.rabbitmq:amqp-client:5.12.0'
-
-}
-
-test {
-    useJUnitPlatform()
-}
-
-/*task runApp1(type: JavaExec) {
-    main = 'org.example.Consumer1' // Замените на полное имя класса вашего приложения
-    classpath = sourceSets.main.runtimeClasspath
-}
-
-task runApp2(type: JavaExec) {
-    main = 'org.example.Consumer2' // Замените на полное имя класса вашего приложения
-    classpath = sourceSets.main.runtimeClasspath
-}
-
-task runApp3(type: JavaExec) {
-    main = 'org.example.Publisher' // Замените на полное имя класса вашего приложения
-    classpath = sourceSets.main.runtimeClasspath
-}
-
-task runAll {
-    description = 'Run all three applications concurrently'
-    group = 'application'
-    dependsOn runApp1, runApp2, runApp3
-}*/

belyaeva_ekaterina_lab_4/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Thu Jan 11 14:32:39 GMT+04:00 2024
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

belyaeva_ekaterina_lab_4/gradlew

@@ -1,234 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# 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.
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"

belyaeva_ekaterina_lab_4/gradlew.bat

@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem 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, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

belyaeva_ekaterina_lab_4/settings.gradle

@@ -1,2 +0,0 @@
-rootProject.name = 'lab4'
-

belyaeva_ekaterina_lab_4/src/main/java/org/example/Consumer1.java

@@ -1,42 +0,0 @@
-package org.example;
-
-import com.rabbitmq.client.*;
-
-public class Consumer1 {
-    private static final String QUEUE_NAME = "queue1";
-    private static final String EXCHANGE_NAME = "exchange";
-
-    public static void main(String[] args) throws Exception {
-        try {
-            ConnectionFactory factory = new ConnectionFactory();
-            factory.setHost("localhost");
-
-            Connection connection = factory.newConnection();
-            Channel channel = connection.createChannel();
-
-            channel.queueDeclare(QUEUE_NAME, false, false, false, null);
-            channel.queueBind(QUEUE_NAME, EXCHANGE_NAME, "");
-
-            DeliverCallback deliverCallback = (consumerTag, delivery) -> {
-                String message = new String(delivery.getBody());
-                try {
-                    System.out.println("Consumer1 received" + message);
-                    Thread.sleep(3000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                System.out.println(" Consumer1 processed the following message: " + message);
-            };
-
-            channel.basicConsume(QUEUE_NAME, true, deliverCallback, consumerTag -> {});
-            System.out.println("Consumer1 is waiting for messages");
-
-            while (true) {
-                // Поддержание работы приложения
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}

belyaeva_ekaterina_lab_4/src/main/java/org/example/Consumer2.java

@@ -1,37 +0,0 @@
-package org.example;
-
-import com.rabbitmq.client.*;
-
-public class Consumer2 {
-    private static final String EXCHANGE_NAME = "exchange";
-    private static final String QUEUE_NAME = "queue2";
-
-    public static void main(String[] args) throws Exception {
-        try {
-            ConnectionFactory factory = new ConnectionFactory();
-            factory.setHost("localhost");
-
-            Connection connection = factory.newConnection();
-            Channel channel = connection.createChannel();
-
-            channel.queueDeclare(QUEUE_NAME, false, false, false, null);
-            channel.queueBind(QUEUE_NAME, EXCHANGE_NAME, "");
-            DeliverCallback deliverCallback = (consumerTag, delivery) -> {
-                String message = new String(delivery.getBody());
-                System.out.println("Consumer2 received" + message);
-                // моментальная обработка сообщений
-                System.out.println("Consumer2 processed the following message: " + message);
-            };
-
-            channel.basicConsume(QUEUE_NAME, true, deliverCallback, consumerTag -> {});
-            System.out.println("Consumer2 is waiting for messages");
-
-            while (true) {
-                // Поддержание работы приложения
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-}

belyaeva_ekaterina_lab_4/src/main/java/org/example/Publisher.java

@@ -1,35 +0,0 @@
-package org.example;
-
-import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
-import com.rabbitmq.client.ConnectionFactory;
-
-import java.util.Random;
-
-public class Publisher {
-    private static final String EXCHANGE_NAME = "exchange";
-
-    public static void main(String[] args) throws Exception {
-        ConnectionFactory factory = new ConnectionFactory();
-        factory.setHost("localhost");
-
-        try (Connection connection = factory.newConnection();
-             Channel channel = connection.createChannel()) {
-                channel.exchangeDeclare(EXCHANGE_NAME, "fanout");
-
-                while (true) {
-                    String message = generateMessage(); // Генерация сообщения для журнала событий
-                    channel.basicPublish(EXCHANGE_NAME, "", null, message.getBytes());
-                    System.out.println("Sent: " + message);
-                    Thread.sleep(1000); // Ожидание 1 секунду
-                }
-            } catch (Exception e) {
-            e.printStackTrace();
-             }
-    }
-
-    private static String generateMessage() {
-        Random random = new Random();
-        return "message №" + random.nextInt(100) + 1;
-    }
-}

belyaeva_ekaterina_lab_5/.gitignore

@@ -1,29 +0,0 @@
-### IntelliJ IDEA ###
-out/
-!**/src/main/**/out/
-!**/src/test/**/out/
-
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-
-### VS Code ###
-.vscode/
-
-### Mac OS ###
-.DS_Store

belyaeva_ekaterina_lab_5/README.md

@@ -1,98 +0,0 @@
-# Лабораторная работа №5
-
-## Задание
-
-Кратко: реализовать умножение двух больших квадратных матриц.
-
-Подробно: в лабораторной работе требуется сделать два алгоритма: обычный и параллельный. В параллельном алгоритме предусмотреть ручное задание количества потоков, каждый из которых будет выполнять умножение элементов матрицы в рамках своей зоны ответственности.
-
-## Ход работы
-
-### Последовательный алгоритм
-```
-public static int[][] multiplyMatricesSequential(int[][] matrix1, int[][] matrix2) {
-        int rows1 = matrix1.length;
-        int columns1 = matrix1[0].length;
-        int columns2 = matrix2[0].length;
-
-        int[][] result = new int[rows1][columns2];
-
-        for (int i = 0; i < rows1; i++) {
-            for (int j = 0; j < columns2; j++) {
-                for (int k = 0; k < columns1; k++) {
-                    result[i][j] += matrix1[i][k] * matrix2[k][j];
-                }
-            }
-        }
-
-        return result;
-    }
-```
-### Параллельный алгоритм
-```
- public static int[][] multiplyMatricesParallel(int[][] matrix1, int[][] matrix2) {
-        int rows1 = matrix1.length;
-        int columns1 = matrix1[0].length;
-        int columns2 = matrix2[0].length;
-
-        int[][] result = new int[rows1][columns2];
-
-        int numberOfThreads = 5; // Количество потоков
-        ExecutorService executor = Executors.newFixedThreadPool(numberOfThreads);
-
-        for (int i = 0; i < rows1; i++) {
-            final int row = i;
-            executor.execute(new Runnable() {
-                @Override
-                public void run() {
-                    for (int j = 0; j < columns2; j++) {
-                        for (int k = 0; k < columns1; k++) {
-                            result[row][j] += matrix1[row][k] * matrix2[k][j];
-                        }
-                    }
-                }
-            });
-        }
-
-        executor.shutdown();
-        while (!executor.isTerminated()) {
-            // Ожидаем завершения всех потоков
-        }
-
-        return result;
-    }
-```
-
-## Результат
-
-Была проверка времени выполнения алгоритма для матриц размером 100х100, 300х300, 500х500 с разным количеством потоков.
-
-100х100, 1 поток
-
-![100thr1.png](screenshots%2F100thr1.png)
-
-100х100, 5 потоков
-
-![100thr5.png](screenshots%2F100thr5.png)
-
-300х300, 1 поток
-
-![300thr1.png](screenshots%2F300thr1.png)
-
-300х300, 5 потоков
-
-![300thr5.png](screenshots%2F300thr5.png)
-
-500х500, 1 поток
-
-![500th1.png](screenshots%2F500th1.png)
-
-500х500, 5 потоков
-
-![500thr5.png](screenshots%2F500thr5.png)
-
-Из данных скриншотов видно, что в случае с матрицей 100х100 последовательный алгоритм работает лучше, чем параллельный.
-
-Для остальных матриц параллельный алгоритм работает лучше, а также увеличение кол-ва потоков уменьшает время выполнения алгоритма. (хотя в случае матрицы 100х100 - сильно увеличивает)
-
-Работоспособность показана в видео: [lab5.mp4](lab5.mp4)

belyaeva_ekaterina_lab_5/src/Matrix100x100.java

@@ -1,84 +0,0 @@
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class Matrix100x100 {
-    private static final int SIZE = 100;
-
-    public static void main(String[] args) {
-        int[][] matrix1 = generateMatrix(SIZE, SIZE);
-        int[][] matrix2 = generateMatrix(SIZE, SIZE);
-
-        long startTime = System.currentTimeMillis();
-        int[][] resultSequential = multiplyMatricesSequential(matrix1, matrix2);
-        long endTime = System.currentTimeMillis();
-        long sequentialTime = endTime - startTime;
-
-        startTime = System.currentTimeMillis();
-        int[][] resultParallel = multiplyMatricesParallel(matrix1, matrix2);
-        endTime = System.currentTimeMillis();
-        long parallelTime = endTime - startTime;
-
-        System.out.println("Sequential multiplication time: " + sequentialTime + " ms");
-        System.out.println("Parallel multiplication time: " + parallelTime + " ms");
-    }
-
-    public static int[][] multiplyMatricesSequential(int[][] matrix1, int[][] matrix2) {
-        int rows1 = matrix1.length;
-        int columns1 = matrix1[0].length;
-        int columns2 = matrix2[0].length;
-
-        int[][] result = new int[rows1][columns2];
-
-        for (int i = 0; i < rows1; i++) {
-            for (int j = 0; j < columns2; j++) {
-                for (int k = 0; k < columns1; k++) {
-                    result[i][j] += matrix1[i][k] * matrix2[k][j];
-                }
-            }
-        }
-
-        return result;
-    }
-
-    public static int[][] multiplyMatricesParallel(int[][] matrix1, int[][] matrix2) {
-        int rows1 = matrix1.length;
-        int columns1 = matrix1[0].length;
-        int columns2 = matrix2[0].length;
-
-        int[][] result = new int[rows1][columns2];
-
-        int numberOfThreads = 5; // Количество потоков
-        ExecutorService executor = Executors.newFixedThreadPool(numberOfThreads);
-
-        for (int i = 0; i < rows1; i++) {
-            final int row = i;
-            executor.execute(new Runnable() {
-                @Override
-                public void run() {
-                    for (int j = 0; j < columns2; j++) {
-                        for (int k = 0; k < columns1; k++) {
-                            result[row][j] += matrix1[row][k] * matrix2[k][j];
-                        }
-                    }
-                }
-            });
-        }
-
-        executor.shutdown();
-        while (!executor.isTerminated()) {
-            // Ожидаем завершения всех потоков
-        }
-
-        return result;
-    }
-
-    public static int[][] generateMatrix(int rows, int columns) {
-        int[][] matrix = new int[rows][columns];
-        for (int i = 0; i < rows; i++) {
-            for (int j = 0; j < columns; j++) {
-                matrix[i][j] = (int) (Math.random() * 10);
-            }
-        }
-        return matrix;
-    }
-}

belyaeva_ekaterina_lab_5/src/Matrix300x300.java

@@ -1,84 +0,0 @@
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class Matrix300x300 {
-    private static final int SIZE = 300;
-
-    public static void main(String[] args) {
-        int[][] matrix1 = generateMatrix(SIZE, SIZE);
-        int[][] matrix2 = generateMatrix(SIZE, SIZE);
-
-        long startTime = System.currentTimeMillis();
-        int[][] resultSequential = multiplyMatricesSequential(matrix1, matrix2);
-        long endTime = System.currentTimeMillis();
-        long sequentialTime = endTime - startTime;
-
-        startTime = System.currentTimeMillis();
-        int[][] resultParallel = multiplyMatricesParallel(matrix1, matrix2);
-        endTime = System.currentTimeMillis();
-        long parallelTime = endTime - startTime;
-
-        System.out.println("Sequential multiplication time: " + sequentialTime + " ms");
-        System.out.println("Parallel multiplication time: " + parallelTime + " ms");
-    }
-
-    public static int[][] multiplyMatricesSequential(int[][] matrix1, int[][] matrix2) {
-        int rows1 = matrix1.length;
-        int columns1 = matrix1[0].length;
-        int columns2 = matrix2[0].length;
-
-        int[][] result = new int[rows1][columns2];
-
-        for (int i = 0; i < rows1; i++) {
-            for (int j = 0; j < columns2; j++) {
-                for (int k = 0; k < columns1; k++) {
-                    result[i][j] += matrix1[i][k] * matrix2[k][j];
-                }
-            }
-        }
-
-        return result;
-    }
-
-    public static int[][] multiplyMatricesParallel(int[][] matrix1, int[][] matrix2) {
-        int rows1 = matrix1.length;
-        int columns1 = matrix1[0].length;
-        int columns2 = matrix2[0].length;
-
-        int[][] result = new int[rows1][columns2];
-
-        int numberOfThreads = 5; // Количество потоков
-        ExecutorService executor = Executors.newFixedThreadPool(numberOfThreads);
-
-        for (int i = 0; i < rows1; i++) {
-            final int row = i;
-            executor.execute(new Runnable() {
-                @Override
-                public void run() {
-                    for (int j = 0; j < columns2; j++) {
-                        for (int k = 0; k < columns1; k++) {
-                            result[row][j] += matrix1[row][k] * matrix2[k][j];
-                        }
-                    }
-                }
-            });
-        }
-
-        executor.shutdown();
-        while (!executor.isTerminated()) {
-            // Ожидаем завершения всех потоков
-        }
-
-        return result;
-    }
-
-    public static int[][] generateMatrix(int rows, int columns) {
-        int[][] matrix = new int[rows][columns];
-        for (int i = 0; i < rows; i++) {
-            for (int j = 0; j < columns; j++) {
-                matrix[i][j] = (int) (Math.random() * 10);
-            }
-        }
-        return matrix;
-    }
-}

belyaeva_ekaterina_lab_5/src/Matrix500x500.java

@@ -1,84 +0,0 @@
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-public class Matrix500x500 {
-    private static final int SIZE = 500;
-
-    public static void main(String[] args) {
-        int[][] matrix1 = generateMatrix(SIZE, SIZE);
-        int[][] matrix2 = generateMatrix(SIZE, SIZE);
-
-        long startTime = System.currentTimeMillis();
-        int[][] resultSequential = multiplyMatricesSequential(matrix1, matrix2);
-        long endTime = System.currentTimeMillis();
-        long sequentialTime = endTime - startTime;
-
-        startTime = System.currentTimeMillis();
-        int[][] resultParallel = multiplyMatricesParallel(matrix1, matrix2);
-        endTime = System.currentTimeMillis();
-        long parallelTime = endTime - startTime;
-
-        System.out.println("Sequential multiplication time: " + sequentialTime + " ms");
-        System.out.println("Parallel multiplication time: " + parallelTime + " ms");
-    }
-
-    public static int[][] multiplyMatricesSequential(int[][] matrix1, int[][] matrix2) {
-        int rows1 = matrix1.length;
-        int columns1 = matrix1[0].length;
-        int columns2 = matrix2[0].length;
-
-        int[][] result = new int[rows1][columns2];
-
-        for (int i = 0; i < rows1; i++) {
-            for (int j = 0; j < columns2; j++) {
-                for (int k = 0; k < columns1; k++) {
-                    result[i][j] += matrix1[i][k] * matrix2[k][j];
-                }
-            }
-        }
-
-        return result;
-    }
-
-    public static int[][] multiplyMatricesParallel(int[][] matrix1, int[][] matrix2) {
-        int rows1 = matrix1.length;
-        int columns1 = matrix1[0].length;
-        int columns2 = matrix2[0].length;
-
-        int[][] result = new int[rows1][columns2];
-
-        int numberOfThreads = 1; // Количество потоков
-        ExecutorService executor = Executors.newFixedThreadPool(numberOfThreads);
-
-        for (int i = 0; i < rows1; i++) {
-            final int row = i;
-            executor.execute(new Runnable() {
-                @Override
-                public void run() {
-                    for (int j = 0; j < columns2; j++) {
-                        for (int k = 0; k < columns1; k++) {
-                            result[row][j] += matrix1[row][k] * matrix2[k][j];
-                        }
-                    }
-                }
-            });
-        }
-
-        executor.shutdown();
-        while (!executor.isTerminated()) {
-            // Ожидаем завершения всех потоков
-        }
-
-        return result;
-    }
-
-    public static int[][] generateMatrix(int rows, int columns) {
-        int[][] matrix = new int[rows][columns];
-        for (int i = 0; i < rows; i++) {
-            for (int j = 0; j < columns; j++) {
-                matrix[i][j] = (int) (Math.random() * 10);
-            }
-        }
-        return matrix;
-    }
-}

belyaeva_ekaterina_lab_6/.gitignore

@@ -1,29 +0,0 @@
-### IntelliJ IDEA ###
-out/
-!**/src/main/**/out/
-!**/src/test/**/out/
-
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-
-### VS Code ###
-.vscode/
-
-### Mac OS ###
-.DS_Store

belyaeva_ekaterina_lab_6/README.md

@@ -1,105 +0,0 @@
-# Лабораторная работа №6
-
-## Задание
-
-Кратко: реализовать нахождение детерминанта квадратной матрицы.
-
-Подробно: в лабораторной работе требуется сделать два алгоритма: обычный и параллельный. В параллельном алгоритме предусмотреть ручное задание количества потоков, каждый из которых будет выполнять нахождение отдельной группы множителей.
-## Ход работы
-
-### Обычный алгоритм
-```
-private static BigDecimal findDeterminantGauss(double[][] matrix) {
-        int n = matrix.length;
-        BigDecimal det = BigDecimal.ONE;
-
-        for (int i = 0; i < n; i++) {
-            int maxRow = i;
-            for (int j = i + 1; j < n; j++) {
-                if (Math.abs(matrix[j][i]) > Math.abs(matrix[maxRow][i])) {
-                    maxRow = j;
-                }
-            }
-
-            if (maxRow != i) {
-                double[] temp = matrix[i];
-                matrix[i] = matrix[maxRow];
-                matrix[maxRow] = temp;
-
-                det = det.multiply(BigDecimal.valueOf(-1));
-            }
-
-            for (int j = i + 1; j < n; j++) {
-                double factor = matrix[j][i] / matrix[i][i];
-                for (int k = i; k < n; k++) {
-                    matrix[j][k] -= factor * matrix[i][k];
-                }
-            }
-        }
-
-        for (int i = 0; i < n; i++) {
-            det = det.multiply(BigDecimal.valueOf(matrix[i][i]));
-        }
-
-        return det;
-    }
-```
-### Параллельный алгоритм
-```
- private static BigDecimal findDeterminantGaussParallel(double[][] matrix, int threadsCount) {
-        int n = matrix.length;
-        final BigDecimal[] det = {BigDecimal.ONE};
-
-        ExecutorService executor = Executors.newFixedThreadPool(threadsCount);
-
-        for (int i = 0; i < n; i++) {
-            final int rowIdx = i;
-
-            int maxRow = rowIdx;
-            for (int j = rowIdx + 1; j < n; j++) {
-                if (Math.abs(matrix[j][rowIdx]) > Math.abs(matrix[maxRow][rowIdx])) {
-                    maxRow = j;
-                }
-            }
-
-            if (maxRow != rowIdx) {
-                double[] temp = matrix[rowIdx];
-                matrix[rowIdx] = matrix[maxRow];
-                matrix[maxRow] = temp;
-                det[0] = det[0].multiply(BigDecimal.valueOf(-1));
-            }
-            executor.execute(() -> {
-                for (int j = rowIdx + 1; j < n; j++) {
-                    double factor = matrix[j][rowIdx] / matrix[rowIdx][rowIdx];
-                    for (int k = rowIdx; k < n; k++) {
-                        matrix[j][k] -= factor * matrix[rowIdx][k];
-                    }
-                }
-            });
-            det[0] = det[0].multiply(BigDecimal.valueOf(matrix[rowIdx][rowIdx]));
-        }
-
-        executor.shutdown();
-
-        try {
-            executor.awaitTermination(1, TimeUnit.DAYS);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        return det[0];
-    }
-```
-
-## Результат
-
-Была проверка времени выполнения алгоритма для матриц размером 100х100, 300х300, 500х500 с разным количеством потоков.
-
-![img.png](img.png)
-
-Из данного скриншота можно сделать вывод, что нахождение детерминанта для матрицы:
-- 100х100 - обычный алгоритм работает лучше параллельного, но разница не сказать что значительная
-- 300х300 - обычный алгоритм работает хуже параллельного, но при добавлении потоков параллельный алгоритм работает чуть хуже
-- 500х500 - обычный алгоритм работает значительно лучше параллельного, но параллельный начинает показывать себя лучше при увеличении количества потоков (но обычный алгоритм все равно лучше)
-
-Работоспособность показана в видео: [lab6.mp4](lab6.mp4)

belyaeva_ekaterina_lab_6/src/Main.java

@@ -1,123 +0,0 @@
-import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
-
-public class Main {
-
-    public static double[][] generateMatrix(int n) {
-        double[][] matrix = new double[n][n];
-
-        for (int i = 0; i < n; i++) {
-            for (int j = 0; j < n; j++) {
-                matrix[i][j] = Math.round((Math.random() * 5));
-            }
-        }
-        return matrix;
-    }
-
-    private static BigDecimal findDeterminantGauss(double[][] matrix) {
-        int n = matrix.length;
-        BigDecimal det = BigDecimal.ONE;
-
-        for (int i = 0; i < n; i++) {
-            int maxRow = i;
-            for (int j = i + 1; j < n; j++) {
-                if (Math.abs(matrix[j][i]) > Math.abs(matrix[maxRow][i])) {
-                    maxRow = j;
-                }
-            }
-
-            if (maxRow != i) {
-                double[] temp = matrix[i];
-                matrix[i] = matrix[maxRow];
-                matrix[maxRow] = temp;
-
-                det = det.multiply(BigDecimal.valueOf(-1));
-            }
-
-            for (int j = i + 1; j < n; j++) {
-                double factor = matrix[j][i] / matrix[i][i];
-                for (int k = i; k < n; k++) {
-                    matrix[j][k] -= factor * matrix[i][k];
-                }
-            }
-        }
-
-        for (int i = 0; i < n; i++) {
-            det = det.multiply(BigDecimal.valueOf(matrix[i][i]));
-        }
-
-        return det;
-    }
-
-    private static BigDecimal findDeterminantGaussParallel(double[][] matrix, int threadsCount) {
-        int n = matrix.length;
-        final BigDecimal[] det = {BigDecimal.ONE};
-
-        ExecutorService executor = Executors.newFixedThreadPool(threadsCount);
-
-        for (int i = 0; i < n; i++) {
-            final int rowIdx = i;
-
-            int maxRow = rowIdx;
-            for (int j = rowIdx + 1; j < n; j++) {
-                if (Math.abs(matrix[j][rowIdx]) > Math.abs(matrix[maxRow][rowIdx])) {
-                    maxRow = j;
-                }
-            }
-
-            if (maxRow != rowIdx) {
-                double[] temp = matrix[rowIdx];
-                matrix[rowIdx] = matrix[maxRow];
-                matrix[maxRow] = temp;
-                det[0] = det[0].multiply(BigDecimal.valueOf(-1));
-            }
-            executor.execute(() -> {
-                for (int j = rowIdx + 1; j < n; j++) {
-                    double factor = matrix[j][rowIdx] / matrix[rowIdx][rowIdx];
-                    for (int k = rowIdx; k < n; k++) {
-                        matrix[j][k] -= factor * matrix[rowIdx][k];
-                    }
-                }
-            });
-            det[0] = det[0].multiply(BigDecimal.valueOf(matrix[rowIdx][rowIdx]));
-        }
-
-        executor.shutdown();
-
-        try {
-            executor.awaitTermination(1, TimeUnit.DAYS);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        return det[0];
-    }
-
-    public static void main(String[] args) {
-        run(100, 1);
-        run(100, 5);
-        run(300, 1);
-        run(300, 5);
-        run(500, 1);
-        run(500, 5);
-    }
-
-    public static void run(int n, int threadCount) {
-        System.out.println(String.format("Размер матрицы: %d х %d", n, n));
-        double[][] a = generateMatrix(n);
-        double[][] aClone = Arrays.copyOf(a, n);
-
-        long time = System.currentTimeMillis();
-        BigDecimal determinantGauss = findDeterminantGauss(a);
-        System.out.println("Время выполнения: " + (System.currentTimeMillis() - time) + "ms");
-
-        time = System.currentTimeMillis();
-        BigDecimal determinantGaussAsync = findDeterminantGaussParallel(aClone, threadCount);
-        System.out.println("Время параллельного выполнения: " + (System.currentTimeMillis() - time) + "ms, " +
-                "количество потоков: " + threadCount);
-        System.out.println();
-    }
-}

belyaeva_ekaterina_lab_7/README.md

@@ -1,28 +0,0 @@
-## Задание
-
-Эссе по вопросам:
-- Какие алгоритмы и методы используются для балансировки нагрузки?
-- Какие открытые и закрытые технологии существуют для балансировки нагрузки?
-- Как осуществляется балансировка нагрузки на базах данных?
-- Реверс-прокси как один из элементов балансировки нагрузки.
-
-## Ответ
-
-Балансировка нагрузки нужна для равномерного распределения запросов пользователей
-и ресурсов в системе.
-
-Для балансировки нагрузки используются различные алгоритмы и методы, например, Round Robin,
-когда каждый запрос направляется поочередно на каждый сервер в кластере. Также есть метод Least Connection, когда запросы 
-направляются на мервер с наименьшим количеством активных соединений и Weighted Round Robin, который отличается
-от обычного Round Robin тем, что у каждого сервера есть вес, который показывает его производительность, чтобы нагрузка у серверов
-была более распределенной.
-
-Существуют различные открытые и закрытые методы для балансировки нагрузки. Один из примеров для открытых технологий - nginx, 
-который был использован в одной из лабороторных работ. Он поддерживает различные методы балансировки нагрузки.   
-Касаемо закрытых технологий, в пример можно взять Citrix ADC, Kemp LoadMaster.
-
-Балансировка нагрузки на базах данных осуществляется с помощью различных методов, самый популярный из которых - горизонтальное масштабирование, 
-где где данные разделены на узлы, которые выполняют обработку только лишь собственной части данных, что позволяет распределить нагрузку и улучшить производительность БД.
-
-Реверс-прокси как элемент балансировки нагрузки является посредником между клиентом и сервером, принимая запросы клиентов 
-и перенеаправляя их на различный серверы, опираясь на их нагрузку, а затем передает ответ обратно пользователю.

belyaeva_ekaterina_lab_8/README.md

@@ -1,25 +0,0 @@
-# Лабораторная работа №8
-
-## Задание
-
-Эссе по вопросам:
-- Зачем сложные системы пишутся в распределенном стиле, где каждое отдельное приложение функционально выполняет только ограниченный спектр задач?
-- Для чего были созданы системы оркестрации приложений? Каким образом они упрощают/усложняют разработку и сопровождение распределенных систем?
-- Для чего нужны очереди обработки сообщений и что может подразумеваться под сообщениями?
-- Какие преимущества и недостатки распределенных приложений существуют на Ваш взгляд?
-- Целесообразно ли в сложную распределенную систему внедрять параллельные вычисления? Приведите примеры, когда это нужно, а когда нет.
-
-## Ответ
-
-Сложные системы пишутся в распределенном стиле для того, чтобы обеспечить масштабируемость и отказоустойчивость, а также каждый отдельный сервис оптимизируется для конкретных задач.
-Это упрощает разработку системы и распределяет нагрузку между ее компонентами.
-
-Системы оркестрации приложений были созданы для того, чтобы управлять распределенными системами (обсепечивать контроль и координацию между сервисами систем).
-Они упрощают разработку и сопровождение тем, что предоставляют дополнительные инструменты для работы с распределенными системами, но могут и усложнить разработку и сопровождение тем, что требуют дополнительного управления, персонала, и усложняют внедрение новых компонентов.
-
-Очереди обработки сообщений нужны для обмена информацией и координации между компонентами системы. Под сообщениями могут подразумеваться инструкции, запросы или просто данные.
-
-Одно из главных преимуществ распределенных систем - масштабируемость и распределение нагрузки на систему. Недостатки - сложность разработки, тестирования и синхронизации данных.
-
-Внедрять в сложную распределенную систему параллельные вычисления нужно тогда, когда вычисления являются специализацией системы и являются большими по объему (например, при перемножении матриц 100х100 это было нецелесообразно, но в примере с матрицей 500х500 параллельное умножение сыграло большую роль в уменьшении времени выполнения данного действия).
-Следовательно, это нужно тогда, когда вычисления большие, и не нужно, если операции относительно простые.

kutygin_andrey_lab_1/.idea/.gitignore

@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml

kutygin_andrey_lab_1/.idea/jpa-buddy.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JpaBuddyIdeaProjectConfig">
-    <option name="renamerInitialized" value="true" />
-  </component>
-</project>

kutygin_andrey_lab_1/.idea/misc.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="18" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="jpab" />
-  </component>
-</project>

kutygin_andrey_lab_1/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/kutygin_andrey_lab_1.iml" filepath="$PROJECT_DIR$/kutygin_andrey_lab_1.iml" />
-    </modules>
-  </component>
-</project>

kutygin_andrey_lab_1/.idea/workspace.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="2825a2d7-cbe6-410f-9785-96603cbb0f02" name="Changes" comment="" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectId" id="2aWZgD9jVzSrrT33mt6jGLtpCOt" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "project.structure.last.edited": "Modules",
-    "project.structure.proportion": "0.15",
-    "project.structure.side.proportion": "0.2"
-  }
-}]]></component>
-  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="C:\Users\kutyg\Downloads\pibd-22-internet-programming-Lab5 (1)\kutygin_andrey_lab_1" />
-    </key>
-  </component>
-  <component name="RunManager">
-    <configuration name="docker-compose.yml.rabbitmq: Compose Deployment" type="docker-deploy" factoryName="docker-compose.yml" temporary="true" server-name="Docker">
-      <deployment type="docker-compose.yml">
-        <settings>
-          <option name="services">
-            <list>
-              <option value="rabbitmq" />
-            </list>
-          </option>
-          <option name="sourceFilePath" value="docker-compose.yml" />
-        </settings>
-      </deployment>
-      <method v="2" />
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Docker.docker-compose.yml.rabbitmq: Compose Deployment" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="2825a2d7-cbe6-410f-9785-96603cbb0f02" name="Changes" comment="" />
-      <created>1704436409086</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1704436409086</updated>
-    </task>
-    <servers />
-  </component>
-</project>

kutygin_andrey_lab_1/README.md

@@ -1,28 +0,0 @@
-**Задание**
-***
-Развернуть не менее 3х сервисов через docker-compose.
-
-**Выполнение**
-***
-Было выбрано три сервиса: RabbitMQ, MediaWiki, WordPress.
-
-Описание сервисов:
-- "rabbitmq": использует образ rabbitmq:3.12.8-management и открывает порты 5672 и 15672 для доступа к RabbitMQ и его управляющему интерфейсу.
-- "mediawiki": использует образ mediawiki и открывает порт 8082 для доступа к серверу Mediawiki.
-- "wordpress": использует образ wordpress и открывает порт 8083 для доступа к серверу Wordpress.
-
-Описание томов:
-- "rabbitmq-data": том для хранения данных RabbitMQ.
-- "mediawiki-data": том для хранения данных Mediawiki.
-- "wordpress-data": том для хранения данных Wordpress.
-**Результаты:**
-***
-![mediawiki.png](screenshots/mediawiki.png)
-![rabbitmq.png](screenshots/rabbitmq.png)
-![wordpress.png](screenshots/wordpress.png)
-
-**Видео:**
-
-[![Видео по лабораторной](https://avatars.mds.yandex.net/i?id=39a897a792179979ea684bfffbe0ca3ce053731c-10928048-images-thumbs&n=13)](https://disk.yandex.ru/i/-9wvRKd04dLa8w)
-
-Нужно кликнуть на jpg, чтобы открылось

kutygin_andrey_lab_1/docker-compose.yml

@@ -1,27 +0,0 @@
-services:
-  rabbitmq:
-    image: rabbitmq:3.12.8-management
-    ports:
-      - 5672:5672
-      - 15672:15672
-    volumes:
-      - rabbitmq-data:/var/lib/rabbitmq
-
-  mediawiki:
-    image: mediawiki
-    ports:
-      - 8082:80
-    volumes:
-      - mediawiki-data:/var/files/mediawiki
-
-  wordpress:
-    image: wordpress
-    ports:
-      - 8083:80
-    volumes:
-      - wordpress-data:/var/files/wordpress
-
-volumes:
-  rabbitmq-data:
-  mediawiki-data:
-  wordpress-data:

kutygin_andrey_lab_1/kutygin_andrey_lab_1.iml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>