diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..153c9335 --- /dev/null +++ b/.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/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..1ff940cf --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,125 @@ +/* +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/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..01e67997 Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..cd0d451c --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip diff --git a/mvnw b/mvnw new file mode 100644 index 00000000..8b9da3b8 --- /dev/null +++ b/mvnw @@ -0,0 +1,286 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # 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/mvnw.cmd b/mvnw.cmd new file mode 100644 index 00000000..fef5a8f7 --- /dev/null +++ b/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/pom.xml b/pom.xml new file mode 100644 index 00000000..31a0977b --- /dev/null +++ b/pom.xml @@ -0,0 +1,96 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.4.RELEASE + + + com.lambdaschool + java-zoo + 0.0.1-SNAPSHOT + java-zoo + Demo project for Spring Boot + + + 11 + + + + + 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 + + + com.h2database + h2 + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + + + org.springframework.security.oauth + spring-security-oauth2 + 2.3.5.RELEASE + + + + + javax.xml.bind + jaxb-api + 2.3.1 + + + + + javax.activation + activation + 1.1.1 + + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/com/lambdaschool/javazoo/JavaZooApplication.java b/src/main/java/com/lambdaschool/javazoo/JavaZooApplication.java new file mode 100644 index 00000000..7ef3bafb --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/JavaZooApplication.java @@ -0,0 +1,17 @@ +package com.lambdaschool.javazoo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@EnableJpaAuditing +@SpringBootApplication +public class JavaZooApplication +{ + + public static void main(String[] args) + { + SpringApplication.run(JavaZooApplication.class, args); + } + +} diff --git a/src/main/java/com/lambdaschool/javazoo/SeedData.java b/src/main/java/com/lambdaschool/javazoo/SeedData.java new file mode 100644 index 00000000..592b5199 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/SeedData.java @@ -0,0 +1,49 @@ +package com.lambdaschool.javazoo; + +import com.lambdaschool.javazoo.model.Role; +import com.lambdaschool.javazoo.model.User; +import com.lambdaschool.javazoo.model.UserRoles; +import com.lambdaschool.javazoo.repository.RoleRepository; +import com.lambdaschool.javazoo.repository.UserRepository; +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 +{ + RoleRepository rolerepos; + UserRepository userrepos; + + public SeedData(RoleRepository rolerepos, UserRepository userrepos) + { + this.rolerepos = rolerepos; + this.userrepos = userrepos; + } + + @Override + public void run(String[] args) throws Exception + { + Role r1 = new Role("admin"); + Role r2 = new Role("zoodata"); + + ArrayList admins = new ArrayList<>(); + admins.add(new UserRoles(new User(), r1)); + admins.add(new UserRoles(new User(), r2)); + + ArrayList users = new ArrayList<>(); + users.add(new UserRoles(new User(), r2)); + + rolerepos.save(r1); + rolerepos.save(r2); + User u1 = new User("lappjeff", "lambda", users); + + User u2 = new User("admin", "password", admins); + + userrepos.save(u1); + userrepos.save(u2); + } +} diff --git a/src/main/java/com/lambdaschool/javazoo/config/AuthorizationServerConfig.java b/src/main/java/com/lambdaschool/javazoo/config/AuthorizationServerConfig.java new file mode 100644 index 00000000..23d1b388 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/config/AuthorizationServerConfig.java @@ -0,0 +1,56 @@ +package com.lambdaschool.javazoo.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 = "jeff-lapp"; + static final String CLIENT_SECRET = "jeff-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 { + + configurer + .inMemory() + .withClient(CLIENT_ID) + .secret(encoder.encode(CLIENT_SECRET)) + .authorizedGrantTypes(GRANT_TYPE_PASSWORD, AUTHORIZATION_CODE, REFRESH_TOKEN, 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/src/main/java/com/lambdaschool/javazoo/config/ResourceServerConfig.java b/src/main/java/com/lambdaschool/javazoo/config/ResourceServerConfig.java new file mode 100644 index 00000000..690e70d1 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/config/ResourceServerConfig.java @@ -0,0 +1,50 @@ +package com.lambdaschool.javazoo.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 + "/h2-console/**", // h2 + "/v2/api-docs", // swagger + "/swagger-resources", // swagger + "/swagger-resources/**", // swagger + "/configuration/ui", // swagger + "/configuration/security", // swagger + "/swagger-ui.html", // swagger + "/webjars/**" // swagger + + ).permitAll() +// .antMatchers("/admin/**", "/home/**", "/animals/**", "/actuator/**").authenticated() + .antMatchers("/admin").hasAnyRole("ROLE_ADMIN") + .antMatchers("/home").hasAnyRole("ROLE_ZOODATA", "ROLE_ADMIN", "ROLE_MGR") + .antMatchers("/animals").hasAnyRole("ROLE_ANIMALDATA", "ROLE_ADMIN", "ROLE_MGR") + .antMatchers("/actuator/**").hasAnyRole("ROLE_MGR") + .and().exceptionHandling().accessDeniedHandler(new OAuth2AccessDeniedHandler()); + + // http.requiresChannel().anyRequest().requiresSecure(); + http.csrf().disable(); + http.headers().frameOptions().disable(); + } +} diff --git a/src/main/java/com/lambdaschool/javazoo/config/SecurityConfig.java b/src/main/java/com/lambdaschool/javazoo/config/SecurityConfig.java new file mode 100644 index 00000000..409c08c8 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/config/SecurityConfig.java @@ -0,0 +1,72 @@ +package com.lambdaschool.javazoo.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +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 org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; + +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(); + } + + @Bean + public FilterRegistrationBean corsFilter() + { + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + CorsConfiguration config = new CorsConfiguration(); + config.setAllowCredentials(true); + config.addAllowedOrigin("*"); + config.addAllowedHeader("*"); + config.addAllowedMethod("*"); + source.registerCorsConfiguration("/**", config); + FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source)); + bean.setOrder(0); + return bean; + } +} \ No newline at end of file diff --git a/src/main/java/com/lambdaschool/javazoo/controller/AdminController.java b/src/main/java/com/lambdaschool/javazoo/controller/AdminController.java new file mode 100644 index 00000000..9c0c2f2b --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/controller/AdminController.java @@ -0,0 +1,66 @@ +package com.lambdaschool.javazoo.controller; + +import com.lambdaschool.javazoo.model.Zoo; +import com.lambdaschool.javazoo.service.ZooService; +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.validation.Valid; +import java.net.URI; +import java.net.URISyntaxException; + +@RestController +@RequestMapping(value = "/admin") +public class AdminController +{ + @Autowired + private ZooService zooService; + + //localhost:2019/admin/zoos/{id} + @PutMapping(value = "/zoos/{zooid}") + public ResponseEntity updateZoo( + @RequestBody Zoo updateZoo, + @PathVariable long zooid + ) + { + zooService.update(updateZoo, zooid); + return new ResponseEntity<>(HttpStatus.OK); + } + + //localhost:2019/admin/zoos + @PostMapping(value = "/zoos", + consumes = {"application/json"}, + produces = {"application/json"}) + public ResponseEntity addNewZoo(@Valid + @RequestBody Zoo newZoo) throws URISyntaxException + { + newZoo = zooService.save(newZoo); + HttpHeaders responseHeaders= new HttpHeaders(); + URI newZooURI = ServletUriComponentsBuilder.fromCurrentRequest(). + path("/{zooid}"). + buildAndExpand(newZoo.getZooid()).toUri(); + responseHeaders.setLocation(newZooURI); + + return new ResponseEntity<>(null, responseHeaders, HttpStatus.CREATED); + } + + //localhost:2019/admin/zoos/{id} + @DeleteMapping(value = "/zoos/{zooid}") + public ResponseEntity deleteRestaurantById(@PathVariable long zooid) + { + zooService.delete(zooid); + return new ResponseEntity<>(HttpStatus.OK); + } + + //localhost:2019/admin/zoos/{zooid}/animals/{animalid} + @DeleteMapping(value = "/zoos/{zooid}/animals/{animalid}") + public ResponseEntity deleteAnimalInZoo(@PathVariable long zooid, @PathVariable long animalid) + { + zooService.deleteAnimal(zooid, animalid); + return new ResponseEntity<>(HttpStatus.OK); + } +} diff --git a/src/main/java/com/lambdaschool/javazoo/controller/AnimalController.java b/src/main/java/com/lambdaschool/javazoo/controller/AnimalController.java new file mode 100644 index 00000000..1f9ae010 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/controller/AnimalController.java @@ -0,0 +1,41 @@ +package com.lambdaschool.javazoo.controller; + +import com.lambdaschool.javazoo.service.AnimalService; +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.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(value = "/animals") +public class AnimalController +{ + @Autowired + private AnimalService animalService; + + //localhost:2019/animals/all + @GetMapping(value = "/all", produces = {"application/json"}) + public ResponseEntity listAllAnimals() + { + return new ResponseEntity<>(animalService.findAll(), HttpStatus.OK); + + } + + //localhost:2019/animals/{name} + @GetMapping(value = "/{name}", produces = {"application/json"}) + public ResponseEntity getAnimalByName(@PathVariable String name) + { + return new ResponseEntity<>(animalService.findAnimalByName(name), HttpStatus.OK); + } + + + //localhost:2019/animals/count + @GetMapping(value = "/count", produces = {"application/json"}) + public ResponseEntity getCountZoosWithAnimals() + { + return new ResponseEntity<>(animalService.getCountZoosWithAnimals(), HttpStatus.OK); + } +} diff --git a/src/main/java/com/lambdaschool/javazoo/controller/ZooController.java b/src/main/java/com/lambdaschool/javazoo/controller/ZooController.java new file mode 100644 index 00000000..e4dd7520 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/controller/ZooController.java @@ -0,0 +1,35 @@ +package com.lambdaschool.javazoo.controller; + +import com.lambdaschool.javazoo.service.ZooService; +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.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(value = "/home") +public class ZooController +{ + @Autowired + private ZooService zooService; + + //localhost:2019/home/zoos/all + @GetMapping(value = "/zoos/all", produces = {"application/json"}) + public ResponseEntity listAllZoos() + { + return new ResponseEntity<>(zooService.findAll(), HttpStatus.OK); + } + + //localhost:2019/home/zoos/{zooname} + @GetMapping(value = "/zoos/{zooName}", produces = {"application/json"}) + public ResponseEntity getZooByName(@PathVariable String zooName) + { + return new ResponseEntity<>(zooService.findZooByname(zooName), HttpStatus.OK); + } + + + +} diff --git a/src/main/java/com/lambdaschool/javazoo/model/Animal.java b/src/main/java/com/lambdaschool/javazoo/model/Animal.java new file mode 100644 index 00000000..709c7493 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/model/Animal.java @@ -0,0 +1,65 @@ +package com.lambdaschool.javazoo.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonView; +import com.lambdaschool.javazoo.view.View; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "animal") +public class Animal +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @JsonView(View.AnimalsOnly.class) + private long animalid; + + @JsonView(View.AnimalsOnly.class) + private String animaltype; + + @ManyToMany(mappedBy = "animals", cascade = CascadeType.ALL, fetch = FetchType.LAZY) + @JsonIgnoreProperties("animals") + private List zoos = new ArrayList<>(); + + public Animal() + { + } + + public Animal(String animaltype) + { + this.animaltype = animaltype; + } + + public long getAnimalid() + { + return animalid; + } + + public void setAnimalid(long animalid) + { + this.animalid = animalid; + } + + public String getAnimaltype() + { + return animaltype; + } + + public void setAnimaltype(String animaltype) + { + this.animaltype = animaltype; + } + + public List getZoos() + { + return zoos; + } + + public void setZoos(List zoos) + { + this.zoos = zoos; + } +} diff --git a/src/main/java/com/lambdaschool/javazoo/model/Auditable.java b/src/main/java/com/lambdaschool/javazoo/model/Auditable.java new file mode 100644 index 00000000..4d93a8fe --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/model/Auditable.java @@ -0,0 +1,34 @@ +package com.lambdaschool.javazoo.model; + +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; + +//boilerplate code +@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/src/main/java/com/lambdaschool/javazoo/model/Role.java b/src/main/java/com/lambdaschool/javazoo/model/Role.java new file mode 100644 index 00000000..31c80235 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/model/Role.java @@ -0,0 +1,63 @@ +package com.lambdaschool.javazoo.model; + +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", "user"}) + 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/src/main/java/com/lambdaschool/javazoo/model/Telephone.java b/src/main/java/com/lambdaschool/javazoo/model/Telephone.java new file mode 100644 index 00000000..749993f7 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/model/Telephone.java @@ -0,0 +1,72 @@ +package com.lambdaschool.javazoo.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import javax.persistence.*; + +@Entity +@Table(name = "telephone") +public class Telephone +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long phoneid; + + private String phonetype; + private String phonenumber; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "zooid") + @JsonIgnoreProperties("telephones") + private Zoo zoo; + + public Telephone() + { + } + + public Telephone(String phonetype, String phonenumber) + { + this.phonetype = phonetype; + this.phonenumber = phonenumber; + } + + public long getPhoneid() + { + return phoneid; + } + + public void setPhoneid(long phoneid) + { + this.phoneid = phoneid; + } + + public String getPhonetype() + { + return phonetype; + } + + public void setPhonetype(String phonetype) + { + this.phonetype = phonetype; + } + + public String getPhonenumber() + { + return phonenumber; + } + + public void setPhonenumber(String phonenumber) + { + this.phonenumber = phonenumber; + } + + public Zoo getZoo() + { + return zoo; + } + + public void setZoo(Zoo zoo) + { + this.zoo = zoo; + } +} diff --git a/src/main/java/com/lambdaschool/javazoo/model/User.java b/src/main/java/com/lambdaschool/javazoo/model/User.java new file mode 100644 index 00000000..4d75f9a7 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/model/User.java @@ -0,0 +1,100 @@ +package com.lambdaschool.javazoo.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +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; + +@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) + private String password; + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + @JsonIgnoreProperties({"role", "user"}) + private List userRoles = new ArrayList<>(); + + public User() + { + } + + public User(String username, String password, List userRoles) + { + this.username = username; + BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); + this.password = passwordEncoder.encode(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 List getUserRoles() + { + return userRoles; + } + + public void setUserRoles(List userRoles) + { + this.userRoles = userRoles; + } + + public List getAuthority() + { + List rtnList = new ArrayList<>(); + + for (UserRoles r : this.userRoles) + { + String myRole = "ROLE_" + r.getRole().getName().toUpperCase(); + System.out.println(myRole); + rtnList.add(new SimpleGrantedAuthority(myRole)); + } + return rtnList; + } +} diff --git a/src/main/java/com/lambdaschool/javazoo/model/UserRoles.java b/src/main/java/com/lambdaschool/javazoo/model/UserRoles.java new file mode 100644 index 00000000..02af2269 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/model/UserRoles.java @@ -0,0 +1,75 @@ +package com.lambdaschool.javazoo.model; + +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(fetch = FetchType.LAZY) + @JsonIgnoreProperties({"userRoles", "hibernateLazyInitializer"}) + @JoinColumn(name = "userid") + private User user; + + @Id + @ManyToOne(fetch = FetchType.LAZY) + @JsonIgnoreProperties({"userRoles", "hibernateLazyInitializer"}) + @JoinColumn(name = "roleid") + 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 user.equals(userRoles.user) && role.equals(userRoles.role); + } + + @Override + public int hashCode() + { + return Objects.hash(user, role); + } +} diff --git a/src/main/java/com/lambdaschool/javazoo/model/Zoo.java b/src/main/java/com/lambdaschool/javazoo/model/Zoo.java new file mode 100644 index 00000000..345bcb24 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/model/Zoo.java @@ -0,0 +1,87 @@ +package com.lambdaschool.javazoo.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonView; +import com.lambdaschool.javazoo.view.View; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "zoo") +public class Zoo +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long zooid; + + @Column(unique = true) + @JsonView(View.AnimalsOnly.class) + private String zooname; + + @OneToMany(mappedBy = "zoo", + cascade = CascadeType.ALL, + orphanRemoval = true, + fetch = FetchType.LAZY) + @JsonIgnoreProperties("zoo") + private List telephones = new ArrayList<>(); + + @ManyToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL) + @JoinTable(name = "zooanimal", + joinColumns = {@JoinColumn(name = "zooid")}, + inverseJoinColumns = {@JoinColumn(name = "animalid")}) + @JsonIgnoreProperties("zoos") + private List animals = new ArrayList<>(); + + public Zoo() + { + } + + public Zoo(String zooname, List telephones, List animals) + { + this.zooname = zooname; + this.telephones = telephones; + this.animals = animals; + } + + public long getZooid() + { + return zooid; + } + + public void setZooid(long zooid) + { + this.zooid = zooid; + } + + public String getZooname() + { + return zooname; + } + + public void setZooname(String zooname) + { + this.zooname = zooname; + } + + public List getTelephones() + { + return telephones; + } + + public void setTelephones(List telephones) + { + this.telephones = telephones; + } + + public List getAnimals() + { + return animals; + } + + public void setAnimals(List animals) + { + this.animals = animals; + } +} diff --git a/src/main/java/com/lambdaschool/javazoo/repository/AnimalRepository.java b/src/main/java/com/lambdaschool/javazoo/repository/AnimalRepository.java new file mode 100644 index 00000000..8e30c477 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/repository/AnimalRepository.java @@ -0,0 +1,18 @@ +package com.lambdaschool.javazoo.repository; + +import com.lambdaschool.javazoo.model.Animal; +import com.lambdaschool.javazoo.view.CountZoosWithAnimals; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; + +import java.util.ArrayList; + +public interface AnimalRepository extends CrudRepository +{ + Animal findByAnimaltype(String name); + + @Query(value = "SELECT za.animalid, animaltype, count(zooid) as countzoos FROM zooanimal za INNER JOIN animal a " + + "on za.animalid=a.animalid GROUP BY za.animalid, animaltype", + nativeQuery = true) + ArrayList getCountZoosWithAnimals(); +} diff --git a/src/main/java/com/lambdaschool/javazoo/repository/RoleRepository.java b/src/main/java/com/lambdaschool/javazoo/repository/RoleRepository.java new file mode 100644 index 00000000..3f1b1576 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/repository/RoleRepository.java @@ -0,0 +1,21 @@ +package com.lambdaschool.javazoo.repository; + +import com.lambdaschool.javazoo.model.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); + +} \ No newline at end of file diff --git a/src/main/java/com/lambdaschool/javazoo/repository/TelephoneRepository.java b/src/main/java/com/lambdaschool/javazoo/repository/TelephoneRepository.java new file mode 100644 index 00000000..b863fa7d --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/repository/TelephoneRepository.java @@ -0,0 +1,8 @@ +package com.lambdaschool.javazoo.repository; + +import com.lambdaschool.javazoo.model.Telephone; +import org.springframework.data.repository.CrudRepository; + +public interface TelephoneRepository extends CrudRepository +{ +} diff --git a/src/main/java/com/lambdaschool/javazoo/repository/UserRepository.java b/src/main/java/com/lambdaschool/javazoo/repository/UserRepository.java new file mode 100644 index 00000000..5520bf7e --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/repository/UserRepository.java @@ -0,0 +1,9 @@ +package com.lambdaschool.javazoo.repository; + +import com.lambdaschool.javazoo.model.User; +import org.springframework.data.repository.CrudRepository; + +public interface UserRepository extends CrudRepository +{ + User findByUsername(String username); +} \ No newline at end of file diff --git a/src/main/java/com/lambdaschool/javazoo/repository/ZooRepository.java b/src/main/java/com/lambdaschool/javazoo/repository/ZooRepository.java new file mode 100644 index 00000000..7d54fdad --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/repository/ZooRepository.java @@ -0,0 +1,21 @@ +package com.lambdaschool.javazoo.repository; + +import com.lambdaschool.javazoo.model.Animal; +import com.lambdaschool.javazoo.model.Zoo; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; + +public interface ZooRepository extends CrudRepository +{ + Zoo findByZooname(String name); + + @Modifying + @Query(value = "DELETE FROM zooanimal WHERE zooid = :zooid", nativeQuery = true) + void deleteZooFromZooAnimals(long zooid); + + @Modifying + @Query(value = "DELETE FROM zooanimal WHERE zooid = :zooid AND animalid = :animalid", nativeQuery = true) + void deleteAnimalFromZoo(long zooid, long animalid); + +} diff --git a/src/main/java/com/lambdaschool/javazoo/service/AnimalService.java b/src/main/java/com/lambdaschool/javazoo/service/AnimalService.java new file mode 100644 index 00000000..7f91d0b3 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/service/AnimalService.java @@ -0,0 +1,15 @@ +package com.lambdaschool.javazoo.service; + +import com.lambdaschool.javazoo.model.Animal; +import com.lambdaschool.javazoo.view.CountZoosWithAnimals; + +import java.util.ArrayList; + +public interface AnimalService +{ + ArrayList findAll(); + + Animal findAnimalByName(String name); + + ArrayList getCountZoosWithAnimals(); +} diff --git a/src/main/java/com/lambdaschool/javazoo/service/AnimalServiceImpl.java b/src/main/java/com/lambdaschool/javazoo/service/AnimalServiceImpl.java new file mode 100644 index 00000000..10e966f4 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/service/AnimalServiceImpl.java @@ -0,0 +1,44 @@ +package com.lambdaschool.javazoo.service; + +import com.lambdaschool.javazoo.model.Animal; +import com.lambdaschool.javazoo.repository.AnimalRepository; +import com.lambdaschool.javazoo.view.CountZoosWithAnimals; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.persistence.EntityNotFoundException; +import java.util.ArrayList; + +@Service(value = "animalService") +public class AnimalServiceImpl implements AnimalService +{ + @Autowired + private AnimalRepository animalrepos; + + @Override + public ArrayList findAll() + { + ArrayList list = new ArrayList<>(); + animalrepos.findAll().iterator().forEachRemaining(list::add); + return list; + } + + @Override + public Animal findAnimalByName(String name) throws EntityNotFoundException + { + Animal animal = animalrepos.findByAnimaltype(name); + + if (animal == null) + { + throw new EntityNotFoundException("Animal " + name + " not found"); + } + + return animal; + } + + @Override + public ArrayList getCountZoosWithAnimals() + { + return animalrepos.getCountZoosWithAnimals(); + } +} diff --git a/src/main/java/com/lambdaschool/javazoo/service/TelephoneService.java b/src/main/java/com/lambdaschool/javazoo/service/TelephoneService.java new file mode 100644 index 00000000..b42d8d54 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/service/TelephoneService.java @@ -0,0 +1,5 @@ +package com.lambdaschool.javazoo.service; + +public interface TelephoneService +{ +} diff --git a/src/main/java/com/lambdaschool/javazoo/service/TelephoneServiceImpl.java b/src/main/java/com/lambdaschool/javazoo/service/TelephoneServiceImpl.java new file mode 100644 index 00000000..2d78bdec --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/service/TelephoneServiceImpl.java @@ -0,0 +1,12 @@ +package com.lambdaschool.javazoo.service; + +import com.lambdaschool.javazoo.repository.TelephoneRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service(value = "studentService") +public class TelephoneServiceImpl implements TelephoneService +{ + @Autowired + private TelephoneRepository telephonerepos; +} diff --git a/src/main/java/com/lambdaschool/javazoo/service/UserAuditing.java b/src/main/java/com/lambdaschool/javazoo/service/UserAuditing.java new file mode 100644 index 00000000..fda1d1e6 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/service/UserAuditing.java @@ -0,0 +1,30 @@ +package com.lambdaschool.javazoo.service; + +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/src/main/java/com/lambdaschool/javazoo/service/UserService.java b/src/main/java/com/lambdaschool/javazoo/service/UserService.java new file mode 100644 index 00000000..bc319fc8 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/service/UserService.java @@ -0,0 +1,18 @@ +package com.lambdaschool.javazoo.service; + +import com.lambdaschool.javazoo.model.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/src/main/java/com/lambdaschool/javazoo/service/UserServiceImpl.java b/src/main/java/com/lambdaschool/javazoo/service/UserServiceImpl.java new file mode 100644 index 00000000..4c920872 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/service/UserServiceImpl.java @@ -0,0 +1,132 @@ +package com.lambdaschool.javazoo.service; + +import com.lambdaschool.javazoo.model.User; +import com.lambdaschool.javazoo.model.UserRoles; +import com.lambdaschool.javazoo.repository.RoleRepository; +import com.lambdaschool.javazoo.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 javax.persistence.EntityNotFoundException; +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 EntityNotFoundException + { + return userrepos.findById(id) + .orElseThrow(() -> new EntityNotFoundException(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 EntityNotFoundException(Long.toString(id)); + } + } + + @Transactional + @Override + public User save(User user) + { + User newUser = new User(); + newUser.setUsername(user.getUsername()); + + ArrayList newRoles = new ArrayList<>(); + for (UserRoles ur : user.getUserRoles()) + { + newRoles.add(new UserRoles(newUser, ur.getRole())); + } + newUser.setUserRoles(newRoles); + + 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.setPassword(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()); + } + } + + return userrepos.save(currentUser); + } + else + { + throw new EntityNotFoundException(Long.toString(id) + " Not current user"); + } + } + else + { + throw new EntityNotFoundException(authentication.getName()); + } + + } +} diff --git a/src/main/java/com/lambdaschool/javazoo/service/ZooService.java b/src/main/java/com/lambdaschool/javazoo/service/ZooService.java new file mode 100644 index 00000000..296bafbf --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/service/ZooService.java @@ -0,0 +1,20 @@ +package com.lambdaschool.javazoo.service; + +import com.lambdaschool.javazoo.model.Zoo; + +import java.util.ArrayList; + +public interface ZooService +{ + ArrayList findAll(); + + Zoo findZooByname(String name); + + void delete(long id); + + void deleteAnimal(long zooid, long animalid); + + Zoo update(Zoo zoo, long id); + + Zoo save(Zoo zoo); +} diff --git a/src/main/java/com/lambdaschool/javazoo/service/ZooServiceImpl.java b/src/main/java/com/lambdaschool/javazoo/service/ZooServiceImpl.java new file mode 100644 index 00000000..548010ab --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/service/ZooServiceImpl.java @@ -0,0 +1,109 @@ +package com.lambdaschool.javazoo.service; + +import com.lambdaschool.javazoo.model.Animal; +import com.lambdaschool.javazoo.model.Telephone; +import com.lambdaschool.javazoo.model.Zoo; +import com.lambdaschool.javazoo.repository.ZooRepository; +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; + +@Transactional +@Service(value = "zooService") +public class ZooServiceImpl implements ZooService +{ + @Autowired + private ZooRepository zoorepos; + + + @Override + public ArrayList findAll() + { + ArrayList list = new ArrayList<>(); + zoorepos.findAll().iterator().forEachRemaining(list::add); + return list; + } + + @Override + public Zoo findZooByname(String name) throws EntityNotFoundException + { + Zoo zoo = zoorepos.findByZooname(name); + + if (zoo == null) + { + throw new EntityNotFoundException("Zoo " + name + " not found"); + } + + return zoo; + } + + @Transactional + @Override + public void delete(long id) throws EntityNotFoundException + { + if (zoorepos.findById(id).isPresent()) + { + zoorepos.deleteZooFromZooAnimals(id); + zoorepos.deleteById(id); + } else { + throw new EntityNotFoundException(Long.toString(id)); + } + } + + @Override + public void deleteAnimal(long zooid, long animalid) throws EntityNotFoundException + { + if (zoorepos.findById(zooid).isPresent()) + { + zoorepos.deleteAnimalFromZoo(zooid, animalid); + } else { + throw new EntityNotFoundException("Check your zoo id and animal id"); + } + } + + @Transactional + @Override + public Zoo update(Zoo zoo, long id) throws EntityNotFoundException + { + Zoo currentZoo = zoorepos.findById(id) + .orElseThrow(() -> new EntityNotFoundException(Long.toString(id))); + if (zoo.getZooname() != null) + { + currentZoo.setZooname(zoo.getZooname()); + } + + if (zoo.getAnimals().size() > 0) + { + for (Animal a : zoo.getAnimals()) + { + currentZoo.getAnimals().add(new Animal(a.getAnimaltype())); + } + } + + return zoorepos.save(currentZoo); + } + + @Transactional + @Override + public Zoo save(Zoo zoo) + { + Zoo newZoo = new Zoo(); + + newZoo.setZooname(zoo.getZooname()); + + for (Animal a : zoo.getAnimals()) + { + newZoo.getAnimals().add(new Animal(a.getAnimaltype())); + } + + for (Telephone t : zoo.getTelephones()) + { + newZoo.getTelephones().add(new Telephone(t.getPhonetype(), t.getPhonenumber())); + } + + return zoorepos.save(newZoo); + } +} diff --git a/src/main/java/com/lambdaschool/javazoo/view/CountZoosWithAnimals.java b/src/main/java/com/lambdaschool/javazoo/view/CountZoosWithAnimals.java new file mode 100644 index 00000000..cfc6e3b1 --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/view/CountZoosWithAnimals.java @@ -0,0 +1,9 @@ +package com.lambdaschool.javazoo.view; + +public interface CountZoosWithAnimals +{ + long getAnimalid(); + int getCountZoos(); + String getAnimaltype(); + +} diff --git a/src/main/java/com/lambdaschool/javazoo/view/View.java b/src/main/java/com/lambdaschool/javazoo/view/View.java new file mode 100644 index 00000000..5e22a3ab --- /dev/null +++ b/src/main/java/com/lambdaschool/javazoo/view/View.java @@ -0,0 +1,9 @@ +package com.lambdaschool.javazoo.view; + +public class View +{ + public interface AnimalsOnly + { + + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000..1f02f637 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,9 @@ +server.port=${PORT:2019} + +spring.jackson.serialization.fail-on-empty-beans=false +spring.jpa.hibernate.ddl-auto=create + +spring.h2.console.enabled=true +spring.h2.console.path=/h2-console + +logging.level.web=TRACE \ No newline at end of file diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql new file mode 100644 index 00000000..c28451d8 --- /dev/null +++ b/src/main/resources/data.sql @@ -0,0 +1,40 @@ +DELETE +FROM zooanimal; +DELETE +FROM animal; +DELETE +FROM telephone; +DELETE +FROM zoo; +INSERT INTO zoo (zooid, zooname) + VALUES (1, 'Gladys Porter Zoo'), + (2, 'Point Defiance Zoo'), + (3, 'San Diego Zoo'), + (4, 'San Antonio Zoo'), + (5, 'Smithsonian National Zoo'); +INSERT INTO telephone(phoneid, phonetype, phonenumber, zooid) + VALUES (1, 'main', '555-555-5555', 1), + (2, 'education', '555-555-1234', 1), + (3, 'membership', '555-555-4321', 1), + (4, 'main', '123-555-5555', 4), + (5, 'main', '555-123-5555', 3); +INSERT INTO animal (animalid, animaltype) + VALUES (1, 'lion'), + (2, 'bear'), + (3, 'monkey'), + (4, 'penguin'), + (5, 'tiger'), + (6, 'bear'), + (7, 'turtle'); +INSERT INTO zooanimal (zooid, animalid) + VALUES (1, 1), + (2, 2), + (1, 2), + (5, 7), + (5, 6), + (5, 5), + (5, 1), + (3, 1), + (3, 2); + +alter sequence hibernate_sequence restart WITH 10; \ No newline at end of file diff --git a/src/test/java/com/lambdaschool/javazoo/JavaZooApplicationTests.java b/src/test/java/com/lambdaschool/javazoo/JavaZooApplicationTests.java new file mode 100644 index 00000000..f0727861 --- /dev/null +++ b/src/test/java/com/lambdaschool/javazoo/JavaZooApplicationTests.java @@ -0,0 +1,18 @@ +package com.lambdaschool.javazoo; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class JavaZooApplicationTests +{ + + @Test + public void contextLoads() + { + } + +}