Compare commits
No commits in common. "LabWork03" and "main" have entirely different histories.
55
.gitignore
vendored
55
.gitignore
vendored
@ -1,37 +1,26 @@
|
|||||||
HELP.md
|
# ---> Java
|
||||||
.gradle
|
# Compiled class file
|
||||||
build/
|
*.class
|
||||||
!gradle/wrapper/gradle-wrapper.jar
|
|
||||||
!**/src/main/**/build/
|
|
||||||
!**/src/test/**/build/
|
|
||||||
|
|
||||||
### STS ###
|
# Log file
|
||||||
.apt_generated
|
*.log
|
||||||
.classpath
|
|
||||||
.factorypath
|
|
||||||
.project
|
|
||||||
.settings
|
|
||||||
.springBeans
|
|
||||||
.sts4-cache
|
|
||||||
bin/
|
|
||||||
!**/src/main/**/bin/
|
|
||||||
!**/src/test/**/bin/
|
|
||||||
|
|
||||||
### IntelliJ IDEA ###
|
# BlueJ files
|
||||||
.idea
|
*.ctxt
|
||||||
*.iws
|
|
||||||
*.iml
|
|
||||||
*.ipr
|
|
||||||
out/
|
|
||||||
!**/src/main/**/out/
|
|
||||||
!**/src/test/**/out/
|
|
||||||
|
|
||||||
### NetBeans ###
|
# Mobile Tools for Java (J2ME)
|
||||||
/nbproject/private/
|
.mtj.tmp/
|
||||||
/nbbuild/
|
|
||||||
/dist/
|
# Package Files #
|
||||||
/nbdist/
|
*.jar
|
||||||
/.nb-gradle/
|
*.war
|
||||||
|
*.nar
|
||||||
|
*.ear
|
||||||
|
*.zip
|
||||||
|
*.tar.gz
|
||||||
|
*.rar
|
||||||
|
|
||||||
|
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
||||||
|
hs_err_pid*
|
||||||
|
replay_pid*
|
||||||
|
|
||||||
### VS Code ###
|
|
||||||
.vscode/
|
|
||||||
|
|||||||
25
build.gradle
25
build.gradle
@ -1,25 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id 'java'
|
|
||||||
id 'org.springframework.boot' version '3.0.2'
|
|
||||||
id 'io.spring.dependency-management' version '1.1.0'
|
|
||||||
}
|
|
||||||
|
|
||||||
group = 'ru.ulstu.is'
|
|
||||||
version = '0.0.1-SNAPSHOT'
|
|
||||||
sourceCompatibility = '17'
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
|
||||||
testImplementation 'org.springframework.boot:spring-boot-starter-test'
|
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
|
|
||||||
implementation 'com.h2database:h2:2.1.210'
|
|
||||||
implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.5'
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.named('test') {
|
|
||||||
useJUnitPlatform()
|
|
||||||
}
|
|
||||||
@ -1,64 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<title>Calc</title>
|
|
||||||
<link rel="stylesheet" href="https://unpkg.com/chota@latest">
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<div class="container" style="max-width:600px">
|
|
||||||
<div class="card row is-full-screen is-center">
|
|
||||||
<div class="col">
|
|
||||||
<div class="row">
|
|
||||||
<div class="col">
|
|
||||||
<input type="text" id="val1">
|
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<select id="operation">
|
|
||||||
<option value="sum" selected>+</option>
|
|
||||||
<option value="sub">-</option>
|
|
||||||
<option value="mul">*</option>
|
|
||||||
<option value="div">/</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="col">
|
|
||||||
<input type="text" id="val2">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col">
|
|
||||||
<button type="button" id="get-int-result" onclick="calculate('inttype')">Result for int</button>
|
|
||||||
</div>
|
|
||||||
<div class="col is-right">
|
|
||||||
<button type="button" id="get-string-result" onclick="calculate('stringtype')">Result for string</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="card row is-center">
|
|
||||||
<h5 class="is-center" id="result"></h5>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
async function calculate(resulttype) {
|
|
||||||
const val1 = document.getElementById("val1").value
|
|
||||||
const val2 = document.getElementById("val2").value
|
|
||||||
const op = document.getElementById("operation").value
|
|
||||||
if (op == 'sum') {
|
|
||||||
document.getElementById("result").innerHTML = await (await fetch(`http://127.0.0.1:8080/sum?val1=${val1}&val2=${val2}&type=${resulttype}`)).text()
|
|
||||||
} else if (op == 'sub') {
|
|
||||||
document.getElementById("result").innerHTML = await (await fetch(`http://127.0.0.1:8080/sub?val1=${val1}&val2=${val2}&type=${resulttype}`)).text()
|
|
||||||
} else if (op == 'mul') {
|
|
||||||
document.getElementById("result").innerHTML = await (await fetch(`http://127.0.0.1:8080/mul?val1=${val1}&val2=${val2}&type=${resulttype}`)).text()
|
|
||||||
} else {
|
|
||||||
document.getElementById("result").innerHTML = await (await fetch(`http://127.0.0.1:8080/div?val1=${val1}&val2=${val2}&type=${resulttype}`)).text()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
const fs = require('fs')
|
|
||||||
const http = require('http')
|
|
||||||
|
|
||||||
const requestListener = async function (req, res) {
|
|
||||||
res.writeHead(200);
|
|
||||||
fs.readFile('index.html', (err, data) => {
|
|
||||||
res.end(data);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const server = http.createServer(requestListener)
|
|
||||||
server.listen(5050)
|
|
||||||
9
frontend/node_modules/fs/README.md
generated
vendored
9
frontend/node_modules/fs/README.md
generated
vendored
@ -1,9 +0,0 @@
|
|||||||
# Security holding package
|
|
||||||
|
|
||||||
This package name is not currently in use, but was formerly occupied
|
|
||||||
by another package. To avoid malicious use, npm is hanging on to the
|
|
||||||
package name, but loosely, and we'll probably give it to you if you
|
|
||||||
want it.
|
|
||||||
|
|
||||||
You may adopt this package by contacting support@npmjs.com and
|
|
||||||
requesting the name.
|
|
||||||
46
frontend/node_modules/fs/package.json
generated
vendored
46
frontend/node_modules/fs/package.json
generated
vendored
@ -1,46 +0,0 @@
|
|||||||
{
|
|
||||||
"_from": "fs",
|
|
||||||
"_id": "fs@0.0.1-security",
|
|
||||||
"_inBundle": false,
|
|
||||||
"_integrity": "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==",
|
|
||||||
"_location": "/fs",
|
|
||||||
"_phantomChildren": {},
|
|
||||||
"_requested": {
|
|
||||||
"type": "tag",
|
|
||||||
"registry": true,
|
|
||||||
"raw": "fs",
|
|
||||||
"name": "fs",
|
|
||||||
"escapedName": "fs",
|
|
||||||
"rawSpec": "",
|
|
||||||
"saveSpec": null,
|
|
||||||
"fetchSpec": "latest"
|
|
||||||
},
|
|
||||||
"_requiredBy": [
|
|
||||||
"#USER",
|
|
||||||
"/"
|
|
||||||
],
|
|
||||||
"_resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
|
|
||||||
"_shasum": "8a7bd37186b6dddf3813f23858b57ecaaf5e41d4",
|
|
||||||
"_spec": "fs",
|
|
||||||
"_where": "C:\\Users\\user\\Desktop\\something\\frontend",
|
|
||||||
"author": "",
|
|
||||||
"bugs": {
|
|
||||||
"url": "https://github.com/npm/security-holder/issues"
|
|
||||||
},
|
|
||||||
"bundleDependencies": false,
|
|
||||||
"deprecated": false,
|
|
||||||
"description": "This package name is not currently in use, but was formerly occupied by another package. To avoid malicious use, npm is hanging on to the package name, but loosely, and we'll probably give it to you if you want it.",
|
|
||||||
"homepage": "https://github.com/npm/security-holder#readme",
|
|
||||||
"keywords": [],
|
|
||||||
"license": "ISC",
|
|
||||||
"main": "index.js",
|
|
||||||
"name": "fs",
|
|
||||||
"repository": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "git+https://github.com/npm/security-holder.git"
|
|
||||||
},
|
|
||||||
"scripts": {
|
|
||||||
"test": "echo \"Error: no test specified\" && exit 1"
|
|
||||||
},
|
|
||||||
"version": "0.0.1-security"
|
|
||||||
}
|
|
||||||
9
frontend/node_modules/http/README.md
generated
vendored
9
frontend/node_modules/http/README.md
generated
vendored
@ -1,9 +0,0 @@
|
|||||||
# Security holding package
|
|
||||||
|
|
||||||
This package name is not currently in use, but was formerly occupied
|
|
||||||
by another package. To avoid malicious use, npm is hanging on to the
|
|
||||||
package name, but loosely, and we'll probably give it to you if you
|
|
||||||
want it.
|
|
||||||
|
|
||||||
You may adopt this package by contacting support@npmjs.com and
|
|
||||||
requesting the name.
|
|
||||||
39
frontend/node_modules/http/package.json
generated
vendored
39
frontend/node_modules/http/package.json
generated
vendored
@ -1,39 +0,0 @@
|
|||||||
{
|
|
||||||
"_from": "http",
|
|
||||||
"_id": "http@0.0.1-security",
|
|
||||||
"_inBundle": false,
|
|
||||||
"_integrity": "sha512-RnDvP10Ty9FxqOtPZuxtebw1j4L/WiqNMDtuc1YMH1XQm5TgDRaR1G9u8upL6KD1bXHSp9eSXo/ED+8Q7FAr+g==",
|
|
||||||
"_location": "/http",
|
|
||||||
"_phantomChildren": {},
|
|
||||||
"_requested": {
|
|
||||||
"type": "tag",
|
|
||||||
"registry": true,
|
|
||||||
"raw": "http",
|
|
||||||
"name": "http",
|
|
||||||
"escapedName": "http",
|
|
||||||
"rawSpec": "",
|
|
||||||
"saveSpec": null,
|
|
||||||
"fetchSpec": "latest"
|
|
||||||
},
|
|
||||||
"_requiredBy": [
|
|
||||||
"#USER",
|
|
||||||
"/"
|
|
||||||
],
|
|
||||||
"_resolved": "https://registry.npmjs.org/http/-/http-0.0.1-security.tgz",
|
|
||||||
"_shasum": "3aac09129d12dc2747bbce4157afde20ad1f7995",
|
|
||||||
"_spec": "http",
|
|
||||||
"_where": "C:\\Users\\user\\Desktop\\something\\frontend",
|
|
||||||
"bugs": {
|
|
||||||
"url": "https://github.com/npm/security-holder/issues"
|
|
||||||
},
|
|
||||||
"bundleDependencies": false,
|
|
||||||
"deprecated": false,
|
|
||||||
"description": "security holding package",
|
|
||||||
"homepage": "https://github.com/npm/security-holder#readme",
|
|
||||||
"name": "http",
|
|
||||||
"repository": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "git+https://github.com/npm/security-holder.git"
|
|
||||||
},
|
|
||||||
"version": "0.0.1-security"
|
|
||||||
}
|
|
||||||
18
frontend/package-lock.json
generated
18
frontend/package-lock.json
generated
@ -1,18 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "frontend",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"lockfileVersion": 1,
|
|
||||||
"requires": true,
|
|
||||||
"dependencies": {
|
|
||||||
"fs": {
|
|
||||||
"version": "0.0.1-security",
|
|
||||||
"resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
|
|
||||||
"integrity": "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w=="
|
|
||||||
},
|
|
||||||
"http": {
|
|
||||||
"version": "0.0.1-security",
|
|
||||||
"resolved": "https://registry.npmjs.org/http/-/http-0.0.1-security.tgz",
|
|
||||||
"integrity": "sha512-RnDvP10Ty9FxqOtPZuxtebw1j4L/WiqNMDtuc1YMH1XQm5TgDRaR1G9u8upL6KD1bXHSp9eSXo/ED+8Q7FAr+g=="
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "frontend",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"description": "",
|
|
||||||
"main": "index.js",
|
|
||||||
"scripts": {
|
|
||||||
"dev": "node index.js"
|
|
||||||
},
|
|
||||||
"author": "",
|
|
||||||
"license": "ISC",
|
|
||||||
"dependencies": {
|
|
||||||
"fs": "0.0.1-security",
|
|
||||||
"http": "0.0.1-security"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
5
gradle/wrapper/gradle-wrapper.properties
vendored
5
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +0,0 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
|
||||||
distributionPath=wrapper/dists
|
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
|
||||||
zipStorePath=wrapper/dists
|
|
||||||
240
gradlew
vendored
240
gradlew
vendored
@ -1,240 +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 \
|
|
||||||
"$@"
|
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
|
||||||
if ! command -v xargs >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
die "xargs is not available"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Use "xargs" to parse quoted args.
|
|
||||||
#
|
|
||||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
|
||||||
#
|
|
||||||
# In Bash we could simply go:
|
|
||||||
#
|
|
||||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
|
||||||
# set -- "${ARGS[@]}" "$@"
|
|
||||||
#
|
|
||||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
|
||||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
|
||||||
# character that might be a shell metacharacter, then use eval to reverse
|
|
||||||
# that process (while maintaining the separation between arguments), and wrap
|
|
||||||
# the whole thing up as a single "set" statement.
|
|
||||||
#
|
|
||||||
# This will of course break if any of these variables contains a newline or
|
|
||||||
# an unmatched quote.
|
|
||||||
#
|
|
||||||
|
|
||||||
eval "set -- $(
|
|
||||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
|
||||||
xargs -n1 |
|
|
||||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
|
||||||
tr '\n' ' '
|
|
||||||
)" '"$@"'
|
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
|
||||||
91
gradlew.bat
vendored
91
gradlew.bat
vendored
@ -1,91 +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% equ 0 goto execute
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
echo location of your Java installation.
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
echo location of your Java installation.
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:execute
|
|
||||||
@rem Setup the command line
|
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
|
||||||
|
|
||||||
:end
|
|
||||||
@rem End local scope for the variables with windows NT shell
|
|
||||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
|
||||||
|
|
||||||
:fail
|
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
|
||||||
rem the _cmd.exe /c_ return code!
|
|
||||||
set EXIT_CODE=%ERRORLEVEL%
|
|
||||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
|
||||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
|
||||||
exit /b %EXIT_CODE%
|
|
||||||
|
|
||||||
:mainEnd
|
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
|
||||||
|
|
||||||
:omega
|
|
||||||
@ -1 +0,0 @@
|
|||||||
rootProject.name = 'labwork'
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
package ru.ulstu.is.labwork;
|
|
||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RequestParam;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
@SpringBootApplication
|
|
||||||
@RestController
|
|
||||||
//@RequestMapping("/lab1")
|
|
||||||
public class LabworkApplication {
|
|
||||||
public static void main(String[] args) {
|
|
||||||
SpringApplication.run(LabworkApplication.class, args);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
package ru.ulstu.is.labwork;
|
|
||||||
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.web.servlet.config.annotation.CorsRegistry;
|
|
||||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
public class WebConfiguration implements WebMvcConfigurer {
|
|
||||||
@Override
|
|
||||||
public void addCorsMappings(CorsRegistry registry) {
|
|
||||||
registry.addMapping("/**").allowedMethods("*");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,67 +0,0 @@
|
|||||||
package ru.ulstu.is.labwork.dbLab3.AdditionalTask;
|
|
||||||
import jakarta.persistence.EntityManager;
|
|
||||||
import jakarta.persistence.PersistenceContext;
|
|
||||||
import jakarta.transaction.Transactional;
|
|
||||||
import ru.ulstu.is.labwork.dbLab3.model.Comment;
|
|
||||||
import ru.ulstu.is.labwork.dbLab3.model.Post;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
public class SearchService {
|
|
||||||
@PersistenceContext
|
|
||||||
private EntityManager em;
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public List<Object> finder(String searchWord){
|
|
||||||
|
|
||||||
List<Post> postResult = em.createQuery("SELECT p FROM Post p WHERE p.content LIKE :word", Post.class)
|
|
||||||
.setParameter("word", searchWord)
|
|
||||||
.getResultList();
|
|
||||||
|
|
||||||
List<Comment> commentResult = em.createQuery("SELECT c FROM Comment c WHERE c.content LIKE :word", Comment.class)
|
|
||||||
.setParameter("word", searchWord)
|
|
||||||
.getResultList();
|
|
||||||
|
|
||||||
List<Object> result = new ArrayList<>();
|
|
||||||
result.addAll(postResult);
|
|
||||||
result.addAll(commentResult);
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//
|
|
||||||
// @Autowired
|
|
||||||
// SearchService searchService;
|
|
||||||
//
|
|
||||||
// @Test
|
|
||||||
// void testFinder(){
|
|
||||||
// commentService.deleteAllComment();
|
|
||||||
// postService.deleteAllPosts();
|
|
||||||
// customerService.deleteAllCustomers();
|
|
||||||
//
|
|
||||||
// Customer c1 = customerService.addCustomer("first", "1");
|
|
||||||
// Customer c2 = customerService.addCustomer("second", "2");
|
|
||||||
// Customer c3 = customerService.addCustomer("third", "3");
|
|
||||||
//
|
|
||||||
// Post p1 = postService.addPost(c1, "first title", "nonsense");
|
|
||||||
// Post p2 = postService.addPost(c2, "second title", "ordinal");
|
|
||||||
// Post p3 = postService.addPost(c3, "third title", "searchword");
|
|
||||||
//
|
|
||||||
// Comment com1 = commentService.addComment(c1, p2, "What");
|
|
||||||
// Comment com2 = commentService.addComment(c2, p3, "searchword");
|
|
||||||
// Comment com3 = commentService.addComment(c3, p1, "How");
|
|
||||||
//
|
|
||||||
// List<Object> expectedResult = new ArrayList<>();
|
|
||||||
// expectedResult.add((Object)p3);
|
|
||||||
// expectedResult.add((Object)com2);
|
|
||||||
//
|
|
||||||
// List<Object> actualResult = searchService.finder("searchword");
|
|
||||||
//
|
|
||||||
// Assertions.assertEquals(expectedResult.size(),actualResult.size());
|
|
||||||
//
|
|
||||||
// Assertions.assertEquals(expectedResult.get(0),actualResult.get(0));
|
|
||||||
// Assertions.assertEquals(expectedResult.get(1),actualResult.get(1));
|
|
||||||
// }
|
|
||||||
@ -1,66 +0,0 @@
|
|||||||
package ru.ulstu.is.labwork.dbLab3.model;
|
|
||||||
import jakarta.persistence.*;
|
|
||||||
import java.util.Objects;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
public class Comment {
|
|
||||||
@Id
|
|
||||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@Column
|
|
||||||
private String content;
|
|
||||||
|
|
||||||
@ManyToOne(fetch = FetchType.EAGER)
|
|
||||||
@JoinColumn(name="customer_fk")
|
|
||||||
private Customer customer;
|
|
||||||
|
|
||||||
@ManyToOne(fetch = FetchType.EAGER)
|
|
||||||
@JoinColumn(name="post_fk")
|
|
||||||
private Post post;
|
|
||||||
|
|
||||||
public Comment() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public Comment(Customer customer, Post post, String content) {
|
|
||||||
this.customer = customer;
|
|
||||||
this.post = post;
|
|
||||||
this.content = content;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Post getPost() {
|
|
||||||
return post;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Customer getCustomer() {
|
|
||||||
return customer;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getContent() {
|
|
||||||
return content;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setContent(String content) {
|
|
||||||
this.content = content;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(Object o) {
|
|
||||||
if (this == o) return true;
|
|
||||||
if (o == null || getClass() != o.getClass()) return false;
|
|
||||||
|
|
||||||
Comment comment = (Comment) o;
|
|
||||||
|
|
||||||
return Objects.equals(id, comment.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode() {
|
|
||||||
return Objects.hash(id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
package ru.ulstu.is.labwork.dbLab3.model;
|
|
||||||
import jakarta.persistence.*;
|
|
||||||
import java.util.*;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
public class Customer {
|
|
||||||
@Id
|
|
||||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
|
||||||
private Long id;
|
|
||||||
@Column
|
|
||||||
private String username;
|
|
||||||
@Column
|
|
||||||
private String hashedPassword;
|
|
||||||
@OneToMany(fetch = FetchType.EAGER, mappedBy = "customer", cascade = CascadeType.ALL)
|
|
||||||
private List<Comment> comments;
|
|
||||||
@OneToMany(fetch = FetchType.EAGER, mappedBy = "customer", cascade = CascadeType.ALL)
|
|
||||||
private List<Post> posts;
|
|
||||||
|
|
||||||
public Customer() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public Customer(String username, String hashedPassword) {
|
|
||||||
this.username = username;
|
|
||||||
this.hashedPassword = hashedPassword;
|
|
||||||
this.comments = new ArrayList<>();
|
|
||||||
this.posts = new ArrayList<>();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getUsername() {
|
|
||||||
return username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getHashedPassword() {
|
|
||||||
return hashedPassword;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Comment> getComments() {
|
|
||||||
return comments;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Post> getPosts() {
|
|
||||||
return posts;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUsername(String username) {
|
|
||||||
this.username = username;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setHashedPassword(String hashedPassword) {
|
|
||||||
this.hashedPassword = hashedPassword;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(Object obj) {
|
|
||||||
if (this == obj) return true;
|
|
||||||
if (obj == null || getClass() != obj.getClass()) return false;
|
|
||||||
Customer customer = (Customer) obj;
|
|
||||||
return Objects.equals(id, customer.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode() {
|
|
||||||
return Objects.hash(id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
package ru.ulstu.is.labwork.dbLab3.model;
|
|
||||||
import jakarta.persistence.*;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Entity
|
|
||||||
public class Post {
|
|
||||||
@Id
|
|
||||||
@GeneratedValue(strategy = GenerationType.AUTO)
|
|
||||||
private Long id;
|
|
||||||
|
|
||||||
@Column
|
|
||||||
private String title;
|
|
||||||
|
|
||||||
@Column
|
|
||||||
private String content;
|
|
||||||
|
|
||||||
@ManyToOne(fetch = FetchType.EAGER)
|
|
||||||
@JoinColumn(name = "customer_fk")
|
|
||||||
private Customer customer;
|
|
||||||
|
|
||||||
@OneToMany(fetch = FetchType.EAGER, mappedBy = "post", cascade = CascadeType.ALL)
|
|
||||||
private List<Comment> comments;
|
|
||||||
|
|
||||||
public Post() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public Post(Customer customer, String title, String content) {
|
|
||||||
this.customer = customer;
|
|
||||||
this.title = title;
|
|
||||||
this.content = content;
|
|
||||||
this.comments = new ArrayList<>();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean equals(Object o) {
|
|
||||||
if (this == o) return true;
|
|
||||||
if (o == null || getClass() != o.getClass()) return false;
|
|
||||||
|
|
||||||
Post post = (Post) o;
|
|
||||||
|
|
||||||
return id.equals(post.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int hashCode() {
|
|
||||||
return id.hashCode();
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getTitle() {
|
|
||||||
return title;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setTitle(String title) {
|
|
||||||
this.title = title;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getContent() {
|
|
||||||
return content;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setContent(String content) {
|
|
||||||
this.content = content;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Comment> getComments() {
|
|
||||||
return comments;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Customer getCustomer() {
|
|
||||||
return customer;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Long getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,72 +0,0 @@
|
|||||||
package ru.ulstu.is.labwork.dbLab3.service;
|
|
||||||
|
|
||||||
import jakarta.persistence.EntityManager;
|
|
||||||
import jakarta.persistence.EntityNotFoundException;
|
|
||||||
import jakarta.persistence.PersistenceContext;
|
|
||||||
import jakarta.transaction.Transactional;
|
|
||||||
import ru.ulstu.is.labwork.dbLab3.model.Comment;
|
|
||||||
import ru.ulstu.is.labwork.dbLab3.model.Customer;
|
|
||||||
import ru.ulstu.is.labwork.dbLab3.model.Post;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import org.springframework.util.StringUtils;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
public class CommentService {
|
|
||||||
@PersistenceContext
|
|
||||||
private EntityManager em;
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public Comment findComment(Long id) {
|
|
||||||
final Comment comment = em.find(Comment.class, id);
|
|
||||||
if (comment == null) {
|
|
||||||
throw new EntityNotFoundException(String.format("Comment with id [%s] is not found", id));
|
|
||||||
}
|
|
||||||
return comment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public List<Comment> findAllComments() {
|
|
||||||
return em.createQuery("select c from Comment c", Comment.class).getResultList();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public Comment addComment(Customer customer, Post post, String content) {
|
|
||||||
if (customer == null || post == null) {
|
|
||||||
throw new IllegalArgumentException("Invalid customer or post");
|
|
||||||
}
|
|
||||||
if (!StringUtils.hasText(content)) {
|
|
||||||
throw new IllegalArgumentException("Invalid comment's content");
|
|
||||||
}
|
|
||||||
final Comment comment = new Comment(customer, post, content);
|
|
||||||
comment.getCustomer().getComments().add(comment);
|
|
||||||
comment.getPost().getComments().add(comment);
|
|
||||||
em.persist(comment);
|
|
||||||
return comment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public Comment updateComment(Long id, String content) {
|
|
||||||
if (!StringUtils.hasText(content)) {
|
|
||||||
throw new IllegalArgumentException("Comment's content is empty");
|
|
||||||
}
|
|
||||||
final Comment comment = findComment(id);
|
|
||||||
comment.setContent(content);
|
|
||||||
return em.merge(comment);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public Comment deleteComment(Long id) {
|
|
||||||
final Comment currentComment = findComment(id);
|
|
||||||
currentComment.getPost().getComments().remove(currentComment);
|
|
||||||
currentComment.getCustomer().getComments().remove(currentComment);
|
|
||||||
em.remove(currentComment);
|
|
||||||
return currentComment;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public void deleteAllComment() {
|
|
||||||
em.createQuery("delete from Comment").executeUpdate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,62 +0,0 @@
|
|||||||
package ru.ulstu.is.labwork.dbLab3.service;
|
|
||||||
import jakarta.persistence.EntityManager;
|
|
||||||
import jakarta.persistence.EntityNotFoundException;
|
|
||||||
import jakarta.persistence.PersistenceContext;
|
|
||||||
import jakarta.transaction.Transactional;
|
|
||||||
import ru.ulstu.is.labwork.dbLab3.model.Customer;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import org.springframework.util.StringUtils;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
public class CustomerService {
|
|
||||||
@PersistenceContext
|
|
||||||
private EntityManager em;
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public Customer findCustomer(Long id) {
|
|
||||||
final Customer customer = em.find(Customer.class, id);
|
|
||||||
if (customer == null) {
|
|
||||||
throw new EntityNotFoundException(String.format("User with id [%s] is not found", id));
|
|
||||||
}
|
|
||||||
return customer;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public List<Customer> findAllCustomers() {
|
|
||||||
return em.createQuery("select c from Customer c", Customer.class).getResultList();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public Customer addCustomer(String username, String password) {
|
|
||||||
if (!StringUtils.hasText(username) || !StringUtils.hasText(password)) {
|
|
||||||
throw new IllegalArgumentException("Customer's username or password is empty");
|
|
||||||
}
|
|
||||||
final Customer customer = new Customer(username, password);
|
|
||||||
em.persist(customer);
|
|
||||||
return customer;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public Customer updateCustomer(Long id, String username, String password) {
|
|
||||||
if (!StringUtils.hasText(username) || !StringUtils.hasText(password)) {
|
|
||||||
throw new IllegalArgumentException("Customer's username or password is empty");
|
|
||||||
}
|
|
||||||
final Customer customer = findCustomer(id);
|
|
||||||
customer.setUsername(username);
|
|
||||||
customer.setHashedPassword(password);
|
|
||||||
return em.merge(customer);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public Customer deleteCustomer(Long id) {
|
|
||||||
final Customer currentCustomer = findCustomer(id);
|
|
||||||
em.remove(currentCustomer);
|
|
||||||
return currentCustomer;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public void deleteAllCustomers() {
|
|
||||||
em.createQuery("delete from Customer").executeUpdate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
package ru.ulstu.is.labwork.dbLab3.service;
|
|
||||||
|
|
||||||
import jakarta.persistence.EntityManager;
|
|
||||||
import jakarta.persistence.EntityNotFoundException;
|
|
||||||
import jakarta.persistence.PersistenceContext;
|
|
||||||
import jakarta.transaction.Transactional;
|
|
||||||
import ru.ulstu.is.labwork.dbLab3.model.Comment;
|
|
||||||
import ru.ulstu.is.labwork.dbLab3.model.Customer;
|
|
||||||
import ru.ulstu.is.labwork.dbLab3.model.Post;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import org.springframework.util.StringUtils;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@Service
|
|
||||||
public class PostService {
|
|
||||||
@PersistenceContext
|
|
||||||
private EntityManager em;
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public Post findPost(Long id) {
|
|
||||||
final Post post = em.find(Post.class, id);
|
|
||||||
if (post == null) {
|
|
||||||
throw new EntityNotFoundException(String.format("Post with id [%s] is not found", id));
|
|
||||||
}
|
|
||||||
return post;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public List<Post> findAllPosts() {
|
|
||||||
return em.createQuery("select p from Post p", Post.class).getResultList();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public Post addPost(Customer customer, String title, String content) {
|
|
||||||
if (customer == null) {
|
|
||||||
throw new IllegalArgumentException("Invalid customer");
|
|
||||||
}
|
|
||||||
if (!StringUtils.hasText(title) | !StringUtils.hasText(content)) {
|
|
||||||
throw new IllegalArgumentException("Invalid post's content or title");
|
|
||||||
}
|
|
||||||
final Post post = new Post(customer, title, content);
|
|
||||||
post.getCustomer().getPosts().add(post);
|
|
||||||
em.persist(post);
|
|
||||||
return post;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public Post updatePost(Long id, String title, String content) {
|
|
||||||
if (!StringUtils.hasText(content) | !StringUtils.hasText(title)) {
|
|
||||||
throw new IllegalArgumentException("Post's content or title is empty");
|
|
||||||
}
|
|
||||||
final Post post = findPost(id);
|
|
||||||
post.setTitle(title);
|
|
||||||
post.setContent(content);
|
|
||||||
return em.merge(post);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public Post deletePost(Long id) {
|
|
||||||
final Post currentPost = findPost(id);
|
|
||||||
currentPost.getCustomer().getPosts().remove(currentPost);
|
|
||||||
em.remove(currentPost);
|
|
||||||
return currentPost;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Transactional
|
|
||||||
public void deleteAllPosts() {
|
|
||||||
em.createQuery("delete from Post").executeUpdate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
spring.main.banner-mode=off
|
|
||||||
#server.port=8080
|
|
||||||
spring.datasource.url=jdbc:h2:file:./data
|
|
||||||
spring.datasource.driverClassName=org.h2.Driver
|
|
||||||
spring.datasource.username=sa
|
|
||||||
spring.datasource.password=password
|
|
||||||
spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
|
|
||||||
spring.jpa.hibernate.ddl-auto=update
|
|
||||||
spring.h2.console.enabled=true
|
|
||||||
spring.h2.console.settings.trace=false
|
|
||||||
spring.h2.console.settings.web-allow-others=false
|
|
||||||
@ -1,125 +0,0 @@
|
|||||||
package ru.ulstu.is.labwork;
|
|
||||||
|
|
||||||
import ru.ulstu.is.labwork.dbLab3.model.*;
|
|
||||||
import ru.ulstu.is.labwork.dbLab3.service.CommentService;
|
|
||||||
import ru.ulstu.is.labwork.dbLab3.service.CustomerService;
|
|
||||||
import ru.ulstu.is.labwork.dbLab3.service.PostService;
|
|
||||||
import org.junit.jupiter.api.Assertions;
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
|
||||||
|
|
||||||
@SpringBootTest
|
|
||||||
class LabworkApplicationTests {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
CustomerService customerService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
CommentService commentService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
PostService postService;
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void testCustomers() {
|
|
||||||
commentService.deleteAllComment();
|
|
||||||
postService.deleteAllPosts();
|
|
||||||
customerService.deleteAllCustomers();
|
|
||||||
|
|
||||||
Customer c1 = customerService.addCustomer("first", "1");
|
|
||||||
Customer c2 = customerService.addCustomer("second", "2");
|
|
||||||
Customer c3 = customerService.addCustomer("third", "3");
|
|
||||||
|
|
||||||
Assertions.assertEquals("first", c1.getUsername());
|
|
||||||
Assertions.assertEquals("second", c2.getUsername());
|
|
||||||
Assertions.assertEquals("third", c3.getUsername());
|
|
||||||
|
|
||||||
Assertions.assertEquals(c1, customerService.findCustomer(c1.getId()));
|
|
||||||
|
|
||||||
customerService.deleteCustomer(c2.getId());
|
|
||||||
|
|
||||||
Assertions.assertEquals(2, customerService.findAllCustomers().size());
|
|
||||||
|
|
||||||
Customer c4 = customerService.updateCustomer(c3.getId(), "fourth", "4");
|
|
||||||
|
|
||||||
Assertions.assertNotEquals(c3.getUsername(), c4.getUsername());
|
|
||||||
Assertions.assertNotEquals(c3.getHashedPassword(), c4.getHashedPassword());
|
|
||||||
|
|
||||||
commentService.deleteAllComment();
|
|
||||||
postService.deleteAllPosts();
|
|
||||||
customerService.deleteAllCustomers();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void testPost() {
|
|
||||||
commentService.deleteAllComment();
|
|
||||||
postService.deleteAllPosts();
|
|
||||||
customerService.deleteAllCustomers();
|
|
||||||
|
|
||||||
Customer c1 = customerService.addCustomer("first", "1");
|
|
||||||
Customer c2 = customerService.addCustomer("second", "2");
|
|
||||||
|
|
||||||
Post p1 = postService.addPost(c1, "first title", "nonsense");
|
|
||||||
Post p2 = postService.addPost(c2, "second title", "ordinal");
|
|
||||||
|
|
||||||
Assertions.assertEquals(2, postService.findAllPosts().size());
|
|
||||||
|
|
||||||
Assertions.assertEquals(p1.getCustomer(), c1);
|
|
||||||
Assertions.assertEquals(p2.getCustomer(), c2);
|
|
||||||
|
|
||||||
Assertions.assertEquals(c1.getPosts().get(0), p1);
|
|
||||||
Assertions.assertEquals(c2.getPosts().get(0), p2);
|
|
||||||
|
|
||||||
Assertions.assertEquals(p1, postService.findPost(p1.getId()));
|
|
||||||
Assertions.assertEquals(p2, postService.findPost(p2.getId()));
|
|
||||||
|
|
||||||
Post p3 = postService.addPost(c1, "asdf", "asd");
|
|
||||||
postService.deletePost(p1.getId());
|
|
||||||
Assertions.assertEquals(1, customerService.findCustomer(c1.getId()).getPosts().size());
|
|
||||||
|
|
||||||
Post p4 = postService.updatePost(p2.getId(), "third title", "wow");
|
|
||||||
|
|
||||||
Assertions.assertNotEquals(p2.getTitle(), p4.getTitle());
|
|
||||||
Assertions.assertNotEquals(p2.getContent(), p4.getContent());
|
|
||||||
|
|
||||||
commentService.deleteAllComment();
|
|
||||||
postService.deleteAllPosts();
|
|
||||||
customerService.deleteAllCustomers();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void testComment() {
|
|
||||||
commentService.deleteAllComment();
|
|
||||||
postService.deleteAllPosts();
|
|
||||||
customerService.deleteAllCustomers();
|
|
||||||
|
|
||||||
Customer c1 = customerService.addCustomer("first", "1");
|
|
||||||
Customer c2 = customerService.addCustomer("second", "2");
|
|
||||||
|
|
||||||
Post p1 = postService.addPost(c1, "first title", "nonsense");
|
|
||||||
Post p2 = postService.addPost(c2, "second title", "ordinal");
|
|
||||||
|
|
||||||
Assertions.assertEquals(2, postService.findAllPosts().size());
|
|
||||||
|
|
||||||
Comment com1 = commentService.addComment(c1, p2, "What");
|
|
||||||
Comment com2 = commentService.addComment(c2, p1, "How");
|
|
||||||
|
|
||||||
Assertions.assertEquals(c1, p2.getComments().get(0).getCustomer());
|
|
||||||
Assertions.assertEquals(c2, p1.getComments().get(0).getCustomer());
|
|
||||||
|
|
||||||
Comment com3 = commentService.addComment(c1, p1, "Really");
|
|
||||||
|
|
||||||
Assertions.assertEquals(com2, commentService.findComment(p1.getComments().get(0).getId()));
|
|
||||||
|
|
||||||
Comment com4 = commentService.updateComment(com3.getId(), "Not really");
|
|
||||||
|
|
||||||
Assertions.assertNotEquals(com3.getContent(), com4.getContent());
|
|
||||||
Assertions.assertEquals(com3.getCustomer().getId(), com4.getCustomer().getId());
|
|
||||||
|
|
||||||
commentService.deleteAllComment();
|
|
||||||
postService.deleteAllPosts();
|
|
||||||
customerService.deleteAllCustomers();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user