diff --git a/.gitignore b/.gitignore index 13a0344..219dfd9 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,7 @@ hs_err_pid* # private file with login-data -application.properties \ No newline at end of file +application.properties + +.idea/ +.gradle/ \ No newline at end of file diff --git a/vpr/.gitignore b/server/.gitignore similarity index 69% rename from vpr/.gitignore rename to server/.gitignore index 549e00a..c2065bc 100644 --- a/vpr/.gitignore +++ b/server/.gitignore @@ -1,8 +1,9 @@ HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ ### STS ### .apt_generated @@ -12,12 +13,18 @@ target/ .settings .springBeans .sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ ### IntelliJ IDEA ### .idea *.iws *.iml *.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ ### NetBeans ### /nbproject/private/ @@ -25,9 +32,6 @@ target/ /dist/ /nbdist/ /.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ ### VS Code ### .vscode/ diff --git a/server/build.gradle b/server/build.gradle new file mode 100644 index 0000000..c4ffdba --- /dev/null +++ b/server/build.gradle @@ -0,0 +1,24 @@ +plugins { + id 'org.springframework.boot' version '2.5.6' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' +} + +group = 'com.vpr' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '11' + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + runtimeOnly 'mysql:mysql-connector-java' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +test { + useJUnitPlatform() +} diff --git a/server/gradle/wrapper/gradle-wrapper.jar b/server/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7454180 Binary files /dev/null and b/server/gradle/wrapper/gradle-wrapper.jar differ diff --git a/server/gradle/wrapper/gradle-wrapper.properties b/server/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..ffed3a2 --- /dev/null +++ b/server/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/server/gradlew b/server/gradlew new file mode 100644 index 0000000..1b6c787 --- /dev/null +++ b/server/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/server/gradlew.bat b/server/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/server/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/server/settings.gradle b/server/settings.gradle new file mode 100644 index 0000000..096502d --- /dev/null +++ b/server/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'server' diff --git a/server/src/main/java/com/vpr/server/DateEvent.java b/server/src/main/java/com/vpr/server/DateEvent.java new file mode 100644 index 0000000..6f27461 --- /dev/null +++ b/server/src/main/java/com/vpr/server/DateEvent.java @@ -0,0 +1,118 @@ +package com.vpr.server; + +import java.sql.Date; +import java.sql.Time; + +public class DateEvent { + private long userId; + private String userName; + private String userForename; + + private Date date; + + private String name; + private Integer priority; + private boolean isFullDay; + private Time start; + private Time end; + + public DateEvent(UserEvent userEvent) { + this.userId = userEvent.getUser().getId(); + this.userName = userEvent.getUser().getName(); + this.userForename = userEvent.getUser().getForename(); + this.date = userEvent.getDate(); + this.name = userEvent.getEvent().getName(); + this.priority = userEvent.getEvent().getPriority(); + this.isFullDay = userEvent.getEvent().isFullDay(); + this.start = userEvent.getEvent().getStart(); + this.end = userEvent.getEvent().getEnd(); + } + + public DateEvent(long userId, String userName, String userForename, Date date, String name, Integer priority, boolean isFullDay, Time start, Time end) { + this.userId = userId; + this.userName = userName; + this.userForename = userForename; + this.date = date; + this.name = name; + this.priority = priority; + this.isFullDay = isFullDay; + this.start = start; + this.end = end; + } + + /********************* + * Getter and Setter * + *********************/ + + public long getUserId() { + return userId; + } + + public void setUserId(long userId) { + this.userId = userId; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getUserForename() { + return userForename; + } + + public void setUserForename(String userForename) { + this.userForename = userForename; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getPriority() { + return priority; + } + + public void setPriority(Integer priority) { + this.priority = priority; + } + + public boolean isFullDay() { + return isFullDay; + } + + public void setFullDay(boolean fullDay) { + isFullDay = fullDay; + } + + public Time getStart() { + return start; + } + + public void setStart(Time start) { + this.start = start; + } + + public Time getEnd() { + return end; + } + + public void setEnd(Time end) { + this.end = end; + } +} diff --git a/vpr/src/main/java/com/mam/vpr/accessingdatamysql/Event.java b/server/src/main/java/com/vpr/server/Event.java similarity index 56% rename from vpr/src/main/java/com/mam/vpr/accessingdatamysql/Event.java rename to server/src/main/java/com/vpr/server/Event.java index 5bb08a1..15e7e4f 100644 --- a/vpr/src/main/java/com/mam/vpr/accessingdatamysql/Event.java +++ b/server/src/main/java/com/vpr/server/Event.java @@ -1,74 +1,97 @@ -package com.mam.vpr.accessingdatamysql; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import java.sql.Time; - -// @Entity creates a table out of this class with Hibernate -@Entity -public class Event { - // Generate the primary key - @Id - @GeneratedValue(strategy=GenerationType.IDENTITY) - private Integer id; - - private String name; - private Integer priority; - private boolean isFullDay; - private java.sql.Time start; - private java.sql.Time end; - - /********************* - * Getter and Setter * - *********************/ - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getPriority() { - return priority; - } - - public void setPriority(Integer priority) { - this.priority = priority; - } - - public boolean isFullDay() { - return isFullDay; - } - - public void setFullDay(boolean fullDay) { - isFullDay = fullDay; - } - - public Time getStart() { - return start; - } - - public void setStart(Time start) { - this.start = start; - } - - public Time getEnd() { - return end; - } - - public void setEnd(Time end) { - this.end = end; - } -} +package com.vpr.server; + +import javax.persistence.*; +import java.sql.Time; +import java.util.List; + +// @Entity creates a table out of this class with Hibernate +@Entity(name = "Event") +public class Event { + // Generate the primary key + @Id + @GeneratedValue(strategy=GenerationType.IDENTITY) + private long id; + + private String name; + private Integer priority; + private boolean isFullDay; + private Time start; + private Time end; + + @OneToMany(mappedBy = "event") + private List userEvent; + + /********************* + * Getter and Setter * + *********************/ + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getPriority() { + return priority; + } + + public void setPriority(Integer priority) { + this.priority = priority; + } + + public boolean isFullDay() { + return isFullDay; + } + + public void setFullDay(boolean fullDay) { + isFullDay = fullDay; + } + + public Time getStart() { + return start; + } + + public void setStart(Time start) { + this.start = start; + } + + public Time getEnd() { + return end; + } + + public void setEnd(Time end) { + this.end = end; + } + + public List getUserEvent() { + return userEvent; + } + + public void setUserEvent(List userEvent) { + this.userEvent = userEvent; + } + + // toString + @Override + public String toString() { + return "Event{" + + "id=" + id + + ", name='" + name + '\'' + + ", priority=" + priority + + ", isFullDay=" + isFullDay + + ", start=" + start + + ", end=" + end + + ", userEvent=" + userEvent + + '}'; + } +} diff --git a/vpr/src/main/java/com/mam/vpr/accessingdatamysql/EventRepository.java b/server/src/main/java/com/vpr/server/EventRepository.java similarity index 72% rename from vpr/src/main/java/com/mam/vpr/accessingdatamysql/EventRepository.java rename to server/src/main/java/com/vpr/server/EventRepository.java index 36da782..5d45661 100644 --- a/vpr/src/main/java/com/mam/vpr/accessingdatamysql/EventRepository.java +++ b/server/src/main/java/com/vpr/server/EventRepository.java @@ -1,12 +1,12 @@ -package com.mam.vpr.accessingdatamysql; - -import org.springframework.data.repository.CrudRepository; - -import com.mam.vpr.accessingdatamysql.Event; - -// This will be AUTO IMPLEMENTED by Spring into a Bean called eventRepository -// CRUD refers Create, Read, Update, Delete - -public interface EventRepository extends CrudRepository { - +package com.vpr.server; + +import org.springframework.data.repository.CrudRepository; + +import java.util.List; + +// This will be AUTO IMPLEMENTED by Spring into a Bean called eventRepository +// CRUD refers Create, Read, Update, Delete + +public interface EventRepository extends CrudRepository { + } \ No newline at end of file diff --git a/vpr/src/main/java/com/mam/vpr/accessingdatamysql/MainController.java b/server/src/main/java/com/vpr/server/MainController.java similarity index 64% rename from vpr/src/main/java/com/mam/vpr/accessingdatamysql/MainController.java rename to server/src/main/java/com/vpr/server/MainController.java index a1cc3dd..499dbba 100644 --- a/vpr/src/main/java/com/mam/vpr/accessingdatamysql/MainController.java +++ b/server/src/main/java/com/vpr/server/MainController.java @@ -1,69 +1,72 @@ -package com.mam.vpr.accessingdatamysql; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -@Controller // This means that this class is a Controller -@RequestMapping(path="/vpr") // This means URL's start with /demo (after Application path) -public class MainController { - - // This means to get the bean called userRepository - // Which is auto-generated by Spring, we will use it to handle the data - @Autowired - private UserRepository userRepository; - - @Autowired - private EventRepository eventRepository; - - @Autowired - private EventListRepository eventListRepository; - - // POST-request at /add with request parameter - // @ResponseBody means the returned String is the response, not a view name - @PostMapping(path="/add-user") - public @ResponseBody String addNewUser ( - @RequestParam String name, - @RequestParam String forename, - @RequestParam String password, - @RequestParam String isAdmin - ) { - - User user = new User(); - - // TODO set correct token and password - user.setName(name); - user.setForename(forename); - user.setPassword(password); - user.setToken("test"); - user.setAdmin(isAdmin.equals("1")); - - userRepository.save(user); - return "Saved"; - } - - // GET-request at /all-users - // returns JSON-data - @GetMapping(path="/all-users") - public @ResponseBody Iterable getAllUsers() { - return userRepository.findAll(); - } - - // GET-request at /all-events - // returns JSON-data - @GetMapping(path="/all-events") - public @ResponseBody Iterable getAllEvents() { - return eventRepository.findAll(); - } - - // GET-request at /all-event-lists - // returns JSON-data - @GetMapping(path="/all-event-lists") - public @ResponseBody Iterable getAllEventLists() { - return eventListRepository.findAll(); - } +package com.vpr.server; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.sql.Date; + +@Controller // This means that this class is a Controller +@RequestMapping(path="/vpr") // This means URL's start with /demo (after Application path) +public class MainController { + + // This means to get the bean called userRepository + // Which is auto-generated by Spring, we will use it to handle the data + @Autowired + private com.vpr.server.UserRepository userRepository; + + @Autowired + private EventRepository eventRepository; + + @Autowired + private UserEventRepository userEventRepository; + + // POST-request at /add with request parameter + // @ResponseBody means the returned String is the response, not a view name + @PostMapping(path="/add-user") + public @ResponseBody String addNewUser ( + @RequestParam String name, + @RequestParam String forename, + @RequestParam String password, + @RequestParam String isAdmin + ) { + + com.vpr.server.User user = new com.vpr.server.User(); + + // TODO set correct token and password + user.setName(name); + user.setForename(forename); + user.setPassword(password); + user.setToken("test"); + user.setAdmin(isAdmin.equals("1")); + + userRepository.save(user); + return "Saved"; + } + + // GET-request at /all-users + // returns JSON-data + @GetMapping(path="/all-users") + public @ResponseBody Iterable getAllUsers() { + return userRepository.findAll(); + } + + // POST-request at /users-by-name + // returns JSON-data + @PostMapping(path="/users-by-name") + public @ResponseBody Iterable getUsersByName(@RequestParam String name) { + return userRepository.findByName(name); + } + + // GET-request at /all-events + // returns JSON-data + @GetMapping(path="/all-events") + public @ResponseBody Iterable getAllEvents() { + return eventRepository.findAll(); + } + + @GetMapping(path="/event-by-userid") + public @ResponseBody Iterable getEventByUserId() { + return userEventRepository.findAllDates(); + } } \ No newline at end of file diff --git a/server/src/main/java/com/vpr/server/ServerApplication.java b/server/src/main/java/com/vpr/server/ServerApplication.java new file mode 100644 index 0000000..28bd4c0 --- /dev/null +++ b/server/src/main/java/com/vpr/server/ServerApplication.java @@ -0,0 +1,13 @@ + package com.vpr.server; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ServerApplication { + + public static void main(String[] args) { + SpringApplication.run(ServerApplication.class, args); + } + +} diff --git a/vpr/src/main/java/com/mam/vpr/accessingdatamysql/User.java b/server/src/main/java/com/vpr/server/User.java similarity index 74% rename from vpr/src/main/java/com/mam/vpr/accessingdatamysql/User.java rename to server/src/main/java/com/vpr/server/User.java index 4ab2aa4..7b4fa04 100644 --- a/vpr/src/main/java/com/mam/vpr/accessingdatamysql/User.java +++ b/server/src/main/java/com/vpr/server/User.java @@ -1,74 +1,82 @@ -package com.mam.vpr.accessingdatamysql; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; - -// @Entity creates a table out of this class with Hibernate -@Entity -public class User { - // Generate the primary key - @Id - @GeneratedValue(strategy=GenerationType.IDENTITY) - private Integer id; - - private String name; - private String forename; - private String password; - private String token; - private boolean isAdmin; - - /********************* - * Getter and Setter * - *********************/ - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getForename() { - return forename; - } - - public void setForename(String forename) { - this.forename = forename; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - public String getToken() { - return token; - } - - public void setToken(String token) { - this.token = token; - } - - public boolean isAdmin() { - return isAdmin; - } - - public void setAdmin(boolean admin) { - isAdmin = admin; - } - +package com.vpr.server; + +import javax.persistence.*; +import java.util.List; + +// @Entity creates a table out of this class with Hibernate +@Entity +public class User { + // Generate the primary key + @Id + @GeneratedValue(strategy=GenerationType.IDENTITY) + private long id; + + private String name; + private String forename; + private String password; + private String token; + private boolean isAdmin; + + @OneToMany(mappedBy = "user") + private List userEvent; + + /********************* + * Getter and Setter * + *********************/ + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getForename() { + return forename; + } + + public void setForename(String forename) { + this.forename = forename; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + public boolean isAdmin() { + return isAdmin; + } + + public void setAdmin(boolean admin) { + isAdmin = admin; + } + + public List getEventList() { + return userEvent; + } + + public void setEventList(List userEvent) { + this.userEvent = userEvent; + } } \ No newline at end of file diff --git a/server/src/main/java/com/vpr/server/UserEvent.java b/server/src/main/java/com/vpr/server/UserEvent.java new file mode 100644 index 0000000..d86c473 --- /dev/null +++ b/server/src/main/java/com/vpr/server/UserEvent.java @@ -0,0 +1,62 @@ +package com.vpr.server; + +import javax.persistence.*; +import java.sql.Date; +import java.util.List; + +// @Entity creates a table out of this class with Hibernate +// @Table defines the table-name +@Entity +@Table(name="user_event") +@IdClass(UserEventId.class) +public class UserEvent { + @Id + @ManyToOne + @JoinColumn(name = "user_id", referencedColumnName = "id") + private User user; + + @Id + @ManyToOne + @JoinColumn(name = "event_id", referencedColumnName = "id") + private Event event; + + private Date date; + + /********************* + * Getter and Setter * + *********************/ + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + } + + public Event getEvent() { + return event; + } + + public void setEvent(Event event) { + this.event = event; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + // toString + @Override + public String toString() { + return "UserEvent{" + + "user=" + user.getId() + + ", event=" + event.getId() + + ", date=" + date + + '}'; + } +} \ No newline at end of file diff --git a/server/src/main/java/com/vpr/server/UserEventId.java b/server/src/main/java/com/vpr/server/UserEventId.java new file mode 100644 index 0000000..5e3d517 --- /dev/null +++ b/server/src/main/java/com/vpr/server/UserEventId.java @@ -0,0 +1,28 @@ +package com.vpr.server; + +import java.io.Serializable; + +public class UserEventId implements Serializable { + private long user; + private long event; + + /********************* + * Getter and Setter * + *********************/ + + public long getUser() { + return user; + } + + public void setUser(long user) { + this.user = user; + } + + public long getEvent() { + return event; + } + + public void setEvent(long event) { + this.event = event; + } +} diff --git a/server/src/main/java/com/vpr/server/UserEventRepository.java b/server/src/main/java/com/vpr/server/UserEventRepository.java new file mode 100644 index 0000000..129ed43 --- /dev/null +++ b/server/src/main/java/com/vpr/server/UserEventRepository.java @@ -0,0 +1,27 @@ +package com.vpr.server; + +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; + +import java.sql.Date; +import java.util.List; + +// This will be AUTO IMPLEMENTED by Spring into a Bean called eventListRepository +// CRUD refers Create, Read, Update, Delete + +public interface UserEventRepository extends CrudRepository { + @Query("SELECT " + + " ue.date " + + "FROM " + + " user_event ue") + List findAllDates(); + + /* + @Query("SELECT " + + " new com.vpr.server.DateEvent(ue.date) " + + "FROM " + + " user_event ue") + List findAllAsDateEvent(); + + */ +} diff --git a/vpr/src/main/java/com/mam/vpr/accessingdatamysql/UserRepository.java b/server/src/main/java/com/vpr/server/UserRepository.java similarity index 72% rename from vpr/src/main/java/com/mam/vpr/accessingdatamysql/UserRepository.java rename to server/src/main/java/com/vpr/server/UserRepository.java index ab1983c..4215f17 100644 --- a/vpr/src/main/java/com/mam/vpr/accessingdatamysql/UserRepository.java +++ b/server/src/main/java/com/vpr/server/UserRepository.java @@ -1,12 +1,12 @@ -package com.mam.vpr.accessingdatamysql; - -import org.springframework.data.repository.CrudRepository; - -import com.mam.vpr.accessingdatamysql.User; - -// This will be AUTO IMPLEMENTED by Spring into a Bean called userRepository -// CRUD refers Create, Read, Update, Delete - -public interface UserRepository extends CrudRepository { - +package com.vpr.server; + +import org.springframework.data.repository.CrudRepository; + +import java.util.List; + +// This will be AUTO IMPLEMENTED by Spring into a Bean called userRepository +// CRUD refers Create, Read, Update, Delete + +public interface UserRepository extends CrudRepository { + List findByName(String name); } \ No newline at end of file diff --git a/vpr/src/test/java/com/mam/vpr/VprApplicationTests.java b/server/src/test/java/com/vpr/server/ServerApplicationTests.java similarity index 73% rename from vpr/src/test/java/com/mam/vpr/VprApplicationTests.java rename to server/src/test/java/com/vpr/server/ServerApplicationTests.java index 6b35efa..07c96ec 100644 --- a/vpr/src/test/java/com/mam/vpr/VprApplicationTests.java +++ b/server/src/test/java/com/vpr/server/ServerApplicationTests.java @@ -1,10 +1,10 @@ -package com.mam.vpr; +package com.vpr.server; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -class VprApplicationTests { +class ServerApplicationTests { @Test void contextLoads() { diff --git a/vpr/.mvn/wrapper/MavenWrapperDownloader.java b/vpr/.mvn/wrapper/MavenWrapperDownloader.java deleted file mode 100644 index e76d1f3..0000000 --- a/vpr/.mvn/wrapper/MavenWrapperDownloader.java +++ /dev/null @@ -1,117 +0,0 @@ -/* - * Copyright 2007-present the original author or 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. - */ -import java.net.*; -import java.io.*; -import java.nio.channels.*; -import java.util.Properties; - -public class MavenWrapperDownloader { - - private static final String WRAPPER_VERSION = "0.5.6"; - /** - * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. - */ - private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" - + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; - - /** - * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to - * use instead of the default one. - */ - private static final String MAVEN_WRAPPER_PROPERTIES_PATH = - ".mvn/wrapper/maven-wrapper.properties"; - - /** - * Path where the maven-wrapper.jar will be saved to. - */ - private static final String MAVEN_WRAPPER_JAR_PATH = - ".mvn/wrapper/maven-wrapper.jar"; - - /** - * Name of the property which should be used to override the default download url for the wrapper. - */ - private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; - - public static void main(String args[]) { - System.out.println("- Downloader started"); - File baseDirectory = new File(args[0]); - System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); - - // If the maven-wrapper.properties exists, read it and check if it contains a custom - // wrapperUrl parameter. - File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); - String url = DEFAULT_DOWNLOAD_URL; - if(mavenWrapperPropertyFile.exists()) { - FileInputStream mavenWrapperPropertyFileInputStream = null; - try { - mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); - Properties mavenWrapperProperties = new Properties(); - mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); - url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); - } catch (IOException e) { - System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); - } finally { - try { - if(mavenWrapperPropertyFileInputStream != null) { - mavenWrapperPropertyFileInputStream.close(); - } - } catch (IOException e) { - // Ignore ... - } - } - } - System.out.println("- Downloading from: " + url); - - File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); - if(!outputFile.getParentFile().exists()) { - if(!outputFile.getParentFile().mkdirs()) { - System.out.println( - "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); - } - } - System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); - try { - downloadFileFromURL(url, outputFile); - System.out.println("Done"); - System.exit(0); - } catch (Throwable e) { - System.out.println("- Error downloading"); - e.printStackTrace(); - System.exit(1); - } - } - - private static void downloadFileFromURL(String urlString, File destination) throws Exception { - if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { - String username = System.getenv("MVNW_USERNAME"); - char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); - Authenticator.setDefault(new Authenticator() { - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(username, password); - } - }); - } - URL website = new URL(urlString); - ReadableByteChannel rbc; - rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(destination); - fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); - fos.close(); - rbc.close(); - } - -} diff --git a/vpr/.mvn/wrapper/maven-wrapper.jar b/vpr/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 2cc7d4a..0000000 Binary files a/vpr/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/vpr/.mvn/wrapper/maven-wrapper.properties b/vpr/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index a9f1ef8..0000000 --- a/vpr/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,2 +0,0 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/vpr/mvnw b/vpr/mvnw deleted file mode 100644 index a16b543..0000000 --- a/vpr/mvnw +++ /dev/null @@ -1,310 +0,0 @@ -#!/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 /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="`which 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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - else - jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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" - else - wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$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 \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/vpr/mvnw.cmd b/vpr/mvnw.cmd deleted file mode 100644 index c8d4337..0000000 --- a/vpr/mvnw.cmd +++ /dev/null @@ -1,182 +0,0 @@ -@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 "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\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/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" - -FOR /F "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%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.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 "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\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% - -exit /B %ERROR_CODE% diff --git a/vpr/pom.xml b/vpr/pom.xml deleted file mode 100644 index 64d4dd7..0000000 --- a/vpr/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.5.6 - - - com.mam - vpr - 0.0.1-SNAPSHOT - vpr - vpr project with Spring Boot - - 1.8 - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-web - - - - mysql - mysql-connector-java - runtime - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/vpr/src/main/java/com/mam/vpr/VprApplication.java b/vpr/src/main/java/com/mam/vpr/VprApplication.java deleted file mode 100644 index 2fe4b36..0000000 --- a/vpr/src/main/java/com/mam/vpr/VprApplication.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.mam.vpr; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -@SpringBootApplication -public class VprApplication { - - public static void main(String[] args) { - SpringApplication.run(VprApplication.class, args); - } - -} diff --git a/vpr/src/main/java/com/mam/vpr/accessingdatamysql/EventList.java b/vpr/src/main/java/com/mam/vpr/accessingdatamysql/EventList.java deleted file mode 100644 index d5d99ee..0000000 --- a/vpr/src/main/java/com/mam/vpr/accessingdatamysql/EventList.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.mam.vpr.accessingdatamysql; - -import javax.persistence.*; -import java.sql.Date; - -// @Entity creates a table out of this class with Hibernate -// @Table defines the table-name -@Entity -@Table(name="event_list") -public class EventList { - // Generate the primary key - @Id - @GeneratedValue(strategy=GenerationType.IDENTITY) - private Integer id; - - // Generate the foreign key - //@ManyToOne - //@JoinColumn(name = "user_id", referencedColumnName = "id") - private Integer userId; - //@ManyToOne - //@JoinColumn(name = "event_id", referencedColumnName = "id") - private Integer eventId; - - private Date date; - - /********************* - * Getter and Setter * - *********************/ - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getUserId() { - return userId; - } - - public void setUserId(Integer userId) { - this.userId = userId; - } - - public Integer getEventId() { - return eventId; - } - - public void setEventId(Integer eventId) { - this.eventId = eventId; - } - - public Date getDate() { - return date; - } - - public void setDate(Date date) { - this.date = date; - } -} \ No newline at end of file diff --git a/vpr/src/main/java/com/mam/vpr/accessingdatamysql/EventListRepository.java b/vpr/src/main/java/com/mam/vpr/accessingdatamysql/EventListRepository.java deleted file mode 100644 index 471cf25..0000000 --- a/vpr/src/main/java/com/mam/vpr/accessingdatamysql/EventListRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.mam.vpr.accessingdatamysql; - -import org.springframework.data.repository.CrudRepository; - -import com.mam.vpr.accessingdatamysql.EventList; - -// This will be AUTO IMPLEMENTED by Spring into a Bean called eventListRepository -// CRUD refers Create, Read, Update, Delete - -public interface EventListRepository extends CrudRepository { -}