From 199b55d6a0d1b7305df4de7386f7497137eb48cc Mon Sep 17 00:00:00 2001 From: atolmie Date: Fri, 28 Jun 2019 10:20:12 -0500 Subject: [PATCH 1/9] first commit --- StartHere/.gitignore | 29 ++ .../.mvn/wrapper/MavenWrapperDownloader.java | 128 ++++++++ StartHere/.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 48337 bytes .../.mvn/wrapper/maven-wrapper.properties | 1 + StartHere/mvnw | 286 ++++++++++++++++++ StartHere/mvnw.cmd | 161 ++++++++++ StartHere/pom.xml | 170 +++++++++++ .../com/lambdaschool/starthere/SeedData.java | 74 +++++ .../starthere/StartHereApplication.java | 27 ++ .../config/AuthorizationServerConfig.java | 54 ++++ .../config/H2ServerConfiguration.java | 48 +++ .../config/ResourceServerConfig.java | 43 +++ .../starthere/config/SecurityConfig.java | 52 ++++ .../starthere/config/SimpleCorsFilter.java | 52 ++++ .../starthere/config/Swagger2Config.java | 33 ++ .../starthere/config/WebConfig.java | 17 ++ .../starthere/controllers/APIsController.java | 56 ++++ .../controllers/LogoutController.java | 33 ++ .../starthere/controllers/OpenController.java | 59 ++++ .../controllers/QuotesController.java | 94 ++++++ .../controllers/RolesController.java | 84 +++++ .../starthere/controllers/UserController.java | 114 +++++++ .../exceptions/ResourceNotFoundException.java | 20 ++ .../starthere/exceptions/ValidationError.java | 27 ++ .../handlers/RestExceptionHandler.java | 82 +++++ .../starthere/models/APIOpenLibrary.java | 72 +++++ .../starthere/models/Auditable.java | 33 ++ .../starthere/models/ErrorDetail.java | 82 +++++ .../lambdaschool/starthere/models/Quote.java | 63 ++++ .../lambdaschool/starthere/models/Role.java | 64 ++++ .../lambdaschool/starthere/models/User.java | 124 ++++++++ .../starthere/models/UserRoles.java | 75 +++++ .../starthere/models/UserTypes.java | 6 + .../starthere/repository/QuoteRepository.java | 9 + .../starthere/repository/RoleRepository.java | 23 ++ .../starthere/repository/UserRepository.java | 9 + .../starthere/services/QuoteService.java | 18 ++ .../starthere/services/QuoteServiceImpl.java | 70 +++++ .../starthere/services/RoleService.java | 18 ++ .../starthere/services/RoleServiceImpl.java | 62 ++++ .../starthere/services/UserAuditing.java | 29 ++ .../starthere/services/UserService.java | 19 ++ .../starthere/services/UserServiceImpl.java | 145 +++++++++ .../src/main/resources/application.properties | 61 ++++ .../src/main/resources/info/ChangeLog.txt | 13 + StartHere/src/main/resources/info/curl.txt | 31 ++ .../src/main/resources/logback-spring.xml | 77 +++++ 47 files changed, 2847 insertions(+) create mode 100644 StartHere/.gitignore create mode 100644 StartHere/.mvn/wrapper/MavenWrapperDownloader.java create mode 100644 StartHere/.mvn/wrapper/maven-wrapper.jar create mode 100644 StartHere/.mvn/wrapper/maven-wrapper.properties create mode 100755 StartHere/mvnw create mode 100644 StartHere/mvnw.cmd create mode 100644 StartHere/pom.xml create mode 100755 StartHere/src/main/java/com/lambdaschool/starthere/SeedData.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/StartHereApplication.java create mode 100755 StartHere/src/main/java/com/lambdaschool/starthere/config/AuthorizationServerConfig.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/config/H2ServerConfiguration.java create mode 100755 StartHere/src/main/java/com/lambdaschool/starthere/config/ResourceServerConfig.java create mode 100755 StartHere/src/main/java/com/lambdaschool/starthere/config/SecurityConfig.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/config/SimpleCorsFilter.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/config/Swagger2Config.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/config/WebConfig.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/controllers/APIsController.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/controllers/LogoutController.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/controllers/OpenController.java create mode 100755 StartHere/src/main/java/com/lambdaschool/starthere/controllers/QuotesController.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/controllers/RolesController.java create mode 100755 StartHere/src/main/java/com/lambdaschool/starthere/controllers/UserController.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/exceptions/ResourceNotFoundException.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/exceptions/ValidationError.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/handlers/RestExceptionHandler.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/models/APIOpenLibrary.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/models/Auditable.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/models/ErrorDetail.java create mode 100755 StartHere/src/main/java/com/lambdaschool/starthere/models/Quote.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/models/Role.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/models/User.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/models/UserRoles.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/models/UserTypes.java create mode 100755 StartHere/src/main/java/com/lambdaschool/starthere/repository/QuoteRepository.java create mode 100755 StartHere/src/main/java/com/lambdaschool/starthere/repository/RoleRepository.java create mode 100755 StartHere/src/main/java/com/lambdaschool/starthere/repository/UserRepository.java create mode 100755 StartHere/src/main/java/com/lambdaschool/starthere/services/QuoteService.java create mode 100755 StartHere/src/main/java/com/lambdaschool/starthere/services/QuoteServiceImpl.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/services/RoleService.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/services/RoleServiceImpl.java create mode 100755 StartHere/src/main/java/com/lambdaschool/starthere/services/UserAuditing.java create mode 100755 StartHere/src/main/java/com/lambdaschool/starthere/services/UserService.java create mode 100755 StartHere/src/main/java/com/lambdaschool/starthere/services/UserServiceImpl.java create mode 100644 StartHere/src/main/resources/application.properties create mode 100644 StartHere/src/main/resources/info/ChangeLog.txt create mode 100644 StartHere/src/main/resources/info/curl.txt create mode 100644 StartHere/src/main/resources/logback-spring.xml diff --git a/StartHere/.gitignore b/StartHere/.gitignore new file mode 100644 index 00000000..153c9335 --- /dev/null +++ b/StartHere/.gitignore @@ -0,0 +1,29 @@ +HELP.md +/target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +/build/ + +### VS Code ### +.vscode/ diff --git a/StartHere/.mvn/wrapper/MavenWrapperDownloader.java b/StartHere/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..f059db3c --- /dev/null +++ b/StartHere/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,128 @@ +/* +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. +*/ + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URL; +import java.nio.channels.Channels; +import java.nio.channels.ReadableByteChannel; +import java.util.Properties; + +public class MavenWrapperDownloader +{ + + /** + * 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/0.4.2/maven-wrapper-0.4.2.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 direcrory '" + 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 + { + 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/StartHere/.mvn/wrapper/maven-wrapper.jar b/StartHere/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..01e67997377a393fd672c7dcde9dccbedf0cb1e9 GIT binary patch literal 48337 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 \(.*\)$'` + 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)`" + # TODO classpath? +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 + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar" + 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 command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + wget "$jarUrl" -O "$wrapperJarPath" + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + curl -o "$wrapperJarPath" "$jarUrl" + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + 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 + +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/StartHere/mvnw.cmd b/StartHere/mvnw.cmd new file mode 100644 index 00000000..fef5a8f7 --- /dev/null +++ b/StartHere/mvnw.cmd @@ -0,0 +1,161 @@ +@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 Maven2 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 key stroke 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 my 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.4.2/maven-wrapper-0.4.2.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% ( + echo Found %WRAPPER_JAR% +) else ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')" + echo Finished downloading %WRAPPER_JAR% +) +@REM End of extension + +%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/StartHere/pom.xml b/StartHere/pom.xml new file mode 100644 index 00000000..07463214 --- /dev/null +++ b/StartHere/pom.xml @@ -0,0 +1,170 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.5.RELEASE + + + com.lambdaschool + authenticatedusers + 0.0.1-SNAPSHOT + authenticatedusers + Demo project for Spring Boot + + + 11 + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + com.h2database + h2 + + + + org.postgresql + postgresql + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + + + com.fasterxml.jackson.core + jackson-databind + 2.9.9 + + + + + org.springframework.security.oauth + spring-security-oauth2 + 2.3.6.RELEASE + + + + + javax.xml.bind + jaxb-api + 2.3.1 + + + + + javax.activation + activation + 1.1.1 + + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + + + + + io.springfox + springfox-swagger2 + 2.9.2 + + + + + io.springfox + springfox-swagger-ui + 2.9.2 + + + + + org.slf4j + slf4j-api + 1.7.26 + + + + org.junit.jupiter + junit-jupiter-api + 5.3.2 + test + + + + + io.rest-assured + spring-mock-mvc + 3.3.0 + test + + + + + + jrmmba-starthere + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + com.heroku.sdk + heroku-maven-plugin + 2.0.3 + + jrmmba-starthere + false + + + ${project.build.directory}/${project.build.finalName}.jar + + ${java.version} + + java $JAVA_OPTS -Dserver.port=$PORT -jar target/${project.build.finalName}.jar + + + + + + + + diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/SeedData.java b/StartHere/src/main/java/com/lambdaschool/starthere/SeedData.java new file mode 100755 index 00000000..f879d427 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/SeedData.java @@ -0,0 +1,74 @@ +package com.lambdaschool.starthere; + +import com.lambdaschool.starthere.models.Quote; +import com.lambdaschool.starthere.models.Role; +import com.lambdaschool.starthere.models.User; +import com.lambdaschool.starthere.models.UserRoles; +import com.lambdaschool.starthere.services.RoleService; +import com.lambdaschool.starthere.services.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; + +@Transactional +@Component +public class SeedData implements CommandLineRunner +{ + @Autowired + RoleService roleService; + + @Autowired + UserService userService; + + + @Override + public void run(String[] args) throws Exception + { + Role r1 = new Role("admin"); + Role r2 = new Role("user"); + Role r3 = new Role("data"); + + roleService.save(r1); + roleService.save(r2); + roleService.save(r3); + + // admin, data, user + ArrayList admins = new ArrayList<>(); + admins.add(new UserRoles(new User(), r1)); + admins.add(new UserRoles(new User(), r2)); + admins.add(new UserRoles(new User(), r3)); + User u1 = new User("admin", "password", admins); + u1.getQuotes().add(new Quote("A creative man is motivated by the desire to achieve, not by the desire to beat others", u1)); + u1.getQuotes().add(new Quote("The question isn't who is going to let me; it's who is going to stop me.", u1)); + userService.save(u1); + + // data, user + ArrayList datas = new ArrayList<>(); + datas.add(new UserRoles(new User(), r3)); + datas.add(new UserRoles(new User(), r2)); + User u2 = new User("cinnamon", "1234567", datas); + userService.save(u2); + + // user + ArrayList users = new ArrayList<>(); + users.add(new UserRoles(new User(), r2)); + User u3 = new User("barnbarn", "ILuvM4th!", users); + u3.getQuotes().add(new Quote("Live long and prosper", u3)); + u3.getQuotes().add(new Quote("The enemy of my enemy is the enemy I kill last", u3)); + u3.getQuotes().add(new Quote("Beam me up", u3)); + userService.save(u3); + + users = new ArrayList<>(); + users.add(new UserRoles(new User(), r2)); + User u4 = new User("Bob", "password", users); + userService.save(u4); + + users = new ArrayList<>(); + users.add(new UserRoles(new User(), r2)); + User u5 = new User("Jane", "password", users); + userService.save(u5); + } +} \ No newline at end of file diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/StartHereApplication.java b/StartHere/src/main/java/com/lambdaschool/starthere/StartHereApplication.java new file mode 100644 index 00000000..49516924 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/StartHereApplication.java @@ -0,0 +1,27 @@ +package com.lambdaschool.starthere; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ApplicationContext; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +import org.springframework.web.servlet.DispatcherServlet; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +@EnableWebMvc +@EnableJpaAuditing +@SpringBootApplication +@EnableSwagger2 +public class StartHereApplication +{ + + public static void main(String[] args) + { + ApplicationContext ctx = SpringApplication.run(StartHereApplication.class, args); + + DispatcherServlet dispatcherServlet = (DispatcherServlet) ctx.getBean("dispatcherServlet"); + dispatcherServlet.setThrowExceptionIfNoHandlerFound(true); + + } + +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/config/AuthorizationServerConfig.java b/StartHere/src/main/java/com/lambdaschool/starthere/config/AuthorizationServerConfig.java new file mode 100755 index 00000000..f639db89 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/config/AuthorizationServerConfig.java @@ -0,0 +1,54 @@ +package com.lambdaschool.starthere.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; +import org.springframework.security.oauth2.provider.token.TokenStore; + +@Configuration +@EnableAuthorizationServer +public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter +{ + // static final String CLIENT_ID = System.getenv("OAUTHCLIENTID"); // read from environment variable + // static final String CLIENT_SECRET = System.getenv("OAUTHCLIENTSECRET"); // read from environment variable + static final String CLIENT_ID = "lambda-client"; + static final String CLIENT_SECRET = "lambda-secret"; + + static final String GRANT_TYPE_PASSWORD = "password"; + static final String AUTHORIZATION_CODE = "authorization_code"; + static final String REFRESH_TOKEN = "refresh_token"; + static final String IMPLICIT = "implicit"; + static final String SCOPE_READ = "read"; + static final String SCOPE_WRITE = "write"; + static final String TRUST = "trust"; + static final int ACCESS_TOKEN_VALIDITY_SECONDS = 1 * 60 * 60; + static final int FREFRESH_TOKEN_VALIDITY_SECONDS = 6 * 60 * 60; + + @Autowired + private TokenStore tokenStore; + + @Autowired + private AuthenticationManager authenticationManager; + + @Autowired + private PasswordEncoder encoder; + + @Override + public void configure(ClientDetailsServiceConfigurer configurer) throws Exception + { + // .authorizedGrantTypes(GRANT_TYPE_PASSWORD, AUTHORIZATION_CODE, REFRESH_TOKEN, IMPLICIT) + + configurer.inMemory().withClient(CLIENT_ID).secret(encoder.encode(CLIENT_SECRET)).authorizedGrantTypes(GRANT_TYPE_PASSWORD, AUTHORIZATION_CODE, IMPLICIT).scopes(SCOPE_READ, SCOPE_WRITE, TRUST).accessTokenValiditySeconds(ACCESS_TOKEN_VALIDITY_SECONDS).refreshTokenValiditySeconds(FREFRESH_TOKEN_VALIDITY_SECONDS); + } + + @Override + public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception + { + endpoints.tokenStore(tokenStore).authenticationManager(authenticationManager); + } +} \ No newline at end of file diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/config/H2ServerConfiguration.java b/StartHere/src/main/java/com/lambdaschool/starthere/config/H2ServerConfiguration.java new file mode 100644 index 00000000..73984a41 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/config/H2ServerConfiguration.java @@ -0,0 +1,48 @@ +package com.lambdaschool.starthere.config; + +import org.h2.tools.Server; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.sql.SQLException; + +@Configuration +// taken from https://techdev.io/en/developer-blog/querying-the-embedded-h2-database-of-a-spring-boot-application +// necessary for using the database tool built into intellij +public class H2ServerConfiguration +{ + + // TCP port for remote connections, default 9092 + @Value("${h2.tcp.port:9092}") + private String h2TcpPort; + + // Web port, default 8082 + @Value("${h2.web.port:8082}") + private String h2WebPort; + + /** + * TCP connection to connect with SQL clients to the embedded h2 database. + *

+ * Connect to "jdbc:h2:tcp://localhost:9092/mem:testdb", username "sa", password empty. + */ + @Bean + @ConditionalOnExpression("${h2.tcp.enabled:true}") + public Server h2TcpServer() throws SQLException + { + return Server.createTcpServer("-tcp", "-tcpAllowOthers", "-tcpPort", h2TcpPort).start(); + } + + /** + * Web console for the embedded h2 database. + *

+ * Go to http://localhost:8082 and connect to the database "jdbc:h2:mem:testdb", username "sa", password empty. + */ + @Bean + @ConditionalOnExpression("${h2.web.enabled:true}") + public Server h2WebServer() throws SQLException + { + return Server.createWebServer("-web", "-webAllowOthers", "-webPort", h2WebPort).start(); + } +} \ No newline at end of file diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/config/ResourceServerConfig.java b/StartHere/src/main/java/com/lambdaschool/starthere/config/ResourceServerConfig.java new file mode 100755 index 00000000..995c8c57 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/config/ResourceServerConfig.java @@ -0,0 +1,43 @@ +package com.lambdaschool.starthere.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; +import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer; +import org.springframework.security.oauth2.provider.error.OAuth2AccessDeniedHandler; + +@Configuration +@EnableResourceServer +public class ResourceServerConfig extends ResourceServerConfigurerAdapter +{ + + private static final String RESOURCE_ID = "resource_id"; + + @Override + public void configure(ResourceServerSecurityConfigurer resources) + { + resources.resourceId(RESOURCE_ID).stateless(false); + } + + @Override + public void configure(HttpSecurity http) throws Exception + { + // http.anonymous().disable(); + http.authorizeRequests().antMatchers("/", + "/h2-console/**", + "/swagger-resources/**", + "/swagger-resources/configuration/ui", + "/swagger-resources/configuration/security", + "/swagger-resource/**", + "/swagger-ui.html", + "/v2/api-docs", + "/webjars/**", + "/createnewuser", + "/otherapis/**").permitAll().antMatchers("/users/**", "/oauth/revoke-token").authenticated().antMatchers("/roles/**").hasAnyRole("ADMIN", "USER", "DATA").antMatchers("/actuator/**").hasAnyRole("ADMIN").and().exceptionHandling().accessDeniedHandler(new OAuth2AccessDeniedHandler()); + + // http.requiresChannel().anyRequest().requiresSecure(); + http.csrf().disable(); + http.headers().frameOptions().disable(); + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/config/SecurityConfig.java b/StartHere/src/main/java/com/lambdaschool/starthere/config/SecurityConfig.java new file mode 100755 index 00000000..b9c05eb5 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/config/SecurityConfig.java @@ -0,0 +1,52 @@ +package com.lambdaschool.starthere.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.oauth2.provider.token.TokenStore; +import org.springframework.security.oauth2.provider.token.store.InMemoryTokenStore; + +import javax.annotation.Resource; + +@Configuration +@EnableWebSecurity +@EnableGlobalMethodSecurity(prePostEnabled = true) +public class SecurityConfig extends WebSecurityConfigurerAdapter +{ + + @Resource(name = "userService") + private UserDetailsService userDetailsService; + + @Override + @Bean + public AuthenticationManager authenticationManagerBean() throws Exception + { + return super.authenticationManagerBean(); + } + + @Autowired + public void globalUserDetails(AuthenticationManagerBuilder auth) throws Exception + { + auth.userDetailsService(userDetailsService).passwordEncoder(encoder()); + } + + @Bean + public TokenStore tokenStore() + { + return new InMemoryTokenStore(); + } + + @Bean + public PasswordEncoder encoder() + { + return new BCryptPasswordEncoder(); + } +} \ No newline at end of file diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/config/SimpleCorsFilter.java b/StartHere/src/main/java/com/lambdaschool/starthere/config/SimpleCorsFilter.java new file mode 100644 index 00000000..e6ece179 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/config/SimpleCorsFilter.java @@ -0,0 +1,52 @@ +package com.lambdaschool.starthere.config; + +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.http.HttpMethod; +import org.springframework.stereotype.Component; + +import javax.servlet.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +@Component +@Order(Ordered.HIGHEST_PRECEDENCE) +public class SimpleCorsFilter implements Filter +{ + + public SimpleCorsFilter() + { + } + + @Override + public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException + { + HttpServletResponse response = (HttpServletResponse) res; + HttpServletRequest request = (HttpServletRequest) req; + response.setHeader("Access-Control-Allow-Origin", "*"); + // response.setHeader("Access-Control-Allow-Methods", "POST, PUT, GET, OPTIONS, DELETE"); + response.setHeader("Access-Control-Allow-Methods", "*"); + // response.setHeader("Access-Control-Allow-Headers", "x-requested-with, authorization, content-type, access_token"); + response.setHeader("Access-Control-Allow-Headers", "*"); + response.setHeader("Access-Control-Max-Age", "3600"); + + if (HttpMethod.OPTIONS.name().equalsIgnoreCase(((HttpServletRequest) req).getMethod())) + { + response.setStatus(HttpServletResponse.SC_OK); + } else + { + chain.doFilter(req, res); + } + } + + @Override + public void init(FilterConfig filterConfig) throws ServletException + { + } + + @Override + public void destroy() + { + } +} \ No newline at end of file diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/config/Swagger2Config.java b/StartHere/src/main/java/com/lambdaschool/starthere/config/Swagger2Config.java new file mode 100644 index 00000000..a49e6391 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/config/Swagger2Config.java @@ -0,0 +1,33 @@ +package com.lambdaschool.starthere.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.domain.Pageable; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; + +// http://localhost:2019/swagger-ui.html +@Configuration +public class Swagger2Config +{ + @Bean + public Docket api() + { + return new Docket(DocumentationType.SWAGGER_2) + .select().apis(RequestHandlerSelectors.any()) + .paths(PathSelectors.any()).build() + .useDefaultResponseMessages(false) // Allows only my exception responses + .ignoredParameterTypes(Pageable.class) // allows only my paging parameter list + .apiInfo(apiEndPointsInfo()); + } + + private ApiInfo apiEndPointsInfo() + { + return new ApiInfoBuilder().title("Java String Back End Starting Project").description("A starting application for developing Java Spring Back End Projects").contact(new Contact("John Mitchell", "http://www.lambdaschool.com", "john@lambdaschool.com")).license("MIT").licenseUrl("https://github.com/LambdaSchool/java-starthere/blob/master/LICENSE").version("1.0.0").build(); + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/config/WebConfig.java b/StartHere/src/main/java/com/lambdaschool/starthere/config/WebConfig.java new file mode 100644 index 00000000..1c9ba680 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/config/WebConfig.java @@ -0,0 +1,17 @@ +package com.lambdaschool.starthere.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfig implements WebMvcConfigurer +{ + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) + { + registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/"); + + registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/APIsController.java b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/APIsController.java new file mode 100644 index 00000000..9b2c47e8 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/APIsController.java @@ -0,0 +1,56 @@ +package com.lambdaschool.starthere.controllers; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.lambdaschool.starthere.models.APIOpenLibrary; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.RestTemplate; + +import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/otherapis") +public class APIsController +{ + private static final Logger logger = LoggerFactory.getLogger(RolesController.class); + private RestTemplate restTemplate = new RestTemplate(); + + // taken from https://openlibrary.org/dev/docs/api/books + // returns a list of books - you can include multiple ISBNs in a single request + // This API returns a map instead of the standard list + // + // localhost:2019/otherapis/openlibrary/0982477562 + + @GetMapping(value = "/openlibrary/{isbn}", + produces = {"application/json"}) + public ResponseEntity listABookGivenISBN(HttpServletRequest request, @PathVariable String isbn) + { + logger.trace(request.getRequestURI() + " accessed"); + + String requestURL = "https://openlibrary.org/api/books?bibkeys=" + "ISBN:" + isbn + "&format=json"; + + ParameterizedTypeReference> responseType = + new ParameterizedTypeReference>() {}; + ResponseEntity> responseEntity = + restTemplate.exchange(requestURL, + HttpMethod.GET, null, responseType); + + Map ourBooks = responseEntity.getBody(); + + System.out.println(ourBooks); + return new ResponseEntity<>(ourBooks, HttpStatus.OK); + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/LogoutController.java b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/LogoutController.java new file mode 100644 index 00000000..ce35115c --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/LogoutController.java @@ -0,0 +1,33 @@ +package com.lambdaschool.starthere.controllers; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.security.oauth2.common.OAuth2AccessToken; +import org.springframework.security.oauth2.provider.token.TokenStore; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseStatus; + +import javax.servlet.http.HttpServletRequest; + +@Controller +public class LogoutController +{ + @Autowired + private TokenStore tokenStore; + + @RequestMapping(value = "/oauth/revoke-token", + method = RequestMethod.GET) + @ResponseStatus(HttpStatus.OK) + public void logout(HttpServletRequest request) + { + String authHeader = request.getHeader("Authorization"); + if (authHeader != null) + { + String tokenValue = authHeader.replace("Bearer", "").trim(); + OAuth2AccessToken accessToken = tokenStore.readAccessToken(tokenValue); + tokenStore.removeAccessToken(accessToken); + } + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/OpenController.java b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/OpenController.java new file mode 100644 index 00000000..f5a8038b --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/OpenController.java @@ -0,0 +1,59 @@ +package com.lambdaschool.starthere.controllers; + +import com.lambdaschool.starthere.models.User; +import com.lambdaschool.starthere.models.UserRoles; +import com.lambdaschool.starthere.services.RoleService; +import com.lambdaschool.starthere.services.UserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; + +@RestController +public class OpenController +{ + private static final Logger logger = LoggerFactory.getLogger(RolesController.class); + + @Autowired + private UserService userService; + + @Autowired + private RoleService roleService; + + @PostMapping(value = "/createnewuser", + consumes = {"application/json"}, + produces = {"application/json"}) + public ResponseEntity addNewUser(HttpServletRequest request, @Valid + @RequestBody + User newuser) throws URISyntaxException + { + logger.trace(request.getRequestURI() + " accessed"); + + ArrayList newRoles = new ArrayList<>(); + newRoles.add(new UserRoles(newuser, roleService.findByName("user"))); + newuser.setUserRoles(newRoles); + + newuser = userService.save(newuser); + + // set the location header for the newly created resource - to another controller! + HttpHeaders responseHeaders = new HttpHeaders(); + URI newRestaurantURI = ServletUriComponentsBuilder.fromUriString(request.getServerName() + ":" + request.getLocalPort() + "/users/user/{userId}").buildAndExpand(newuser.getUserid()).toUri(); + responseHeaders.setLocation(newRestaurantURI); + + + return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED); + } + +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/QuotesController.java b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/QuotesController.java new file mode 100755 index 00000000..27eb1bde --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/QuotesController.java @@ -0,0 +1,94 @@ +package com.lambdaschool.starthere.controllers; + +import com.lambdaschool.starthere.models.Quote; +import com.lambdaschool.starthere.services.QuoteService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; + +@RestController +@RequestMapping("/quotes") +public class QuotesController +{ + private static final Logger logger = LoggerFactory.getLogger(RolesController.class); + + @Autowired + QuoteService quoteService; + + @GetMapping(value = "/quotes", + produces = {"application/json"}) + public ResponseEntity listAllQuotes(HttpServletRequest request) + { + logger.trace(request.getRequestURI() + " accessed"); + + List allQuotes = quoteService.findAll(); + return new ResponseEntity<>(allQuotes, HttpStatus.OK); + } + + + @GetMapping(value = "/quote/{quoteId}", + produces = {"application/json"}) + public ResponseEntity getQuote(HttpServletRequest request, + @PathVariable + Long quoteId) + { + logger.trace(request.getRequestURI() + " accessed"); + + Quote q = quoteService.findQuoteById(quoteId); + return new ResponseEntity<>(q, HttpStatus.OK); + } + + + @GetMapping(value = "/username/{userName}", + produces = {"application/json"}) + public ResponseEntity findQuoteByUserName(HttpServletRequest request, + @PathVariable + String userName) + { + logger.trace(request.getRequestURI() + " accessed"); + + List theQuotes = quoteService.findByUserName(userName); + return new ResponseEntity<>(theQuotes, HttpStatus.OK); + } + + + @PostMapping(value = "/quote") + public ResponseEntity addNewQuote(HttpServletRequest request, @Valid + @RequestBody + Quote newQuote) throws URISyntaxException + { + logger.trace(request.getRequestURI() + " accessed"); + + newQuote = quoteService.save(newQuote); + + // set the location header for the newly created resource + HttpHeaders responseHeaders = new HttpHeaders(); + URI newQuoteURI = ServletUriComponentsBuilder.fromCurrentRequest().path("/{quoteid}").buildAndExpand(newQuote.getQuotesid()).toUri(); + responseHeaders.setLocation(newQuoteURI); + + return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED); + } + + + @DeleteMapping("/quote/{id}") + public ResponseEntity deleteQuoteById(HttpServletRequest request, + @PathVariable + long id) + { + logger.trace(request.getRequestURI() + " accessed"); + + quoteService.delete(id); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/RolesController.java b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/RolesController.java new file mode 100644 index 00000000..fd5f6743 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/RolesController.java @@ -0,0 +1,84 @@ +package com.lambdaschool.starthere.controllers; + +import com.lambdaschool.starthere.models.Role; +import com.lambdaschool.starthere.services.RoleService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; + +@RestController +@RequestMapping("/roles") +public class RolesController +{ + private static final Logger logger = LoggerFactory.getLogger(RolesController.class); + @Autowired + RoleService roleService; + + @GetMapping(value = "/roles", + produces = {"application/json"}) + public ResponseEntity listRoles(HttpServletRequest request) + { + logger.trace(request.getRequestURI() + " accessed"); + + List allRoles = roleService.findAll(); + return new ResponseEntity<>(allRoles, HttpStatus.OK); + } + + + @GetMapping(value = "/role/{roleId}", + produces = {"application/json"}) + public ResponseEntity getRole(HttpServletRequest request, + @PathVariable + Long roleId) + { + logger.trace(request.getRequestURI() + " accessed"); + + Role r = roleService.findRoleById(roleId); + return new ResponseEntity<>(r, HttpStatus.OK); + } + + + @PostMapping(value = "/role") + public ResponseEntity addNewRole(HttpServletRequest request, @Valid + @RequestBody + Role newRole) throws URISyntaxException + { + logger.trace(request.getRequestURI() + " accessed"); + + newRole = roleService.save(newRole); + + // set the location header for the newly created resource + HttpHeaders responseHeaders = new HttpHeaders(); + URI newRoleURI = ServletUriComponentsBuilder.fromCurrentRequest().path("/{roleid}").buildAndExpand(newRole.getRoleid()).toUri(); + responseHeaders.setLocation(newRoleURI); + + return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED); + } + + +// @PostMapping(value = "/user/{userid}/role/{roleid}") + + + + @DeleteMapping("/role/{id}") + public ResponseEntity deleteRoleById(HttpServletRequest request, + @PathVariable + long id) + { + logger.trace(request.getRequestURI() + " accessed"); + + roleService.delete(id); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/UserController.java b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/UserController.java new file mode 100755 index 00000000..66446698 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/UserController.java @@ -0,0 +1,114 @@ +package com.lambdaschool.starthere.controllers; + +import com.lambdaschool.starthere.models.User; +import com.lambdaschool.starthere.services.UserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.core.Authentication; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; + +@RestController +@RequestMapping("/users") +public class UserController +{ + private static final Logger logger = LoggerFactory.getLogger(RolesController.class); + + @Autowired + private UserService userService; + + @PreAuthorize("hasAuthority('ROLE_ADMIN')") + @GetMapping(value = "/users", + produces = {"application/json"}) + public ResponseEntity listAllUsers(HttpServletRequest request) + { + logger.trace(request.getRequestURI() + " accessed"); + + List myUsers = userService.findAll(); + return new ResponseEntity<>(myUsers, HttpStatus.OK); + } + + + @PreAuthorize("hasAuthority('ROLE_ADMIN')") + @GetMapping(value = "/user/{userId}", + produces = {"application/json"}) + public ResponseEntity getUser(HttpServletRequest request, + @PathVariable + Long userId) + { + logger.trace(request.getRequestURI() + " accessed"); + + User u = userService.findUserById(userId); + return new ResponseEntity<>(u, HttpStatus.OK); + } + + + @GetMapping(value = "/getusername", + produces = {"application/json"}) + @ResponseBody + public ResponseEntity getCurrentUserName(HttpServletRequest request, Authentication authentication) + { + logger.trace(request.getRequestURI() + " accessed"); + + return new ResponseEntity<>(authentication.getPrincipal(), HttpStatus.OK); + } + + + @PreAuthorize("hasAuthority('ROLE_ADMIN')") + @PostMapping(value = "/user", + consumes = {"application/json"}, + produces = {"application/json"}) + public ResponseEntity addNewUser(HttpServletRequest request, @Valid + @RequestBody + User newuser) throws URISyntaxException + { + logger.trace(request.getRequestURI() + " accessed"); + + newuser = userService.save(newuser); + + // set the location header for the newly created resource + HttpHeaders responseHeaders = new HttpHeaders(); + URI newUserURI = ServletUriComponentsBuilder.fromCurrentRequest().path("/{userid}").buildAndExpand(newuser.getUserid()).toUri(); + responseHeaders.setLocation(newUserURI); + + return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED); + } + + + @PutMapping(value = "/user/{id}") + public ResponseEntity updateUser(HttpServletRequest request, + @RequestBody + User updateUser, + @PathVariable + long id) + { + logger.trace(request.getRequestURI() + " accessed"); + + userService.update(updateUser, id); + return new ResponseEntity<>(HttpStatus.OK); + } + + + @PreAuthorize("hasAuthority('ROLE_ADMIN')") + @DeleteMapping("/user/{id}") + public ResponseEntity deleteUserById(HttpServletRequest request, + @PathVariable + long id) + { + logger.trace(request.getRequestURI() + " accessed"); + + userService.delete(id); + return new ResponseEntity<>(HttpStatus.OK); + } +} \ No newline at end of file diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/exceptions/ResourceNotFoundException.java b/StartHere/src/main/java/com/lambdaschool/starthere/exceptions/ResourceNotFoundException.java new file mode 100644 index 00000000..b9cc5018 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/exceptions/ResourceNotFoundException.java @@ -0,0 +1,20 @@ +package com.lambdaschool.starthere.exceptions; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ResponseStatus; + +@ResponseStatus(value = HttpStatus.NOT_FOUND) +public class ResourceNotFoundException extends RuntimeException +{ + private static final long serialVersionUID = 1L; + + public ResourceNotFoundException(String message) + { + super(message); + } + + public ResourceNotFoundException(String message, Throwable cause) + { + super(message, cause); + } +} \ No newline at end of file diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/exceptions/ValidationError.java b/StartHere/src/main/java/com/lambdaschool/starthere/exceptions/ValidationError.java new file mode 100644 index 00000000..8094994e --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/exceptions/ValidationError.java @@ -0,0 +1,27 @@ +package com.lambdaschool.starthere.exceptions; + +public class ValidationError +{ + private String Code; + private String message; + + public String getCode() + { + return Code; + } + + public void setCode(String code) + { + Code = code; + } + + public String getMessage() + { + return message; + } + + public void setMessage(String message) + { + this.message = message; + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/handlers/RestExceptionHandler.java b/StartHere/src/main/java/com/lambdaschool/starthere/handlers/RestExceptionHandler.java new file mode 100644 index 00000000..73344928 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/handlers/RestExceptionHandler.java @@ -0,0 +1,82 @@ +package com.lambdaschool.starthere.handlers; + +import com.lambdaschool.starthere.exceptions.ResourceNotFoundException; +import com.lambdaschool.starthere.models.ErrorDetail; +import org.springframework.beans.TypeMismatchException; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.MessageSource; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.servlet.NoHandlerFoundException; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; + +import javax.persistence.EntityNotFoundException; +import javax.servlet.http.HttpServletRequest; +import java.util.Date; + +// bean shared across controller classes +@ControllerAdvice +public class RestExceptionHandler extends ResponseEntityExceptionHandler +{ + @Autowired + private MessageSource messageSource; + + @ExceptionHandler({ResourceNotFoundException.class, EntityNotFoundException.class, UsernameNotFoundException.class}) + public ResponseEntity handleResourceNotFoundException(ResourceNotFoundException rnfe, HttpServletRequest request) + { + ErrorDetail errorDetail = new ErrorDetail(); + errorDetail.setTimestamp(new Date().getTime()); + errorDetail.setStatus(HttpStatus.NOT_FOUND.value()); + errorDetail.setTitle("Resource Not Found"); + errorDetail.setDetail(rnfe.getMessage()); + errorDetail.setDeveloperMessage(rnfe.getClass().getName()); + + return new ResponseEntity<>(errorDetail, null, HttpStatus.NOT_FOUND); + } + + + @Override + protected ResponseEntity handleTypeMismatch(TypeMismatchException ex, HttpHeaders headers, HttpStatus status, WebRequest request) + { + ErrorDetail errorDetail = new ErrorDetail(); + errorDetail.setTimestamp(new Date().getTime()); + errorDetail.setStatus(HttpStatus.BAD_REQUEST.value()); + errorDetail.setTitle(ex.getPropertyName()); + errorDetail.setDetail(ex.getMessage()); + errorDetail.setDeveloperMessage(request.getDescription(true)); + + return new ResponseEntity<>(errorDetail, null, HttpStatus.NOT_FOUND); + } + + @Override + protected ResponseEntity handleNoHandlerFoundException(NoHandlerFoundException ex, HttpHeaders headers, HttpStatus status, WebRequest request) + { + ErrorDetail errorDetail = new ErrorDetail(); + errorDetail.setTimestamp(new Date().getTime()); + errorDetail.setStatus(HttpStatus.NOT_FOUND.value()); + errorDetail.setTitle(ex.getRequestURL()); + errorDetail.setDetail(request.getDescription(true)); + errorDetail.setDeveloperMessage("Rest Handler Not Found (check for valid URI)"); + + return new ResponseEntity<>(errorDetail, null, HttpStatus.NOT_FOUND); + } + + @Override + protected ResponseEntity handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException ex, HttpHeaders headers, HttpStatus status, WebRequest request) + { + ErrorDetail errorDetail = new ErrorDetail(); + errorDetail.setTimestamp(new Date().getTime()); + errorDetail.setStatus(HttpStatus.NOT_FOUND.value()); + errorDetail.setTitle(ex.getMethod()); + errorDetail.setDetail(request.getDescription(true)); + errorDetail.setDeveloperMessage("HTTP Method Not Valid for Endpoint (check for valid URI and proper HTTP Method)"); + + return new ResponseEntity<>(errorDetail, null, HttpStatus.NOT_FOUND); + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/models/APIOpenLibrary.java b/StartHere/src/main/java/com/lambdaschool/starthere/models/APIOpenLibrary.java new file mode 100644 index 00000000..91879d0b --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/models/APIOpenLibrary.java @@ -0,0 +1,72 @@ +package com.lambdaschool.starthere.models; + +// Taken from the output of https://openlibrary.org/api/books?bibkeys=ISBN:0982477562&format=json +// This class must match the JSON object +public class APIOpenLibrary +{ + private String bib_key; + private String preview; + private String thumbnail_url; + private String preview_url; + private String info_url; + + public APIOpenLibrary() + { + } + + public String getBib_key() + { + return bib_key; + } + + public void setBib_key(String bib_key) + { + this.bib_key = bib_key; + } + + public String getThumbnail_url() + { + return thumbnail_url; + } + + public void setThumbnail_url(String thumbnail_url) + { + this.thumbnail_url = thumbnail_url; + } + + public String getPreview() + { + return preview; + } + + public void setPreview(String preview) + { + this.preview = preview; + } + + public String getPreview_url() + { + return preview_url; + } + + public void setPreview_url(String preview_url) + { + this.preview_url = preview_url; + } + + public String getInfo_url() + { + return info_url; + } + + public void setInfo_url(String info_url) + { + this.info_url = info_url; + } + + @Override + public String toString() + { + return "APIOpenLibrary{" + "bib_key='" + bib_key + '\'' + ", preview='" + preview + '\'' + ", thumbnail_url='" + thumbnail_url + '\'' + ", preview_url='" + preview_url + '\'' + ", info_url='" + info_url + '\'' + '}'; + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/models/Auditable.java b/StartHere/src/main/java/com/lambdaschool/starthere/models/Auditable.java new file mode 100644 index 00000000..8004fe50 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/models/Auditable.java @@ -0,0 +1,33 @@ +package com.lambdaschool.starthere.models; + +import org.springframework.data.annotation.CreatedBy; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedBy; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import javax.persistence.EntityListeners; +import javax.persistence.MappedSuperclass; +import javax.persistence.Temporal; +import java.util.Date; + +import static javax.persistence.TemporalType.TIMESTAMP; + +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +abstract class Auditable +{ + @CreatedBy + protected String createdBy; + + @CreatedDate + @Temporal(TIMESTAMP) + protected Date createdDate; + + @LastModifiedBy + protected String lastModifiedBy; + + @LastModifiedDate + @Temporal(TIMESTAMP) + protected Date lastModifiedDate; +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/models/ErrorDetail.java b/StartHere/src/main/java/com/lambdaschool/starthere/models/ErrorDetail.java new file mode 100644 index 00000000..e5fb648b --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/models/ErrorDetail.java @@ -0,0 +1,82 @@ +package com.lambdaschool.starthere.models; + + +import com.lambdaschool.starthere.exceptions.ValidationError; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +// adapted from https://tools.ietf.org/html/rfc7807 +public class ErrorDetail +{ + private String title; + private int status; + private String detail; + private String timestamp; + private String developerMessage; + private Map> errors = new HashMap>(); + + public String getTitle() + { + return title; + } + + public void setTitle(String title) + { + this.title = title; + } + + public int getStatus() + { + return status; + } + + public void setStatus(int status) + { + this.status = status; + } + + public String getDetail() + { + return detail; + } + + public void setDetail(String detail) + { + this.detail = detail; + } + + public String getTimestamp() + { + return timestamp; + } + + public void setTimestamp(Long timestamp) + { + this.timestamp = new SimpleDateFormat("dd MMM yyyy HH:mm:ss:SSS Z").format(new Date(timestamp)); + } + + public String getDeveloperMessage() + { + return developerMessage; + } + + public void setDeveloperMessage(String developerMessage) + { + this.developerMessage = developerMessage; + } + + public Map> getErrors() + { + return errors; + } + + public void setErrors(Map> errors) + { + this.errors = errors; + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/models/Quote.java b/StartHere/src/main/java/com/lambdaschool/starthere/models/Quote.java new file mode 100755 index 00000000..b92cae40 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/models/Quote.java @@ -0,0 +1,63 @@ +package com.lambdaschool.starthere.models; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import javax.persistence.*; + +@Entity +@Table(name = "quotes") +public class Quote extends Auditable +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long quotesid; + + @Column(nullable = false) + private String quote; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "userid", + nullable = false) + @JsonIgnoreProperties({"quotes", "hibernateLazyInitializer"}) + private User user; + + public Quote() + { + } + + public Quote(String quote, User user) + { + this.quote = quote; + this.user = user; + } + + public long getQuotesid() + { + return quotesid; + } + + public void setQuotesid(long quotesid) + { + this.quotesid = quotesid; + } + + public String getQuote() + { + return quote; + } + + public void setQuote(String quote) + { + this.quote = quote; + } + + public User getUser() + { + return user; + } + + public void setUser(User user) + { + this.user = user; + } +} \ No newline at end of file diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/models/Role.java b/StartHere/src/main/java/com/lambdaschool/starthere/models/Role.java new file mode 100644 index 00000000..9584c1b2 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/models/Role.java @@ -0,0 +1,64 @@ +package com.lambdaschool.starthere.models; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "roles") +public class Role extends Auditable +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long roleid; + + @Column(nullable = false, + unique = true) + private String name; + + @OneToMany(mappedBy = "role", + cascade = CascadeType.ALL) + @JsonIgnoreProperties("role") + private List userRoles = new ArrayList<>(); + + public Role() + { + } + + public Role(String name) + { + this.name = name; + } + + public long getRoleid() + { + return roleid; + } + + public void setRoleid(long roleid) + { + this.roleid = roleid; + } + + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + public List getUserRoles() + { + return userRoles; + } + + public void setUserRoles(List userRoles) + { + this.userRoles = userRoles; + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/models/User.java b/StartHere/src/main/java/com/lambdaschool/starthere/models/User.java new file mode 100644 index 00000000..a267e7b0 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/models/User.java @@ -0,0 +1,124 @@ +package com.lambdaschool.starthere.models; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +// User is considered the parent entity + +@Entity +@Table(name = "users") +public class User extends Auditable +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long userid; + + @Column(nullable = false, + unique = true) + private String username; + + @Column(nullable = false) + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String password; + + @OneToMany(mappedBy = "user", + cascade = CascadeType.ALL) + @JsonIgnoreProperties("user") + private List userRoles = new ArrayList<>(); + + @OneToMany(mappedBy = "user", + cascade = CascadeType.ALL, + orphanRemoval = true) + @JsonIgnoreProperties("user") + private List quotes = new ArrayList<>(); + + public User() + { + } + + public User(String username, String password, List userRoles) + { + setUsername(username); + setPassword(password); + for (UserRoles ur : userRoles) + { + ur.setUser(this); + } + this.userRoles = userRoles; + } + + 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 getPassword() + { + return password; + } + + public void setPassword(String password) + { + BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); + this.password = passwordEncoder.encode(password); + } + + public void setPasswordNoEncrypt(String password) + { + this.password = password; + } + + public List getUserRoles() + { + return userRoles; + } + + public void setUserRoles(List userRoles) + { + this.userRoles = userRoles; + } + + public List getQuotes() + { + return quotes; + } + + public void setQuotes(List quotes) + { + this.quotes = quotes; + } + + public List getAuthority() + { + List rtnList = new ArrayList<>(); + + for (UserRoles r : this.userRoles) + { + String myRole = "ROLE_" + r.getRole().getName().toUpperCase(); + rtnList.add(new SimpleGrantedAuthority(myRole)); + } + + return rtnList; + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/models/UserRoles.java b/StartHere/src/main/java/com/lambdaschool/starthere/models/UserRoles.java new file mode 100644 index 00000000..460fea56 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/models/UserRoles.java @@ -0,0 +1,75 @@ +package com.lambdaschool.starthere.models; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Objects; + +@Entity +@Table(name = "userroles") +public class UserRoles extends Auditable implements Serializable +{ + @Id + @ManyToOne + @JoinColumn(name = "userid") + @JsonIgnoreProperties("userRoles") + private User user; + + @Id + @ManyToOne + @JoinColumn(name = "roleid") + @JsonIgnoreProperties("userRoles") + private Role role; + + public UserRoles() + { + } + + public UserRoles(User user, Role role) + { + this.user = user; + this.role = role; + } + + public User getUser() + { + return user; + } + + public void setUser(User user) + { + this.user = user; + } + + public Role getRole() + { + return role; + } + + public void setRole(Role role) + { + this.role = role; + } + + @Override + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (!(o instanceof UserRoles)) + { + return false; + } + UserRoles userRoles = (UserRoles) o; + return getUser().equals(userRoles.getUser()) && getRole().equals(userRoles.getRole()); + } + + @Override + public int hashCode() + { + return Objects.hash(getUser(), getRole()); + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/models/UserTypes.java b/StartHere/src/main/java/com/lambdaschool/starthere/models/UserTypes.java new file mode 100644 index 00000000..5d76bff5 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/models/UserTypes.java @@ -0,0 +1,6 @@ +package com.lambdaschool.starthere.models; + +abstract class UserTypes +{ + protected String UserName; +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/repository/QuoteRepository.java b/StartHere/src/main/java/com/lambdaschool/starthere/repository/QuoteRepository.java new file mode 100755 index 00000000..09082dd4 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/repository/QuoteRepository.java @@ -0,0 +1,9 @@ +package com.lambdaschool.starthere.repository; + +import com.lambdaschool.starthere.models.Quote; +import org.springframework.data.repository.CrudRepository; + +public interface QuoteRepository extends CrudRepository +{ + +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/repository/RoleRepository.java b/StartHere/src/main/java/com/lambdaschool/starthere/repository/RoleRepository.java new file mode 100755 index 00000000..ea8ef9dc --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/repository/RoleRepository.java @@ -0,0 +1,23 @@ +package com.lambdaschool.starthere.repository; + +import com.lambdaschool.starthere.models.Role; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.springframework.transaction.annotation.Transactional; + +public interface RoleRepository extends CrudRepository +{ + @Transactional + @Modifying + @Query(value = "DELETE from UserRoles where userid = :userid") + void deleteUserRolesByUserId(long userid); + + @Transactional + @Modifying + @Query(value = "INSERT INTO UserRoles(userid, roleid) values (:userid, :roleid)", + nativeQuery = true) + void insertUserRoles(long userid, long roleid); + + Role findByNameIgnoreCase(String name); +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/repository/UserRepository.java b/StartHere/src/main/java/com/lambdaschool/starthere/repository/UserRepository.java new file mode 100755 index 00000000..84160b73 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/repository/UserRepository.java @@ -0,0 +1,9 @@ +package com.lambdaschool.starthere.repository; + +import com.lambdaschool.starthere.models.User; +import org.springframework.data.repository.CrudRepository; + +public interface UserRepository extends CrudRepository +{ + User findByUsername(String username); +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/QuoteService.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/QuoteService.java new file mode 100755 index 00000000..06101a80 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/QuoteService.java @@ -0,0 +1,18 @@ +package com.lambdaschool.starthere.services; + +import com.lambdaschool.starthere.models.Quote; + +import java.util.List; + +public interface QuoteService +{ + List findAll(); + + Quote findQuoteById(long id); + + List findByUserName(String username); + + void delete(long id); + + Quote save(Quote quote); +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/QuoteServiceImpl.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/QuoteServiceImpl.java new file mode 100755 index 00000000..2e865b70 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/QuoteServiceImpl.java @@ -0,0 +1,70 @@ +package com.lambdaschool.starthere.services; + +import com.lambdaschool.starthere.exceptions.ResourceNotFoundException; +import com.lambdaschool.starthere.models.Quote; +import com.lambdaschool.starthere.repository.QuoteRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +@Service(value = "quoteService") +public class QuoteServiceImpl implements QuoteService +{ + @Autowired + private QuoteRepository quoterepos; + + @Override + public List findAll() + { + List list = new ArrayList<>(); + quoterepos.findAll().iterator().forEachRemaining(list::add); + return list; + } + + @Override + public Quote findQuoteById(long id) + { + return quoterepos.findById(id).orElseThrow(() -> new ResourceNotFoundException(Long.toString(id))); + } + + @Override + public void delete(long id) + { + if (quoterepos.findById(id).isPresent()) + { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (quoterepos.findById(id).get().getUser().getUsername().equalsIgnoreCase(authentication.getName())) + { + quoterepos.deleteById(id); + } else + { + throw new ResourceNotFoundException(id + " " + authentication.getName()); + } + } else + { + throw new ResourceNotFoundException(Long.toString(id)); + } + } + + @Transactional + @Override + public Quote save(Quote quote) + { + return quoterepos.save(quote); + } + + @Override + public List findByUserName(String username) + { + List list = new ArrayList<>(); + quoterepos.findAll().iterator().forEachRemaining(list::add); + + list.removeIf(q -> !q.getUser().getUsername().equalsIgnoreCase(username)); + return list; + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/RoleService.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/RoleService.java new file mode 100644 index 00000000..ac7a8626 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/RoleService.java @@ -0,0 +1,18 @@ +package com.lambdaschool.starthere.services; + +import com.lambdaschool.starthere.models.Role; + +import java.util.List; + +public interface RoleService +{ + List findAll(); + + Role findRoleById(long id); + + void delete(long id); + + Role save(Role role); + + Role findByName(String name); +} \ No newline at end of file diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/RoleServiceImpl.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/RoleServiceImpl.java new file mode 100644 index 00000000..7019d630 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/RoleServiceImpl.java @@ -0,0 +1,62 @@ +package com.lambdaschool.starthere.services; + +import com.lambdaschool.starthere.exceptions.ResourceNotFoundException; +import com.lambdaschool.starthere.models.Role; +import com.lambdaschool.starthere.repository.RoleRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +@Service(value = "roleService") +public class RoleServiceImpl implements RoleService +{ + @Autowired + RoleRepository rolerepos; + + @Override + public List findAll() + { + List list = new ArrayList<>(); + rolerepos.findAll().iterator().forEachRemaining(list::add); + return list; + } + + + @Override + public Role findRoleById(long id) + { + return rolerepos.findById(id).orElseThrow(() -> new ResourceNotFoundException(Long.toString(id))); + } + + @Override + public Role findByName(String name) + { + Role rr = rolerepos.findByNameIgnoreCase(name); + + if (rr != null) + { + return rr; + } else + { + throw new ResourceNotFoundException(name); + } + } + + @Override + public void delete(long id) + { + rolerepos.findById(id).orElseThrow(() -> new ResourceNotFoundException(Long.toString(id))); + rolerepos.deleteById(id); + } + + + @Transactional + @Override + public Role save(Role role) + { + return rolerepos.save(role); + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/UserAuditing.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/UserAuditing.java new file mode 100755 index 00000000..02ef6017 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/UserAuditing.java @@ -0,0 +1,29 @@ +package com.lambdaschool.starthere.services; + +import org.springframework.data.domain.AuditorAware; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Component; + +import java.util.Optional; + +@Component +public class UserAuditing implements AuditorAware +{ + + @Override + public Optional getCurrentAuditor() + { + String uname; + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication != null) + { + uname = authentication.getName(); + } else + { + uname = "SYSTEM"; + } + return Optional.of(uname); + } + +} \ No newline at end of file diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/UserService.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/UserService.java new file mode 100755 index 00000000..9f7ba10b --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/UserService.java @@ -0,0 +1,19 @@ +package com.lambdaschool.starthere.services; + +import com.lambdaschool.starthere.models.User; + +import java.util.List; + +public interface UserService +{ + + List findAll(); + + User findUserById(long id); + + void delete(long id); + + User save(User user); + + User update(User user, long id); +} \ No newline at end of file diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/UserServiceImpl.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/UserServiceImpl.java new file mode 100755 index 00000000..25c65f0a --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/UserServiceImpl.java @@ -0,0 +1,145 @@ +package com.lambdaschool.starthere.services; + +import com.lambdaschool.starthere.exceptions.ResourceNotFoundException; +import com.lambdaschool.starthere.models.Quote; +import com.lambdaschool.starthere.models.User; +import com.lambdaschool.starthere.models.UserRoles; +import com.lambdaschool.starthere.repository.RoleRepository; +import com.lambdaschool.starthere.repository.UserRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + + +@Service(value = "userService") +public class UserServiceImpl implements UserDetailsService, UserService +{ + + @Autowired + private UserRepository userrepos; + + @Autowired + private RoleRepository rolerepos; + + @Transactional + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException + { + User user = userrepos.findByUsername(username); + if (user == null) + { + throw new UsernameNotFoundException("Invalid username or password."); + } + return new org.springframework.security.core.userdetails.User(user.getUsername(), user.getPassword(), user.getAuthority()); + } + + public User findUserById(long id) throws ResourceNotFoundException + { + return userrepos.findById(id).orElseThrow(() -> new ResourceNotFoundException(Long.toString(id))); + } + + public List findAll() + { + List list = new ArrayList<>(); + userrepos.findAll().iterator().forEachRemaining(list::add); + return list; + } + + @Override + public void delete(long id) + { + if (userrepos.findById(id).isPresent()) + { + userrepos.deleteById(id); + } else + { + throw new ResourceNotFoundException(Long.toString(id)); + } + } + + @Transactional + @Override + public User save(User user) + { + User newUser = new User(); + newUser.setUsername(user.getUsername()); + newUser.setPasswordNoEncrypt(user.getPassword()); + + ArrayList newRoles = new ArrayList<>(); + for (UserRoles ur : user.getUserRoles()) + { + newRoles.add(new UserRoles(newUser, ur.getRole())); + } + newUser.setUserRoles(newRoles); + + for (Quote q : user.getQuotes()) + { + newUser.getQuotes().add(new Quote(q.getQuote(), newUser)); + } + + return userrepos.save(newUser); + } + + + @Transactional + @Override + public User update(User user, long id) + { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + User currentUser = userrepos.findByUsername(authentication.getName()); + + if (currentUser != null) + { + if (id == currentUser.getUserid()) + { + if (user.getUsername() != null) + { + currentUser.setUsername(user.getUsername()); + } + + if (user.getPassword() != null) + { + currentUser.setPasswordNoEncrypt(user.getPassword()); + } + + if (user.getUserRoles().size() > 0) + { + // with so many relationships happening, I decided to go + // with old school queries + // delete the old ones + rolerepos.deleteUserRolesByUserId(currentUser.getUserid()); + + // add the new ones + for (UserRoles ur : user.getUserRoles()) + { + rolerepos.insertUserRoles(id, ur.getRole().getRoleid()); + } + } + + if (user.getQuotes().size() > 0) + { + for (Quote q : user.getQuotes()) + { + currentUser.getQuotes().add(new Quote(q.getQuote(), currentUser)); + } + } + + return userrepos.save(currentUser); + } else + { + throw new ResourceNotFoundException(id + " Not current user"); + } + } else + { + throw new ResourceNotFoundException(authentication.getName()); + } + + } +} diff --git a/StartHere/src/main/resources/application.properties b/StartHere/src/main/resources/application.properties new file mode 100644 index 00000000..64b270e2 --- /dev/null +++ b/StartHere/src/main/resources/application.properties @@ -0,0 +1,61 @@ +server.port=${PORT:2019} +# server.servlet.context-path=/apis + +# Begin h2 configuration +spring.h2.console.enabled=true +spring.h2.console.path=/h2-console +spring.h2.console.settings.web-allow-others=true +# End h2 configuration + + +# Begin PostgreSQL local configuration +#spring.datasource.url=jdbc:postgresql://localhost:5432/dbstarthere +#spring.datasource.username=postgres +#spring.datasource.password=${MYDBPASSWORD} +#spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true +# End PostgreSQL local configuration + +# Begin PostgreSQL heroku configuration +# heroku config -a jrmmba-starthere +# postgres://rrwzjxlkniayov:83e8dc9dc5a3c3a30e40dde8fb62941da11030b3953709f5c8f808690e776c71@ec2-54-243-241-62.compute-1.amazonaws.com:5432/d7bl8dlv2l83jj +# posgress://username :password @url :5432/dbname +# check environment variables: +# heroku run echo \$SPRING_DATASOURCE_URL -a jrmmba-starthere +# heroku run echo \$SPRING_DATASOURCE_USERNAME -a jrmmba-starthere +# heroku run echo \$SPRING_DATASOURCE_PASSWORD -a jrmmba-starthere +### If you environment variables get set, just use those! +#spring.datasource.url=${SPRING_DATASOURCE_URL} +#spring.datasource.username=${SPRING_DATASOURCE_USERNAME} +#spring.datasource.password=${SPRING_DATASOURCE_PASSWORD} +#spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true +### If your environment variables do not get set +#spring.datasource.url=${SPRING_DATASOURCE_URL:jdbc:postgresql://ec2-54-243-241-62.compute-1.amazonaws.com:5432/d7bl8dlv2l83jj?user=rrwzjxlkniayov&password=83e8dc9dc5a3c3a30e40dde8fb62941da11030b3953709f5c8f808690e776c71&sslmode=require} +#spring.datasource.username=${SPRING_DATASOURCE_USERNAME:rrwzjxlkniayov} +#spring.datasource.password=${SPRING_DATASOURCE_PASSWORD:83e8dc9dc5a3c3a30e40dde8fb62941da11030b3953709f5c8f808690} +#spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true +# End PostgreSQL heroku configuration + + +# What do with the schema +# drop n create table again, good for testing +spring.jpa.hibernate.ddl-auto=create +spring.datasource.initialization-mode=always + +# Good for production! +#spring.jpa.hibernate.ddl-auto=update +#spring.datasource.initialization-mode=never + + +# Feature that determines what happens when no accessors are found for a type +# (and there are no annotations to indicate it is meant to be serialized). +spring.jackson.serialization.fail-on-empty-beans=false + + +# Turns off Spring Boot automatic exception handling +server.error.whitelabel.enabled=false + + +# needed for actuators to work +management.endpoints.web.exposure.include=* +management.endpoint.health.show-details=always +management.endpoint.shutdown.enabled=true diff --git a/StartHere/src/main/resources/info/ChangeLog.txt b/StartHere/src/main/resources/info/ChangeLog.txt new file mode 100644 index 00000000..b0b52856 --- /dev/null +++ b/StartHere/src/main/resources/info/ChangeLog.txt @@ -0,0 +1,13 @@ +Starting June 20, 2019 + +* Remove generation of refresh token for oauth2 +* Reading Client Id and Secret from environment variables +* Changed EntityNotFoundException to ResourceNotFoundException + +June 23 + +* Added Access to OpenLibrary API + +Todo + +Swagger diff --git a/StartHere/src/main/resources/info/curl.txt b/StartHere/src/main/resources/info/curl.txt new file mode 100644 index 00000000..094dea7e --- /dev/null +++ b/StartHere/src/main/resources/info/curl.txt @@ -0,0 +1,31 @@ +curl -X POST --user "lambda-client:lambda-secret" -d "grant_type=password&username=admin&password=password" http://localhost:2019/oauth/token + +curl -X GET -H "Accept: application/json" -H "Authorization: Bearer d781956f-32c1-46c3-a531-dc8f64466f7b" http://localhost:2019/users/users + +curl -X POST --user "lambda-client:lambda-secret" -d 'grant_type=password&username=barnbarn&password=ILuvM4th!' http://localhost:2019/oauth/token + +curl -X GET -H "Accept: application/json" -H "Authorization: Bearer acd0586d-fc11-4715-a2ae-9acab553672c" http://localhost:2019/users/users + +curl -X GET -H "Accept: application/json" -H "Authorization: Bearer d781956f-32c1-46c3-a531-dc8f64466f7b" http://localhost:2019/users/users + +curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer d781956f-32c1-46c3-a531-dc8f64466f7b" -d "{ \"username\":\"snoopy\", \"password\":\"password\", \"roleid\":"1" }" http://localhost:2019/users/user + +curl -X GET -H "Accept: application/json" -H "Authorization: Bearer d781956f-32c1-46c3-a531-dc8f64466f7b" http://localhost:2019/users/users + +curl -X GET -H "Accept: application/json" -H "Authorization: Bearer d781956f-32c1-46c3-a531-dc8f64466f7b" http://localhost:2019/users/user/14 + +curl -X DELETE -H "Authorization: Bearer d781956f-32c1-46c3-a531-dc8f64466f7b" http://localhost:2019/users/user/14 + +curl -X GET -H "Accept: application/json" -H "Authorization: Bearer d781956f-32c1-46c3-a531-dc8f64466f7b" http://localhost:2019/users/user/14 + +curl -X POST -H "Content-Type: application/json" -d "{\"username\": \"Ginger\", \"password\": \"EATEATEAT\"}" http://localhost:2019/createnewuser + +curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer d781956f-32c1-46c3-a531-dc8f64466f7b" -d "{ \"username\": \"Snoopy\", \"password\": \"password\", \"userRoles\": [ { \"role\": { \"roleid\": 1 } } ], \"quotes\": [ { \"quote\": \"The Red Baron\" } ]}" http://localhost:2019/users/user + +curl -X GET -H "Accept: application/json" -H "Authorization: Bearer d781956f-32c1-46c3-a531-dc8f64466f7b" http://localhost:2019/users/user/15 + +curl -X GET -H "Accept: application/json" -H "Authorization: Bearer d781956f-32c1-46c3-a531-dc8f64466f7b" http://localhost:2019/oauth/revoke-token + +*** using a different host + +curl -X POST --user "lambda-client:lambda-secret" -d "grant_type=password&username=admin&password=password" http://jrmmba-starthere.herokuapp.com/oauth/token diff --git a/StartHere/src/main/resources/logback-spring.xml b/StartHere/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..17531612 --- /dev/null +++ b/StartHere/src/main/resources/logback-spring.xml @@ -0,0 +1,77 @@ + + + + + + [%d{yyyy-MM-dd' 'HH:mm:ss.SSS}] [%25.25class] [%thread] [%line] [%-5level] %m%n + + + + + /tmp/var/mylog.log + true + + [%d{yyyy-MM-dd' 'HH:mm:ss.SSS}] [%C] [%t] [%L] [%-5p] %m%n + + + + + + /tmp/var/mylog.%d{yyyy-MM-dd HH}.%i.txt + 10MB + + + 30 + 3GB + + + + + /tmp/var/myTomcatLog.log + true + + [%d{yyyy-MM-dd' 'HH:mm:ss.sss}] [%C] [%t] [%L] [%-5p] %m%n + + + + + + /tmp/var/myTomcatLog.%d{yyyy-MM-dd HH}.%i.txt + 10MB + + + 30 + 3GB + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 4a2800a77e74ba5e131ef77ca5b6c9c8b0e25a4f Mon Sep 17 00:00:00 2001 From: atolmie Date: Fri, 28 Jun 2019 11:11:41 -0500 Subject: [PATCH 2/9] added controllers and data --- StartHere/pom.xml | 4 +-- .../starthere/config/WebConfig.java | 2 +- .../controllers/AuthorController.java | 6 +++++ .../controllers/BooksController.java | 6 +++++ StartHere/src/main/resources/data.sql | 27 +++++++++++++++++++ 5 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/controllers/BooksController.java create mode 100644 StartHere/src/main/resources/data.sql diff --git a/StartHere/pom.xml b/StartHere/pom.xml index 07463214..866ca5b9 100644 --- a/StartHere/pom.xml +++ b/StartHere/pom.xml @@ -136,7 +136,7 @@ - jrmmba-starthere + project.artifactId @@ -151,7 +151,7 @@ heroku-maven-plugin 2.0.3 - jrmmba-starthere + starthere false diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/config/WebConfig.java b/StartHere/src/main/java/com/lambdaschool/starthere/config/WebConfig.java index 1c9ba680..a6370930 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/config/WebConfig.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/config/WebConfig.java @@ -5,7 +5,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration -public class WebConfig implements WebMvcConfigurer +public class WebConfig implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java new file mode 100644 index 00000000..1631e64d --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java @@ -0,0 +1,6 @@ +package com.lambdaschool.starthere.controllers; + +public class AuthorController +{ + +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BooksController.java b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BooksController.java new file mode 100644 index 00000000..f23f51e5 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BooksController.java @@ -0,0 +1,6 @@ +package com.lambdaschool.starthere.controllers; + +public class BooksController +{ + +} diff --git a/StartHere/src/main/resources/data.sql b/StartHere/src/main/resources/data.sql new file mode 100644 index 00000000..40d6e967 --- /dev/null +++ b/StartHere/src/main/resources/data.sql @@ -0,0 +1,27 @@ +INSERT INTO section (sectionid, name) VALUES (1, 'Fiction'); +INSERT INTO section (sectionid, name) VALUES (2, 'Technology'); +INSERT INTO section (sectionid, name) VALUES (3, 'Travel'); +INSERT INTO section (sectionid, name) VALUES (4, 'Business'); +INSERT INTO section (sectionid, name) VALUES (5, 'Religion'); + +INSERT INTO author (authorid, fname, lname) VALUES (1, 'John', 'Mitchell'); +INSERT INTO author (authorid, fname, lname) VALUES (2, 'Dan', 'Brown'); +INSERT INTO author (authorid, fname, lname) VALUES (3, 'Jerry', 'Poe'); +INSERT INTO author (authorid, fname, lname) VALUES (4, 'Wells', 'Teague'); +INSERT INTO author (authorid, fname, lname) VALUES (5, 'George', 'Gallinger'); +INSERT INTO author (authorid, fname, lname) VALUES (6, 'Ian', 'Stewart'); + +INSERT INTO book (bookid, title, ISBN, copy, sectionid) VALUES (1, 'Flatterland', '9780738206752', 2001, 1); +INSERT INTO book (bookid, title, ISBN, copy, sectionid) VALUES (2, 'Digital Fortess', '9788489367012', 2007, 1); +INSERT INTO book (bookid, title, ISBN, copy, sectionid) VALUES (3, 'The Da Vinci Code', '9780307474278', 2009, 1); +INSERT INTO book (bookid, title, ISBN, copy, sectionid) VALUES (4, 'Essentials of Finance', '1314241651234', NULL, 4); +INSERT INTO book (bookid, title, ISBN, copy, sectionid) VALUES (5, 'Calling Texas Home', '1885171382134', 2000, 3); + +INSERT INTO wrote (bookid, authorid) VALUES (1, 6); +INSERT INTO wrote (bookid, authorid) VALUES (2, 2); +INSERT INTO wrote (bookid, authorid) VALUES (3, 2); +INSERT INTO wrote (bookid, authorid) VALUES (4, 5); +INSERT INTO wrote (bookid, authorid) VALUES (4, 3); +INSERT INTO wrote (bookid, authorid) VALUES (5, 4); + +alter sequence hibernate_sequence restart with 25; \ No newline at end of file From 49c93007803b088114606edf5568a01753d90720 Mon Sep 17 00:00:00 2001 From: atolmie Date: Fri, 28 Jun 2019 11:40:02 -0500 Subject: [PATCH 3/9] added models --- .../lambdaschool/starthere/models/Author.java | 69 ++++++++++++++++ .../lambdaschool/starthere/models/Book.java | 79 +++++++++++++++++++ 2 files changed, 148 insertions(+) create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/models/Author.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/models/Book.java diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/models/Author.java b/StartHere/src/main/java/com/lambdaschool/starthere/models/Author.java new file mode 100644 index 00000000..85e6e7db --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/models/Author.java @@ -0,0 +1,69 @@ +package com.lambdaschool.starthere.models; + +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.ManyToMany; +import java.awt.print.Book; +import java.util.ArrayList; +import java.util.List; + +public class Author extends Auditable +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long authorid; + + private String lastname; + + private String firstname; + + @ManyToMany(mappedBy = "authorList") + List bookList = new ArrayList<>(); + + public Author() { + } + + public Author(String lastname, String firstname) { + this.lastname = lastname; + this.firstname = firstname; + } + + public Author(String lastname, String firstname, List bookList) { + this.lastname = lastname; + this.firstname = firstname; + this.bookList = bookList; + } + + public long getAuthorid() { + return authorid; + } + + public void setAuthorid(long authorid) { + this.authorid = authorid; + } + + public String getLastname() { + return lastname; + } + + public void setLastname(String lastname) { + this.lastname = lastname; + } + + public String getFirstname() { + return firstname; + } + + public void setFirstname(String firstname) { + this.firstname = firstname; + } + + public List getBookList() { + return bookList; + } + + public void setBookList(List bookList) { + this.bookList = bookList; + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/models/Book.java b/StartHere/src/main/java/com/lambdaschool/starthere/models/Book.java new file mode 100644 index 00000000..5bdeceef --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/models/Book.java @@ -0,0 +1,79 @@ +package com.lambdaschool.starthere.models; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +public class Book extends Auditable +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long bookid; + + @Column(nullable = false) + private String booktitle; + + private String isbn; + + private String copy; + + @ManyToMany + @JoinTable(name = "bookauthors", joinColumns = {@JoinColumn(name = "bookid")}, inverseJoinColumns = {@JoinColumn(name = "authorid")}) + List authorList = new ArrayList<>(); + + public Book() { + } + + public Book(String booktitle, String isbn, String copy) { + this.booktitle = booktitle; + this.isbn = isbn; + this.copy = copy; + } + + public Book(String booktitle, String isbn, String copy, List authorList) { + this.booktitle = booktitle; + this.isbn = isbn; + this.copy = copy; + this.authorList = authorList; + } + + public long getBookid() { + return bookid; + } + + public void setBookid(long bookid) { + this.bookid = bookid; + } + + public String getBooktitle() { + return booktitle; + } + + public void setBooktitle(String booktitle) { + this.booktitle = booktitle; + } + + public String getIsbn() { + return isbn; + } + + public void setIsbn(String isbn) { + this.isbn = isbn; + } + + public String getCopy() { + return copy; + } + + public void setCopy(String copy) { + this.copy = copy; + } + + public List getAuthorList() { + return authorList; + } + + public void setAuthorList(List authorList) { + this.authorList = authorList; + } +} From 8f4a032c08912f4fe63673b7f3345448cec628d5 Mon Sep 17 00:00:00 2001 From: atolmie Date: Fri, 28 Jun 2019 11:48:46 -0500 Subject: [PATCH 4/9] added repos --- .../starthere/repository/AuthorRepository.java | 9 +++++++++ .../starthere/repository/BookRepository.java | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/repository/AuthorRepository.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/repository/BookRepository.java diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/repository/AuthorRepository.java b/StartHere/src/main/java/com/lambdaschool/starthere/repository/AuthorRepository.java new file mode 100644 index 00000000..4d3ddece --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/repository/AuthorRepository.java @@ -0,0 +1,9 @@ +package com.lambdaschool.starthere.repository; + +import com.lambdaschool.starthere.models.Author; +import org.springframework.data.repository.PagingAndSortingRepository; + +public interface AuthorRepository extends PagingAndSortingRepository +{ + +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/repository/BookRepository.java b/StartHere/src/main/java/com/lambdaschool/starthere/repository/BookRepository.java new file mode 100644 index 00000000..66589aa1 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/repository/BookRepository.java @@ -0,0 +1,9 @@ +package com.lambdaschool.starthere.repository; + +import com.lambdaschool.starthere.models.Book; +import org.springframework.data.repository.PagingAndSortingRepository; + +public interface BookRepository extends PagingAndSortingRepository +{ + +} From 5761ad2afbe7991dd2e2660d3787a71d6e2cb31a Mon Sep 17 00:00:00 2001 From: atolmie Date: Fri, 28 Jun 2019 12:06:32 -0500 Subject: [PATCH 5/9] added services --- .../starthere/services/AuthorService.java | 11 ++++ .../starthere/services/AuthorServiceImpl.java | 22 +++++++ .../starthere/services/BookService.java | 16 +++++ .../starthere/services/BookServiceImpl.java | 62 +++++++++++++++++++ 4 files changed, 111 insertions(+) create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorService.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/services/BookService.java create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorService.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorService.java new file mode 100644 index 00000000..44ffabcb --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorService.java @@ -0,0 +1,11 @@ +package com.lambdaschool.starthere.services; + +import com.lambdaschool.starthere.models.Author; + + +import java.util.List; + +public interface AuthorService +{ + List findAll(); +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java new file mode 100644 index 00000000..dbd8bc1f --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java @@ -0,0 +1,22 @@ +package com.lambdaschool.starthere.services; + +import com.lambdaschool.starthere.models.Author; +import com.lambdaschool.starthere.repository.AuthorRepository; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.ArrayList; +import java.util.List; + +public class AuthorServiceImpl implements AuthorService +{ + @Autowired + private AuthorRepository repo; + + + @Override + public List findAll() { + List authorList = new ArrayList<>(); + repo.findAll().iterator().forEachRemaining(authorList::add); + return authorList; + } +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/BookService.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookService.java new file mode 100644 index 00000000..c8c19bab --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookService.java @@ -0,0 +1,16 @@ +package com.lambdaschool.starthere.services; + +import com.lambdaschool.starthere.models.Book; + +import java.util.List; + +public interface BookService +{ + List findAll(); + + Book updateBook(Book book, long id); + + void delete(long id); + + void assignAuthor(long bookid, long authorid); +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java new file mode 100644 index 00000000..48280d56 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java @@ -0,0 +1,62 @@ +package com.lambdaschool.starthere.services; + +import com.lambdaschool.starthere.models.Book; +import com.lambdaschool.starthere.repository.AuthorRepository; +import com.lambdaschool.starthere.repository.BookRepository; +import org.springframework.beans.factory.annotation.Autowired; + +import javax.persistence.EntityNotFoundException; +import java.util.ArrayList; +import java.util.List; + +public class BookServiceImpl implements BookService +{ + @Autowired + private BookRepository repo; + + @Autowired + private AuthorRepository authorRepo; + + @Override + public List findAll() { + List bookList = new ArrayList<>(); + repo.findAll().iterator().forEachRemaining(bookList::add); + return bookList; + } + + @Override + public Book updateBook(Book book, long id) { + Book currentBook = repo.findById(id).orElseThrow(EntityNotFoundException::new); + if(book.getBooktitle() != null){ + currentBook.setBooktitle(book.getBooktitle()); + } + if(book.getCopy() != null){ + currentBook.setCopy(book.getCopy()); + } + if (book.getIsbn() != null){ + currentBook.setIsbn(book.getIsbn()); + } + if (book.getAuthorList() != null && book.getAuthorList().size() > 0){ + currentBook.setAuthorList(book.getAuthorList()); + } + + repo.save(currentBook); + return currentBook; + } + + @Override + public void delete(long id) { + if (repo.findById(id).isPresent()){ + repo.deleteById(id); + }else{ + throw new EntityNotFoundException(); + } + + } + + @Override + public void assignAuthor(long bookid, long authorid) { + Book currentBook = repo.findById(bookid).orElseThrow(EntityNotFoundException::new); + currentBook.getAuthorList().add(authorRepo.findById(authorid).orElseThrow(EntityNotFoundException::new)); + } +} From 3bfb703ea3d01873dd8e3d6402b31a2839d8e84f Mon Sep 17 00:00:00 2001 From: atolmie Date: Fri, 28 Jun 2019 12:19:45 -0500 Subject: [PATCH 6/9] updated controllers --- .../config/ResourceServerConfig.java | 2 + .../controllers/AuthorController.java | 15 +++++++ .../starthere/controllers/BookController.java | 39 +++++++++++++++++++ .../controllers/BooksController.java | 6 --- .../starthere/services/AuthorServiceImpl.java | 2 + .../starthere/services/BookServiceImpl.java | 5 +++ 6 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/controllers/BookController.java delete mode 100644 StartHere/src/main/java/com/lambdaschool/starthere/controllers/BooksController.java diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/config/ResourceServerConfig.java b/StartHere/src/main/java/com/lambdaschool/starthere/config/ResourceServerConfig.java index 995c8c57..3bacb929 100755 --- a/StartHere/src/main/java/com/lambdaschool/starthere/config/ResourceServerConfig.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/config/ResourceServerConfig.java @@ -33,6 +33,8 @@ public void configure(HttpSecurity http) throws Exception "/swagger-ui.html", "/v2/api-docs", "/webjars/**", + "/authors", + "/books", "/createnewuser", "/otherapis/**").permitAll().antMatchers("/users/**", "/oauth/revoke-token").authenticated().antMatchers("/roles/**").hasAnyRole("ADMIN", "USER", "DATA").antMatchers("/actuator/**").hasAnyRole("ADMIN").and().exceptionHandling().accessDeniedHandler(new OAuth2AccessDeniedHandler()); diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java index 1631e64d..05beaf1d 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java @@ -1,6 +1,21 @@ package com.lambdaschool.starthere.controllers; +import com.lambdaschool.starthere.services.AuthorService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController public class AuthorController { + @Autowired + private AuthorService authorService; + + @GetMapping(value = "/authors") + public ResponseEntity findAllAuthors(){ + return new ResponseEntity<>(authorService.findAll(), HttpStatus.OK); + } } diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BookController.java b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BookController.java new file mode 100644 index 00000000..3bf50da9 --- /dev/null +++ b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BookController.java @@ -0,0 +1,39 @@ +package com.lambdaschool.starthere.controllers; + +import com.lambdaschool.starthere.models.Author; +import com.lambdaschool.starthere.models.Book; +import com.lambdaschool.starthere.services.BookService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RestController +public class BookController +{ + @Autowired + private BookService bookService; + + @GetMapping(value = "/books") + public ResponseEntity findAllBooks(){ + return new ResponseEntity<>(bookService.findAll(), HttpStatus.OK); + } + + @PutMapping(value = "/data/books/{id}") + public ResponseEntity updateBook(@PathVariable long id, @RequestBody Book book){ + return new ResponseEntity<>(bookService.updateBook(book, id), HttpStatus.OK); + } + + @PostMapping(value = "/data/books/{id}") + public ResponseEntity matchBookWithAuthor(@PathVariable long id, @RequestBody Author author){ + bookService.assignAuthor(id, author.getAuthorid()); + return new ResponseEntity<>(HttpStatus.OK); + } + + @DeleteMapping(value = "/data/books/{id}") + public ResponseEntity deleteBook(@PathVariable long id){ + bookService.delete(id); + return new ResponseEntity<>(HttpStatus.OK); + } + +} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BooksController.java b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BooksController.java deleted file mode 100644 index f23f51e5..00000000 --- a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BooksController.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.lambdaschool.starthere.controllers; - -public class BooksController -{ - -} diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java index dbd8bc1f..feee5cc2 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java @@ -3,10 +3,12 @@ import com.lambdaschool.starthere.models.Author; import com.lambdaschool.starthere.repository.AuthorRepository; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +@Service(value = "authorService") public class AuthorServiceImpl implements AuthorService { @Autowired diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java index 48280d56..9f533389 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java @@ -4,11 +4,14 @@ import com.lambdaschool.starthere.repository.AuthorRepository; import com.lambdaschool.starthere.repository.BookRepository; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.persistence.EntityNotFoundException; import java.util.ArrayList; import java.util.List; +@Service(value = "bookService") public class BookServiceImpl implements BookService { @Autowired @@ -24,6 +27,7 @@ public List findAll() { return bookList; } + @Transactional @Override public Book updateBook(Book book, long id) { Book currentBook = repo.findById(id).orElseThrow(EntityNotFoundException::new); @@ -54,6 +58,7 @@ public void delete(long id) { } + @Transactional @Override public void assignAuthor(long bookid, long authorid) { Book currentBook = repo.findById(bookid).orElseThrow(EntityNotFoundException::new); From 32cae184248c0b31a4c085dc2218cae83d8fae94 Mon Sep 17 00:00:00 2001 From: atolmie Date: Fri, 28 Jun 2019 12:48:05 -0500 Subject: [PATCH 7/9] updated seed data --- .../com/lambdaschool/starthere/SeedData.java | 41 +++++++++++++++++-- .../controllers/AuthorController.java | 6 ++- .../starthere/controllers/BookController.java | 3 +- .../lambdaschool/starthere/models/Author.java | 3 ++ .../lambdaschool/starthere/models/Book.java | 6 ++- .../starthere/services/AuthorService.java | 1 + .../starthere/services/AuthorServiceImpl.java | 5 +++ .../starthere/services/BookService.java | 2 + .../starthere/services/BookServiceImpl.java | 4 ++ 9 files changed, 64 insertions(+), 7 deletions(-) diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/SeedData.java b/StartHere/src/main/java/com/lambdaschool/starthere/SeedData.java index f879d427..af899c1a 100755 --- a/StartHere/src/main/java/com/lambdaschool/starthere/SeedData.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/SeedData.java @@ -1,9 +1,8 @@ package com.lambdaschool.starthere; -import com.lambdaschool.starthere.models.Quote; -import com.lambdaschool.starthere.models.Role; -import com.lambdaschool.starthere.models.User; -import com.lambdaschool.starthere.models.UserRoles; +import com.lambdaschool.starthere.models.*; +import com.lambdaschool.starthere.services.AuthorService; +import com.lambdaschool.starthere.services.BookService; import com.lambdaschool.starthere.services.RoleService; import com.lambdaschool.starthere.services.UserService; import org.springframework.beans.factory.annotation.Autowired; @@ -12,6 +11,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Arrays; @Transactional @Component @@ -23,6 +23,13 @@ public class SeedData implements CommandLineRunner @Autowired UserService userService; + @Autowired + AuthorService authorService; + + @Autowired + BookService bookService; + + @Override public void run(String[] args) throws Exception @@ -70,5 +77,31 @@ public void run(String[] args) throws Exception users.add(new UserRoles(new User(), r2)); User u5 = new User("Jane", "password", users); userService.save(u5); + + Author a1 = new Author("Mitchell", "John"); + Author a2 = new Author("Brown", "Dan"); + Author a3 = new Author("Poe", "Jerry"); + Author a4 = new Author("Teague", "Wells"); + Author a5 = new Author("Gallinger", "George"); + Author a6 = new Author("Stewart", "Ian"); + + authorService.save(a1); + authorService.save(a2); + authorService.save(a3); + authorService.save(a4); + authorService.save(a5); + authorService.save(a6); + + Book b1 = new Book("Flatterland", "9780738206752", "2001", new ArrayList<>(Arrays.asList(a6))); + Book b2 = new Book("Digital Fortess", "9788489367012", "2007", new ArrayList<>(Arrays.asList(a2))); + Book b3 = new Book("The Da Vinci Code", "9780307474278", "2009", new ArrayList<>(Arrays.asList(a2))); + Book b4 = new Book("Essentials of Finance", "1314241651234", null, new ArrayList<>(Arrays.asList(a5, a3))); + Book b5 = new Book("Calling Texas Home", "1885171382134", "2000", new ArrayList<>(Arrays.asList(a4))); + + bookService.save(b1); + bookService.save(b2); + bookService.save(b3); + bookService.save(b4); + bookService.save(b5); } } \ No newline at end of file diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java index 05beaf1d..f167d740 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java @@ -1,5 +1,6 @@ package com.lambdaschool.starthere.controllers; +import com.lambdaschool.starthere.models.Author; import com.lambdaschool.starthere.services.AuthorService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -7,6 +8,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController public class AuthorController { @@ -15,7 +18,8 @@ public class AuthorController @GetMapping(value = "/authors") public ResponseEntity findAllAuthors(){ - return new ResponseEntity<>(authorService.findAll(), HttpStatus.OK); + List authorList = authorService.findAll(); + return new ResponseEntity<>(authorList, HttpStatus.OK); } } diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BookController.java b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BookController.java index 3bf50da9..29c75110 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BookController.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BookController.java @@ -21,7 +21,8 @@ public ResponseEntity findAllBooks(){ @PutMapping(value = "/data/books/{id}") public ResponseEntity updateBook(@PathVariable long id, @RequestBody Book book){ - return new ResponseEntity<>(bookService.updateBook(book, id), HttpStatus.OK); + bookService.updateBook(book, id); + return new ResponseEntity<>(book, HttpStatus.OK); } @PostMapping(value = "/data/books/{id}") diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/models/Author.java b/StartHere/src/main/java/com/lambdaschool/starthere/models/Author.java index 85e6e7db..8685dc0c 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/models/Author.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/models/Author.java @@ -1,5 +1,7 @@ package com.lambdaschool.starthere.models; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -19,6 +21,7 @@ public class Author extends Auditable private String firstname; @ManyToMany(mappedBy = "authorList") + @JsonIgnoreProperties(value = "authorList") List bookList = new ArrayList<>(); public Author() { diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/models/Book.java b/StartHere/src/main/java/com/lambdaschool/starthere/models/Book.java index 5bdeceef..70513e3e 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/models/Book.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/models/Book.java @@ -1,9 +1,12 @@ package com.lambdaschool.starthere.models; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + import javax.persistence.*; import java.util.ArrayList; import java.util.List; +@Entity public class Book extends Auditable { @Id @@ -18,7 +21,8 @@ public class Book extends Auditable private String copy; @ManyToMany - @JoinTable(name = "bookauthors", joinColumns = {@JoinColumn(name = "bookid")}, inverseJoinColumns = {@JoinColumn(name = "authorid")}) + @JsonIgnoreProperties(value = "bookList") + @JoinTable(name = "wrote", joinColumns = {@JoinColumn(name = "bookid")}, inverseJoinColumns = {@JoinColumn(name = "authorid")}) List authorList = new ArrayList<>(); public Book() { diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorService.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorService.java index 44ffabcb..348b6cb4 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorService.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorService.java @@ -8,4 +8,5 @@ public interface AuthorService { List findAll(); + void save(Author author); } diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java index feee5cc2..955f7dd1 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java @@ -21,4 +21,9 @@ public List findAll() { repo.findAll().iterator().forEachRemaining(authorList::add); return authorList; } + + @Override + public void save(Author author) { + repo.save(author); + } } diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/BookService.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookService.java index c8c19bab..aea1d0c6 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/services/BookService.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookService.java @@ -13,4 +13,6 @@ public interface BookService void delete(long id); void assignAuthor(long bookid, long authorid); + + void save(Book book); } diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java index 9f533389..07a6e029 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java @@ -64,4 +64,8 @@ public void assignAuthor(long bookid, long authorid) { Book currentBook = repo.findById(bookid).orElseThrow(EntityNotFoundException::new); currentBook.getAuthorList().add(authorRepo.findById(authorid).orElseThrow(EntityNotFoundException::new)); } + @Override + public void save(Book book) { + repo.save(book); + } } From ed2526579efb6fbcc7c85b78f372738a5aa21e31 Mon Sep 17 00:00:00 2001 From: atolmie Date: Fri, 28 Jun 2019 13:09:32 -0500 Subject: [PATCH 8/9] added pageable --- .../controllers/AuthorController.java | 19 ++++++++++-- .../starthere/controllers/BookController.java | 30 +++++++++++++++++-- .../starthere/services/AuthorService.java | 3 +- .../starthere/services/AuthorServiceImpl.java | 3 +- .../starthere/services/BookService.java | 3 +- .../starthere/services/BookServiceImpl.java | 5 ++-- 6 files changed, 54 insertions(+), 9 deletions(-) diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java index f167d740..a4eb9a54 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/AuthorController.java @@ -2,12 +2,16 @@ import com.lambdaschool.starthere.models.Author; import com.lambdaschool.starthere.services.AuthorService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import java.awt.print.Pageable; import java.util.List; @RestController @@ -16,9 +20,20 @@ public class AuthorController @Autowired private AuthorService authorService; + @ApiOperation(value = "Return all Authors", response = Author.class, responseContainer = "List") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", dataType = "integr", paramType = "query", + value = "Results page you want to retrieve (0..N)"), + @ApiImplicitParam(name = "size", dataType = "integer", paramType = "query", + value = "Number of records per page."), + @ApiImplicitParam(name = "sort", allowMultiple = true, dataType = "string", paramType = "query", + value = "Sorting criteria in the format: property(,asc|desc). " + + "Default sort order is ascending. " + + "Multiple sort criteria are supported.")}) + @GetMapping(value = "/authors") - public ResponseEntity findAllAuthors(){ - List authorList = authorService.findAll(); + public ResponseEntity findAllAuthors(Pageable pageable){ + List authorList = authorService.findAll(pageable); return new ResponseEntity<>(authorList, HttpStatus.OK); } diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BookController.java b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BookController.java index 29c75110..f94b63fc 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BookController.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/controllers/BookController.java @@ -2,22 +2,42 @@ import com.lambdaschool.starthere.models.Author; import com.lambdaschool.starthere.models.Book; +import com.lambdaschool.starthere.models.ErrorDetail; import com.lambdaschool.starthere.services.BookService; +import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.awt.print.Pageable; + @RestController public class BookController { @Autowired private BookService bookService; + @ApiOperation(value = "Return all Books", response = Book.class, responseContainer = "List") + @ApiImplicitParams({ + @ApiImplicitParam(name = "page", dataType = "integr", paramType = "query", + value = "Results page you want to retrieve (0..N)"), + @ApiImplicitParam(name = "size", dataType = "integer", paramType = "query", + value = "Number of records per page."), + @ApiImplicitParam(name = "sort", allowMultiple = true, dataType = "string", paramType = "query", + value = "Sorting criteria in the format: property(,asc|desc). " + + "Default sort order is ascending. " + + "Multiple sort criteria are supported.")}) + @GetMapping(value = "/books") - public ResponseEntity findAllBooks(){ - return new ResponseEntity<>(bookService.findAll(), HttpStatus.OK); + public ResponseEntity findAllBooks(Pageable pageable){ + return new ResponseEntity<>(bookService.findAll(pageable), HttpStatus.OK); } + @ApiOperation(value = "Update a current Book", response = Book.class) + @ApiResponses(value = { + @ApiResponse(code = 201, message = "Successfully updated book", response = void.class), + @ApiResponse(code = 500, message = "Failed to update book", response = ErrorDetail.class) + }) @PutMapping(value = "/data/books/{id}") public ResponseEntity updateBook(@PathVariable long id, @RequestBody Book book){ @@ -31,6 +51,12 @@ public ResponseEntity matchBookWithAuthor(@PathVariable long id, @RequestBody return new ResponseEntity<>(HttpStatus.OK); } + @ApiOperation(value = "Delete a current book", response = void.class) + @ApiResponses(value = { + @ApiResponse(code = 201, message = "Succesfully deleted book", response = void.class), + @ApiResponse(code = 500, message = "Failed to delete book", response = ErrorDetail.class) + }) + @DeleteMapping(value = "/data/books/{id}") public ResponseEntity deleteBook(@PathVariable long id){ bookService.delete(id); diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorService.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorService.java index 348b6cb4..c228f0de 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorService.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorService.java @@ -3,10 +3,11 @@ import com.lambdaschool.starthere.models.Author; +import java.awt.print.Pageable; import java.util.List; public interface AuthorService { - List findAll(); + List findAll(Pageable pageable); void save(Author author); } diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java index 955f7dd1..8957c683 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/AuthorServiceImpl.java @@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.awt.print.Pageable; import java.util.ArrayList; import java.util.List; @@ -16,7 +17,7 @@ public class AuthorServiceImpl implements AuthorService @Override - public List findAll() { + public List findAll(Pageable pageable) { List authorList = new ArrayList<>(); repo.findAll().iterator().forEachRemaining(authorList::add); return authorList; diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/BookService.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookService.java index aea1d0c6..5b5f238a 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/services/BookService.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookService.java @@ -2,11 +2,12 @@ import com.lambdaschool.starthere.models.Book; +import java.awt.print.Pageable; import java.util.List; public interface BookService { - List findAll(); + List findAll(Pageable pageable); Book updateBook(Book book, long id); diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java index 07a6e029..ad88ddc6 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java @@ -8,6 +8,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.persistence.EntityNotFoundException; +import java.awt.print.Pageable; import java.util.ArrayList; import java.util.List; @@ -21,9 +22,9 @@ public class BookServiceImpl implements BookService private AuthorRepository authorRepo; @Override - public List findAll() { + public List findAll(Pageable pageable) { List bookList = new ArrayList<>(); - repo.findAll().iterator().forEachRemaining(bookList::add); + repo.findAll(pageable).iterator().forEachRemaining(bookList::add); return bookList; } From a34371400ada1c9a98864652b7d071c71cc2f13c Mon Sep 17 00:00:00 2001 From: atolmie Date: Fri, 28 Jun 2019 13:18:04 -0500 Subject: [PATCH 9/9] ready to deploy --- StartHere/pom.xml | 2 +- .../com/lambdaschool/starthere/services/BookServiceImpl.java | 2 ++ StartHere/src/main/resources/application.properties | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/StartHere/pom.xml b/StartHere/pom.xml index 866ca5b9..9d175d2c 100644 --- a/StartHere/pom.xml +++ b/StartHere/pom.xml @@ -151,7 +151,7 @@ heroku-maven-plugin 2.0.3 - starthere + bookstore false diff --git a/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java index ad88ddc6..3b03ade5 100644 --- a/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java +++ b/StartHere/src/main/java/com/lambdaschool/starthere/services/BookServiceImpl.java @@ -4,6 +4,8 @@ import com.lambdaschool.starthere.repository.AuthorRepository; import com.lambdaschool.starthere.repository.BookRepository; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.data.web.SpringDataWebProperties; + import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/StartHere/src/main/resources/application.properties b/StartHere/src/main/resources/application.properties index 64b270e2..4e385559 100644 --- a/StartHere/src/main/resources/application.properties +++ b/StartHere/src/main/resources/application.properties @@ -38,8 +38,8 @@ spring.h2.console.settings.web-allow-others=true # What do with the schema # drop n create table again, good for testing -spring.jpa.hibernate.ddl-auto=create -spring.datasource.initialization-mode=always +spring.jpa.hibernate.ddl-auto=none +spring.datasource.initialization-mode=never # Good for production! #spring.jpa.hibernate.ddl-auto=update