commit 9f6edb2aa10ff8a4714d46827cfde35b458fc90f Author: tacehex Date: Mon Jul 1 15:00:38 2024 +0300 add - перенос из hg в git diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..cb28b0e Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..5f0536e --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..66df285 --- /dev/null +++ b/mvnw @@ -0,0 +1,308 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "$(uname)" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin ; then + javaHome="$(dirname "\"$javaExecutable\"")" + javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "\"$javaExecutable\"")" + fi + javaHome="$(dirname "\"$javaExecutable\"")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$(cd "$wdir/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +fi + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..95ba6f5 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,205 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..9681651 --- /dev/null +++ b/pom.xml @@ -0,0 +1,103 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.2.2 + + + ru.integrics + espd-server + 0.0.1-SNAPSHOT + espd-server + espd-server + + 17 + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-jooq + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.postgresql + postgresql + runtime + + + org.projectlombok + lombok + true + + + org.springframework.boot + spring-boot-starter-test + test + + + com.fasterxml.jackson.core + jackson-databind + 2.16.1 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + + + + org.jooq + jooq-codegen-maven + 3.14.16 + + + generate-sources + + generate + + + + + + jdbc:postgresql://localhost:5435/rois + rois + FHrnU&3487&h*&E&Fue7746 + + + + COMP_EQUIPMENT + public + + + ru.integrics.espdserver.db.gen + ${project.build.directory}/generated-sources/jooq + + + + + + + + diff --git a/src/main/java/ru/integrics/espdserver/EspdServerApplication.java b/src/main/java/ru/integrics/espdserver/EspdServerApplication.java new file mode 100644 index 0000000..a948020 --- /dev/null +++ b/src/main/java/ru/integrics/espdserver/EspdServerApplication.java @@ -0,0 +1,13 @@ +package ru.integrics.espdserver; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class EspdServerApplication { + + public static void main(String[] args) { + SpringApplication.run(EspdServerApplication.class, args); + } + +} diff --git a/src/main/java/ru/integrics/espdserver/api/RestApi.java b/src/main/java/ru/integrics/espdserver/api/RestApi.java new file mode 100644 index 0000000..7fb51eb --- /dev/null +++ b/src/main/java/ru/integrics/espdserver/api/RestApi.java @@ -0,0 +1,35 @@ +package ru.integrics.espdserver.api; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import ru.integrics.espdserver.db.DbService; +import ru.integrics.espdserver.jsonObjects.Status; +import ru.integrics.espdserver.jsonObjects.FullConfig; +import ru.integrics.espdserver.jsonObjects.Rooms; +import ru.integrics.espdserver.jsonObjects.School; + +@RestController +@RequestMapping("/espd") +public class RestApi { + private final DbService dbService; + + @Autowired + public RestApi(DbService dbService) { + this.dbService = dbService; + } + + @GetMapping("/school={schoolCode}") + public School getSchoolNameAndBuildings(@PathVariable("schoolCode") String schoolCode) { + return dbService.getSchoolNameAndBuildings(schoolCode); + } + + @GetMapping("/rooms={sysGuidFk}") + public Rooms getRooms(@PathVariable("sysGuidFk") String sysGuidFk) { + return dbService.getRooms(sysGuidFk); + } + + @PostMapping(value = "/configs") + public Status enterConfig(@RequestBody FullConfig config) { + return dbService.enterConfig(config); + } +} diff --git a/src/main/java/ru/integrics/espdserver/controllers/JsonController.java b/src/main/java/ru/integrics/espdserver/controllers/JsonController.java new file mode 100644 index 0000000..a2d2b05 --- /dev/null +++ b/src/main/java/ru/integrics/espdserver/controllers/JsonController.java @@ -0,0 +1,31 @@ +package ru.integrics.espdserver.controllers; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import java.util.HashMap; +import java.util.Map; + +public class JsonController { + private final ObjectMapper objectMapper = new ObjectMapper(); + private final Map data = new HashMap<>(); + + public void addData(String key, Object value) { + data.put(key, value); + } + + public void addNestedData(String parentKey, String childKey, Object childValue) { + if (data.containsKey(parentKey)) { + Map nestedData = (Map) data.get(parentKey); + nestedData.put(childKey, childValue); + } else { + Map nestedData = new HashMap<>(); + nestedData.put(childKey, childValue); + data.put(parentKey, nestedData); + } + } + + public String toJson() throws JsonProcessingException { + return objectMapper.writeValueAsString(data); + } +} diff --git a/src/main/java/ru/integrics/espdserver/db/DbService.java b/src/main/java/ru/integrics/espdserver/db/DbService.java new file mode 100644 index 0000000..4008685 --- /dev/null +++ b/src/main/java/ru/integrics/espdserver/db/DbService.java @@ -0,0 +1,151 @@ +package ru.integrics.espdserver.db; + +import java.math.BigDecimal; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.jooq.DSLContext; +import org.jooq.Record; +import org.jooq.Result; +import org.jooq.tools.StringUtils; +import org.springframework.stereotype.Service; +import ru.integrics.espdserver.db.gen.tables.CompEquipment; +import ru.integrics.espdserver.jsonObjects.Building; +import ru.integrics.espdserver.jsonObjects.FullConfig; +import ru.integrics.espdserver.jsonObjects.Room; +import ru.integrics.espdserver.jsonObjects.Rooms; +import ru.integrics.espdserver.jsonObjects.School; +import ru.integrics.espdserver.jsonObjects.Status; + +@Service +public class DbService { + private static final Logger log = LogManager.getLogger(ru.integrics.espdserver.db.DbService.class); + + private final DSLContext service; + + private static final CompEquipment COMP_EQUIPMENT_DB = CompEquipment.COMP_EQUIPMENT.as("compEquipment"); + + public DbService(DSLContext service) { + this.service = service; + } + + public School getSchoolNameAndBuildings(String schoolCode) { + School school = new School(); + if (StringUtils.isEmpty(schoolCode)) { + log.atDebug().log("{}", schoolCode); + school.setError(""); + } else { + Map params = new HashMap<>(); + params.put("schoolCode", schoolCode); + String schoolSql = processWithParams("select * From \"SCHOOLS\" where \"SCHOOLID\" = :schoolCode and coalesce(\"SYS_STATE\", 0) % 2 = 0;", params); + Result schoolsRecords = executeRequest(schoolSql); + if (schoolsRecords.isNotEmpty()) { + if (schoolsRecords.size() >= 2) { + school.setError("" + schoolsRecords.size()); + } else { + Record record = schoolsRecords.get(0); + school.setShortAddress(record.get("SHORTNAME", String.class)); + String buildingsSql = processWithParams("select * From \"BUILDINGS\" where \"SYS_GUIDFK\" = :schoolCode and coalesce(\"BUILDINGS\".\"SYS_STATE\", 0) % 2 = 0;", params); + Result buildingsRecords = executeRequest(buildingsSql); + Map buildings = new HashMap<>(); + if (buildingsRecords.isNotEmpty()) { + for (int i = 0; i < buildingsRecords.size(); i++) { + Record buildingRecord = buildingsRecords.get(i); + Building building = new Building(buildingRecord.get("FACTADDRESS", String.class), (String)buildingRecord.get("NAME", String.class), (String)buildingRecord.get("SYS_GUID", String.class)); + buildings.put("building" + i, building); + } + school.setBuildings(buildings); + } else { + log.atDebug().log("{}", schoolCode); + school.setError("Не был получен список помещений у школы. Заполните в базе."); + } + } + } else { + log.atDebug().log("{}", schoolCode); + school.setError(""); + } + } + return school; + } + + public Rooms getRooms(String sysGuidFk) { + Rooms rooms = new Rooms(); + if (StringUtils.isEmpty(sysGuidFk)) { + log.atDebug().log("SYS_GUIDFK. {}", sysGuidFk); + rooms.setError(""); + } else { + Map params = new HashMap<>(); + params.put("sysGuidFk", sysGuidFk); + String schoolSql = processWithParams("SELECT * FROM \"ROOMS\" where \"SYS_GUIDFK\" = :sysGuidFk and coalesce(\"ROOMS\".\"SYS_STATE\", 0) % 2 = 0;", params); + Result roomsRecords = executeRequest(schoolSql); + if (roomsRecords.isNotEmpty()) { + Map roomsMap = new HashMap<>(); + for (int i = 0; i < roomsRecords.size(); i++) { + Record record = roomsRecords.get(i); + Integer roomNumber = record.get("NUMBER", Integer.class); + String roomSysGuid = record.get("SYS_GUID", String.class); + roomsMap.put("number" + i, new Room(roomNumber, roomSysGuid)); + } + rooms.setRooms(roomsMap); + } else { + log.atDebug().log("SYS_GUID_FK: {}", sysGuidFk); + rooms.setError(""); + } + } + return rooms; + } + + public Status enterConfig(FullConfig config) { + if (config != null) { + this.service.insertInto(COMP_EQUIPMENT_DB) + .set(COMP_EQUIPMENT_DB.SYS_GUID, createSysGuid()) + .set(COMP_EQUIPMENT_DB.SYS_STATE, 0L) + .set(COMP_EQUIPMENT_DB.SYS_USER, "cb413fa02289ca5a128647b1875e6690") + .set(COMP_EQUIPMENT_DB.SYS_CREATOR, "cb413fa02289ca5a128647b1875e6690") + .set(COMP_EQUIPMENT_DB.SYS_GUIDFK, config.getSysGuidRoom()) + .set(COMP_EQUIPMENT_DB.TYPE, config.getDeviceType()) + .set(COMP_EQUIPMENT_DB.PROCESSOR_MODEL, config.getCpuModel()) + .set(COMP_EQUIPMENT_DB.FREQUENCY, Long.valueOf(config.getCpuFrequency())) + .set(COMP_EQUIPMENT_DB.RAM_SIZE, new BigDecimal(config.getRamSize())) + .set(COMP_EQUIPMENT_DB.OS, config.getOsName()) + .set(COMP_EQUIPMENT_DB.OS_VERSION, config.getOsVersion()) + .set(COMP_EQUIPMENT_DB.HDD_CAPACITY, Long.valueOf(config.getHddCapacity())) + .set(COMP_EQUIPMENT_DB.SSD_CAPACITY, Long.valueOf(config.getSsdCapacity())) + .set(COMP_EQUIPMENT_DB.IP_ADDRESS, config.getIpAddress()) + .set(COMP_EQUIPMENT_DB.MAC_ADDRESS, config.getMacAddress()) + .set(COMP_EQUIPMENT_DB.UPLOAD_SPEED, new BigDecimal(0)) + .set(COMP_EQUIPMENT_DB.DOWNLOAD_SPEED, new BigDecimal(0)) + .execute(); + return new Status(200, "Форма успешно отправлена."); + } + + return new Status(500, "Ошибка заполнения в базе. Попробуйте попытку позже или обратитесь к техническим специалистам"); + } + + private Result executeRequest(String sql) { + Result records = null; + try { + records = this.service.fetch(sql); + } catch (Exception e) { + log.atError().log("{}. {}", e, sql); + } + return records; + } + + private String processWithParams(String sql, Map params) { + String processedSql = sql; + for (Map.Entry entry : params.entrySet()) { + String key = entry.getKey(); + Object value = entry.getValue(); + String replacement = StringUtils.isEmpty((String)value) ? "null" : ("'" + value + "'"); + processedSql = processedSql.replace(":" + key, replacement); + } + return processedSql; + } + + private String createSysGuid() { + return UUID.randomUUID().toString().replaceAll("-", "").toUpperCase(); + } +} diff --git a/src/main/java/ru/integrics/espdserver/jsonObjects/Building.java b/src/main/java/ru/integrics/espdserver/jsonObjects/Building.java new file mode 100644 index 0000000..c9a5e94 --- /dev/null +++ b/src/main/java/ru/integrics/espdserver/jsonObjects/Building.java @@ -0,0 +1,21 @@ +package ru.integrics.espdserver.jsonObjects; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class Building { + private String actualAddress; + private String name; + private String sysGuid; + + @JsonCreator + public Building(@JsonProperty("actualAddress") String actualAddress, @JsonProperty("name") String name, @JsonProperty("sysGuid") String sysGuid) { + this.actualAddress = actualAddress; + this.name = name; + this.sysGuid = sysGuid; + } +} diff --git a/src/main/java/ru/integrics/espdserver/jsonObjects/FullConfig.java b/src/main/java/ru/integrics/espdserver/jsonObjects/FullConfig.java new file mode 100644 index 0000000..81c1cd4 --- /dev/null +++ b/src/main/java/ru/integrics/espdserver/jsonObjects/FullConfig.java @@ -0,0 +1,27 @@ +package ru.integrics.espdserver.jsonObjects; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class FullConfig { + private Integer codeOO; + private String nameOO; + private String nameBuilding; + private String addressBuilding; + private Integer roomNumber; + private String sysGuidRoom; + private String deviceType; + private String cpuModel; + private Integer cpuFrequency; + private Integer ramSize; + private String osName; + private String osVersion; + private Integer hddCapacity; + private Integer ssdCapacity; + private String ipAddress; + private String macAddress; + private String uploadSpeed; + private String downloadSpeed; +} diff --git a/src/main/java/ru/integrics/espdserver/jsonObjects/Room.java b/src/main/java/ru/integrics/espdserver/jsonObjects/Room.java new file mode 100644 index 0000000..6ad7717 --- /dev/null +++ b/src/main/java/ru/integrics/espdserver/jsonObjects/Room.java @@ -0,0 +1,19 @@ +package ru.integrics.espdserver.jsonObjects; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class Room { + private Integer number; + private String sysGuid; + + @JsonCreator + public Room(@JsonProperty("number") Integer number, @JsonProperty("sysGuid") String sysGuid) { + this.number = number; + this.sysGuid = sysGuid; + } +} diff --git a/src/main/java/ru/integrics/espdserver/jsonObjects/Rooms.java b/src/main/java/ru/integrics/espdserver/jsonObjects/Rooms.java new file mode 100644 index 0000000..fac9b32 --- /dev/null +++ b/src/main/java/ru/integrics/espdserver/jsonObjects/Rooms.java @@ -0,0 +1,13 @@ +package ru.integrics.espdserver.jsonObjects; + +import lombok.Getter; +import lombok.Setter; + +import java.util.Map; + +@Setter +@Getter +public class Rooms { + private Map rooms; + private String error; +} diff --git a/src/main/java/ru/integrics/espdserver/jsonObjects/School.java b/src/main/java/ru/integrics/espdserver/jsonObjects/School.java new file mode 100644 index 0000000..97d2000 --- /dev/null +++ b/src/main/java/ru/integrics/espdserver/jsonObjects/School.java @@ -0,0 +1,14 @@ +package ru.integrics.espdserver.jsonObjects; + +import lombok.Getter; +import lombok.Setter; + +import java.util.Map; + +@Getter +@Setter +public class School { + private String shortAddress; + private String error; + private Map buildings; +} diff --git a/src/main/java/ru/integrics/espdserver/jsonObjects/Status.java b/src/main/java/ru/integrics/espdserver/jsonObjects/Status.java new file mode 100644 index 0000000..fe0266f --- /dev/null +++ b/src/main/java/ru/integrics/espdserver/jsonObjects/Status.java @@ -0,0 +1,19 @@ +package ru.integrics.espdserver.jsonObjects; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class Status { + private Integer status; + private String statusMsg; + + @JsonCreator + public Status(@JsonProperty("status") Integer status, @JsonProperty("statusMsg") String statusMsg) { + this.status = status; + this.statusMsg = statusMsg; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..ea9aa66 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,5 @@ +spring.datasource.url=jdbc:postgresql://localhost:5435/rois +spring.datasource.username=rois +spring.datasource.password=FHrnU&3487&h*&E&Fue7746 + +server.port=8085 \ No newline at end of file diff --git a/src/main/resources/logback.spring.xml b/src/main/resources/logback.spring.xml new file mode 100644 index 0000000..162d57f --- /dev/null +++ b/src/main/resources/logback.spring.xml @@ -0,0 +1,26 @@ + + + + + + ${LOG_DIR}/app.log + + %d{dd.MM.yyyy HH:mm:ss.SSS} [%thread{20}] %-5level - %msg%n + + + ${LOG_DIR}/archived/app_%d{dd-MM-yyyy}.log + 100 + 200MB + + + + + %d{dd.MM.yyyy HH:mm:ss.SSS} %magenta([%-20.20thread]) %highlight(%-5level) - %msg%n + + + + + + + + diff --git a/src/test/java/ru/integrics/espdserver/EspdServerApplicationTests.java b/src/test/java/ru/integrics/espdserver/EspdServerApplicationTests.java new file mode 100644 index 0000000..eb970c1 --- /dev/null +++ b/src/test/java/ru/integrics/espdserver/EspdServerApplicationTests.java @@ -0,0 +1,13 @@ +package ru.integrics.espdserver; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class EspdServerApplicationTests { + + @Test + void contextLoads() { + } + +}