From 7ec4f0c75465f2defc6beed1fc4c3dcd9f6d8d9d Mon Sep 17 00:00:00 2001 From: Roman Shishkin Date: Sat, 16 Aug 2025 00:20:50 +0500 Subject: [PATCH 001/231] build: Removed using gradle --- build.gradle.kts | 152 --------------- gradle.properties | 3 - gradle/wrapper/gradle-wrapper.jar | Bin 59821 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 5 - gradlew | 234 ----------------------- gradlew.bat | 89 --------- settings.gradle.kts | 3 - 7 files changed, 486 deletions(-) delete mode 100644 build.gradle.kts delete mode 100644 gradle.properties delete mode 100644 gradle/wrapper/gradle-wrapper.jar delete mode 100644 gradle/wrapper/gradle-wrapper.properties delete mode 100755 gradlew delete mode 100644 gradlew.bat delete mode 100644 settings.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts deleted file mode 100644 index 5b853b95..00000000 --- a/build.gradle.kts +++ /dev/null @@ -1,152 +0,0 @@ -import com.google.protobuf.gradle.id - -plugins { - jacoco - id("org.springframework.boot") version "2.7.0" - id("io.spring.dependency-management") version "1.0.11.RELEASE" - id("com.google.protobuf") version "0.9.4" - kotlin("jvm") version "1.8.10" - kotlin("plugin.spring") version "1.6.21" - kotlin("plugin.jpa") version "1.6.21" -} - -group = "TestSys" -version = "2.7.0-snapshot" -java.sourceCompatibility = JavaVersion.VERSION_17 - -repositories { - mavenCentral() -} - -sourceSets { - main { - proto { - srcDir("libs/trik-testsys/protos") - } - } -} - -val protobufVersion = "4.27.3" -val grpcVersion = "1.66.0" -val grpcktVersion = "1.4.1" - -dependencies { - implementation("org.jetbrains.kotlin:kotlin-reflect") - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") - - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0-RC.2") - implementation("com.google.protobuf:protobuf-kotlin:${protobufVersion}") - implementation("io.grpc:grpc-okhttp:${grpcVersion}") - api("io.grpc:grpc-protobuf:${grpcVersion}") - api("com.google.protobuf:protobuf-java-util:${protobufVersion}") - api("com.google.protobuf:protobuf-kotlin:${protobufVersion}") - api("io.grpc:grpc-kotlin-stub:${grpcktVersion}") - api("io.grpc:grpc-stub:${grpcVersion}") - - implementation("org.springframework.boot:spring-boot-starter") - implementation("org.springframework.boot:spring-boot-starter-web") - implementation("org.springframework.boot:spring-boot-starter-security") - implementation("org.springframework.boot:spring-boot-starter-data-jpa") - implementation("org.springframework.boot:spring-boot-starter-data-jdbc") - implementation("org.springframework.boot:spring-boot-devtools") - implementation("org.springframework.boot:spring-boot-starter-thymeleaf") - - implementation("org.thymeleaf.extras:thymeleaf-extras-java8time") - - implementation("org.springframework.session:spring-session-jdbc") - - implementation("org.zeroturnaround:zt-zip:1.17") - implementation("org.yaml:snakeyaml:1.33") - implementation("com.github.ua-parser:uap-java:1.5.4") - - implementation("io.springfox:springfox-swagger2:3.0.0") - implementation("io.springfox:springfox-swagger-ui:3.0.0") - implementation("io.springfox:springfox-boot-starter:3.0.0") - -// implementation("org.springframework.boot:spring-boot-starter-actuator") -// implementation("io.micrometer:micrometer-core:1.6.6") -// implementation("io.micrometer:micrometer-registry-prometheus:1.6.6") - - runtimeOnly("mysql:mysql-connector-java") - implementation("com.fasterxml.jackson.module:jackson-module-kotlin") - - implementation("com.h2database:h2") - testImplementation("org.springframework.security:spring-security-test") - testImplementation("org.springframework.boot:spring-boot-starter-test") - testImplementation("org.junit.jupiter:junit-jupiter:5.9.0") - testImplementation("org.mockito:mockito-core:2.1.0") - testImplementation("org.mockito.kotlin:mockito-kotlin:5.1.0") - testImplementation(platform("org.junit:junit-bom:5.9.0")) - testImplementation(kotlin("test")) -} - -protobuf { - protoc { - artifact = "com.google.protobuf:protoc:${protobufVersion}" - } - plugins { - id("grpc") { - artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}" - } - id("grpckt") { - artifact = "io.grpc:protoc-gen-grpc-kotlin:${grpcktVersion}:jdk8@jar" - } - } - generateProtoTasks { - all().forEach { - it.plugins { - id("grpc") - id("grpckt") - } - it.builtins { - id("kotlin") - } - } - } -} - -tasks.withType { - kotlinOptions { - freeCompilerArgs = listOf("-Xjsr305=strict") - jvmTarget = "17" - } -} - -val jacocoExclude = listOf( - "**/configuration/**", - "**/entities/**", - "**/enums/**", - "**/repositories/**", - "**/services/**", - "**/*Application*" -) - -tasks.test { - finalizedBy(tasks.jacocoTestReport) - useJUnitPlatform() - maxHeapSize = "2G" - extensions.configure { - excludes = jacocoExclude - } - // Uncomment to run concurrent tests on your own PC - /*jvmArgs( - "-Xmx4096m", - "--add-opens", "java.base/jdk.internal.misc=ALL-UNNAMED", - "--add-exports", "java.base/jdk.internal.util=ALL-UNNAMED" - )*/ -} - -tasks.jacocoTestReport { - dependsOn(tasks.test) - reports { - xml.required.set(false) - csv.required.set(true) - csv.outputLocation.set(file("${buildDir}/jacoco/report.csv")) - html.outputLocation.set(file("${buildDir}/reports/jacoco")) - } - classDirectories.setFrom(classDirectories.files.map { - fileTree(it).matching { - exclude(jacocoExclude) - } - }) -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 35164e2e..00000000 --- a/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -kotlin.code.style=official -org.gradle.parallel=true -org.gradle.daemon=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 41d9927a4d4fb3f96a785543079b8df6723c946b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 59821 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index aa991fce..00000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew deleted file mode 100755 index 1b6c7873..00000000 --- a/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 107acd32..00000000 --- a/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/settings.gradle.kts b/settings.gradle.kts deleted file mode 100644 index 325d9b9a..00000000 --- a/settings.gradle.kts +++ /dev/null @@ -1,3 +0,0 @@ - -rootProject.name = "web-app" - From 529cb4ae9a7e6b0eed6714c84d0d3a96bd8f3a9c Mon Sep 17 00:00:00 2001 From: Roman Shishkin Date: Sat, 16 Aug 2025 00:20:59 +0500 Subject: [PATCH 002/231] build: Added using maven --- .gitattributes | 2 + .mvn/wrapper/maven-wrapper.properties | 19 ++ mvnw | 259 ++++++++++++++++++++++++++ mvnw.cmd | 149 +++++++++++++++ pom.xml | 99 ++++++++++ 5 files changed, 528 insertions(+) create mode 100644 .gitattributes create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..3b41682a --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +/mvnw text eol=lf +*.cmd text eol=crlf diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..12fbe1e9 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff --git a/mvnw b/mvnw new file mode 100755 index 00000000..19529ddf --- /dev/null +++ b/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 00000000..249bdf38 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..08d1f3bd --- /dev/null +++ b/pom.xml @@ -0,0 +1,99 @@ + + + 4.0.0 + + trik.testsys + spring-app-core + 1.1.0-SNAPSHOT + + + + web-app + 3.0.0-SNAPSHOT + + Web Application + TestSys Web Application + + + 1.1.0-SNAPSHOT + + + + + mavenCentral + https://repo1.maven.org/maven2/ + + + testsys-releases + TestSys Releases + https://raw.githubusercontent.com/trik-testsys/maven-repo/releases/ + + true + daily + warn + + + false + + + + testsys-snapshots + TestSys Snapshots + https://raw.githubusercontent.com/trik-testsys/maven-repo/snapshots/ + + false + + + true + always + warn + + + + + + + Apache License 2.0 + https://github.com/trik-testsys/spring-app-core/blob/master/LICENSE + + + + + + Roman Shishkin + romashkin.2001@yandex.ru + TestSys + + + Vyacheslav Buchin + slava.slava2003@mail.ru + TestSys + + + + + + trik.testsys.sac + core-commons + ${project.parent.version} + + + trik.testsys.grading + protos + ${protos.version} + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + trik.testsys.sac.application.TSApp + + + + + From e3a54094fa4c399a6e9a0c2d90f662b05df02ef9 Mon Sep 17 00:00:00 2001 From: Roman Shishkin Date: Sat, 16 Aug 2025 00:24:55 +0500 Subject: [PATCH 003/231] build: Updated git files --- .gitignore | 8 +++++++- .gitmodules | 3 --- libs/trik-testsys/protos | 1 - 3 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 .gitmodules delete mode 160000 libs/trik-testsys/protos diff --git a/.gitignore b/.gitignore index 5b1c6d81..4a5785ff 100644 --- a/.gitignore +++ b/.gitignore @@ -181,4 +181,10 @@ gradle-app.setting *.gz # Demo application data -demo/ \ No newline at end of file +demo/ + +HELP.md +target/ +.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 26904466..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "protos"] - path = libs/trik-testsys/protos - url = https://github.com/trik-testsys/protos.git diff --git a/libs/trik-testsys/protos b/libs/trik-testsys/protos deleted file mode 160000 index 66c2e085..00000000 --- a/libs/trik-testsys/protos +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 66c2e085e1686922c1d7fc1c05e0dee38ca1e896 From 3d0edf80aa772816aa3acb6d40f4684b73700772 Mon Sep 17 00:00:00 2001 From: Roman Shishkin Date: Sun, 17 Aug 2025 05:03:06 +0500 Subject: [PATCH 004/231] feat: Removed useless files --- src/main/kotlin/trik/testsys/Application.kt | 31 -- .../testsys/core/entity/AbstractEntity.kt | 107 ------ .../kotlin/trik/testsys/core/entity/Entity.kt | 50 --- .../core/entity/named/AbstractNamedEntity.kt | 34 -- .../testsys/core/entity/named/NamedEntity.kt | 22 -- .../testsys/core/entity/user/AbstractUser.kt | 50 --- .../testsys/core/entity/user/UserEntity.kt | 45 --- .../core/repository/EntityRepository.kt | 57 --- .../repository/named/NamedEntityRepository.kt | 32 -- .../core/repository/user/UserRepository.kt | 63 ---- .../testsys/core/service/AbstractService.kt | 141 ------- .../testsys/core/service/EntityService.kt | 235 ------------ .../named/AbstractNamedEntityService.kt | 34 -- .../core/service/named/NamedEntityService.kt | 44 --- .../core/service/user/AbstractUserService.kt | 46 --- .../testsys/core/service/user/UserService.kt | 52 --- .../trik/testsys/core/utils/enums/Enum.kt | 12 - .../enums/converter/AbstractEnumConverter.kt | 27 -- .../trik/testsys/core/utils/l10n/L10nCode.kt | 3 - .../utils/l10n/localizer/DefaultLocalizer.kt | 43 --- .../core/utils/l10n/localizer/Localizer.kt | 18 - .../core/view/named/NamedEntityView.kt | 13 - .../trik/testsys/core/view/user/UserView.kt | 17 - .../webclient/entity/AbstractNotedEntity.kt | 33 -- .../testsys/webclient/entity/NotedEntity.kt | 13 - .../webclient/entity/user/impl/SuperUser.kt | 12 - .../repository/user/SuperUserRepository.kt | 8 - .../testsys/webclient/service/LogoService.kt | 14 - .../webclient/service/UserAgentParser.kt | 11 - .../service/entity/user/WebUserService.kt | 24 -- .../entity/user/impl/SuperUserService.kt | 9 - .../webclient/service/impl/LogoServiceImpl.kt | 50 --- .../service/impl/UserAgentParserImpl.kt | 108 ------ .../service/security/UserValidator.kt | 19 - .../security/impl/UserValidatorImpl.kt | 22 -- .../service/startup/impl/StartupListener.kt | 51 --- .../service/startup/runner/StartupRunner.kt | 12 - .../runner/impl/EntityCreatorRunner.kt | 352 ------------------ .../impl/LektoriumEntityCreatorRunner.kt | 91 ----- .../webclient/util/config/SpringFoxConfig.kt | 22 -- 40 files changed, 2027 deletions(-) delete mode 100644 src/main/kotlin/trik/testsys/Application.kt delete mode 100644 src/main/kotlin/trik/testsys/core/entity/AbstractEntity.kt delete mode 100644 src/main/kotlin/trik/testsys/core/entity/Entity.kt delete mode 100644 src/main/kotlin/trik/testsys/core/entity/named/AbstractNamedEntity.kt delete mode 100644 src/main/kotlin/trik/testsys/core/entity/named/NamedEntity.kt delete mode 100644 src/main/kotlin/trik/testsys/core/entity/user/AbstractUser.kt delete mode 100644 src/main/kotlin/trik/testsys/core/entity/user/UserEntity.kt delete mode 100644 src/main/kotlin/trik/testsys/core/repository/EntityRepository.kt delete mode 100644 src/main/kotlin/trik/testsys/core/repository/named/NamedEntityRepository.kt delete mode 100644 src/main/kotlin/trik/testsys/core/repository/user/UserRepository.kt delete mode 100644 src/main/kotlin/trik/testsys/core/service/AbstractService.kt delete mode 100644 src/main/kotlin/trik/testsys/core/service/EntityService.kt delete mode 100644 src/main/kotlin/trik/testsys/core/service/named/AbstractNamedEntityService.kt delete mode 100644 src/main/kotlin/trik/testsys/core/service/named/NamedEntityService.kt delete mode 100644 src/main/kotlin/trik/testsys/core/service/user/AbstractUserService.kt delete mode 100644 src/main/kotlin/trik/testsys/core/service/user/UserService.kt delete mode 100644 src/main/kotlin/trik/testsys/core/utils/enums/Enum.kt delete mode 100644 src/main/kotlin/trik/testsys/core/utils/enums/converter/AbstractEnumConverter.kt delete mode 100644 src/main/kotlin/trik/testsys/core/utils/l10n/L10nCode.kt delete mode 100644 src/main/kotlin/trik/testsys/core/utils/l10n/localizer/DefaultLocalizer.kt delete mode 100644 src/main/kotlin/trik/testsys/core/utils/l10n/localizer/Localizer.kt delete mode 100644 src/main/kotlin/trik/testsys/core/view/named/NamedEntityView.kt delete mode 100644 src/main/kotlin/trik/testsys/core/view/user/UserView.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/entity/AbstractNotedEntity.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/entity/NotedEntity.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/entity/user/impl/SuperUser.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/repository/user/SuperUserRepository.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/service/LogoService.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/service/UserAgentParser.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/service/entity/user/WebUserService.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/service/entity/user/impl/SuperUserService.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/service/impl/LogoServiceImpl.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/service/impl/UserAgentParserImpl.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/service/security/UserValidator.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/service/security/impl/UserValidatorImpl.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/service/startup/impl/StartupListener.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/service/startup/runner/StartupRunner.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/service/startup/runner/impl/EntityCreatorRunner.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/service/startup/runner/impl/LektoriumEntityCreatorRunner.kt delete mode 100644 src/main/kotlin/trik/testsys/webclient/util/config/SpringFoxConfig.kt diff --git a/src/main/kotlin/trik/testsys/Application.kt b/src/main/kotlin/trik/testsys/Application.kt deleted file mode 100644 index 6395ec62..00000000 --- a/src/main/kotlin/trik/testsys/Application.kt +++ /dev/null @@ -1,31 +0,0 @@ -package trik.testsys - -import org.springframework.boot.SpringApplication -import org.springframework.boot.autoconfigure.SpringBootApplication -import org.springframework.boot.web.servlet.MultipartConfigFactory -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.Configuration -import org.springframework.util.unit.DataSize -import org.springframework.util.unit.DataUnit - -import javax.servlet.MultipartConfigElement - -@SpringBootApplication -@Configuration -class Application { - - @Bean - fun multipartConfigElement(): MultipartConfigElement { - val factory = MultipartConfigFactory() - factory.setMaxFileSize(DataSize.of(4, DataUnit.MEGABYTES)) - factory.setMaxRequestSize(DataSize.of(4, DataUnit.MEGABYTES)) - return factory.createMultipartConfig() - } - - companion object { - @JvmStatic - fun main(args: Array) { - SpringApplication.run(Application::class.java, *args) - } - } -} diff --git a/src/main/kotlin/trik/testsys/core/entity/AbstractEntity.kt b/src/main/kotlin/trik/testsys/core/entity/AbstractEntity.kt deleted file mode 100644 index 4eccb69c..00000000 --- a/src/main/kotlin/trik/testsys/core/entity/AbstractEntity.kt +++ /dev/null @@ -1,107 +0,0 @@ -package trik.testsys.core.entity - -import java.time.LocalDateTime -import java.time.ZoneId -import java.util.TimeZone -import javax.persistence.* - -/** - * Simple abstract entity class. Describes basic entity behavior. - * - * @see Entity - * @author Roman Shishkin - * @since 2.0.0 - */ -@MappedSuperclass -abstract class AbstractEntity : Entity { - - /** - * Entity ID field. - * May be null if an entity doesn't persist in a database. - * - * The default value is null. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(nullable = false, unique = true, updatable = false) - private var id: Long? = null - - @Column(nullable = true, unique = false, updatable = false) - override var creationDate: LocalDateTime? = null - - override fun setId(id: Long?) { - this.id = id - } - - override fun getId() = id - - override fun isNew() = id == null - - @Column( - nullable = false, unique = false, updatable = true, - length = ADDITIONAL_INFO_MAX_LENGTH - ) - override var additionalInfo: String = ADDITIONAL_INFO_DEFAULT - - override fun toString() = when (isNew) { - true -> "New entity of type ${javaClass.name} and with hashcode: ${hashCode().toString(16)}" - false -> "Entity of type ${javaClass.name} and with ID: $id" - } - - @PrePersist - fun onCreate() { - creationDate = LocalDateTime.now(DEFAULT_ZONE_ID) - } - - companion object { - - /** - * Default zone code for all entities in the system. - * - * @see DEFAULT_ZONE_ID - * @see DEFAULT_TIME_ZONE - * @author Roman Shishkin - * @since 2.0.0 - */ - const val DEFAULT_ZONE_CODE = "UTC" - - /** - * Default zone id for all entities in the system. - * - * @see DEFAULT_ZONE_CODE - * @see DEFAULT_TIME_ZONE - * @author Roman Shishkin - * @since 2.0.0 - */ - val DEFAULT_ZONE_ID: ZoneId = ZoneId.of(DEFAULT_ZONE_CODE) - - /** - * Default time zone for all entities in the system. - * - * @see DEFAULT_ZONE_CODE - * @see DEFAULT_ZONE_ID - * @see TimeZone - * @since 2.0.0 - */ - val DEFAULT_TIME_ZONE: TimeZone = TimeZone.getTimeZone(DEFAULT_ZONE_ID) - - /** - * Max length for [additionalInfo] field. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - private const val ADDITIONAL_INFO_MAX_LENGTH = 1000 - - /** - * Default value for [additionalInfo] field. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - private const val ADDITIONAL_INFO_DEFAULT = "" - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/entity/Entity.kt b/src/main/kotlin/trik/testsys/core/entity/Entity.kt deleted file mode 100644 index ba90dc48..00000000 --- a/src/main/kotlin/trik/testsys/core/entity/Entity.kt +++ /dev/null @@ -1,50 +0,0 @@ -package trik.testsys.core.entity - -import org.springframework.data.domain.Persistable -import java.time.LocalDateTime - -/** - * Simple interface for entities. It inherits [getId] (val property id) and [isNew] (val property isNew) from [Persistable], - * and extends it with [creationDate] field. - * - * @see Persistable - * @author Roman Shishkin - * @since 2.0.0 - */ -interface Entity : Persistable { - - /** - * Property which contains entity id. - * - * @author Roman Shishkin - * @since 2.0.0 - **/ - fun setId(id: Long?) - - /** - * Property which says date and time of entity creation. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - val creationDate: LocalDateTime? - - /** - * Property which contains any entity additional info. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - var additionalInfo: String - - companion object { - - /** - * Prefix for all tables in database. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - const val TABLE_PREFIX = "TRIK" - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/entity/named/AbstractNamedEntity.kt b/src/main/kotlin/trik/testsys/core/entity/named/AbstractNamedEntity.kt deleted file mode 100644 index a518a974..00000000 --- a/src/main/kotlin/trik/testsys/core/entity/named/AbstractNamedEntity.kt +++ /dev/null @@ -1,34 +0,0 @@ -package trik.testsys.core.entity.named - -import trik.testsys.core.entity.AbstractEntity -import javax.persistence.Column -import javax.persistence.MappedSuperclass - -/** - * Simple abstract named entity class which extends [AbstractEntity] and implements [NamedEntity]. - * - * @see NamedEntity - * @see AbstractEntity - * - * @author Roman Shishkin - * @since 2.0.0 - **/ -@MappedSuperclass -abstract class AbstractNamedEntity( - @Column( - nullable = false, unique = false, updatable = true, - length = NAME_MAX_LEN - ) override var name: String -) : NamedEntity, AbstractEntity() { - - companion object { - - /** - * Maximum length of the [name] property. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - private const val NAME_MAX_LEN = 127 - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/entity/named/NamedEntity.kt b/src/main/kotlin/trik/testsys/core/entity/named/NamedEntity.kt deleted file mode 100644 index 02afd0e6..00000000 --- a/src/main/kotlin/trik/testsys/core/entity/named/NamedEntity.kt +++ /dev/null @@ -1,22 +0,0 @@ -package trik.testsys.core.entity.named - -import trik.testsys.core.entity.Entity - -/** - * Interface for named entities. Extends [Entity] with [name] property. - * - * @see Entity - * - * @author Roman Shishkin - * @since 2.0.0 - **/ -interface NamedEntity : Entity { - - /** - * Property which contains name string. Must be initialized. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - var name: String -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/entity/user/AbstractUser.kt b/src/main/kotlin/trik/testsys/core/entity/user/AbstractUser.kt deleted file mode 100644 index ee57b099..00000000 --- a/src/main/kotlin/trik/testsys/core/entity/user/AbstractUser.kt +++ /dev/null @@ -1,50 +0,0 @@ -package trik.testsys.core.entity.user - -import trik.testsys.core.entity.named.AbstractNamedEntity -import java.time.LocalDateTime -import javax.persistence.* - -/** - * Simple abstract user entity class which extends [AbstractNamedEntity] and implements [UserEntity]. - * Describes basic behavior. - * - * @see UserEntity - * @see AbstractNamedEntity - * - * @author Roman Shishkin - * @since 2.0.0 - */ -@MappedSuperclass -abstract class AbstractUser( - name: String, - - @Column( - nullable = false, unique = true, updatable = false, - length = ACCESS_TOKEN_MAX_LEN - ) override var accessToken: AccessToken -) : UserEntity, AbstractNamedEntity(name) { - - @Column(nullable = true, unique = false, updatable = true) - final override var lastLoginDate: LocalDateTime? = null - - override fun updateLastLoginDate() { - lastLoginDate = LocalDateTime.now(DEFAULT_ZONE_ID) - this.name - } - - companion object { - - private const val ACCESS_TOKEN_MAX_LEN = 255 - - /** - * Anonymous user entity for system usage. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - object System : AbstractUser( - name = "System User", - accessToken = "system-user-non-accessible-token" - ) - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/entity/user/UserEntity.kt b/src/main/kotlin/trik/testsys/core/entity/user/UserEntity.kt deleted file mode 100644 index b6e10374..00000000 --- a/src/main/kotlin/trik/testsys/core/entity/user/UserEntity.kt +++ /dev/null @@ -1,45 +0,0 @@ -package trik.testsys.core.entity.user - -import trik.testsys.core.entity.Entity -import trik.testsys.core.entity.named.NamedEntity -import java.time.LocalDateTime - -typealias AccessToken = String - -/** - * Simple interface for user entities. Extends [Entity] with [accessToken] properties. - * In fact every entity that implements this can be identified by [accessToken]. - * - * @see Entity - * @author Roman Shishkin - * @since 2.0.0 - */ -interface UserEntity : NamedEntity { - - /** - * Property which contains unique access token. - * It is used to identify user in a system. - * Must be initialized. - * In fact should be an entity identifier. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - var accessToken: AccessToken - - /** - * Property which contains date time of last user login. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - var lastLoginDate: LocalDateTime? - - /** - * Update [lastLoginDate] field. Should be used when a user is logging in. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun updateLastLoginDate() -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/repository/EntityRepository.kt b/src/main/kotlin/trik/testsys/core/repository/EntityRepository.kt deleted file mode 100644 index 4d4a3fe8..00000000 --- a/src/main/kotlin/trik/testsys/core/repository/EntityRepository.kt +++ /dev/null @@ -1,57 +0,0 @@ -package trik.testsys.core.repository - -import org.springframework.data.jpa.repository.JpaRepository -import org.springframework.data.repository.NoRepositoryBean -import trik.testsys.core.entity.Entity -import java.time.LocalDateTime - -/** - * Simple repository interface for entities, extends [JpaRepository]. - * Contains methods that works with [Entity.creationDate]: - * - * 1. [findByCreationDateAfter] - * 2. [findByCreationDateBefore] - * 3. [findByCreationDateBetween] - * - * @see JpaRepository - * @param E entity class, implements [Entity] - * @author Roman Shishkin - * @since 2.0.0 - */ -@NoRepositoryBean -interface EntityRepository : JpaRepository { - - /** - * Finds entities with [Entity.creationDate] greater than [creationDate]. - * - * @param creationDate date by which entities will be found - * @return [Collection] of entities with [Entity.creationDate] greater than [creationDate] - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun findByCreationDateAfter(creationDate: LocalDateTime): List - - /** - * Finds entities with [Entity.creationDate] less than [creationDate]. - * - * @param creationDate date by which entities will be found - * @return [Collection] of entities with [Entity.creationDate] less than [creationDate] - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun findByCreationDateBefore(creationDate: LocalDateTime): List - - /** - * Finds entities with [Entity.creationDate] greater than [creationDateFrom] and less than [creationDateTo]. - * - * @param creationDateFrom bottom edge for finding entities - * @param creationDateTo top edge for finding entities - * @return [Collection] of entities with [Entity.creationDate] between [creationDateFrom] and [creationDateTo] - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun findByCreationDateBetween(creationDateFrom: LocalDateTime, creationDateTo: LocalDateTime): List -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/repository/named/NamedEntityRepository.kt b/src/main/kotlin/trik/testsys/core/repository/named/NamedEntityRepository.kt deleted file mode 100644 index 2b750715..00000000 --- a/src/main/kotlin/trik/testsys/core/repository/named/NamedEntityRepository.kt +++ /dev/null @@ -1,32 +0,0 @@ -package trik.testsys.core.repository.named - -import org.springframework.data.repository.NoRepositoryBean -import trik.testsys.core.entity.named.NamedEntity -import trik.testsys.core.repository.EntityRepository - -/** - * Repository interface for named entities. Extends [EntityRepository] with methods: - * - * 1. [findByName] - * - * @see NamedEntity - * @see EntityRepository - * @param E entity class, implements [NamedEntity] - * - * @author Roman Shishkin - * @since 2.0.0 - **/ -@NoRepositoryBean -interface NamedEntityRepository : EntityRepository { - - /** - * Finds all entities by [NamedEntity.name]. - * - * @param name name by which entities will be found - * @return [Collection] with all found entities with [NamedEntity.name] equals to [name] - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun findByName(name: String): Collection -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/repository/user/UserRepository.kt b/src/main/kotlin/trik/testsys/core/repository/user/UserRepository.kt deleted file mode 100644 index 93aef204..00000000 --- a/src/main/kotlin/trik/testsys/core/repository/user/UserRepository.kt +++ /dev/null @@ -1,63 +0,0 @@ -package trik.testsys.core.repository.user - -import org.springframework.data.repository.NoRepositoryBean -import trik.testsys.core.entity.user.AccessToken -import trik.testsys.core.entity.user.UserEntity -import trik.testsys.core.repository.named.NamedEntityRepository - -/** - * Repository interface for [UserEntity] typed entities, extends [NamedEntityRepository]. - * Contains methods that work with [UserEntity.accessToken]. - * - * 1. [findByAccessToken] - * 2. [findAllByAccessTokenIn] - * 3. [findByNameAndAccessToken] - * - * @param E user entity class, implements [UserEntity] - * - * @see NamedEntityRepository - * @see UserEntity - * - * @author Roman Shishkin - * @since 2.0.0 - */ -@NoRepositoryBean -interface UserRepository : NamedEntityRepository { - - /** - * Finds entity by [UserEntity.accessToken]. - * - * @param accessToken access token by which entity will be found. - * @return entity with [UserEntity.accessToken] equals to [accessToken]. If nothing was found - `null` - * - * @see [UserEntity.accessToken] - * @author Roman Shishkin - * @since 2.0.0 - */ - fun findByAccessToken(accessToken: AccessToken): E? - - /** - * Find all entities by [UserEntity.accessToken]. - * - * @param accessTokens access tokens by which entities will be found - * @return [Collection] with all found entities which [UserEntity.accessToken] contained in [accessTokens] - * - * @see [UserEntity.accessToken] - * @author Roman Shishkin - * @since 2.0.0 - */ - fun findAllByAccessTokenIn(accessTokens: Collection): List - - /** - * Finds entity by [UserEntity.name] and [UserEntity.accessToken]. - * - * @param name name by which entity will be found - * @param accessToken access token by which entity will be found - * @return entity with [UserEntity.name] equals to [name] and [UserEntity.accessToken] equals to [accessToken]. If nothing was found - `null` - * - * @see [UserEntity.name] - * @see [UserEntity.accessToken] - * @since 2.0.0 - */ - fun findByNameAndAccessToken(name: String, accessToken: AccessToken): E? -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/service/AbstractService.kt b/src/main/kotlin/trik/testsys/core/service/AbstractService.kt deleted file mode 100644 index 90a5b3ae..00000000 --- a/src/main/kotlin/trik/testsys/core/service/AbstractService.kt +++ /dev/null @@ -1,141 +0,0 @@ -package trik.testsys.core.service - -import org.springframework.beans.factory.annotation.Autowired -import trik.testsys.core.entity.AbstractEntity -import trik.testsys.core.repository.EntityRepository -import java.time.LocalDateTime - -/** - * Abstract service class that implements [EntityService] basic CRUD operations. - * - * @param E Entity type. Extends [AbstractEntity]. - * @param R Repository type. Extends [EntityRepository]. - * - * @see EntityService - * @see AbstractEntity - * @see EntityRepository - * - * @author Roman Shishkin - * @since 2.0.0 - */ -abstract class AbstractService> : EntityService { - - /** - * The repository associated with the service. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - @Autowired - protected lateinit var repository: R - - //region Save methods - - override fun save(entity: E) = repository.save(entity) - - override fun saveAll(entities: Iterable): List = repository.saveAll(entities) - - //endregion - - //region Find methods - - override fun find(id: Long?) = id?.let { - val entity = repository.findById(id) - entity.orElse(null) - } - - override fun findAll(ids: Iterable): List = repository.findAllById(ids) - - override fun findAll(): List { - val entities = repository.findAll() - return entities - } - - override fun findByCreationDateAfter(creationDate: LocalDateTime): List { - val entities = repository.findByCreationDateAfter(creationDate) - return entities - } - - override fun findByCreationDateBefore(creationDate: LocalDateTime): List { - val entities = repository.findByCreationDateBefore(creationDate) - return entities - } - - override fun findByCreationDateBetween( - creationDateFrom: LocalDateTime, - creationDateTo: LocalDateTime - ): List { - val entities = repository.findByCreationDateBetween(creationDateFrom, creationDateTo) - return entities - } - - //endregion - - //region Count methods - - override fun count(): Long { - val count = repository.count() - return count - } - - //endregion - - //region Exist methods - - override fun exists(id: Long): Boolean { - val isExist = repository.existsById(id) - return isExist - } - - //endregion - - //region Delete methods - - override fun delete(id: Long): Boolean { - val isDeleted = tryDeletion { repository.deleteById(id) } - return isDeleted - } - - override fun delete(entity: E): Boolean { - val isDeleted = tryDeletion { repository.delete(entity) } - return isDeleted - } - - override fun deleteAll(entities: Iterable): Boolean { - val isDeleted = tryDeletion { repository.deleteAll(entities) } - return isDeleted - } - - override fun deleteAllById(ids: Iterable): Boolean { - val isDeleted = tryDeletion { repository.deleteAllById(ids) } - return isDeleted - } - - override fun deleteAll(): Boolean { - val isDeleted = tryDeletion { repository.deleteAll() } - return isDeleted - } - - //endregion - - companion object { - - /** - * Tries to delete entity or entities using [block] function and returns result. - * - * @param block Deletion block. - * @return `true` if deletion was successful and there were no exceptions, `false` otherwise. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - private inline fun tryDeletion(block: () -> Unit): Boolean { - try { - block() - return true - } catch (e: IllegalArgumentException) { - return false - } - } - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/service/EntityService.kt b/src/main/kotlin/trik/testsys/core/service/EntityService.kt deleted file mode 100644 index 1c85dd26..00000000 --- a/src/main/kotlin/trik/testsys/core/service/EntityService.kt +++ /dev/null @@ -1,235 +0,0 @@ -package trik.testsys.core.service - -import trik.testsys.core.entity.Entity -import trik.testsys.core.repository.EntityRepository -import java.time.LocalDateTime - -/** - * This is a generic service interface that defines common operations for a service. - * It works with any type of `Entity`. - * - * @param E The type of the entity. - * - * @see Entity - * @see EntityRepository - * - * @author Roman Shishkin - * @since 2.0.0 - */ -interface EntityService { - - //region Save methods - - /** - * Saves the entity. - * - * @param entity The entity to save. - * @return The saved entity. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun save(entity: E): E - - /** - * Saves all entities. - * - * @param entities The entities to save. - * @return The saved entities. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun saveAll(entities: Iterable): List - - //endregion - - //region Find methods - - /** - * Finds the entity by its ID. - * - * @param id The ID of the entity to find. - * @return The entity with the given ID. If nothing was found - null. - * - * @see Entity.getId - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun find(id: Long?): E? - - /** - * Finds all entities by their IDs. - * - * @param ids The IDs of the entities to find. - * @return The entities with the given IDs. - * - * @see Entity.getId - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun findAll(ids: Iterable): List - - /** - * Finds all entities. - * - * @return All entities. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun findAll(): List - - /** - * Finds entities with creation date after the given date. - * - * @param creationDate The date by which entities will be found. - * @return The entities with creation date after the given date. - * - * @see Entity.creationDate - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun findByCreationDateAfter(creationDate: LocalDateTime): List - - /** - * Finds entities with creation date before the given date. - * - * @param creationDate The date by which entities will be found. - * @return The entities with creation date before the given date. - * - * @see Entity.creationDate - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun findByCreationDateBefore(creationDate: LocalDateTime): List - - /** - * Finds entities with creation date between the given dates. - * - * @param creationDateFrom The bottom edge for finding entities. - * @param creationDateTo The top edge for finding entities. - * @return The entities with creation date between the given dates. - * - * @see Entity.creationDate - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun findByCreationDateBetween(creationDateFrom: LocalDateTime, creationDateTo: LocalDateTime): List - - //endregion - - //region Count methods - - /** - * Counts all entities. - * - * @return The number of entities. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun count(): Long - - //endregion - - //region Exist methods - - /** - * Checks if the entity with the given ID exists. - * - * @param id The ID of the entity to check. - * @return `true` if the entity exists, `false` otherwise. - * - * @see Entity.getId - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun exists(id: Long): Boolean - - //endregion - - //region Delete methods - - /** - * Deletes the entity with the given ID. - * - * @param id The ID of the entity to delete. - * @return `true` if the entity was deleted, `false` otherwise. - * - * @see Entity.getId - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun delete(id: Long): Boolean - - /** - * Deletes the entity. - * - * @param entity The entity to delete. - * @return `true` if the entity was deleted, `false` otherwise. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun delete(entity: E): Boolean - - /** - * Deletes all entities. - * - * @param entities The entities to delete. - * @return `true` if the entities were deleted, `false` otherwise. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun deleteAll(entities: Iterable): Boolean - - /** - * Deletes all entities by their IDs. - * - * @param ids The IDs of the entities to delete. - * @return `true` if the entities were deleted, `false` otherwise. - * - * @see Entity.getId - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun deleteAllById(ids: Iterable): Boolean - - /** - * Deletes all entities. Use with caution. - * - * @return `true` if the entities were deleted, `false` otherwise. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun deleteAll(): Boolean - - //endregion - - //region Validation methods - - /** - * Validates the [Entity.additionalInfo] field. - * - * @param entity entity to validate - * @return `true` if the entity is valid, `false` otherwise. - * - * @see Entity - * - * @since 2.0.0 - */ - fun validateAdditionalInfo(entity: E): Boolean = true - - //endregion -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/service/named/AbstractNamedEntityService.kt b/src/main/kotlin/trik/testsys/core/service/named/AbstractNamedEntityService.kt deleted file mode 100644 index 8790582d..00000000 --- a/src/main/kotlin/trik/testsys/core/service/named/AbstractNamedEntityService.kt +++ /dev/null @@ -1,34 +0,0 @@ -package trik.testsys.core.service.named - -import trik.testsys.core.entity.named.AbstractNamedEntity -import trik.testsys.core.repository.named.NamedEntityRepository -import trik.testsys.core.service.AbstractService - -/** - * Abstract implementation of [NamedEntityService] interface. Contains common methods for named entity services. - * - * @param E named entity class, extends [AbstractNamedEntity] - * - * @see NamedEntityService - * @see AbstractNamedEntity - * @see NamedEntityRepository - * - * @author Roman Shishkin - * @since 2.0.0 - **/ -abstract class AbstractNamedEntityService> : - NamedEntityService, - AbstractService() { - - override fun findByName(name: String): Collection { - val entity = repository.findByName(name) - return entity - } - - override fun validateName(entity: E) = entity.nameIsNotEmpty() - - companion object { - - fun E.nameIsNotEmpty() = name.isNotEmpty() - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/service/named/NamedEntityService.kt b/src/main/kotlin/trik/testsys/core/service/named/NamedEntityService.kt deleted file mode 100644 index 647bfa7b..00000000 --- a/src/main/kotlin/trik/testsys/core/service/named/NamedEntityService.kt +++ /dev/null @@ -1,44 +0,0 @@ -package trik.testsys.core.service.named - -import trik.testsys.core.entity.named.NamedEntity -import trik.testsys.core.service.EntityService - -/** - * Simple interface for named entity services extends [EntityService]. Contains methods that work with [NamedEntity.name]: - * - * 1. [findByName] - * - * @param E entity class, implements [NamedEntity] - * - * @see EntityService - * @see NamedEntity - * - * @author Roman Shishkin - * @since 2.0.0 - **/ -interface NamedEntityService : EntityService { - - /** - * Finds all entities by [NamedEntity.name]. - * - * @param name name by which entities will be found - * @return [Collection] with all found entities with [NamedEntity.name] equals to [name] - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun findByName(name: String): Collection - - /** - * Validates the [NamedEntity.name] of the [entity]. - * - * @param entity entity to validate - * @return `true` if the [NamedEntity.name] is valid, `false` otherwise. - * - * @see NamedEntity.name - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun validateName(entity: E): Boolean -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/service/user/AbstractUserService.kt b/src/main/kotlin/trik/testsys/core/service/user/AbstractUserService.kt deleted file mode 100644 index 033e0b92..00000000 --- a/src/main/kotlin/trik/testsys/core/service/user/AbstractUserService.kt +++ /dev/null @@ -1,46 +0,0 @@ -package trik.testsys.core.service.user - -import trik.testsys.core.entity.user.AbstractUser -import trik.testsys.core.entity.user.AccessToken -import trik.testsys.core.repository.user.UserRepository -import trik.testsys.core.service.named.AbstractNamedEntityService - -/** - * Abstract implementation of [UserService] interface. Contains common methods for user services. - * - * @param E user entity class, extends [AbstractUser] - * @param R user repository class, extends [UserRepository] - * - * @see UserService - * @see AbstractUser - * @see UserRepository - * @see AbstractNamedEntityService - * - * @author Roman Shishkin - * @since 2.0.0 - */ -abstract class AbstractUserService> : - UserService, - AbstractNamedEntityService() { - - override fun findByAccessToken(accessToken: String): E? { - val entity = repository.findByAccessToken(accessToken) - return entity - } - - override fun findAllByAccessTokenIn(accessTokens: Collection): Collection { - val entities = repository.findAllByAccessTokenIn(accessTokens) - return entities - } - - override fun validateName(entity: E) = super.validateName(entity) && - !entity.name.containsAccessToken(entity.accessToken) - - override fun validateAdditionalInfo(entity: E) = super.validateAdditionalInfo(entity) && - !entity.additionalInfo.containsAccessToken(entity.accessToken) - - companion object { - - fun String.containsAccessToken(accessToken: AccessToken) = contains(accessToken, ignoreCase = true) - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/service/user/UserService.kt b/src/main/kotlin/trik/testsys/core/service/user/UserService.kt deleted file mode 100644 index c982620f..00000000 --- a/src/main/kotlin/trik/testsys/core/service/user/UserService.kt +++ /dev/null @@ -1,52 +0,0 @@ -package trik.testsys.core.service.user - -import trik.testsys.core.entity.user.UserEntity -import trik.testsys.core.repository.user.UserRepository -import trik.testsys.core.service.EntityService -import trik.testsys.core.service.named.NamedEntityService - -/** - * Simple interface for user services extends [NamedEntityService]. - * Contains methods that work with [UserEntity.accessToken]: - * - * 1. [findByAccessToken] - * 2. [findAllByAccessTokenIn] - * - * @param E user entity class, implements [UserEntity] - * @param R user repository class, implements [UserRepository] - * - * @see EntityService - * @see UserEntity - * @see UserRepository - * - * @author Roman Shishkin - * @since 2.0.0 - */ -interface UserService : NamedEntityService { - - /** - * Finds entity by [UserEntity.accessToken]. - * - * @param accessToken access token by which entity will be found. - * @return entity with [UserEntity.accessToken] equals to [accessToken]. If nothing was found - `null` - * - * @see [UserEntity.accessToken] - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun findByAccessToken(accessToken: String): E? - - /** - * Find all entities by [UserEntity.accessToken]. - * - * @param accessTokens access tokens by which entities will be found - * @return [Collection] with all found entities which [UserEntity.accessToken] contained in [accessTokens] - * - * @see [UserEntity.accessToken] - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun findAllByAccessTokenIn(accessTokens: Collection): Collection -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/utils/enums/Enum.kt b/src/main/kotlin/trik/testsys/core/utils/enums/Enum.kt deleted file mode 100644 index 64ab3fa6..00000000 --- a/src/main/kotlin/trik/testsys/core/utils/enums/Enum.kt +++ /dev/null @@ -1,12 +0,0 @@ -package trik.testsys.core.utils.enums - -/** - * Interface for any enum class. - * - * @author Roman Shishkin - * @since 2.0.0 - */ -interface Enum { - - val dbkey: String -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/utils/enums/converter/AbstractEnumConverter.kt b/src/main/kotlin/trik/testsys/core/utils/enums/converter/AbstractEnumConverter.kt deleted file mode 100644 index c2a9b264..00000000 --- a/src/main/kotlin/trik/testsys/core/utils/enums/converter/AbstractEnumConverter.kt +++ /dev/null @@ -1,27 +0,0 @@ -package trik.testsys.core.utils.enums.converter - -import trik.testsys.core.utils.enums.Enum -import java.lang.reflect.ParameterizedType -import javax.persistence.AttributeConverter - -/** - * Simple enum jpa converter. - * - * @author Roman Shishkin - * @since 2.0.0 - */ -abstract class AbstractEnumConverter : AttributeConverter { - - private val enumClass = (javaClass.genericSuperclass as ParameterizedType).actualTypeArguments[0] as Class - - override fun convertToDatabaseColumn(attribute: T?) = attribute?.dbkey - - override fun convertToEntityAttribute(dbData: String?): T? { - dbData ?: return null - enumClass.enumConstants.forEach { value -> - if (value.dbkey == dbData) return value - } - - throw IllegalArgumentException("Invalid value $dbData for enum class $${enumClass.simpleName}.") - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/utils/l10n/L10nCode.kt b/src/main/kotlin/trik/testsys/core/utils/l10n/L10nCode.kt deleted file mode 100644 index e03760bc..00000000 --- a/src/main/kotlin/trik/testsys/core/utils/l10n/L10nCode.kt +++ /dev/null @@ -1,3 +0,0 @@ -package trik.testsys.core.utils.l10n - -class L10nCode(val code: String) \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/utils/l10n/localizer/DefaultLocalizer.kt b/src/main/kotlin/trik/testsys/core/utils/l10n/localizer/DefaultLocalizer.kt deleted file mode 100644 index 5ea3bd0f..00000000 --- a/src/main/kotlin/trik/testsys/core/utils/l10n/localizer/DefaultLocalizer.kt +++ /dev/null @@ -1,43 +0,0 @@ -package trik.testsys.core.utils.l10n.localizer - -import com.fasterxml.jackson.databind.ObjectMapper -import org.springframework.beans.factory.annotation.Value -import org.springframework.stereotype.Service -import trik.testsys.core.utils.l10n.L10nCode -import java.io.File - -/** - * Default implementation of localizer. - * - * @author Roman Shishkin - * @since 2.0.0 - */ -@Service -class DefaultLocalizer(@Value("\${path.l10n}") l10nDirPath: String) : Localizer { - - private var l10nDir: File = File(l10nDirPath) - - private lateinit var l10nMap: Map - - init { - val map = mutableMapOf() - - if (l10nDir.exists() && l10nDir.isDirectory) { - l10nDir.listFiles()?.map { - val objectMapper = ObjectMapper() - val jsonNode = objectMapper.readTree(it.reader()) - - jsonNode.fields().forEach { field -> map[field.key] = field.value.asText() } - } - } - - l10nMap = map.toSortedMap() - } - - override fun localize(l10nCode: L10nCode): String { - val code = l10nCode.code - val l10n = l10nMap[code] ?: return code - - return l10n - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/utils/l10n/localizer/Localizer.kt b/src/main/kotlin/trik/testsys/core/utils/l10n/localizer/Localizer.kt deleted file mode 100644 index b2fa3a8e..00000000 --- a/src/main/kotlin/trik/testsys/core/utils/l10n/localizer/Localizer.kt +++ /dev/null @@ -1,18 +0,0 @@ -package trik.testsys.core.utils.l10n.localizer - -import trik.testsys.core.utils.l10n.L10nCode - - -/** - * Contract for implementation of localizer. - * - * @author Roman Shishkin - * @since 2.0.0 - */ -interface Localizer { - - /** - * Gets a localized message by [l10nCode]. - */ - fun localize(l10nCode: L10nCode): String -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/view/named/NamedEntityView.kt b/src/main/kotlin/trik/testsys/core/view/named/NamedEntityView.kt deleted file mode 100644 index 7d9343a6..00000000 --- a/src/main/kotlin/trik/testsys/core/view/named/NamedEntityView.kt +++ /dev/null @@ -1,13 +0,0 @@ -package trik.testsys.core.view.named - -import trik.testsys.core.entity.named.NamedEntity -import trik.testsys.core.view.View - -/** - * @author Roman Shishkin - * @since 2.0.0 - **/ -interface NamedEntityView : View { - - val name: String -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/core/view/user/UserView.kt b/src/main/kotlin/trik/testsys/core/view/user/UserView.kt deleted file mode 100644 index a146fd36..00000000 --- a/src/main/kotlin/trik/testsys/core/view/user/UserView.kt +++ /dev/null @@ -1,17 +0,0 @@ -package trik.testsys.core.view.user - -import trik.testsys.core.entity.user.AccessToken -import trik.testsys.core.entity.user.UserEntity -import trik.testsys.core.view.named.NamedEntityView -import java.time.LocalDateTime - -/** - * @author Roman Shishkin - * @since 2.0.0 - **/ -interface UserView : NamedEntityView { - - val accessToken: AccessToken - - val lastLoginDate: LocalDateTime? -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/entity/AbstractNotedEntity.kt b/src/main/kotlin/trik/testsys/webclient/entity/AbstractNotedEntity.kt deleted file mode 100644 index bac4754f..00000000 --- a/src/main/kotlin/trik/testsys/webclient/entity/AbstractNotedEntity.kt +++ /dev/null @@ -1,33 +0,0 @@ -package trik.testsys.webclient.entity - -import trik.testsys.core.entity.named.AbstractNamedEntity -import javax.persistence.Column -import javax.persistence.MappedSuperclass - -/** - * @author Roman Shishkin - * @since 2.0.0 - **/ -@MappedSuperclass -abstract class AbstractNotedEntity( - name: String -) : NotedEntity, AbstractNamedEntity(name) { - - @Column( - nullable = false, unique = false, updatable = true, - length = NOTE_MAX_LEN - ) override var note: String = NOTE_DEFAULT - - companion object { - - /** - * Maximum length of the [note] property. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - private const val NOTE_MAX_LEN = 255 - - private const val NOTE_DEFAULT = "" - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/entity/NotedEntity.kt b/src/main/kotlin/trik/testsys/webclient/entity/NotedEntity.kt deleted file mode 100644 index 3cc469a4..00000000 --- a/src/main/kotlin/trik/testsys/webclient/entity/NotedEntity.kt +++ /dev/null @@ -1,13 +0,0 @@ -package trik.testsys.webclient.entity - -import trik.testsys.core.entity.named.NamedEntity - - -/** - * @author Roman Shishkin - * @since 2.0.0 - **/ -interface NotedEntity : NamedEntity { - - var note: String -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/entity/user/impl/SuperUser.kt b/src/main/kotlin/trik/testsys/webclient/entity/user/impl/SuperUser.kt deleted file mode 100644 index c71e7e45..00000000 --- a/src/main/kotlin/trik/testsys/webclient/entity/user/impl/SuperUser.kt +++ /dev/null @@ -1,12 +0,0 @@ -package trik.testsys.webclient.entity.user.impl - -import trik.testsys.core.entity.user.AccessToken -import trik.testsys.webclient.entity.user.WebUser -import javax.persistence.* - -@Entity -@Table(name = "SUPER_USERS") -class SuperUser( - name: String, - accessToken: AccessToken -): WebUser(name, accessToken, UserType.SUPER_USER) \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/repository/user/SuperUserRepository.kt b/src/main/kotlin/trik/testsys/webclient/repository/user/SuperUserRepository.kt deleted file mode 100644 index d5ab797b..00000000 --- a/src/main/kotlin/trik/testsys/webclient/repository/user/SuperUserRepository.kt +++ /dev/null @@ -1,8 +0,0 @@ -package trik.testsys.webclient.repository.user - -import org.springframework.stereotype.Repository -import trik.testsys.core.repository.user.UserRepository -import trik.testsys.webclient.entity.user.impl.SuperUser - -@Repository -interface SuperUserRepository: UserRepository \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/service/LogoService.kt b/src/main/kotlin/trik/testsys/webclient/service/LogoService.kt deleted file mode 100644 index fd298241..00000000 --- a/src/main/kotlin/trik/testsys/webclient/service/LogoService.kt +++ /dev/null @@ -1,14 +0,0 @@ -package trik.testsys.webclient.service - -import trik.testsys.webclient.view.impl.LogosView - -/** - * Service for logos management. - * - * @author Roman Shishkin - * @since %CURRENT_VERSION% - */ -interface LogoService { - - fun getLogos(): LogosView -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/service/UserAgentParser.kt b/src/main/kotlin/trik/testsys/webclient/service/UserAgentParser.kt deleted file mode 100644 index 4bc5e319..00000000 --- a/src/main/kotlin/trik/testsys/webclient/service/UserAgentParser.kt +++ /dev/null @@ -1,11 +0,0 @@ -package trik.testsys.webclient.service - -import ua_parser.Client -import java.nio.charset.Charset - -interface UserAgentParser { - - fun getClientInfo(userAgent: String): Client - - fun getCharset(userAgent: String): Charset -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/service/entity/user/WebUserService.kt b/src/main/kotlin/trik/testsys/webclient/service/entity/user/WebUserService.kt deleted file mode 100644 index c0f86259..00000000 --- a/src/main/kotlin/trik/testsys/webclient/service/entity/user/WebUserService.kt +++ /dev/null @@ -1,24 +0,0 @@ -package trik.testsys.webclient.service.entity.user - -import trik.testsys.core.repository.user.UserRepository -import trik.testsys.core.service.user.AbstractUserService -import trik.testsys.webclient.entity.user.WebUser - -/** - * @author Roman Shishkin - * @since 2.0.0 - **/ -abstract class WebUserService> : AbstractUserService() { - - companion object { - - /** - * Checks if the [WebUser] is logging in for the first time. - * - * @return `true` if the [WebUser] is logging in for the first time, `false` otherwise. - * @author Roman Shishkin - * @since 2.0.0 - **/ - fun WebUser.isFirstTimeLoggedIn() = lastLoginDate == null - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/service/entity/user/impl/SuperUserService.kt b/src/main/kotlin/trik/testsys/webclient/service/entity/user/impl/SuperUserService.kt deleted file mode 100644 index bdaed0b6..00000000 --- a/src/main/kotlin/trik/testsys/webclient/service/entity/user/impl/SuperUserService.kt +++ /dev/null @@ -1,9 +0,0 @@ -package trik.testsys.webclient.service.entity.user.impl - -import org.springframework.stereotype.Service -import trik.testsys.webclient.entity.user.impl.SuperUser -import trik.testsys.webclient.repository.user.SuperUserRepository -import trik.testsys.webclient.service.entity.user.WebUserService - -@Service -class SuperUserService : WebUserService() \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/service/impl/LogoServiceImpl.kt b/src/main/kotlin/trik/testsys/webclient/service/impl/LogoServiceImpl.kt deleted file mode 100644 index 2ecd926b..00000000 --- a/src/main/kotlin/trik/testsys/webclient/service/impl/LogoServiceImpl.kt +++ /dev/null @@ -1,50 +0,0 @@ -package trik.testsys.webclient.service.impl - -import org.slf4j.LoggerFactory -import org.springframework.beans.factory.annotation.Value -import org.springframework.stereotype.Service -import trik.testsys.webclient.service.LogoService -import trik.testsys.webclient.view.impl.LogosView -import java.io.File - -/** - * @author Roman Shishkin - * @since %CURRENT_VERSION% - */ -@Service -class LogoServiceImpl( - @Value("\${path.logos.sponsor}") private val sponsorLogosPath: String, - @Value("\${path.logos.main}") private val mainLogoFilePath: String, -) : LogoService { - - private val sponsorLogosDir = File(sponsorLogosPath) - private val mainLogo = File(mainLogoFilePath) - - init { - if (!sponsorLogosDir.exists() || !sponsorLogosDir.isDirectory) { - logger.warn("Sponsor logos directory not found: $sponsorLogosPath. Creating...") - sponsorLogosDir.mkdirs() - } - - if (!mainLogo.exists() || !mainLogo.isFile) { - logger.warn("Main logo file not found: $mainLogoFilePath") - } - } - - override fun getLogos(): LogosView { - val builder = LogosView.builder() - - sponsorLogosDir.listFiles() - ?.filter { it.isFile } - ?.forEach { builder.addSponsorLogo(it.path) } - - mainLogo.takeIf { it.exists() }?.let { builder.addMainLogo(it.path) } - - return builder.build() - } - - companion object { - - private val logger = LoggerFactory.getLogger(LogoServiceImpl::class.java) - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/service/impl/UserAgentParserImpl.kt b/src/main/kotlin/trik/testsys/webclient/service/impl/UserAgentParserImpl.kt deleted file mode 100644 index e37a841c..00000000 --- a/src/main/kotlin/trik/testsys/webclient/service/impl/UserAgentParserImpl.kt +++ /dev/null @@ -1,108 +0,0 @@ -package trik.testsys.webclient.service.impl - -import org.springframework.stereotype.Service -import trik.testsys.webclient.service.UserAgentParser -import ua_parser.Client -import ua_parser.Parser -import java.nio.charset.Charset - -@Service -class UserAgentParserImpl : UserAgentParser { - - private val parser = Parser() - - override fun getClientInfo(userAgent: String): Client = parser.parse(userAgent) - - override fun getCharset(userAgent: String): Charset { - try { - val clientInfo = getClientInfo(userAgent) - val osFamily = OsFamily.getOsFamily(clientInfo.os.family) - val charset = osFamily.getCharsetByVersion(clientInfo.os.major) - - return charset - } catch (e: Exception) { - return UTF_8 - } - } - - sealed interface OsFamily { - - val name: String - - fun getCharsetByVersion(version: String?): Charset = UTF_8 - - object WINDOWS : OsFamily { - - override val name = "Windows NT" - - override fun getCharsetByVersion(version: String?): Charset { - version ?: super.getCharsetByVersion(version) - val charset = charsetsByVersion[version] ?: WINDOWS_1251 - - return charset - } - - private val charsetsByVersion = mapOf( - "5.1" to WINDOWS_1251, - "6.0" to WINDOWS_1251, - "6.1" to WINDOWS_1251, - "6.2" to WINDOWS_1251, - "6.3" to WINDOWS_1251, - "10.0" to UTF_8 - ) - } - - object MacOs : OsFamily { - - override val name = "Mac OS X" - } - - object Linux : OsFamily { - - override val name = "Linux" - } - - object Android : OsFamily { - - override val name = "Android" - } - - object IOS : OsFamily { - - override val name = "iPhone OS" - } - - object IpadOS : OsFamily { - - override val name = "iPad; CPU OS" - } - - object Unknown : OsFamily { - - override val name = "Unknown" - } - - companion object { - - val osFamiliesByName = mapOf( - WINDOWS.name to WINDOWS, - MacOs.name to MacOs, - Linux.name to Linux, - Android.name to Android, - IOS.name to IOS, - IpadOS.name to IpadOS, - Unknown.name to Unknown - ) - - fun getOsFamily(osFamily: String?): OsFamily = osFamiliesByName[osFamily] ?: Unknown - } - } - - companion object { - - val WINDOWS_1251: Charset = Charset.forName("windows-1251") - val WINDOWS_1252: Charset = Charset.forName("windows-1252") - - val UTF_8 = Charsets.UTF_8 - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/service/security/UserValidator.kt b/src/main/kotlin/trik/testsys/webclient/service/security/UserValidator.kt deleted file mode 100644 index 68421161..00000000 --- a/src/main/kotlin/trik/testsys/webclient/service/security/UserValidator.kt +++ /dev/null @@ -1,19 +0,0 @@ -package trik.testsys.webclient.service.security - -import trik.testsys.core.entity.user.AccessToken -import trik.testsys.webclient.entity.user.WebUser - -/** - * @author Roman Shishkin - * @since 2.0.0 - */ -interface UserValidator { - - /** - * Validates if [WebUser] exists by [accessToken]. Returns existence [WebUser] object, `null` - otherwise. - * - * @author Roman Shishkin - * @since 2.0.0 - */ - fun validateExistence(accessToken: AccessToken?): WebUser? -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/service/security/impl/UserValidatorImpl.kt b/src/main/kotlin/trik/testsys/webclient/service/security/impl/UserValidatorImpl.kt deleted file mode 100644 index df74a245..00000000 --- a/src/main/kotlin/trik/testsys/webclient/service/security/impl/UserValidatorImpl.kt +++ /dev/null @@ -1,22 +0,0 @@ -package trik.testsys.webclient.service.security.impl - -import org.springframework.context.ApplicationContext -import org.springframework.stereotype.Service -import trik.testsys.core.entity.user.AccessToken -import trik.testsys.webclient.entity.user.WebUser -import trik.testsys.webclient.service.entity.user.WebUserService -import trik.testsys.webclient.service.security.UserValidator - -@Service -class UserValidatorImpl( - context: ApplicationContext -) : UserValidator { - - private val webUserServices = context.getBeansOfType(WebUserService::class.java).values - - override fun validateExistence(accessToken: AccessToken?): WebUser? { - accessToken ?: return null - val entity = webUserServices.firstNotNullOfOrNull { it.findByAccessToken(accessToken) } - return entity - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/service/startup/impl/StartupListener.kt b/src/main/kotlin/trik/testsys/webclient/service/startup/impl/StartupListener.kt deleted file mode 100644 index 8b0ee4e9..00000000 --- a/src/main/kotlin/trik/testsys/webclient/service/startup/impl/StartupListener.kt +++ /dev/null @@ -1,51 +0,0 @@ -package trik.testsys.webclient.service.startup.impl - -import org.slf4j.LoggerFactory -import org.springframework.boot.context.event.ApplicationReadyEvent -import org.springframework.context.ApplicationContext -import org.springframework.context.ApplicationListener -import org.springframework.stereotype.Service -import trik.testsys.webclient.service.startup.runner.StartupRunner - -/** - * @author Roman Shishkin - * @since 2.0.0 - **/ -@Service -class StartupListener( - context: ApplicationContext -) : ApplicationListener { - - private val startUpRunnersMap = context.getBeansOfType(StartupRunner::class.java) - - override fun onApplicationEvent(event: ApplicationReadyEvent) { - val startTime = System.currentTimeMillis() - - logger.info("Starting startup runners...") - logger.info("Found ${startUpRunnersMap.size} startup runners.") - - startUpRunnersMap.forEach { (name, runner) -> - logger.info("Starting runner $name...") - - runner.tryRun() - } - - val endTime = System.currentTimeMillis() - logger.info("All startup runners finished.") - - logger.info("Startup took ${(endTime - startTime) / 1000.0} seconds.") - } - - private fun StartupRunner.tryRun() = try { - runBlocking() - } catch (e: Exception) { - logger.error("Error while running startup runner", e) - } finally { - logger.info("Startup runner finished.") - } - - companion object { - - private val logger = LoggerFactory.getLogger(StartupListener::class.java) - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/service/startup/runner/StartupRunner.kt b/src/main/kotlin/trik/testsys/webclient/service/startup/runner/StartupRunner.kt deleted file mode 100644 index 42144c15..00000000 --- a/src/main/kotlin/trik/testsys/webclient/service/startup/runner/StartupRunner.kt +++ /dev/null @@ -1,12 +0,0 @@ -package trik.testsys.webclient.service.startup.runner - -/** - * @author Roman Shishkin - * @since 2.0.0 - **/ -interface StartupRunner { - - fun runBlocking() - - suspend fun run() -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/service/startup/runner/impl/EntityCreatorRunner.kt b/src/main/kotlin/trik/testsys/webclient/service/startup/runner/impl/EntityCreatorRunner.kt deleted file mode 100644 index 95c5546c..00000000 --- a/src/main/kotlin/trik/testsys/webclient/service/startup/runner/impl/EntityCreatorRunner.kt +++ /dev/null @@ -1,352 +0,0 @@ -package trik.testsys.webclient.service.startup.runner.impl - -import com.fasterxml.jackson.core.type.TypeReference -import com.fasterxml.jackson.databind.DeserializationFeature -import com.fasterxml.jackson.databind.ObjectMapper -import org.slf4j.LoggerFactory -import org.springframework.beans.factory.annotation.Value -import org.springframework.beans.factory.config.BeanDefinition -import org.springframework.context.annotation.Scope -import org.springframework.stereotype.Service -import trik.testsys.core.entity.Entity -import trik.testsys.core.entity.user.AccessToken -import trik.testsys.core.entity.user.UserEntity -import trik.testsys.core.service.EntityService -import trik.testsys.core.service.user.UserService -import trik.testsys.webclient.entity.RegEntity -import trik.testsys.webclient.entity.impl.ApiKey -import trik.testsys.webclient.entity.impl.Group -import trik.testsys.webclient.entity.user.impl.* -import trik.testsys.webclient.service.entity.RegEntityService -import trik.testsys.webclient.service.entity.impl.ApiKeyService -import trik.testsys.webclient.service.entity.impl.GroupService -import trik.testsys.webclient.service.entity.user.impl.* -import trik.testsys.webclient.service.startup.runner.StartupRunner -import java.io.File -import java.nio.file.Files -import javax.xml.bind.annotation.XmlRootElement - -/** - * @author Roman Shishkin - * @since 2.0.0 - **/ -@Service -@Scope(BeanDefinition.SCOPE_PROTOTYPE) -class EntityCreatorRunner( - @Value("\${path.startup.entities}") private val entitiesDirPath: String, - - private val adminService: AdminService, - private val developerService: DeveloperService, - private val judgeService: JudgeService, - private val studentService: StudentService, - private val superUserService: SuperUserService, - private val viewerService: ViewerService, - private val groupService: GroupService, - private val apiKeyService: ApiKeyService -) : StartupRunner { - - private lateinit var entitiesDir: File - - private var hasInjectedEntities = false - - private fun initEntitiesDir(): Boolean { - logger.info("Checking entities directory by path $entitiesDirPath.") - entitiesDir = File(entitiesDirPath) - - if (!entitiesDir.exists()) { - logger.error("Entities directory by path $entitiesDirPath does not exist.") - return false - } - - if (!entitiesDir.isDirectory) { - logger.error("Entities directory by path $entitiesDirPath is not a directory.") - return false - } - - logger.info("Entities directory by path $entitiesDirPath exists.") - return true - } - - override fun runBlocking() { - initEntitiesDir() - - // Entities without dependencies to others. They should be created first. - developerService.createEntitiesWithoutDependencies(DEVELOPERS_FILE_NAME) - judgeService.createEntitiesWithoutDependencies(JUDGES_FILE_NAME) - superUserService.createEntitiesWithoutDependencies(SUPER_USERS_FILE_NAME) - viewerService.createEntitiesWithoutDependencies(VIEWERS_FILE_NAME) - apiKeyService.createEntitiesWithoutDependencies(API_KEYS_FILE_NAME) - - // Entities with dependencies to others. They should be created after entities without dependencies. - adminService.createEntitiesWithWebUserDependencies(ADMINS_FILE_NAME, viewerService) // Depends on Viewer - groupService.createEntitiesWithWebUserDependencies(GROUPS_FILE_NAME, adminService) // Depends on Admin - studentService.createEntitiesWithGroupDependencies(STUDENTS_FILE_NAME, groupService) // Depends on Group - - if (hasInjectedEntities) afterRun() - } - - override suspend fun run() { - TODO() - } - - private fun afterRun() { - logger.info("All entities were created.") - logger.info("Moving entities files to backup directory.") - - val backupDir = File(entitiesDir, BACKUP_DIR_NAME + "_" + System.currentTimeMillis()) - if (!backupDir.exists()) backupDir.mkdir() - - entitiesDir.listFiles()?.forEach { file -> - if (file.isDirectory) return@forEach - Files.move(file.toPath(), File(backupDir, file.name).toPath()) - } - - logger.info("Entities files were moved to backup directory.") - } - - private inline fun > EntityService.createEntitiesWithoutDependencies( - fileName: String - ) { - logger.info("Creating ${E::class.simpleName}s from file $fileName.") - val file = getEntitiesFile(fileName) ?: return - - val objectMapper = createMapper() - val entitiesData = objectMapper.getEntitiesData(file) ?: return - - saveAll(entitiesData) - } - - private inline fun > EntityService.createEntitiesWithWebUserDependencies( - fileName: String, externalService: UserService - ) { - logger.info("Creating ${E::class.simpleName}s from file $fileName.") - val file = getEntitiesFile(fileName) ?: return - - val objectMapper = createMapper() - val entitiesData = objectMapper.getEntitiesData(file) ?: return - - saveAll(entitiesData, externalService) - } - - private inline fun > EntityService.createEntitiesWithGroupDependencies( - fileName: String, externalService: RegEntityService - ) { - logger.info("Creating ${E::class.simpleName}s from file $fileName.") - val file = getEntitiesFile(fileName) ?: return - - val objectMapper = createMapper() - val entitiesData = objectMapper.getEntitiesData(file) ?: return - - saveAll(entitiesData, externalService) - } - - private fun > EntityService.saveAll( - entitiesData: Collection - ) = entitiesData.forEach { entityData -> entityData?.toEntity()?.let { trySave(it) } } - - private fun > EntityService.saveAll( - entitiesData: Collection, - externalService: UserService - ) = entitiesData.forEach { entityData -> entityData?.toEntity(externalService)?.let { trySave(it) } } - - private fun > EntityService.saveAll( - entitiesData: Collection, - externalService: RegEntityService - ) = entitiesData.forEach { entityData -> entityData?.toEntity(externalService)?.let { trySave(it) } } - - private fun EntityService.trySave(entity: E) = try { - save(entity) - hasInjectedEntities = true - } catch (e: Exception) { - logger.error("Error while saving entity $entity.", e) - } - - private inline fun > ObjectMapper.getEntitiesData(file: File): List? = - try { - readValue(file, object : TypeReference?>() {}) ?: run { - logger.error("Entities data from file ${file.name} is null.") - null - } - } catch (e: Exception) { - logger.error("Error while reading entities data from file ${file.name}.", e) - null - } - - - private fun getEntitiesFile(fileName: String): File? { - val file = File(entitiesDir, fileName) - - if (!file.exists()) { - logger.warn("File $fileName does not exist.") - return null - } - - return file - } - - private fun createMapper(): ObjectMapper { - val objectMapper = ObjectMapper() - objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) - return objectMapper - } - - sealed interface EntityData { - - interface EntityDataWithoutDependencies : EntityData { - - fun toEntity(): E - } - - sealed interface EntityDataWithDependencies : EntityData { - - interface EntityDataWithUserEntityDependencies : EntityDataWithDependencies { - - fun > toEntity(externalService: S): E? - } - - interface EntityDataWithRegEntityDependencies : EntityDataWithDependencies { - - fun > toEntity(externalService: S): E? - } - } - } - - @XmlRootElement - private data class AdminData( - val name: String = "", - val accessToken: AccessToken = "", - val viewerAccessToken: AccessToken = "", - val additionalInfo: String? = null - ) : EntityData.EntityDataWithDependencies.EntityDataWithUserEntityDependencies { - - override fun > toEntity(externalService: S) = - externalService.findByAccessToken(viewerAccessToken)?.let { viewer -> - Admin(name, accessToken).also { - it.viewer = viewer as Viewer - additionalInfo?.let { addInfo -> it.additionalInfo = addInfo } - } - } ?: run { - logger.error("Viewer with accessToken $viewerAccessToken not found.") - null - } - } - - @XmlRootElement - private data class DeveloperData( - val name: String = "", - val accessToken: AccessToken = "", - val additionalInfo: String? = null - ) : EntityData.EntityDataWithoutDependencies { - - override fun toEntity() = Developer(name, accessToken).also { - additionalInfo?.let { addInfo -> it.additionalInfo = addInfo } - } - } - - @XmlRootElement - private data class JudgeData( - val name: String = "", - val accessToken: AccessToken = "", - val additionalInfo: String? = null - ) : EntityData.EntityDataWithoutDependencies { - - override fun toEntity() = Judge(name, accessToken).also { - additionalInfo?.let { addInfo -> it.additionalInfo = addInfo } - } - } - - @XmlRootElement - private data class StudentData( - val name: String = "", - val accessToken: AccessToken = "", - val groupRegToken: AccessToken = "", - val additionalInfo: String? = null - ) : EntityData.EntityDataWithDependencies.EntityDataWithRegEntityDependencies { - - - override fun > toEntity(externalService: S): Student? = - externalService.findByRegToken(groupRegToken)?.let { group -> - Student(name, accessToken).also { - it.group = group as Group - additionalInfo?.let { addInfo -> it.additionalInfo = addInfo } - } - } ?: run { - logger.error("Group with accessToken $groupRegToken not found.") - null - } - } - - @XmlRootElement - private data class SuperUserData( - val name: String = "", - val accessToken: AccessToken = "", - val additionalInfo: String? = null - ) : EntityData.EntityDataWithoutDependencies { - - override fun toEntity() = SuperUser(name, accessToken).also { - additionalInfo?.let { addInfo -> it.additionalInfo = addInfo } - } - } - - @XmlRootElement - private data class ViewerData( - val name: String = "", - val accessToken: AccessToken = "", - val regToken: String = "", - val additionalInfo: String? = null - ) : EntityData.EntityDataWithoutDependencies { - - override fun toEntity() = Viewer(name, accessToken, regToken).also { - additionalInfo?.let { addInfo -> it.additionalInfo = addInfo } - } - } - - @XmlRootElement - private data class GroupData( - val name: String = "", - val regToken: AccessToken = "", - val adminAccessToken: AccessToken = "", - val additionalInfo: String? = null - ) : EntityData.EntityDataWithDependencies.EntityDataWithUserEntityDependencies { - - override fun > toEntity(externalService: S): Group? = - externalService.findByAccessToken(adminAccessToken)?.let { admin -> - Group(name, regToken).also { - it.admin = admin as Admin - additionalInfo?.let { addInfo -> it.additionalInfo = addInfo } - } - } ?: run { - logger.error("Admin with accessToken $adminAccessToken not found.") - null - } - } - - /** - * @author Roman Shishkin - * @since 2.5.0 - */ - @XmlRootElement - private data class ApiKeyData( - val value: String = "" - ) : EntityData.EntityDataWithoutDependencies { - - override fun toEntity() = ApiKey(value) - } - - companion object { - - private val logger = LoggerFactory.getLogger(EntityCreatorRunner::class.java) - - private const val ADMINS_FILE_NAME = "admins.json" - private const val DEVELOPERS_FILE_NAME = "developers.json" - private const val JUDGES_FILE_NAME = "judges.json" - private const val STUDENTS_FILE_NAME = "students.json" - private const val SUPER_USERS_FILE_NAME = "superusers.json" - private const val VIEWERS_FILE_NAME = "viewers.json" - private const val GROUPS_FILE_NAME = "groups.json" - - private const val API_KEYS_FILE_NAME = "api_keys.json" - - private const val BACKUP_DIR_NAME = "backup" - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/service/startup/runner/impl/LektoriumEntityCreatorRunner.kt b/src/main/kotlin/trik/testsys/webclient/service/startup/runner/impl/LektoriumEntityCreatorRunner.kt deleted file mode 100644 index 77d7afed..00000000 --- a/src/main/kotlin/trik/testsys/webclient/service/startup/runner/impl/LektoriumEntityCreatorRunner.kt +++ /dev/null @@ -1,91 +0,0 @@ -package trik.testsys.webclient.service.startup.runner.impl - -import org.springframework.beans.factory.annotation.Qualifier -import org.springframework.beans.factory.annotation.Value -import org.springframework.beans.factory.config.BeanDefinition -import org.springframework.context.annotation.Scope -import org.springframework.stereotype.Service -import trik.testsys.core.entity.user.AccessToken -import trik.testsys.webclient.entity.impl.Group -import trik.testsys.webclient.entity.user.impl.Admin -import trik.testsys.webclient.entity.user.impl.Developer -import trik.testsys.webclient.entity.user.impl.Viewer -import trik.testsys.webclient.service.entity.impl.GroupService -import trik.testsys.webclient.service.entity.user.impl.AdminService -import trik.testsys.webclient.service.entity.user.impl.DeveloperService -import trik.testsys.webclient.service.entity.user.impl.ViewerService -import trik.testsys.webclient.service.startup.runner.StartupRunner -import trik.testsys.webclient.service.token.access.AccessTokenGenerator -import trik.testsys.webclient.service.token.reg.RegTokenGenerator - -@Service -@Scope(BeanDefinition.SCOPE_PROTOTYPE) -class LektoriumEntityCreatorRunner( - @Value("\${create-lektorium-users}") private val createLektoriumUsers: Boolean, - @Value("\${lektorium-group-reg-token}") private val groupRegToken: AccessToken, - - private val groupService: GroupService, - private val developerService: DeveloperService, - private val viewerService: ViewerService, - private val adminService: AdminService, - - @Qualifier("adminRegTokenGenerator") private val adminRegTokenGenerator: RegTokenGenerator, - @Qualifier("webUserAccessTokenGenerator") private val webUserAccessTokenGenerator: AccessTokenGenerator, -) : StartupRunner { - - override fun runBlocking() { - if (!createLektoriumUsers || hasLektoriumInitialized()) { - return - } - - val viewer = createViewer() - val admin = createAdmin(viewer) - val group = createGroup(admin) - val developer = createDeveloper() - } - - override suspend fun run() { - TODO("Not yet implemented") - } - - private fun hasLektoriumInitialized(): Boolean { - return viewerService.findAll().any { it.accessToken.startsWith(LEKTORIUM_PREFIX) } - } - - private fun createViewer(): Viewer { - val adminRegToken = adminRegTokenGenerator.generate(LEKTORIUM_PREFIX) - val viewerToken = webUserAccessTokenGenerator.generate(LEKTORIUM_PREFIX) - val viewer = Viewer("Lektorium Viewer", "$LEKTORIUM_PREFIX-$viewerToken", adminRegToken) - - return viewerService.save(viewer) - } - - private fun createAdmin(viewer: Viewer): Admin { - val adminToken = webUserAccessTokenGenerator.generate(LEKTORIUM_PREFIX) - val admin = Admin("Lektorium Admin", "$LEKTORIUM_PREFIX-$adminToken").also { - it.viewer = viewer - } - - return adminService.save(admin) - } - - private fun createGroup(admin: Admin): Group { - val group = Group("Lektorium Group", groupRegToken).also { - it.admin = admin - } - - return groupService.save(group) - } - - private fun createDeveloper(): Developer { - val developerToken = webUserAccessTokenGenerator.generate(LEKTORIUM_PREFIX) - val developer = Developer("Lektorium Developer", "$LEKTORIUM_PREFIX-$developerToken") - - return developerService.save(developer) - } - - companion object { - - private const val LEKTORIUM_PREFIX = "lkt" - } -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/util/config/SpringFoxConfig.kt b/src/main/kotlin/trik/testsys/webclient/util/config/SpringFoxConfig.kt deleted file mode 100644 index d4bd3915..00000000 --- a/src/main/kotlin/trik/testsys/webclient/util/config/SpringFoxConfig.kt +++ /dev/null @@ -1,22 +0,0 @@ -package trik.testsys.webclient.util.config - -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.Configuration -import springfox.documentation.builders.PathSelectors -import springfox.documentation.builders.RequestHandlerSelectors -import springfox.documentation.spi.DocumentationType -import springfox.documentation.spring.web.plugins.Docket - - -@Configuration -class SpringFoxConfig { - - @Bean - fun api(): Docket { - return Docket(DocumentationType.SWAGGER_2) - .select() - .apis(RequestHandlerSelectors.basePackage("trik.testsys.webclient.controller.impl.rest")) - .paths(PathSelectors.any()) - .build() - } -} \ No newline at end of file From ca2b863febc52aded24fe2f6d2226e49794bed0c Mon Sep 17 00:00:00 2001 From: Roman Shishkin Date: Sun, 17 Aug 2025 05:04:17 +0500 Subject: [PATCH 005/231] config: Updated gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4a5785ff..3f9f1b9f 100644 --- a/.gitignore +++ b/.gitignore @@ -187,4 +187,5 @@ HELP.md target/ .mvn/wrapper/maven-wrapper.jar !**/src/main/**/target/ -!**/src/test/**/target/ \ No newline at end of file +!**/src/test/**/target/ +*.iml \ No newline at end of file From 2e54cf9a1454613c2793051fadce46d5b2514812 Mon Sep 17 00:00:00 2001 From: Roman Shishkin Date: Sun, 17 Aug 2025 05:04:47 +0500 Subject: [PATCH 006/231] feat: Updated ApiKey entity classes --- .../testsys/webclient/entity/impl/ApiKey.kt | 12 +++---- .../testsys/webclient/entity/impl/Group.kt | 34 ------------------- .../webclient/repository/ApiKeyRepository.kt | 2 +- .../service/entity/impl/ApiKeyService.kt | 2 +- 4 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 src/main/kotlin/trik/testsys/webclient/entity/impl/Group.kt diff --git a/src/main/kotlin/trik/testsys/webclient/entity/impl/ApiKey.kt b/src/main/kotlin/trik/testsys/webclient/entity/impl/ApiKey.kt index f0f10342..9e1bbb93 100644 --- a/src/main/kotlin/trik/testsys/webclient/entity/impl/ApiKey.kt +++ b/src/main/kotlin/trik/testsys/webclient/entity/impl/ApiKey.kt @@ -1,13 +1,13 @@ package trik.testsys.webclient.entity.impl -import trik.testsys.core.entity.AbstractEntity -import trik.testsys.core.entity.Entity.Companion.TABLE_PREFIX -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.Table +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Table +import trik.testsys.sac.data.entity.AbstractEntity +import trik.testsys.sac.data.entity.AbstractEntity.Companion.TABLE_PREFIX @Entity -@Table(name = "${TABLE_PREFIX}_API_KEY") +@Table(name = "${TABLE_PREFIX}api_key") class ApiKey( @Column(nullable = false, unique = true, updatable = false) val value: String diff --git a/src/main/kotlin/trik/testsys/webclient/entity/impl/Group.kt b/src/main/kotlin/trik/testsys/webclient/entity/impl/Group.kt deleted file mode 100644 index 991b67ee..00000000 --- a/src/main/kotlin/trik/testsys/webclient/entity/impl/Group.kt +++ /dev/null @@ -1,34 +0,0 @@ -package trik.testsys.webclient.entity.impl - -import trik.testsys.core.entity.Entity.Companion.TABLE_PREFIX -import trik.testsys.core.entity.named.AbstractNamedEntity -import trik.testsys.core.entity.user.AccessToken -import trik.testsys.webclient.entity.RegEntity -import trik.testsys.webclient.entity.user.impl.Admin -import trik.testsys.webclient.entity.user.impl.Student -import javax.persistence.* - -@Entity -@Table(name = "${TABLE_PREFIX}_GROUP") -class Group( - name: String, - - @Column( - nullable = false, unique = true, updatable = false, - length = RegEntity.REG_TOKEN_LENGTH - ) override val regToken: AccessToken -) : AbstractNamedEntity(name), RegEntity { - - @ManyToOne - @JoinColumn( - nullable = false, unique = false, updatable = false, - name = "admin_id", referencedColumnName = "id", - ) - lateinit var admin: Admin - - @OneToMany(mappedBy = "group") - val students: MutableSet = mutableSetOf() - - @ManyToMany(mappedBy = "groups") - val contests: MutableSet = mutableSetOf() -} \ No newline at end of file diff --git a/src/main/kotlin/trik/testsys/webclient/repository/ApiKeyRepository.kt b/src/main/kotlin/trik/testsys/webclient/repository/ApiKeyRepository.kt index c61bd69b..3b7378ed 100644 --- a/src/main/kotlin/trik/testsys/webclient/repository/ApiKeyRepository.kt +++ b/src/main/kotlin/trik/testsys/webclient/repository/ApiKeyRepository.kt @@ -1,7 +1,7 @@ package trik.testsys.webclient.repository import org.springframework.stereotype.Repository -import trik.testsys.core.repository.EntityRepository +import trik.testsys.sac.data.repository.EntityRepository import trik.testsys.webclient.entity.impl.ApiKey @Repository diff --git a/src/main/kotlin/trik/testsys/webclient/service/entity/impl/ApiKeyService.kt b/src/main/kotlin/trik/testsys/webclient/service/entity/impl/ApiKeyService.kt index 5b6b4df1..7910d94a 100644 --- a/src/main/kotlin/trik/testsys/webclient/service/entity/impl/ApiKeyService.kt +++ b/src/main/kotlin/trik/testsys/webclient/service/entity/impl/ApiKeyService.kt @@ -1,7 +1,7 @@ package trik.testsys.webclient.service.entity.impl import org.springframework.stereotype.Service -import trik.testsys.core.service.AbstractService +import trik.testsys.sac.data.service.AbstractService import trik.testsys.webclient.entity.impl.ApiKey import trik.testsys.webclient.repository.ApiKeyRepository From 5d1fc0972b016ce54daaf87014d4569a54c8cc60 Mon Sep 17 00:00:00 2001 From: Roman Shishkin Date: Sun, 17 Aug 2025 05:05:35 +0500 Subject: [PATCH 007/231] config: Updated run configuration --- .idea/runConfigurations/WebApp.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/runConfigurations/WebApp.xml b/.idea/runConfigurations/WebApp.xml index a219eb24..717ba563 100644 --- a/.idea/runConfigurations/WebApp.xml +++ b/.idea/runConfigurations/WebApp.xml @@ -2,8 +2,8 @@