diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index dfe0770..0000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..17c9dd6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,61 @@ +# See https://www.dartlang.org/guides/libraries/private-files + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + + +*.html +*.css +*.rss +*.mvn + +*target + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + + +# Files and directories created by pub +.dart_tool/ +.packages +build/ + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release + +### Firebase ### +**/node_modules/* +**/.firebaserc + +### Firebase Patch ### +.runtimeconfig.json +.firebase/ + +# If you're building an application, you may want to check-in your pubspec.lock +pubspec.lock + +# Directory created by dartdoc +# If you don't generate documentation locally you can remove this line. +doc/api/ + +# Avoid committing generated Javascript files: +*.dart.js +*.info.json # Produced by the --dump-info flag. +*.js # When generated by dart2js. Don't specify *.js if your + # project includes source files written in JavaScript. +*.js_ +*.js.deps +*.js.map diff --git a/README.md b/README.md index 681d633..6f54b47 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ -# Databases - +# Lab 6 + +Spring Boot Maven JPA diff --git a/lombok.config b/lombok.config new file mode 100644 index 0000000..f630e32 --- /dev/null +++ b/lombok.config @@ -0,0 +1,4 @@ +config.stopBubbling = true +lombok.addLombokGeneratedAnnotation = true +lombok.anyConstructor.addConstructorProperties = true +lombok.addNullAnnotations = \ No newline at end of file diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..8a8fb22 --- /dev/null +++ b/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..f33c513 --- /dev/null +++ b/pom.xml @@ -0,0 +1,245 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.7.0 + + + com.mkruchok + DB6MK + 0.0.1-SNAPSHOT + DB6MK + DB6MK + + https://github.com/MKruchok/Databases/tree/lab_6 + + + 11 + false + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-hateoas + + + org.springframework.boot + spring-boot-starter-mustache + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-web-services + + + org.springframework.boot + spring-boot-starter-actuator + + + io.micrometer + micrometer-registry-prometheus + ${micrometer.version} + + + org.springframework.restdocs + spring-restdocs-mockmvc + test + + + org.springdoc + springdoc-openapi-ui + 1.6.8 + + + javax.xml.bind + jaxb-api + 2.3.1 + + + com.querydsl + querydsl-bom + 5.0.0 + pom + + + org.javassist + javassist + 3.25.0-GA + + + com.sun.xml.ws + jaxws-rt + 2.2.3 + test + + + org.springframework.session + spring-session-jdbc + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + com.microsoft.sqlserver + mssql-jdbc + runtime + + + mysql + mysql-connector-java + runtime + + + org.projectlombok + lombok + 1.18.24 + + + org.springframework.boot + spring-boot-starter-test + test + + + com.github.spotbugs + spotbugs + 4.7.0 + + + com.puppycrawl.tools + checkstyle + 10.3.2 + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.2 + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.3.0 + + + + + + + + + org.apache.maven.plugins + maven-pmd-plugin + 3.13.0 + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.2 + + + com.puppycrawl.tools + checkstyle + 10.3.2 + + + + + + + + com.github.spotbugs + spotbugs-maven-plugin + 4.4.1 + + + org.apache.maven.plugins + maven-site-plugin + 3.7.1 + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.2.2 + + + org.apache.maven.plugins + maven-pmd-plugin + 3.13.0 + + + org.springframework.boot + spring-boot-maven-plugin + 2.7.0 + + + + org.projectlombok + lombok + + + + + + + + + + + com.github.spotbugs + spotbugs-maven-plugin + 4.4.1 + + spotbugs-exclude.xml + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.1.2 + + + + checkstyle + + + + + true + UTF-8 + google_checks.xml + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 3.3.0 + + + + issue-management + + + + + + org.apache.maven.plugins + maven-pmd-plugin + 3.13.0 + + + + + diff --git a/spotbugs-exclude.xml b/spotbugs-exclude.xml new file mode 100644 index 0000000..897861d --- /dev/null +++ b/spotbugs-exclude.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/mkruchok/Application.java b/src/main/java/com/mkruchok/Application.java new file mode 100644 index 0000000..3254a49 --- /dev/null +++ b/src/main/java/com/mkruchok/Application.java @@ -0,0 +1,11 @@ +package com.mkruchok; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/src/main/java/com/mkruchok/config/SwaggerConfiguration.java b/src/main/java/com/mkruchok/config/SwaggerConfiguration.java new file mode 100644 index 0000000..b51e9a1 --- /dev/null +++ b/src/main/java/com/mkruchok/config/SwaggerConfiguration.java @@ -0,0 +1,42 @@ +package com.mkruchok.config; + +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.info.License; +import io.swagger.v3.oas.models.servers.Server; +import java.util.ArrayList; +import java.util.List; +import org.springdoc.core.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.hateoas.client.LinkDiscoverer; +import org.springframework.hateoas.client.LinkDiscoverers; +import org.springframework.hateoas.mediatype.collectionjson.CollectionJsonLinkDiscoverer; +import org.springframework.plugin.core.SimplePluginRegistry; + + +@Configuration +public class SwaggerConfiguration { + @Bean + public LinkDiscoverers discoverers() { + List plugins = new ArrayList<>(); + plugins.add(new CollectionJsonLinkDiscoverer()); + return new LinkDiscoverers(SimplePluginRegistry.of(plugins)); + } + + @Bean + public GroupedOpenApi decksApi() { + return GroupedOpenApi.builder().group("public").pathsToMatch("/public/**").build(); + } + + @Bean + public OpenAPI ajaxOpenApi() { + Server server = new Server(); + server.setUrl("http://localhost:8888"); + return new OpenAPI().info(new Info().title("AJAX SYSTEMS CRUD DEMO") + .description("Application for ajax security systems") + .version("v0.0.1") + .license(new License().name("Apache 2.0").url("https://springdoc.org"))); + } + +} \ No newline at end of file diff --git a/src/main/java/com/mkruchok/controller/AbstractController.java b/src/main/java/com/mkruchok/controller/AbstractController.java new file mode 100644 index 0000000..63c0a87 --- /dev/null +++ b/src/main/java/com/mkruchok/controller/AbstractController.java @@ -0,0 +1,66 @@ +package com.mkruchok.controller; + +import com.mkruchok.mapper.AbstractMapper; +import com.mkruchok.service.AbstractService; +import java.util.ArrayList; +import java.util.List; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +public abstract class AbstractController { + protected abstract AbstractService getService(); + + protected abstract AbstractMapper getMapper(); + + @RequestMapping(method = RequestMethod.GET) + public @ResponseBody ResponseEntity> findAll() { + List objects = getService().findAll(); + List objectsDto = new ArrayList<>(); + for (T object : objects) { + objectsDto.add(getMapper().mapObjectToDto(object)); + } + return new ResponseEntity<>(objectsDto, HttpStatus.OK); + } + + @RequestMapping(method = RequestMethod.GET, + value = "/{id}") + public @ResponseBody ResponseEntity findById( + @PathVariable + I id) { + T object = getService().getById(id); + return new ResponseEntity<>(getMapper().mapObjectToDto(object), HttpStatus.OK); + } + + @RequestMapping(method = RequestMethod.POST, + consumes = {MediaType.APPLICATION_JSON_VALUE}) + public @ResponseBody ResponseEntity create( + @RequestBody + T newObject) { + getService().create(newObject); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @RequestMapping(method = RequestMethod.PUT, + consumes = {MediaType.APPLICATION_JSON_VALUE}) + public @ResponseBody ResponseEntity update( + @RequestBody + T object) { + return new ResponseEntity<>(getService().update(object), HttpStatus.OK); + } + + @RequestMapping(method = RequestMethod.DELETE, + value = "/{id}") + public @ResponseBody ResponseEntity delete( + @PathVariable + I id) { + getService().delete(id); + return new ResponseEntity<>(HttpStatus.OK); + } + +} diff --git a/src/main/java/com/mkruchok/controller/DeviceController.java b/src/main/java/com/mkruchok/controller/DeviceController.java new file mode 100644 index 0000000..2b56ac9 --- /dev/null +++ b/src/main/java/com/mkruchok/controller/DeviceController.java @@ -0,0 +1,29 @@ +package com.mkruchok.controller; + +import com.mkruchok.dto.DeviceDto; +import com.mkruchok.entity.Device; +import com.mkruchok.mapper.AbstractMapper; +import com.mkruchok.mapper.DeviceMapper; +import com.mkruchok.service.AbstractService; +import com.mkruchok.service.DeviceService; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RequestMapping(value = "/device") +@AllArgsConstructor +@RestController +public class DeviceController extends AbstractController { + private final DeviceService deviceService; + private final DeviceMapper deviceMapper; + + @Override + protected AbstractService getService() { + return deviceService; + } + + @Override + protected AbstractMapper getMapper() { + return deviceMapper; + } +} diff --git a/src/main/java/com/mkruchok/controller/DevicesGroupController.java b/src/main/java/com/mkruchok/controller/DevicesGroupController.java new file mode 100644 index 0000000..d2535d8 --- /dev/null +++ b/src/main/java/com/mkruchok/controller/DevicesGroupController.java @@ -0,0 +1,30 @@ +package com.mkruchok.controller; + +import com.mkruchok.dto.DevicesGroupDto; +import com.mkruchok.entity.DevicesGroup; +import com.mkruchok.mapper.AbstractMapper; +import com.mkruchok.mapper.DevicesGroupMapper; +import com.mkruchok.service.AbstractService; +import com.mkruchok.service.DevicesGroupService; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RequestMapping(value = "/devices_group") +@AllArgsConstructor +@RestController +public class DevicesGroupController + extends AbstractController { + private final DevicesGroupService devicesGroupService; + private final DevicesGroupMapper devicesGroupMapper; + + @Override + protected AbstractService getService() { + return devicesGroupService; + } + + @Override + protected AbstractMapper getMapper() { + return devicesGroupMapper; + } +} diff --git a/src/main/java/com/mkruchok/controller/HubController.java b/src/main/java/com/mkruchok/controller/HubController.java new file mode 100644 index 0000000..5def569 --- /dev/null +++ b/src/main/java/com/mkruchok/controller/HubController.java @@ -0,0 +1,29 @@ +package com.mkruchok.controller; + +import com.mkruchok.dto.HubDto; +import com.mkruchok.entity.Hub; +import com.mkruchok.mapper.AbstractMapper; +import com.mkruchok.mapper.HubMapper; +import com.mkruchok.service.AbstractService; +import com.mkruchok.service.HubService; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RequestMapping(value = "/hub") +@AllArgsConstructor +@RestController +public class HubController extends AbstractController { + private final HubService hubService; + private final HubMapper hubMapper; + + @Override + protected AbstractService getService() { + return hubService; + } + + @Override + protected AbstractMapper getMapper() { + return hubMapper; + } +} diff --git a/src/main/java/com/mkruchok/controller/NotificationController.java b/src/main/java/com/mkruchok/controller/NotificationController.java new file mode 100644 index 0000000..d82bc84 --- /dev/null +++ b/src/main/java/com/mkruchok/controller/NotificationController.java @@ -0,0 +1,30 @@ +package com.mkruchok.controller; + +import com.mkruchok.dto.NotificationDto; +import com.mkruchok.entity.Notification; +import com.mkruchok.mapper.AbstractMapper; +import com.mkruchok.mapper.NotificationMapper; +import com.mkruchok.service.AbstractService; +import com.mkruchok.service.NotificationService; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RequestMapping(value = "/notification") +@AllArgsConstructor +@RestController +public class NotificationController + extends AbstractController { + private final NotificationService notificationService; + private final NotificationMapper notificationMapper; + + @Override + protected AbstractService getService() { + return notificationService; + } + + @Override + protected AbstractMapper getMapper() { + return notificationMapper; + } +} diff --git a/src/main/java/com/mkruchok/controller/PermissionController.java b/src/main/java/com/mkruchok/controller/PermissionController.java new file mode 100644 index 0000000..c3f7fd1 --- /dev/null +++ b/src/main/java/com/mkruchok/controller/PermissionController.java @@ -0,0 +1,29 @@ +package com.mkruchok.controller; + +import com.mkruchok.dto.PermissionDto; +import com.mkruchok.entity.Permission; +import com.mkruchok.mapper.AbstractMapper; +import com.mkruchok.mapper.PermissionMapper; +import com.mkruchok.service.AbstractService; +import com.mkruchok.service.PermissionService; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RequestMapping(value = "/permission") +@AllArgsConstructor +@RestController +public class PermissionController extends AbstractController { + private final PermissionService permissionService; + private final PermissionMapper permissionMapper; + + @Override + protected AbstractService getService() { + return permissionService; + } + + @Override + protected AbstractMapper getMapper() { + return permissionMapper; + } +} diff --git a/src/main/java/com/mkruchok/controller/RexController.java b/src/main/java/com/mkruchok/controller/RexController.java new file mode 100644 index 0000000..48689f2 --- /dev/null +++ b/src/main/java/com/mkruchok/controller/RexController.java @@ -0,0 +1,29 @@ +package com.mkruchok.controller; + +import com.mkruchok.dto.RexDto; +import com.mkruchok.entity.Rex; +import com.mkruchok.mapper.AbstractMapper; +import com.mkruchok.mapper.RexMapper; +import com.mkruchok.service.AbstractService; +import com.mkruchok.service.RexService; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RequestMapping(value = "/rex") +@AllArgsConstructor +@RestController +public class RexController extends AbstractController { + private final RexService rexService; + private final RexMapper rexMapper; + + @Override + protected AbstractService getService() { + return rexService; + } + + @Override + protected AbstractMapper getMapper() { + return rexMapper; + } +} diff --git a/src/main/java/com/mkruchok/controller/UserController.java b/src/main/java/com/mkruchok/controller/UserController.java new file mode 100644 index 0000000..a7371a9 --- /dev/null +++ b/src/main/java/com/mkruchok/controller/UserController.java @@ -0,0 +1,29 @@ +package com.mkruchok.controller; + +import com.mkruchok.dto.UserDto; +import com.mkruchok.entity.User; +import com.mkruchok.mapper.AbstractMapper; +import com.mkruchok.mapper.UserMapper; +import com.mkruchok.service.AbstractService; +import com.mkruchok.service.UserService; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RequestMapping(value = "/user") +@AllArgsConstructor +@RestController +public class UserController extends AbstractController { + private final UserService userService; + private final UserMapper userMapper; + + @Override + protected AbstractService getService() { + return userService; + } + + @Override + protected AbstractMapper getMapper() { + return userMapper; + } +} diff --git a/src/main/java/com/mkruchok/controller/UsersGroupController.java b/src/main/java/com/mkruchok/controller/UsersGroupController.java new file mode 100644 index 0000000..b3d4ff3 --- /dev/null +++ b/src/main/java/com/mkruchok/controller/UsersGroupController.java @@ -0,0 +1,29 @@ +package com.mkruchok.controller; + +import com.mkruchok.dto.UsersGroupDto; +import com.mkruchok.entity.UsersGroup; +import com.mkruchok.mapper.AbstractMapper; +import com.mkruchok.mapper.UsersGroupMapper; +import com.mkruchok.service.AbstractService; +import com.mkruchok.service.UsersGroupService; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RequestMapping(value = "/users_group") +@AllArgsConstructor +@RestController +public class UsersGroupController extends AbstractController { + private final UsersGroupService usersGroupService; + private final UsersGroupMapper usersGroupMapper; + + @Override + protected AbstractService getService() { + return usersGroupService; + } + + @Override + protected AbstractMapper getMapper() { + return usersGroupMapper; + } +} diff --git a/src/main/java/com/mkruchok/controller/package-info.java b/src/main/java/com/mkruchok/controller/package-info.java new file mode 100644 index 0000000..2db224e --- /dev/null +++ b/src/main/java/com/mkruchok/controller/package-info.java @@ -0,0 +1 @@ +package com.mkruchok.controller; \ No newline at end of file diff --git a/src/main/java/com/mkruchok/dto/DeviceDto.java b/src/main/java/com/mkruchok/dto/DeviceDto.java new file mode 100644 index 0000000..923fcd8 --- /dev/null +++ b/src/main/java/com/mkruchok/dto/DeviceDto.java @@ -0,0 +1,30 @@ +package com.mkruchok.dto; + +import java.sql.Timestamp; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + + +@ToString +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +@Builder(builderClassName = "DeviceBuilder") +public class DeviceDto { + private Integer id; + private String model; + private String status; + private Timestamp serviceLifeEndTime; + private Timestamp warrantyEndTime; + private Integer onBattery; + + private String hubModel; + private Integer notificationsCounter; + private String devicesGroupName; + +} diff --git a/src/main/java/com/mkruchok/dto/DevicesGroupDto.java b/src/main/java/com/mkruchok/dto/DevicesGroupDto.java new file mode 100644 index 0000000..81dea08 --- /dev/null +++ b/src/main/java/com/mkruchok/dto/DevicesGroupDto.java @@ -0,0 +1,20 @@ +package com.mkruchok.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + + +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(of = "id") +@Builder(builderClassName = "DevicesGroupBuilder") +public class DevicesGroupDto { + private Integer id; + private String name; + + private Integer devicesCounter; +} diff --git a/src/main/java/com/mkruchok/dto/HubDto.java b/src/main/java/com/mkruchok/dto/HubDto.java new file mode 100644 index 0000000..d329fdd --- /dev/null +++ b/src/main/java/com/mkruchok/dto/HubDto.java @@ -0,0 +1,31 @@ +package com.mkruchok.dto; + +import java.sql.Timestamp; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder(builderClassName = "HubBuilder") +public class HubDto { + private Integer id; + private String model; + private String status; + private Timestamp serviceLifeEndTime; + private Timestamp warrantyEndTime; + private Integer usersMax; + private Integer roomsMax; + private Integer devicesMax; + private Integer sirensMax; + private Integer onBattery; + + private Integer groupsCounter; + private Integer rexesCounter; + private Integer notificationsCounter; + private Integer devicesCounter; + private Integer hubHasUsersCounter; +} diff --git a/src/main/java/com/mkruchok/dto/NotificationDto.java b/src/main/java/com/mkruchok/dto/NotificationDto.java new file mode 100644 index 0000000..9471665 --- /dev/null +++ b/src/main/java/com/mkruchok/dto/NotificationDto.java @@ -0,0 +1,23 @@ +package com.mkruchok.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; +import java.sql.Timestamp; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + + +@Data +@AllArgsConstructor +@NoArgsConstructor +@JsonInclude(JsonInclude.Include.NON_NULL) +@Builder(builderClassName = "NotificationBuilder") +public class NotificationDto { + private Integer id; + private Timestamp timestamp; + private String type; + + private String deviceModel; + private String hubModel; +} diff --git a/src/main/java/com/mkruchok/dto/PermissionDto.java b/src/main/java/com/mkruchok/dto/PermissionDto.java new file mode 100644 index 0000000..2d81a5d --- /dev/null +++ b/src/main/java/com/mkruchok/dto/PermissionDto.java @@ -0,0 +1,21 @@ +package com.mkruchok.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder(builderClassName = "PermissionBuilder") +public class PermissionDto { + private Integer id; + private String name; + + private String hubModel; + private String userName; + private String usersGroupName; + private String deviceModel; +} diff --git a/src/main/java/com/mkruchok/dto/RexDto.java b/src/main/java/com/mkruchok/dto/RexDto.java new file mode 100644 index 0000000..7b4456a --- /dev/null +++ b/src/main/java/com/mkruchok/dto/RexDto.java @@ -0,0 +1,19 @@ +package com.mkruchok.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder(builderClassName = "RexBuilder") +public class RexDto { + private Integer id; + private String name; + private String range; + + private String rexHubModel; +} diff --git a/src/main/java/com/mkruchok/dto/UserDto.java b/src/main/java/com/mkruchok/dto/UserDto.java new file mode 100644 index 0000000..12c0f5d --- /dev/null +++ b/src/main/java/com/mkruchok/dto/UserDto.java @@ -0,0 +1,25 @@ +package com.mkruchok.dto; + +import java.sql.Timestamp; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder(builderClassName = "UserBuilder") +public class UserDto { + private Integer id; + private String email; + private String password; + private Timestamp dateCreated; + private String userName; + private Integer usersGroupId; + + private String groupName; + private Integer userHasHubsCounter; + private Integer permissionsCounter; +} diff --git a/src/main/java/com/mkruchok/dto/UsersGroupDto.java b/src/main/java/com/mkruchok/dto/UsersGroupDto.java new file mode 100644 index 0000000..a3df950 --- /dev/null +++ b/src/main/java/com/mkruchok/dto/UsersGroupDto.java @@ -0,0 +1,24 @@ +package com.mkruchok.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + + +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(of = "id") +@Builder(builderClassName = "UsersGroupBuilder") +public class UsersGroupDto { + private Integer id; + private String name; + private String groupDescription; + private Integer groupHubId; + + private String groupHubModel; + private Integer usersCounter; + private Integer permissionsCounter; +} diff --git a/src/main/java/com/mkruchok/dto/package-info.java b/src/main/java/com/mkruchok/dto/package-info.java new file mode 100644 index 0000000..792437d --- /dev/null +++ b/src/main/java/com/mkruchok/dto/package-info.java @@ -0,0 +1 @@ +package com.mkruchok.dto; \ No newline at end of file diff --git a/src/main/java/com/mkruchok/entity/Device.java b/src/main/java/com/mkruchok/entity/Device.java new file mode 100644 index 0000000..7965e56 --- /dev/null +++ b/src/main/java/com/mkruchok/entity/Device.java @@ -0,0 +1,83 @@ +package com.mkruchok.entity; + +import java.sql.Timestamp; +import java.util.Collection; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OrderColumn; +import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.LazyCollection; +import org.hibernate.annotations.LazyCollectionOption; + +@Table(name = "device") + +@AllArgsConstructor +@NoArgsConstructor +@ToString +@EqualsAndHashCode(of = "id") +@Getter +@Setter +@Entity +public class Device { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Integer id; + @Column(name = "model", + length = MagicNumber.L45) + private String model; + @Column(name = "device_status", + length = MagicNumber.L45) + private String status; + @CreationTimestamp + @Column(name = "service_life_end_time") + private Timestamp serviceLifeEndTime; + @CreationTimestamp + @Column(name = "warranty_end_time") + private Timestamp warrantyEndTime; + @Column(name = "on_battery", + length = 1) + private Integer onBattery; + + + @ManyToOne(cascade = CascadeType.MERGE) + @JoinColumn(name = "hub_id", + referencedColumnName = "id") + private Hub hubId; + + @ManyToOne(cascade = CascadeType.MERGE) + @JoinColumn(name = "devices_group_id", + referencedColumnName = "id") + private DevicesGroup devicesGroupId; + + @OrderColumn + @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "deviceId", + cascade = CascadeType.ALL, + fetch = FetchType.LAZY) + @ToString.Exclude + private Collection notifications; + + @OrderColumn + @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "deviceId", + fetch = FetchType.LAZY) + @ToString.Exclude + private Collection permissions; + +} diff --git a/src/main/java/com/mkruchok/entity/DevicesGroup.java b/src/main/java/com/mkruchok/entity/DevicesGroup.java new file mode 100644 index 0000000..79f9ebe --- /dev/null +++ b/src/main/java/com/mkruchok/entity/DevicesGroup.java @@ -0,0 +1,46 @@ +package com.mkruchok.entity; + + +import java.util.Collection; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.OrderColumn; +import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + +@Table(name = "devices_group") + +@AllArgsConstructor +@ToString +@EqualsAndHashCode(of = "id") +@Getter +@Setter +@Entity +@NoArgsConstructor +public class DevicesGroup { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Integer id; + @Column(name = "group_name", + length = MagicNumber.L45) + private String name; + @OrderColumn + @OneToMany(mappedBy = "devicesGroupId", + cascade = CascadeType.ALL, + fetch = FetchType.LAZY) + @ToString.Exclude + private Collection devices; + +} diff --git a/src/main/java/com/mkruchok/entity/Hub.java b/src/main/java/com/mkruchok/entity/Hub.java new file mode 100644 index 0000000..0d07d86 --- /dev/null +++ b/src/main/java/com/mkruchok/entity/Hub.java @@ -0,0 +1,115 @@ +package com.mkruchok.entity; + + +import java.sql.Timestamp; +import java.util.Collection; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.OneToMany; +import javax.persistence.OrderColumn; +import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.LazyCollection; +import org.hibernate.annotations.LazyCollectionOption; + +@Table(name = "hub") + +@Getter +@ToString +@EqualsAndHashCode(of = "id") +@AllArgsConstructor +@NoArgsConstructor +@Setter +@Entity +public class Hub { + @OrderColumn + @LazyCollection(LazyCollectionOption.FALSE) + @ManyToMany + @JoinTable(name = "user_has_hub", + joinColumns = @JoinColumn(name = "hub_id"), + inverseJoinColumns = @JoinColumn(name = "user_id")) + @ToString.Exclude + Collection hubHasUsers; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Integer id; + @Column(name = "model", + length = MagicNumber.L45) + private String model; + @Column(name = "hub_status", + length = MagicNumber.L45) + private String status; + @CreationTimestamp + @Column(name = "service_life_end_time", + length = MagicNumber.L45) + private Timestamp serviceLifeEndTime; + @CreationTimestamp + @Column(name = "warranty_end_time", + length = MagicNumber.L45) + private Timestamp warrantyEndTime; + @Column(name = "users_max", + length = MagicNumber.L45) + private Integer usersMax; + @Column(name = "rooms_max", + length = MagicNumber.L45) + private Integer roomsMax; + @Column(name = "devices_max", + length = MagicNumber.L45) + private Integer devicesMax; + @Column(name = "sirens_max", + length = MagicNumber.L45) + private Integer sirensMax; + @Column(name = "on_battery", + length = 1) + private Integer onBattery; + @OrderColumn + @OneToMany(mappedBy = "hubGroupId", + cascade = CascadeType.ALL, + fetch = FetchType.LAZY) + @ToString.Exclude + private Collection usersGroups; + @OrderColumn + @OneToMany(mappedBy = "hubRexId", + cascade = CascadeType.ALL, + fetch = FetchType.LAZY) + @ToString.Exclude + private Collection rexes; + @OrderColumn + @OneToMany(mappedBy = "hubNotificationId", + cascade = CascadeType.ALL, + fetch = FetchType.LAZY) + @ToString.Exclude + private Collection notifications; + + + @OrderColumn + @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "hubId", + cascade = CascadeType.ALL, + fetch = FetchType.LAZY) + @ToString.Exclude + private Collection devices; + + + @OrderColumn + @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "hubId") + @ToString.Exclude + private Collection permissions; + +} diff --git a/src/main/java/com/mkruchok/entity/MagicNumber.java b/src/main/java/com/mkruchok/entity/MagicNumber.java new file mode 100644 index 0000000..5683fa5 --- /dev/null +++ b/src/main/java/com/mkruchok/entity/MagicNumber.java @@ -0,0 +1,7 @@ +package com.mkruchok.entity; + + +public class MagicNumber { + public static final int L45 = 45; + public static final int L150 = 150; +} diff --git a/src/main/java/com/mkruchok/entity/Notification.java b/src/main/java/com/mkruchok/entity/Notification.java new file mode 100644 index 0000000..c322022 --- /dev/null +++ b/src/main/java/com/mkruchok/entity/Notification.java @@ -0,0 +1,55 @@ +package com.mkruchok.entity; + +import java.sql.Timestamp; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import org.hibernate.annotations.CreationTimestamp; + + +@Table(name = "notification") + +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(of = "id") +@Getter +@Setter +@ToString +@Entity +public class Notification { + @Id + @Column(name = "id") + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + @CreationTimestamp + @Column(name = "timestamp") + private Timestamp timestamp; + @Column(name = "notification_type", + length = MagicNumber.L45) + private String type; + + + @ManyToOne(cascade = CascadeType.MERGE) + @JoinColumn(name = "device_id", + referencedColumnName = "id") + private Device deviceId; + + @ManyToOne(cascade = CascadeType.MERGE) + @JoinColumn(name = "hub_id", + referencedColumnName = "id") + private Hub hubNotificationId; + + +} diff --git a/src/main/java/com/mkruchok/entity/Permission.java b/src/main/java/com/mkruchok/entity/Permission.java new file mode 100644 index 0000000..683b5bf --- /dev/null +++ b/src/main/java/com/mkruchok/entity/Permission.java @@ -0,0 +1,54 @@ +package com.mkruchok.entity; + +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + + +@Table(name = "permission") + +@AllArgsConstructor +@NoArgsConstructor +@Getter +@EqualsAndHashCode(of = "id") +@Setter +@ToString +@Entity +public class Permission { + @Id + @Column(name = "id") + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + @Column(name = "permission_name", + length = MagicNumber.L45) + private String name; + @ManyToOne(cascade = CascadeType.MERGE) + @JoinColumn(name = "hub_id", + referencedColumnName = "id") + private Hub hubId; + @ManyToOne(cascade = CascadeType.MERGE) + @JoinColumn(name = "user_id", + referencedColumnName = "id") + private User userId; + @ManyToOne(cascade = CascadeType.MERGE) + @JoinColumn(name = "group_id", + referencedColumnName = "id") + private UsersGroup usersGroupId; + @ManyToOne(cascade = CascadeType.MERGE) + @JoinColumn(name = "device_id", + referencedColumnName = "id") + private Device deviceId; + +} diff --git a/src/main/java/com/mkruchok/entity/Rex.java b/src/main/java/com/mkruchok/entity/Rex.java new file mode 100644 index 0000000..28322e7 --- /dev/null +++ b/src/main/java/com/mkruchok/entity/Rex.java @@ -0,0 +1,48 @@ +package com.mkruchok.entity; + +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; + + +@Table(name = "rex") + +@AllArgsConstructor +@NoArgsConstructor +@ToString +@EqualsAndHashCode(of = "id") +@Getter +@Setter +@Entity +public class Rex { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Integer id; + @Column(name = "rex_name", + length = MagicNumber.L45) + private String name; + @Column(name = "rex_range", + length = MagicNumber.L45) + private String range; + + + @ManyToOne(cascade = CascadeType.MERGE) + @JoinColumn(name = "hub_id", + referencedColumnName = "id") + private Hub hubRexId; + + +} diff --git a/src/main/java/com/mkruchok/entity/User.java b/src/main/java/com/mkruchok/entity/User.java new file mode 100644 index 0000000..7f60429 --- /dev/null +++ b/src/main/java/com/mkruchok/entity/User.java @@ -0,0 +1,75 @@ +package com.mkruchok.entity; + + +import java.sql.Timestamp; +import java.util.Collection; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OrderColumn; +import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.LazyCollection; +import org.hibernate.annotations.LazyCollectionOption; + + +@Table(name = "user") +@NoArgsConstructor +@AllArgsConstructor +@ToString +@EqualsAndHashCode(of = "id") +@Getter +@Setter +@Entity +public class User { + @Id + @Column(name = "id") + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + @Column(name = "email", + length = MagicNumber.L45) + private String email; + @Column(name = "user_password", + length = MagicNumber.L45) + private String password; + @CreationTimestamp + @Column(name = "date_created") + private Timestamp dateCreated; + @Column(name = "user_name", + length = MagicNumber.L45) + private String name; + @ManyToOne(cascade = CascadeType.MERGE) + @JoinColumn(name = "users_group_id", + referencedColumnName = "id") + private UsersGroup usersGroupId; + @OrderColumn + @ManyToMany(cascade = CascadeType.ALL) + @LazyCollection(LazyCollectionOption.FALSE) + @JoinTable(name = "user_has_hub", + joinColumns = @JoinColumn(name = "user_id"), + inverseJoinColumns = @JoinColumn(name = "hub_id")) + @ToString.Exclude + private Collection userHasHubs; + @OrderColumn + @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "userId", + cascade = CascadeType.ALL) + @ToString.Exclude + private Collection permissions; + + +} diff --git a/src/main/java/com/mkruchok/entity/UsersGroup.java b/src/main/java/com/mkruchok/entity/UsersGroup.java new file mode 100644 index 0000000..fdb9f1e --- /dev/null +++ b/src/main/java/com/mkruchok/entity/UsersGroup.java @@ -0,0 +1,61 @@ +package com.mkruchok.entity; + +import java.util.Collection; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OrderColumn; +import javax.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.ToString; +import org.hibernate.annotations.LazyCollection; +import org.hibernate.annotations.LazyCollectionOption; + +@Table(name = "users_group") + +@AllArgsConstructor +@ToString +@EqualsAndHashCode(of = "id") +@Getter +@Setter +@Entity +@NoArgsConstructor +public class UsersGroup { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Integer id; + @Column(name = "group_name", + length = MagicNumber.L45) + private String name; + @Column(name = "group_description", + length = MagicNumber.L150) + private String groupDescription; + @ManyToOne(cascade = CascadeType.MERGE) + @JoinColumn(name = "hub_id", + referencedColumnName = "id") + private Hub hubGroupId; + @OrderColumn + @OneToMany(mappedBy = "usersGroupId", + cascade = CascadeType.ALL, + fetch = FetchType.LAZY) + @ToString.Exclude + private Collection users; + @OrderColumn + @LazyCollection(LazyCollectionOption.FALSE) + @OneToMany(mappedBy = "usersGroupId") + @ToString.Exclude + private Collection permissions; + +} diff --git a/src/main/java/com/mkruchok/entity/package-info.java b/src/main/java/com/mkruchok/entity/package-info.java new file mode 100644 index 0000000..c380b1c --- /dev/null +++ b/src/main/java/com/mkruchok/entity/package-info.java @@ -0,0 +1 @@ +package com.mkruchok.entity; \ No newline at end of file diff --git a/src/main/java/com/mkruchok/mapper/AbstractMapper.java b/src/main/java/com/mkruchok/mapper/AbstractMapper.java new file mode 100644 index 0000000..c724bab --- /dev/null +++ b/src/main/java/com/mkruchok/mapper/AbstractMapper.java @@ -0,0 +1,5 @@ +package com.mkruchok.mapper; + +public abstract class AbstractMapper { + public abstract D mapObjectToDto(T object); +} diff --git a/src/main/java/com/mkruchok/mapper/DeviceMapper.java b/src/main/java/com/mkruchok/mapper/DeviceMapper.java new file mode 100644 index 0000000..5a958dd --- /dev/null +++ b/src/main/java/com/mkruchok/mapper/DeviceMapper.java @@ -0,0 +1,30 @@ +package com.mkruchok.mapper; + +import com.mkruchok.dto.DeviceDto; +import com.mkruchok.entity.Device; +import org.springframework.stereotype.Component; + +@Component +public class DeviceMapper extends AbstractMapper { + + @Override + public DeviceDto mapObjectToDto(Device device) { + if (device == null) { + return null; + } + DeviceDto.DeviceBuilder deviceDtoBuilder = DeviceDto.builder() + .id(device.getId()) + .model(device.getModel()) + .status(device.getStatus()) + .serviceLifeEndTime(device.getServiceLifeEndTime()) + .warrantyEndTime(device.getWarrantyEndTime()) + .onBattery(device.getOnBattery()) + .hubModel(device.getHubId().getModel()) + .notificationsCounter( + device.getNotifications() == null ? null : device.getNotifications().size()) + .devicesGroupName( + device.getDevicesGroupId() == null ? null : device.getDevicesGroupId().getName()); + + return deviceDtoBuilder.build(); + } +} diff --git a/src/main/java/com/mkruchok/mapper/DevicesGroupMapper.java b/src/main/java/com/mkruchok/mapper/DevicesGroupMapper.java new file mode 100644 index 0000000..3478b17 --- /dev/null +++ b/src/main/java/com/mkruchok/mapper/DevicesGroupMapper.java @@ -0,0 +1,21 @@ +package com.mkruchok.mapper; + +import com.mkruchok.dto.DevicesGroupDto; +import com.mkruchok.entity.DevicesGroup; +import org.springframework.stereotype.Component; + +@Component +public class DevicesGroupMapper extends AbstractMapper { + + @Override + public DevicesGroupDto mapObjectToDto(DevicesGroup devicesGroup) { + if (devicesGroup == null) { + return null; + } + DevicesGroupDto.DevicesGroupBuilder devicesGroupDtoBuilder = DevicesGroupDto.builder() + .id(devicesGroup.getId()) + .name(devicesGroup.getName()) + .devicesCounter(devicesGroup.getDevices().size()); + return devicesGroupDtoBuilder.build(); + } +} diff --git a/src/main/java/com/mkruchok/mapper/HubMapper.java b/src/main/java/com/mkruchok/mapper/HubMapper.java new file mode 100644 index 0000000..4d0fd8e --- /dev/null +++ b/src/main/java/com/mkruchok/mapper/HubMapper.java @@ -0,0 +1,33 @@ +package com.mkruchok.mapper; + +import com.mkruchok.dto.HubDto; +import com.mkruchok.entity.Hub; +import org.springframework.stereotype.Component; + +@Component +public class HubMapper extends AbstractMapper { + + @Override + public HubDto mapObjectToDto(Hub hub) { + if (hub == null) { + return null; + } + HubDto.HubBuilder hubDtoBuilder = HubDto.builder() + .id(hub.getId()) + .model(hub.getModel()) + .status(hub.getStatus()) + .serviceLifeEndTime(hub.getServiceLifeEndTime()) + .warrantyEndTime(hub.getWarrantyEndTime()) + .usersMax(hub.getUsersMax()) + .roomsMax(hub.getRoomsMax()) + .devicesMax(hub.getDevicesMax()) + .sirensMax(hub.getSirensMax()) + .onBattery(hub.getOnBattery()) + .groupsCounter(hub.getUsersGroups().size()) + .rexesCounter(hub.getRexes().size()) + .notificationsCounter(hub.getNotifications().size()) + .devicesCounter(hub.getDevices().size()) + .hubHasUsersCounter(hub.getHubHasUsers().size()); + return hubDtoBuilder.build(); + } +} diff --git a/src/main/java/com/mkruchok/mapper/NotificationMapper.java b/src/main/java/com/mkruchok/mapper/NotificationMapper.java new file mode 100644 index 0000000..082264d --- /dev/null +++ b/src/main/java/com/mkruchok/mapper/NotificationMapper.java @@ -0,0 +1,25 @@ +package com.mkruchok.mapper; + +import com.mkruchok.dto.NotificationDto; +import com.mkruchok.entity.Notification; +import org.springframework.stereotype.Component; + +@Component +public class NotificationMapper extends AbstractMapper { + + @Override + public NotificationDto mapObjectToDto(Notification notification) { + if (notification == null) { + return null; + } + NotificationDto.NotificationBuilder notificationDtoBuilder = NotificationDto.builder() + .id(notification.getId()) + .timestamp(notification.getTimestamp()) + .type(notification.getType()) + .deviceModel( + notification.getDeviceId() == null ? null : notification.getDeviceId().getModel()) + .hubModel(notification.getHubNotificationId() == null ? null : + notification.getHubNotificationId().getModel()); + return notificationDtoBuilder.build(); + } +} diff --git a/src/main/java/com/mkruchok/mapper/PermissionMapper.java b/src/main/java/com/mkruchok/mapper/PermissionMapper.java new file mode 100644 index 0000000..972a95b --- /dev/null +++ b/src/main/java/com/mkruchok/mapper/PermissionMapper.java @@ -0,0 +1,25 @@ +package com.mkruchok.mapper; + +import com.mkruchok.dto.PermissionDto; +import com.mkruchok.entity.Permission; +import org.springframework.stereotype.Component; + +@Component +public class PermissionMapper extends AbstractMapper { + + @Override + public PermissionDto mapObjectToDto(Permission permission) { + if (permission == null) { + return null; + } + PermissionDto.PermissionBuilder permissionDtoBuilder = PermissionDto.builder() + .id(permission.getId()) + .name(permission.getName()) + .hubModel(permission.getHubId() == null ? null : permission.getHubId().getModel()) + .userName(permission.getUserId() == null ? null : permission.getUserId().getName()) + .usersGroupName( + permission.getUsersGroupId() == null ? null : permission.getUsersGroupId().getName()) + .deviceModel(permission.getDeviceId() == null ? null : permission.getDeviceId().getModel()); + return permissionDtoBuilder.build(); + } +} diff --git a/src/main/java/com/mkruchok/mapper/RexMapper.java b/src/main/java/com/mkruchok/mapper/RexMapper.java new file mode 100644 index 0000000..a9d4b01 --- /dev/null +++ b/src/main/java/com/mkruchok/mapper/RexMapper.java @@ -0,0 +1,22 @@ +package com.mkruchok.mapper; + +import com.mkruchok.dto.RexDto; +import com.mkruchok.entity.Rex; +import org.springframework.stereotype.Component; + +@Component +public class RexMapper extends AbstractMapper { + + @Override + public RexDto mapObjectToDto(Rex rex) { + if (rex == null) { + return null; + } + RexDto.RexBuilder rexDtoBuilder = RexDto.builder() + .id(rex.getId()) + .name(rex.getName()) + .range(rex.getRange()) + .rexHubModel(rex.getHubRexId() == null ? null : rex.getHubRexId().getModel()); + return rexDtoBuilder.build(); + } +} diff --git a/src/main/java/com/mkruchok/mapper/UserMapper.java b/src/main/java/com/mkruchok/mapper/UserMapper.java new file mode 100644 index 0000000..68e5495 --- /dev/null +++ b/src/main/java/com/mkruchok/mapper/UserMapper.java @@ -0,0 +1,27 @@ +package com.mkruchok.mapper; + +import com.mkruchok.dto.UserDto; +import com.mkruchok.entity.User; +import org.springframework.stereotype.Component; + +@Component +public class UserMapper extends AbstractMapper { + + @Override + public UserDto mapObjectToDto(User user) { + if (user == null) { + return null; + } + UserDto.UserBuilder userDtoBuilder = UserDto.builder() + .id(user.getId()) + .email(user.getEmail()) + .password(user.getPassword()) + .dateCreated(user.getDateCreated()) + .userName(user.getName()) + .usersGroupId(user.getUsersGroupId() == null ? null : user.getUsersGroupId().getId()) + .groupName(user.getUsersGroupId() == null ? null : user.getUsersGroupId().getName()) + .userHasHubsCounter(user.getUserHasHubs() == null ? null : user.getUserHasHubs().size()) + .permissionsCounter(user.getPermissions() == null ? null : user.getPermissions().size()); + return userDtoBuilder.build(); + } +} diff --git a/src/main/java/com/mkruchok/mapper/UsersGroupMapper.java b/src/main/java/com/mkruchok/mapper/UsersGroupMapper.java new file mode 100644 index 0000000..3fd3dbd --- /dev/null +++ b/src/main/java/com/mkruchok/mapper/UsersGroupMapper.java @@ -0,0 +1,27 @@ +package com.mkruchok.mapper; + +import com.mkruchok.dto.UsersGroupDto; +import com.mkruchok.entity.UsersGroup; +import org.springframework.stereotype.Component; + +@Component +public class UsersGroupMapper extends AbstractMapper { + + @Override + public UsersGroupDto mapObjectToDto(UsersGroup usersGroup) { + if (usersGroup == null) { + return null; + } + UsersGroupDto.UsersGroupBuilder groupDtoBuilder = UsersGroupDto.builder() + .id(usersGroup.getId()) + .name(usersGroup.getName()) + .groupDescription(usersGroup.getGroupDescription()) + .groupHubId(usersGroup.getHubGroupId() == null ? null : usersGroup.getHubGroupId().getId()) + .groupHubModel( + usersGroup.getHubGroupId() == null ? null : usersGroup.getHubGroupId().getModel()) + .usersCounter(usersGroup.getUsers() == null ? null : usersGroup.getUsers().size()) + .permissionsCounter( + usersGroup.getPermissions() == null ? null : usersGroup.getPermissions().size()); + return groupDtoBuilder.build(); + } +} diff --git a/src/main/java/com/mkruchok/package-info.java b/src/main/java/com/mkruchok/package-info.java new file mode 100644 index 0000000..4f8c4fa --- /dev/null +++ b/src/main/java/com/mkruchok/package-info.java @@ -0,0 +1 @@ +package com.mkruchok; \ No newline at end of file diff --git a/src/main/java/com/mkruchok/repository/DeviceRepository.java b/src/main/java/com/mkruchok/repository/DeviceRepository.java new file mode 100644 index 0000000..c4538c2 --- /dev/null +++ b/src/main/java/com/mkruchok/repository/DeviceRepository.java @@ -0,0 +1,10 @@ +package com.mkruchok.repository; + +import com.mkruchok.entity.Device; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface DeviceRepository extends JpaRepository { + +} diff --git a/src/main/java/com/mkruchok/repository/DevicesGroupRepository.java b/src/main/java/com/mkruchok/repository/DevicesGroupRepository.java new file mode 100644 index 0000000..76c416d --- /dev/null +++ b/src/main/java/com/mkruchok/repository/DevicesGroupRepository.java @@ -0,0 +1,10 @@ +package com.mkruchok.repository; + +import com.mkruchok.entity.DevicesGroup; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface DevicesGroupRepository extends JpaRepository { + +} diff --git a/src/main/java/com/mkruchok/repository/HubRepository.java b/src/main/java/com/mkruchok/repository/HubRepository.java new file mode 100644 index 0000000..88e88a2 --- /dev/null +++ b/src/main/java/com/mkruchok/repository/HubRepository.java @@ -0,0 +1,11 @@ +package com.mkruchok.repository; + +import com.mkruchok.entity.Hub; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + + +@Repository +public interface HubRepository extends JpaRepository { + +} diff --git a/src/main/java/com/mkruchok/repository/NotificationRepository.java b/src/main/java/com/mkruchok/repository/NotificationRepository.java new file mode 100644 index 0000000..3aaabb0 --- /dev/null +++ b/src/main/java/com/mkruchok/repository/NotificationRepository.java @@ -0,0 +1,11 @@ +package com.mkruchok.repository; + +import com.mkruchok.entity.Notification; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + + +@Repository +public interface NotificationRepository extends JpaRepository { + +} diff --git a/src/main/java/com/mkruchok/repository/PermissionRepository.java b/src/main/java/com/mkruchok/repository/PermissionRepository.java new file mode 100644 index 0000000..92c3281 --- /dev/null +++ b/src/main/java/com/mkruchok/repository/PermissionRepository.java @@ -0,0 +1,11 @@ +package com.mkruchok.repository; + +import com.mkruchok.entity.Permission; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + + +@Repository +public interface PermissionRepository extends JpaRepository { + +} diff --git a/src/main/java/com/mkruchok/repository/RexRepository.java b/src/main/java/com/mkruchok/repository/RexRepository.java new file mode 100644 index 0000000..373df10 --- /dev/null +++ b/src/main/java/com/mkruchok/repository/RexRepository.java @@ -0,0 +1,11 @@ +package com.mkruchok.repository; + +import com.mkruchok.entity.Rex; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + + +@Repository +public interface RexRepository extends JpaRepository { + +} diff --git a/src/main/java/com/mkruchok/repository/UserRepository.java b/src/main/java/com/mkruchok/repository/UserRepository.java new file mode 100644 index 0000000..b11885e --- /dev/null +++ b/src/main/java/com/mkruchok/repository/UserRepository.java @@ -0,0 +1,10 @@ +package com.mkruchok.repository; + +import com.mkruchok.entity.User; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface UserRepository extends JpaRepository { + +} diff --git a/src/main/java/com/mkruchok/repository/UsersGroupRepository.java b/src/main/java/com/mkruchok/repository/UsersGroupRepository.java new file mode 100644 index 0000000..52bfafa --- /dev/null +++ b/src/main/java/com/mkruchok/repository/UsersGroupRepository.java @@ -0,0 +1,10 @@ +package com.mkruchok.repository; + +import com.mkruchok.entity.UsersGroup; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface UsersGroupRepository extends JpaRepository { + +} diff --git a/src/main/java/com/mkruchok/service/AbstractService.java b/src/main/java/com/mkruchok/service/AbstractService.java new file mode 100644 index 0000000..dd0e2d3 --- /dev/null +++ b/src/main/java/com/mkruchok/service/AbstractService.java @@ -0,0 +1,29 @@ +package com.mkruchok.service; + +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; + +public abstract class AbstractService { + protected abstract JpaRepository getRepository(); + + public final List findAll() { + return getRepository().findAll(); + } + + public T getById(I id) { + return getRepository().getReferenceById(id); + } + + public final void create(final T object) { + getRepository().save(object); + } + + public final T update(final T object) { + return getRepository().save(object); + } + + public final void delete(final I id) { + getRepository().deleteById(id); + } + +} \ No newline at end of file diff --git a/src/main/java/com/mkruchok/service/DeviceService.java b/src/main/java/com/mkruchok/service/DeviceService.java new file mode 100644 index 0000000..eb679f7 --- /dev/null +++ b/src/main/java/com/mkruchok/service/DeviceService.java @@ -0,0 +1,19 @@ +package com.mkruchok.service; + +import com.mkruchok.entity.Device; +import com.mkruchok.repository.DeviceRepository; +import lombok.AllArgsConstructor; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Service; + +@AllArgsConstructor +@Service +public class DeviceService extends AbstractService { + private DeviceRepository deviceRepository; + + @Override + protected JpaRepository getRepository() { + return deviceRepository; + } + +} \ No newline at end of file diff --git a/src/main/java/com/mkruchok/service/DevicesGroupService.java b/src/main/java/com/mkruchok/service/DevicesGroupService.java new file mode 100644 index 0000000..0e759d8 --- /dev/null +++ b/src/main/java/com/mkruchok/service/DevicesGroupService.java @@ -0,0 +1,19 @@ +package com.mkruchok.service; + +import com.mkruchok.entity.DevicesGroup; +import com.mkruchok.repository.DevicesGroupRepository; +import lombok.AllArgsConstructor; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Service; + +@AllArgsConstructor +@Service +public class DevicesGroupService extends AbstractService { + private DevicesGroupRepository devicesGroupRepository; + + @Override + protected JpaRepository getRepository() { + return devicesGroupRepository; + } + +} \ No newline at end of file diff --git a/src/main/java/com/mkruchok/service/HubService.java b/src/main/java/com/mkruchok/service/HubService.java new file mode 100644 index 0000000..77ab3a3 --- /dev/null +++ b/src/main/java/com/mkruchok/service/HubService.java @@ -0,0 +1,19 @@ +package com.mkruchok.service; + +import com.mkruchok.entity.Hub; +import com.mkruchok.repository.HubRepository; +import lombok.AllArgsConstructor; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Service; + +@AllArgsConstructor +@Service +public class HubService extends AbstractService { + private HubRepository hubRepository; + + @Override + protected JpaRepository getRepository() { + return hubRepository; + } + +} \ No newline at end of file diff --git a/src/main/java/com/mkruchok/service/NotificationService.java b/src/main/java/com/mkruchok/service/NotificationService.java new file mode 100644 index 0000000..8046336 --- /dev/null +++ b/src/main/java/com/mkruchok/service/NotificationService.java @@ -0,0 +1,18 @@ +package com.mkruchok.service; + +import com.mkruchok.entity.Notification; +import com.mkruchok.repository.NotificationRepository; +import lombok.AllArgsConstructor; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Service; + +@AllArgsConstructor +@Service +public class NotificationService extends AbstractService { + private NotificationRepository notificationRepository; + + @Override + protected JpaRepository getRepository() { + return notificationRepository; + } +} \ No newline at end of file diff --git a/src/main/java/com/mkruchok/service/PermissionService.java b/src/main/java/com/mkruchok/service/PermissionService.java new file mode 100644 index 0000000..d14ff29 --- /dev/null +++ b/src/main/java/com/mkruchok/service/PermissionService.java @@ -0,0 +1,18 @@ +package com.mkruchok.service; + +import com.mkruchok.entity.Permission; +import com.mkruchok.repository.PermissionRepository; +import lombok.AllArgsConstructor; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Service; + +@AllArgsConstructor +@Service +public class PermissionService extends AbstractService { + private PermissionRepository permissionRepository; + + @Override + protected JpaRepository getRepository() { + return permissionRepository; + } +} \ No newline at end of file diff --git a/src/main/java/com/mkruchok/service/RexService.java b/src/main/java/com/mkruchok/service/RexService.java new file mode 100644 index 0000000..57331c3 --- /dev/null +++ b/src/main/java/com/mkruchok/service/RexService.java @@ -0,0 +1,18 @@ +package com.mkruchok.service; + +import com.mkruchok.entity.Rex; +import com.mkruchok.repository.RexRepository; +import lombok.AllArgsConstructor; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Service; + +@AllArgsConstructor +@Service +public class RexService extends AbstractService { + private RexRepository rexRepository; + + @Override + protected JpaRepository getRepository() { + return rexRepository; + } +} \ No newline at end of file diff --git a/src/main/java/com/mkruchok/service/UserService.java b/src/main/java/com/mkruchok/service/UserService.java new file mode 100644 index 0000000..597a59a --- /dev/null +++ b/src/main/java/com/mkruchok/service/UserService.java @@ -0,0 +1,19 @@ +package com.mkruchok.service; + +import com.mkruchok.entity.User; +import com.mkruchok.repository.UserRepository; +import lombok.AllArgsConstructor; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Service; + +@AllArgsConstructor +@Service +public class UserService extends AbstractService { + private UserRepository userRepository; + + @Override + protected JpaRepository getRepository() { + return userRepository; + } + +} \ No newline at end of file diff --git a/src/main/java/com/mkruchok/service/UsersGroupService.java b/src/main/java/com/mkruchok/service/UsersGroupService.java new file mode 100644 index 0000000..99dcf2e --- /dev/null +++ b/src/main/java/com/mkruchok/service/UsersGroupService.java @@ -0,0 +1,19 @@ +package com.mkruchok.service; + +import com.mkruchok.entity.UsersGroup; +import com.mkruchok.repository.UsersGroupRepository; +import lombok.AllArgsConstructor; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Service; + +@AllArgsConstructor +@Service +public class UsersGroupService extends AbstractService { + private UsersGroupRepository usersGroupRepository; + + @Override + protected JpaRepository getRepository() { + return usersGroupRepository; + } + +} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..8b3d63d --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,13 @@ +spring.datasource.url=jdbc:mysql://localhost:3306/ajax_curr?useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.username=root +spring.datasource.password=admin +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.jpa.database-platform=org.hibernate.dialect.MySQL8Dialect +spring.mvc.pathmatch.matching-strategy=ant-path-matcher +management.endpoints.web.exposure.include=* +management.endpoint.health.show-details=always +spring.session.jdbc.initialize-schema=always +management.metrics.tags.application=Application +spring.jpa.show_sql=true +spring.jpa.hibernate.ddl-auto=update +server.port=8888 \ No newline at end of file diff --git a/src/test/java/com/mkruchok/ApplicationTests.java b/src/test/java/com/mkruchok/ApplicationTests.java new file mode 100644 index 0000000..9965ac2 --- /dev/null +++ b/src/test/java/com/mkruchok/ApplicationTests.java @@ -0,0 +1,13 @@ +package com.mkruchok; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ApplicationTests { + + @Test + void contextLoads() { + } + +}