diff --git a/lab2.1/demo/demo.zip b/lab2.1/demo/demo.zip new file mode 100644 index 0000000..6a1b441 Binary files /dev/null and b/lab2.1/demo/demo.zip differ diff --git a/lab2.1/demo/demo/.gitignore b/lab2.1/demo/demo/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/lab2.1/demo/demo/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/lab2.1/demo/demo/build.gradle b/lab2.1/demo/demo/build.gradle new file mode 100644 index 0000000..2263922 --- /dev/null +++ b/lab2.1/demo/demo/build.gradle @@ -0,0 +1,27 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.2' + id 'io.spring.dependency-management' version '1.1.4' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +java { + sourceCompatibility = '17' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/lab2.1/demo/demo/gradle/wrapper/gradle-wrapper.jar b/lab2.1/demo/demo/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/lab2.1/demo/demo/gradle/wrapper/gradle-wrapper.jar differ diff --git a/lab2.1/demo/demo/gradle/wrapper/gradle-wrapper.properties b/lab2.1/demo/demo/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/lab2.1/demo/demo/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/lab2.1/demo/demo/gradle/wrapper/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/gradle/wrapper/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..084c423 Binary files /dev/null and b/lab2.1/demo/demo/gradle/wrapper/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/gradle/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/gradle/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..106a306 Binary files /dev/null and b/lab2.1/demo/demo/gradle/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/gradlew b/lab2.1/demo/demo/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/lab2.1/demo/demo/gradlew @@ -0,0 +1,249 @@ +#!/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/HEAD/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + 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 + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/lab2.1/demo/demo/gradlew.bat b/lab2.1/demo/demo/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/lab2.1/demo/demo/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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% equ 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% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/lab2.1/demo/demo/index.html b/lab2.1/demo/demo/index.html new file mode 100644 index 0000000..55419a6 --- /dev/null +++ b/lab2.1/demo/demo/index.html @@ -0,0 +1,61 @@ + + + + + + Document + + +

Push the button

+ +
+ +
+ +
+ +
+ + + + \ No newline at end of file diff --git a/lab2.1/demo/demo/settings.gradle b/lab2.1/demo/demo/settings.gradle new file mode 100644 index 0000000..0a383dd --- /dev/null +++ b/lab2.1/demo/demo/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'demo' diff --git a/lab2.1/demo/demo/src/main/java/com/example/demo/ApiController.java b/lab2.1/demo/demo/src/main/java/com/example/demo/ApiController.java new file mode 100644 index 0000000..94de943 --- /dev/null +++ b/lab2.1/demo/demo/src/main/java/com/example/demo/ApiController.java @@ -0,0 +1,58 @@ +package com.example.demo; + +import java.util.Date; +import java.util.List; +import java.util.ArrayList; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/user") +public class ApiController { + private final List users = new ArrayList<>(); + private final Logger log = LoggerFactory.getLogger(ApiController.class); + + // my methods + + @PostMapping + public User create(@RequestBody User user) { + users.add(user); + return user; + } + + @GetMapping + public List readAll() { + return users; + } + + @GetMapping("/{id}") + public User readOne(@PathVariable(name = "id") int id) { + return users.get(id); + } + + @DeleteMapping("/{id}") + public User delete(@RequestParam(name = "id") int id) { + User usr = users.get(id); + users.remove(id); + return usr; + } + + @PutMapping("/{id}") + public User update( + @PathVariable(name = "id") int id, + @RequestBody User user) { + users.remove(id); + users.add(id, user); + return users.get(id); + } +} diff --git a/lab2.1/demo/demo/src/main/java/com/example/demo/DemoApplication.java b/lab2.1/demo/demo/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..e03ec75 --- /dev/null +++ b/lab2.1/demo/demo/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,12 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } +} diff --git a/lab2.1/demo/demo/src/main/java/com/example/demo/User.java b/lab2.1/demo/demo/src/main/java/com/example/demo/User.java new file mode 100644 index 0000000..bfe520e --- /dev/null +++ b/lab2.1/demo/demo/src/main/java/com/example/demo/User.java @@ -0,0 +1,20 @@ +package com.example.demo; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + +public class User { + private String name; + + @JsonCreator + public User( + @JsonProperty(value = "name") String name) { + this.name = name; + + } + + public String getName() { + return name; + } + +} diff --git a/lab2.1/demo/demo/src/main/java/com/example/demo/WebConfig.java b/lab2.1/demo/demo/src/main/java/com/example/demo/WebConfig.java new file mode 100644 index 0000000..d5585a1 --- /dev/null +++ b/lab2.1/demo/demo/src/main/java/com/example/demo/WebConfig.java @@ -0,0 +1,15 @@ +package com.example.demo; + +import org.springframework.context.annotation.Configuration; +import org.springframework.lang.NonNull; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + @Override + public void addCorsMappings(@NonNull CorsRegistry registry) { + registry.addMapping("/**") + .allowedMethods("GET", "POST", "PUT", "DELETE"); + } +} diff --git a/lab2.1/demo/demo/src/main/java/com/example/demo/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/src/main/java/com/example/demo/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..f80ee4f Binary files /dev/null and b/lab2.1/demo/demo/src/main/java/com/example/demo/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/src/main/java/com/example/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/src/main/java/com/example/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..87596ac Binary files /dev/null and b/lab2.1/demo/demo/src/main/java/com/example/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/src/main/java/com/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/src/main/java/com/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..40eec4c Binary files /dev/null and b/lab2.1/demo/demo/src/main/java/com/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/src/main/java/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/src/main/java/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..b879dd2 Binary files /dev/null and b/lab2.1/demo/demo/src/main/java/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/src/main/resources/application.properties b/lab2.1/demo/demo/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/lab2.1/demo/demo/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/lab2.1/demo/demo/src/main/resources/static/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/src/main/resources/static/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..036f7fa Binary files /dev/null and b/lab2.1/demo/demo/src/main/resources/static/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/src/main/resources/templates/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/src/main/resources/templates/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..068bbc0 Binary files /dev/null and b/lab2.1/demo/demo/src/main/resources/templates/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/src/main/resources/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/src/main/resources/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..981ff2b Binary files /dev/null and b/lab2.1/demo/demo/src/main/resources/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/src/main/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/src/main/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..4f3a1f6 Binary files /dev/null and b/lab2.1/demo/demo/src/main/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/src/test/java/com/example/demo/DemoApplicationTests.java b/lab2.1/demo/demo/src/test/java/com/example/demo/DemoApplicationTests.java new file mode 100644 index 0000000..2778a6a --- /dev/null +++ b/lab2.1/demo/demo/src/test/java/com/example/demo/DemoApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DemoApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/lab2.1/demo/demo/src/test/java/com/example/demo/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/src/test/java/com/example/demo/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..cd84c19 Binary files /dev/null and b/lab2.1/demo/demo/src/test/java/com/example/demo/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/src/test/java/com/example/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/src/test/java/com/example/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..f4731fe Binary files /dev/null and b/lab2.1/demo/demo/src/test/java/com/example/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/src/test/java/com/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/src/test/java/com/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..6166b85 Binary files /dev/null and b/lab2.1/demo/demo/src/test/java/com/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/src/test/java/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/src/test/java/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..b9ee26f Binary files /dev/null and b/lab2.1/demo/demo/src/test/java/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/src/test/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/src/test/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..31bd6c6 Binary files /dev/null and b/lab2.1/demo/demo/src/test/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/src/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/src/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..63eb154 Binary files /dev/null and b/lab2.1/demo/demo/src/Содержание OneNote.onetoc2 differ diff --git a/lab2.1/demo/demo/Содержание OneNote.onetoc2 b/lab2.1/demo/demo/Содержание OneNote.onetoc2 new file mode 100644 index 0000000..82b6b03 Binary files /dev/null and b/lab2.1/demo/demo/Содержание OneNote.onetoc2 differ diff --git a/lab2.2/Лекция2-src/.gitignore b/lab2.2/Лекция2-src/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/lab2.2/Лекция2-src/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/lab2.2/Лекция2-src/build.gradle b/lab2.2/Лекция2-src/build.gradle new file mode 100644 index 0000000..b7867b9 --- /dev/null +++ b/lab2.2/Лекция2-src/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.3' + id 'io.spring.dependency-management' version '1.1.4' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +java { + sourceCompatibility = '17' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'org.modelmapper:modelmapper:3.2.0' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/lab2.2/Лекция2-src/gradle/wrapper/gradle-wrapper.jar b/lab2.2/Лекция2-src/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d64cd49 Binary files /dev/null and b/lab2.2/Лекция2-src/gradle/wrapper/gradle-wrapper.jar differ diff --git a/lab2.2/Лекция2-src/gradle/wrapper/gradle-wrapper.properties b/lab2.2/Лекция2-src/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1af9e09 --- /dev/null +++ b/lab2.2/Лекция2-src/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/lab2.2/Лекция2-src/gradlew b/lab2.2/Лекция2-src/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/lab2.2/Лекция2-src/gradlew @@ -0,0 +1,249 @@ +#!/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/HEAD/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + 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 + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/lab2.2/Лекция2-src/gradlew.bat b/lab2.2/Лекция2-src/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/lab2.2/Лекция2-src/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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% equ 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% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/lab2.2/Лекция2-src/settings.gradle b/lab2.2/Лекция2-src/settings.gradle new file mode 100644 index 0000000..0a383dd --- /dev/null +++ b/lab2.2/Лекция2-src/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'demo' diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/DemoApplication.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..b365b54 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,50 @@ +package com.example.demo; + +import java.util.Objects; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import com.example.demo.items.model.ItemEntity; +import com.example.demo.items.service.ItemService; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; + +@SpringBootApplication +public class DemoApplication implements CommandLineRunner { + private final Logger log = LoggerFactory.getLogger(DemoApplication.class); + + private final TypeService typeService; + private final ItemService itemService; + + public DemoApplication(TypeService typeService, ItemService itemService) { + this.typeService = typeService; + this.itemService = itemService; + } + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + + @Override + public void run(String... args) throws Exception { + if (args.length > 0 && Objects.equals("--populate", args[0])) { + log.info("Create default types values"); + final var type1 = typeService.create(new TypeEntity(null, "Ноутбук")); + final var type2 = typeService.create(new TypeEntity(null, "Телефон")); + final var type3 = typeService.create(new TypeEntity(null, "Игровая приставка")); + + log.info("Create default items values"); + itemService.create(new ItemEntity(null, type1, 49999.00, 20)); + itemService.create(new ItemEntity(null, type1, 129999.00, 3)); + itemService.create(new ItemEntity(null, type2, 15450.50, 30)); + itemService.create(new ItemEntity(null, type2, 69900.50, 10)); + itemService.create(new ItemEntity(null, type2, 150000.00, 6)); + itemService.create(new ItemEntity(null, type3, 75000.00, 6)); + itemService.create(new ItemEntity(null, type3, 67800.00, 3)); + } + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/configuration/Constants.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/configuration/Constants.java new file mode 100644 index 0000000..d9c6b7c --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/configuration/Constants.java @@ -0,0 +1,8 @@ +package com.example.demo.core.configuration; + +public class Constants { + public static final String API_URL = "/api/1.0"; + + private Constants() { + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java new file mode 100644 index 0000000..a5ad6f3 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/configuration/MapperConfiguration.java @@ -0,0 +1,13 @@ +package com.example.demo.core.configuration; + +import org.modelmapper.ModelMapper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MapperConfiguration { + @Bean + ModelMapper modelMapper() { + return new ModelMapper(); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/configuration/WebConfiguration.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/configuration/WebConfiguration.java new file mode 100644 index 0000000..762e85a --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/configuration/WebConfiguration.java @@ -0,0 +1,15 @@ +package com.example.demo.core.configuration; + +import org.springframework.context.annotation.Configuration; +import org.springframework.lang.NonNull; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfiguration implements WebMvcConfigurer { + @Override + public void addCorsMappings(@NonNull CorsRegistry registry) { + registry.addMapping("/**") + .allowedMethods("GET", "POST", "PUT", "DELETE"); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/error/NotFoundException.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/error/NotFoundException.java new file mode 100644 index 0000000..586af3c --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/error/NotFoundException.java @@ -0,0 +1,7 @@ +package com.example.demo.core.error; + +public class NotFoundException extends RuntimeException { + public NotFoundException(Long id) { + super(String.format("Entity with id [%s] is not found or not exists", id)); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/model/BaseEntity.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/model/BaseEntity.java new file mode 100644 index 0000000..674ddfb --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/model/BaseEntity.java @@ -0,0 +1,20 @@ +package com.example.demo.core.model; + +public abstract class BaseEntity { + protected Long id; + + protected BaseEntity() { + } + + protected BaseEntity(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/repository/CommonRepository.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/repository/CommonRepository.java new file mode 100644 index 0000000..85e1e6d --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/repository/CommonRepository.java @@ -0,0 +1,17 @@ +package com.example.demo.core.repository; + +import java.util.List; + +public interface CommonRepository { + List getAll(); + + E get(T id); + + E create(E entity); + + E update(E entity); + + E delete(E entity); + + void deleteAll(); +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/repository/MapRepository.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/repository/MapRepository.java new file mode 100644 index 0000000..6809ac2 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/core/repository/MapRepository.java @@ -0,0 +1,57 @@ +package com.example.demo.core.repository; + +import java.util.List; +import java.util.Map; +import java.util.TreeMap; + +import com.example.demo.core.model.BaseEntity; + +public abstract class MapRepository implements CommonRepository { + private final Map entities = new TreeMap<>(); + private Long lastId = 0L; + + protected MapRepository() { + } + + @Override + public List getAll() { + return entities.values().stream().toList(); + } + + @Override + public E get(Long id) { + return entities.get(id); + } + + @Override + public E create(E entity) { + lastId++; + entity.setId(lastId); + entities.put(lastId, entity); + return entity; + } + + @Override + public E update(E entity) { + if (get(entity.getId()) == null) { + return null; + } + entities.put(entity.getId(), entity); + return entity; + } + + @Override + public E delete(E entity) { + if (get(entity.getId()) == null) { + return null; + } + entities.remove(entity.getId()); + return entity; + } + + @Override + public void deleteAll() { + lastId = 0L; + entities.clear(); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/items/api/ItemController.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/items/api/ItemController.java new file mode 100644 index 0000000..ffeceaf --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/items/api/ItemController.java @@ -0,0 +1,70 @@ +package com.example.demo.items.api; + +import java.util.List; + +import org.modelmapper.ModelMapper; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.items.model.ItemEntity; +import com.example.demo.items.service.ItemService; +import com.example.demo.types.service.TypeService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/item") +public class ItemController { + private final ItemService itemService; + private final TypeService typeService; + private final ModelMapper modelMapper; + + public ItemController(ItemService itemService, TypeService typeService, ModelMapper modelMapper) { + this.itemService = itemService; + this.typeService = typeService; + this.modelMapper = modelMapper; + } + + private ItemDto toDto(ItemEntity entity) { + return modelMapper.map(entity, ItemDto.class); + } + + private ItemEntity toEntity(ItemDto dto) { + final ItemEntity entity = modelMapper.map(dto, ItemEntity.class); + entity.setType(typeService.get(dto.getTypeId())); + return entity; + } + + @GetMapping + public List getAll(@RequestParam(name = "typeId", defaultValue = "0") Long typeId) { + return itemService.getAll(typeId).stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public ItemDto get(@PathVariable(name = "id") Long id) { + return toDto(itemService.get(id)); + } + + @PostMapping + public ItemDto create(@RequestBody @Valid ItemDto dto) { + return toDto(itemService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public ItemDto update(@PathVariable(name = "id") Long id, @RequestBody ItemDto dto) { + return toDto(itemService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public ItemDto delete(@PathVariable(name = "id") Long id) { + return toDto(itemService.delete(id)); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/items/api/ItemDto.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/items/api/ItemDto.java new file mode 100644 index 0000000..023ffc4 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/items/api/ItemDto.java @@ -0,0 +1,57 @@ +package com.example.demo.items.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public class ItemDto { + private Long id; + @NotNull + @Min(1) + private Long typeId; + @NotNull + @Min(1) + private Double price; + @NotNull + @Min(1) + private Integer count; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getTypeId() { + return typeId; + } + + public void setTypeId(Long typeId) { + this.typeId = typeId; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Double getSum() { + return price * count; + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/items/model/ItemEntity.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/items/model/ItemEntity.java new file mode 100644 index 0000000..55951d9 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/items/model/ItemEntity.java @@ -0,0 +1,65 @@ +package com.example.demo.items.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.types.model.TypeEntity; + +public class ItemEntity extends BaseEntity { + private TypeEntity type; + private Double price; + private Integer count; + + public ItemEntity() { + super(); + } + + public ItemEntity(Long id, TypeEntity type, Double price, Integer count) { + super(id); + this.type = type; + this.price = price; + this.count = count; + } + + public TypeEntity getType() { + return type; + } + + public void setType(TypeEntity type) { + this.type = type; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Integer getCount() { + return count; + } + + public void setCount(Integer count) { + this.count = count; + } + + @Override + public int hashCode() { + return Objects.hash(id, type, price, count); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final ItemEntity other = (ItemEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getType(), type) + && Objects.equals(other.getPrice(), price) + && Objects.equals(other.getCount(), count); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/items/repository/ItemRepository.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/items/repository/ItemRepository.java new file mode 100644 index 0000000..6488c26 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/items/repository/ItemRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.items.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.core.repository.MapRepository; +import com.example.demo.items.model.ItemEntity; + +@Repository +public class ItemRepository extends MapRepository { +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/items/service/ItemService.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/items/service/ItemService.java new file mode 100644 index 0000000..7678a2c --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/items/service/ItemService.java @@ -0,0 +1,51 @@ +package com.example.demo.items.service; + +import java.util.List; +import java.util.Objects; +import java.util.Optional; + +import org.springframework.stereotype.Service; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.items.model.ItemEntity; +import com.example.demo.items.repository.ItemRepository; + +@Service +public class ItemService { + private final ItemRepository repository; + + public ItemService(ItemRepository repository) { + this.repository = repository; + } + + public List getAll(Long typeId) { + if (Objects.equals(typeId, 0L)) { + return repository.getAll(); + } + return repository.getAll().stream() + .filter(item -> item.getType().getId().equals(typeId)) + .toList(); + } + + public ItemEntity get(Long id) { + return Optional.ofNullable(repository.get(id)) + .orElseThrow(() -> new NotFoundException(id)); + } + + public ItemEntity create(ItemEntity entity) { + return repository.create(entity); + } + + public ItemEntity update(Long id, ItemEntity entity) { + final ItemEntity existsEntity = get(id); + existsEntity.setType(entity.getType()); + existsEntity.setPrice(entity.getPrice()); + existsEntity.setCount(entity.getCount()); + return repository.update(existsEntity); + } + + public ItemEntity delete(Long id) { + final ItemEntity existsEntity = get(id); + return repository.delete(existsEntity); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/reviews/api/ReviewController.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/reviews/api/ReviewController.java new file mode 100644 index 0000000..7f57e30 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/reviews/api/ReviewController.java @@ -0,0 +1,70 @@ +package com.example.demo.reviews.api; + +import java.util.List; + +import org.modelmapper.ModelMapper; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.reviews.model.ReviewEntity; +import com.example.demo.reviews.service.ReviewService; +import com.example.demo.users.service.UserService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/review") +public class ReviewController { + private final ReviewService reviewService; + private final UserService userService; + private final ModelMapper modelMapper; + + public ReviewController(ReviewService reviewService, UserService userService, ModelMapper modelMapper) { + this.reviewService = reviewService; + this.userService = userService; + this.modelMapper = modelMapper; + } + + private ReviewDto toDto(ReviewEntity entity) { + return modelMapper.map(entity, ReviewDto.class); + } + + private ReviewEntity toEntity(ReviewDto dto) { + final ReviewEntity entity = modelMapper.map(dto, ReviewEntity.class); + entity.setUser(userService.get(dto.getUserId())); + return entity; + } + + @GetMapping + public List getAll(@RequestParam(name = "userId", defaultValue = "0") Long userId) { + return reviewService.getAll(userId).stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public ReviewDto get(@PathVariable(name = "id") Long id) { + return toDto(reviewService.get(id)); + } + + @PostMapping + public ReviewDto create(@RequestBody @Valid ReviewDto dto) { + return toDto(reviewService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public ReviewDto update(@PathVariable(name = "id") Long id, @RequestBody ReviewDto dto) { + return toDto(reviewService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public ReviewDto delete(@PathVariable(name = "id") Long id) { + return toDto(reviewService.delete(id)); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/reviews/api/ReviewDto.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/reviews/api/ReviewDto.java new file mode 100644 index 0000000..a8d48a6 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/reviews/api/ReviewDto.java @@ -0,0 +1,52 @@ +package com.example.demo.reviews.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public class ItemDto { + private Long id; + @NotNull + @Min(1) + private Long userId; + @NotNull + // @Min(1) + private Date date; + @NotNull + @Min(1) + private String text; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public String getText() { + return text; + } + + public void setText(String date) { + this.date = date; + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/reviews/model/ReviewEntity.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/reviews/model/ReviewEntity.java new file mode 100644 index 0000000..7002d5d --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/reviews/model/ReviewEntity.java @@ -0,0 +1,65 @@ +package com.example.demo.reviews.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; +import com.example.demo.users.model.UserEntity; + +public class ReviewEntity extends BaseEntity { + private UserEntity type; + private Date date; + private String text; + + public ReviewEntity() { + super(); + } + + public ReviewEntity(Long id, UserEntity user, Date date, String text) { + super(id); + this.user = user; + this.date = date; + this.text = text; + } + + public UserEntity getUser() { + return user; + } + + public void setUser(UserEntity user) { + this.user = user; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public String getText() { + return text; + } + + public void setText(String date) { + this.date = date; + } + + @Override + public int hashCode() { + return Objects.hash(id, user, date, text); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final ReviewEntity other = (ReviewEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getUser(), user) + && Objects.equals(other.getDate(), date) + && Objects.equals(other.getText(), text); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/reviews/repository/ReviewRepository.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/reviews/repository/ReviewRepository.java new file mode 100644 index 0000000..6a5470c --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/reviews/repository/ReviewRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.reviews.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.core.repository.MapRepository; +import com.example.demo.reviews.model.ReviewEntity; + +@Repository +public class ReviewRepository extends MapRepository { +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/reviews/service/ReviewService.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/reviews/service/ReviewService.java new file mode 100644 index 0000000..62d44da --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/reviews/service/ReviewService.java @@ -0,0 +1,51 @@ +package com.example.demo.reviews.service; + +import java.util.List; +import java.util.Objects; +import java.util.Optional; + +import org.springframework.stereotype.Service; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.reviews.model.ReviewEntity; +import com.example.demo.reviews.repository.ReviewRepository; + +@Service +public class ReviewService { + private final ReviewRepository repository; + + public ReviewService(ReviewRepository repository) { + this.repository = repository; + } + + public List getAll(Long userId) { + if (Objects.equals(userId, 0L)) { + return repository.getAll(); + } + return repository.getAll().stream() + .filter(review -> review.getUser().getId().equals(userId)) + .toList(); + } + + public ReviewEntity get(Long id) { + return Optional.ofNullable(repository.get(id)) + .orElseThrow(() -> new NotFoundException(id)); + } + + public ReviewEntity create(ReviewEntity entity) { + return repository.create(entity); + } + + public ReviewEntity update(Long id, ReviewEntity entity) { + final ReviewEntity existsEntity = get(id); + existsEntity.setUser(entity.getUser()); + existsEntity.setDate(entity.getDate()); + existsEntity.setText(entity.getText()); + return repository.update(existsEntity); + } + + public ReviewEntity delete(Long id) { + final ReviewEntity existsEntity = get(id); + return repository.delete(existsEntity); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/api/SpeakerController.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/api/SpeakerController.java new file mode 100644 index 0000000..293296d --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/api/SpeakerController.java @@ -0,0 +1,23 @@ +package com.example.demo.speaker.api; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.speaker.service.SpeakerService; + +@RestController +public class SpeakerController { + private final SpeakerService speakerService; + + public SpeakerController(SpeakerService speakerService) { + this.speakerService = speakerService; + } + + @GetMapping + public String hello( + @RequestParam(value = "name", defaultValue = "Мир") String name, + @RequestParam(value = "lang", defaultValue = "ru") String lang) { + return speakerService.say(name, lang); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/configuration/SpeakerConfiguration.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/configuration/SpeakerConfiguration.java new file mode 100644 index 0000000..0ef7cda --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/configuration/SpeakerConfiguration.java @@ -0,0 +1,27 @@ +package com.example.demo.speaker.configuration; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import com.example.demo.speaker.domain.Speaker; +import com.example.demo.speaker.domain.SpeakerEng; +import com.example.demo.speaker.domain.SpeakerRus; + +@Configuration +public class SpeakerConfiguration { + private final Logger log = LoggerFactory.getLogger(SpeakerConfiguration.class); + + @Bean(value = "ru", initMethod = "init", destroyMethod = "destroy") + public SpeakerRus createRusSpeaker() { + log.info("Call createRusSpeaker()"); + return new SpeakerRus(); + } + + @Bean(value = "en") + public Speaker createEngSpeaker() { + log.info("Call createEngSpeaker()"); + return new SpeakerEng(); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/domain/Speaker.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/domain/Speaker.java new file mode 100644 index 0000000..27a0a29 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/domain/Speaker.java @@ -0,0 +1,5 @@ +package com.example.demo.speaker.domain; + +public interface Speaker { + String say(); +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/domain/SpeakerDeu.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/domain/SpeakerDeu.java new file mode 100644 index 0000000..5909864 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/domain/SpeakerDeu.java @@ -0,0 +1,28 @@ +package com.example.demo.speaker.domain; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; + +@Component(value = "de") +public class SpeakerDeu implements Speaker { + private final Logger log = LoggerFactory.getLogger(SpeakerDeu.class); + + @Override + public String say() { + return "Hallo"; + } + + @PostConstruct + public void init() { + log.info("SpeakerDeu.init()"); + } + + @PreDestroy + public void destroy() { + log.info("SpeakerDeu.destroy()"); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/domain/SpeakerEng.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/domain/SpeakerEng.java new file mode 100644 index 0000000..a310403 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/domain/SpeakerEng.java @@ -0,0 +1,26 @@ +package com.example.demo.speaker.domain; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.DisposableBean; +import org.springframework.beans.factory.InitializingBean; + +public class SpeakerEng implements Speaker, InitializingBean, DisposableBean { + private final Logger log = LoggerFactory.getLogger(SpeakerEng.class); + + @Override + public String say() { + return "Hello"; + } + + @Override + public void afterPropertiesSet() { + log.info("SpeakerEng.afterPropertiesSet()"); + } + + @Override + public void destroy() { + log.info("SpeakerEng.destroy()"); + + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/domain/SpeakerRus.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/domain/SpeakerRus.java new file mode 100644 index 0000000..d6ed18e --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/domain/SpeakerRus.java @@ -0,0 +1,21 @@ +package com.example.demo.speaker.domain; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class SpeakerRus implements Speaker { + private final Logger log = LoggerFactory.getLogger(SpeakerRus.class); + + @Override + public String say() { + return "Привет"; + } + + public void init() { + log.info("SpeakerRus.init()"); + } + + public void destroy() { + log.info("SpeakerRus.destroy()"); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/service/SpeakerService.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/service/SpeakerService.java new file mode 100644 index 0000000..db81ba4 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/speaker/service/SpeakerService.java @@ -0,0 +1,20 @@ +package com.example.demo.speaker.service; + +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Service; + +import com.example.demo.speaker.domain.Speaker; + +@Service +public class SpeakerService { + private final ApplicationContext applicationContext; + + public SpeakerService(ApplicationContext applicationContext) { + this.applicationContext = applicationContext; + } + + public String say(String name, String lang) { + final Speaker speaker = (Speaker) applicationContext.getBean(lang); + return String.format("%s, %s!", speaker.say(), name); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/types/api/TypeController.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/types/api/TypeController.java new file mode 100644 index 0000000..81f07cf --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/types/api/TypeController.java @@ -0,0 +1,64 @@ +package com.example.demo.types.api; + +import java.util.List; + +import org.modelmapper.ModelMapper; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/type") +public class TypeController { + private final TypeService typeService; + private final ModelMapper modelMapper; + + public TypeController(TypeService typeService, ModelMapper modelMapper) { + this.typeService = typeService; + this.modelMapper = modelMapper; + } + + private TypeDto toDto(TypeEntity entity) { + return modelMapper.map(entity, TypeDto.class); + } + + private TypeEntity toEntity(TypeDto dto) { + return modelMapper.map(dto, TypeEntity.class); + } + + @GetMapping + public List getAll() { + return typeService.getAll().stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public TypeDto get(@PathVariable(name = "id") Long id) { + return toDto(typeService.get(id)); + } + + @PostMapping + public TypeDto create(@RequestBody @Valid TypeDto dto) { + return toDto(typeService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public TypeDto update(@PathVariable(name = "id") Long id, @RequestBody TypeDto dto) { + return toDto(typeService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public TypeDto delete(@PathVariable(name = "id") Long id) { + return toDto(typeService.delete(id)); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/types/api/TypeDto.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/types/api/TypeDto.java new file mode 100644 index 0000000..c559680 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/types/api/TypeDto.java @@ -0,0 +1,28 @@ +package com.example.demo.types.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.NotBlank; + +public class TypeDto { + private Long id; + @NotBlank + private String name; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + 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; + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/types/model/TypeEntity.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/types/model/TypeEntity.java new file mode 100644 index 0000000..fd90bdb --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/types/model/TypeEntity.java @@ -0,0 +1,43 @@ +package com.example.demo.types.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +public class TypeEntity extends BaseEntity { + private String name; + + public TypeEntity() { + super(); + } + + public TypeEntity(Long id, String name) { + super(id); + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @Override + public int hashCode() { + return Objects.hash(id, name); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final TypeEntity other = (TypeEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getName(), name); + } + +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/types/repository/TypeRepository.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/types/repository/TypeRepository.java new file mode 100644 index 0000000..1c29ea2 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/types/repository/TypeRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.types.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.core.repository.MapRepository; +import com.example.demo.types.model.TypeEntity; + +@Repository +public class TypeRepository extends MapRepository { +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/types/service/TypeService.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/types/service/TypeService.java new file mode 100644 index 0000000..e71b030 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/types/service/TypeService.java @@ -0,0 +1,43 @@ +package com.example.demo.types.service; + +import java.util.List; +import java.util.Optional; + +import org.springframework.stereotype.Service; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.repository.TypeRepository; + +@Service +public class TypeService { + private final TypeRepository repository; + + public TypeService(TypeRepository repository) { + this.repository = repository; + } + + public List getAll() { + return repository.getAll(); + } + + public TypeEntity get(Long id) { + return Optional.ofNullable(repository.get(id)) + .orElseThrow(() -> new NotFoundException(id)); + } + + public TypeEntity create(TypeEntity entity) { + return repository.create(entity); + } + + public TypeEntity update(Long id, TypeEntity entity) { + final TypeEntity existsEntity = get(id); + existsEntity.setName(entity.getName()); + return repository.update(existsEntity); + } + + public TypeEntity delete(Long id) { + final TypeEntity existsEntity = get(id); + return repository.delete(existsEntity); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/users/api/UserController.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/users/api/UserController.java new file mode 100644 index 0000000..8ada30e --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/users/api/UserController.java @@ -0,0 +1,65 @@ +package com.example.demo.items.api; + +import java.util.List; + +import org.modelmapper.ModelMapper; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.example.demo.core.configuration.Constants; +import com.example.demo.users.api.UserDto; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.service.UserService; + +import jakarta.validation.Valid; + +@RestController +@RequestMapping(Constants.API_URL + "/user") +public class ItemController { + private final UserService UserService; + private final ModelMapper modelMapper; + + public ItemController(UserService userService, ModelMapper modelMapper) { + this.userService = userService; + this.modelMapper = modelMapper; + } + + private UserDto toDto(UserEntity entity) { + return modelMapper.map(entity, UserDto.class); + } + + private UserEntity toEntity(UserDto dto) { + return modelMapper.map(dto, UserEntity.class); + } + + @GetMapping + public List getAll() { + return userService.getAll().stream().map(this::toDto).toList(); + } + + @GetMapping("/{id}") + public UserDto get(@PathVariable(name = "id") Long id) { + return toDto(userService.get(id)); + } + + @PostMapping + public UserDto create(@RequestBody @Valid UserDto dto) { + return toDto(userService.create(toEntity(dto))); + } + + @PutMapping("/{id}") + public UserDto update(@PathVariable(name = "id") Long id, @RequestBody UserDto dto) { + return toDto(userService.update(id, toEntity(dto))); + } + + @DeleteMapping("/{id}") + public UserDto delete(@PathVariable(name = "id") Long id) { + return toDto(userService.delete(id)); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/users/api/UserDto.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/users/api/UserDto.java new file mode 100644 index 0000000..49febe0 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/users/api/UserDto.java @@ -0,0 +1,52 @@ +package com.example.demo.users.api; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; + +public class UserDto { + private Long id; + @NotNull + @Min(1) + private String handle; + @NotNull + @Min(1) + private String email; + @NotNull + @Min(1) + private String password; + + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getHandle() { + return typeId; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/users/model/UserEntity.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/users/model/UserEntity.java new file mode 100644 index 0000000..2f9fd1b --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/users/model/UserEntity.java @@ -0,0 +1,65 @@ +package com.example.demo.users.model; + +import java.util.Objects; + +import com.example.demo.core.model.BaseEntity; + +public class UserEntity extends BaseEntity { + + private String handle; + private String email; + private String password; + + public UserEntity() { + super(); + } + + public UserEntity(Long id, String handle, String email, String password) { + super(id); + this.handle = handle; + this.email = email; + this.password = password; + } + + public String getHandle() { + return handle; + } + + public void setHandle(String handle) { + this.handle = handle; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Override + public int hashCode() { + return Objects.hash(id, handle, email, password); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; + final ItemEntity other = (ItemEntity) obj; + return Objects.equals(other.getId(), id) + && Objects.equals(other.getHandle(), handle) + && Objects.equals(other.getEmail(), email) + && Objects.equals(other.getPassword(), password); + } +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/users/repository/UserRepository.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/users/repository/UserRepository.java new file mode 100644 index 0000000..fa4b654 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/users/repository/UserRepository.java @@ -0,0 +1,10 @@ +package com.example.demo.users.repository; + +import org.springframework.stereotype.Repository; + +import com.example.demo.core.repository.MapRepository; +import com.example.demo.users.model.UserEntity; + +@Repository +public class UserRepository extends MapRepository { +} diff --git a/lab2.2/Лекция2-src/src/main/java/com/example/demo/users/service/UserService.java b/lab2.2/Лекция2-src/src/main/java/com/example/demo/users/service/UserService.java new file mode 100644 index 0000000..24354eb --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/java/com/example/demo/users/service/UserService.java @@ -0,0 +1,45 @@ +package com.example.demo.users.service; + +import java.util.List; +import java.util.Optional; + +import org.springframework.stereotype.Service; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.users.model.UserEntity; +import com.example.demo.users.repository.UserRepository; + +@Service +public class UserService { + private final UserRepository repository; + + public UserService(UserRepository repository) { + this.repository = repository; + } + + public List getAll() { + return repository.getAll(); + } + + public UserEntity get(Long id) { + return Optional.ofNullable(repository.get(id)) + .orElseThrow(() -> new NotFoundException(id)); + } + + public UserEntity create(UserEntity entity) { + return repository.create(entity); + } + + public UserEntity update(Long id, UserEntity entity) { + final UserEntity existsEntity = get(id); + existsEntity.setHandle(entity.getHandle()); + existsEntity.setEmail(entity.getEmail()); + existsEntity.setPassword(entity.getPassword()); + return repository.update(existsEntity); + } + + public UserEntity delete(Long id) { + final UserEntity existsEntity = get(id); + return repository.delete(existsEntity); + } +} diff --git a/lab2.2/Лекция2-src/src/main/resources/application.properties b/lab2.2/Лекция2-src/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/lab2.2/Лекция2-src/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/lab2.2/Лекция2-src/src/test/java/com/example/demo/SpeakerSrviceTests.java b/lab2.2/Лекция2-src/src/test/java/com/example/demo/SpeakerSrviceTests.java new file mode 100644 index 0000000..d8624d3 --- /dev/null +++ b/lab2.2/Лекция2-src/src/test/java/com/example/demo/SpeakerSrviceTests.java @@ -0,0 +1,38 @@ +package com.example.demo; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import com.example.demo.speaker.service.SpeakerService; + +@SpringBootTest +class SpeakerSrviceTests { + @Autowired + SpeakerService speakerService; + + @Test + void testSpeakerRus() { + final String res = speakerService.say("Мир", "ru"); + Assertions.assertEquals("Привет, Мир!", res); + } + + @Test + void testSpeakerEng() { + final String res = speakerService.say("World", "en"); + Assertions.assertEquals("Hello, World!", res); + } + + @Test + void testSpeakerDeu() { + final String res = speakerService.say("Welt", "de"); + Assertions.assertEquals("Hallo, Welt!", res); + } + + @Test + void testSpeakerErrorWired() { + Assertions.assertThrows(NoSuchBeanDefinitionException.class, () -> speakerService.say("Мир", "rus")); + } +} diff --git a/lab2.2/Лекция2-src/src/test/java/com/example/demo/TypeServiceTests.java b/lab2.2/Лекция2-src/src/test/java/com/example/demo/TypeServiceTests.java new file mode 100644 index 0000000..409d4d9 --- /dev/null +++ b/lab2.2/Лекция2-src/src/test/java/com/example/demo/TypeServiceTests.java @@ -0,0 +1,61 @@ +package com.example.demo; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import com.example.demo.core.error.NotFoundException; +import com.example.demo.types.model.TypeEntity; +import com.example.demo.types.service.TypeService; + +@SpringBootTest +@TestMethodOrder(OrderAnnotation.class) +class TypeServiceTests { + @Autowired + private TypeService typeService; + + @Test + void getTest() { + Assertions.assertThrows(NotFoundException.class, () -> typeService.get(0L)); + } + + @Test + @Order(1) + void createTest() { + typeService.create(new TypeEntity(null, "Ноутбук")); + typeService.create(new TypeEntity(null, "Телефон")); + final TypeEntity last = typeService.create(new TypeEntity(null, "Игровая приставка")); + Assertions.assertEquals(3, typeService.getAll().size()); + Assertions.assertEquals(last, typeService.get(3L)); + } + + @Test + @Order(2) + void updateTest() { + final String test = "TEST"; + final TypeEntity entity = typeService.get(3L); + final String oldName = entity.getName(); + final TypeEntity newEntity = typeService.update(3L, new TypeEntity(1L, test)); + Assertions.assertEquals(3, typeService.getAll().size()); + Assertions.assertEquals(newEntity, typeService.get(3L)); + Assertions.assertEquals(test, newEntity.getName()); + Assertions.assertNotEquals(oldName, newEntity.getName()); + } + + @Test + @Order(3) + void deleteTest() { + typeService.delete(3L); + Assertions.assertEquals(2, typeService.getAll().size()); + final TypeEntity last = typeService.get(2L); + Assertions.assertEquals(2L, last.getId()); + + final TypeEntity newEntity = typeService.create(new TypeEntity(null, "Игровая приставка")); + Assertions.assertEquals(3, typeService.getAll().size()); + Assertions.assertEquals(4L, newEntity.getId()); + } +}