diff --git a/.gitignore b/.gitignore index 37e76631..549e00a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,34 +1,33 @@ -# Jetbrains IntelliJ Idea +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### .idea +*.iws *.iml - -# Linux -# backup files -*~ - -# Windows -# thumbnails -Thumbs.db - -# Mac OS X -# metadata -.DS_Store -# thumbnails -._* - -# GIT -.git/ - -# Java -*.class - -# packages -*.jar -*.war -*.ear - -# Logging -*.log - -# jME (binaries) -*.so +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 00000000..f017ce67 --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,150 @@ +/* + * Copyright 2007-present the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader +{ + + private static final String WRAPPER_VERSION = "0.5.6"; + + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) + { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, + MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if (mavenWrapperPropertyFile.exists()) + { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try + { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, + url); + } catch (IOException e) + { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally + { + try + { + if (mavenWrapperPropertyFileInputStream != null) + { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) + { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), + MAVEN_WRAPPER_JAR_PATH); + if (!outputFile.getParentFile() + .exists()) + { + if (!outputFile.getParentFile() + .mkdirs()) + { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile() + .getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try + { + downloadFileFromURL(url, + outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) + { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL( + String urlString, + File destination) throws Exception + { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) + { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD") + .toCharArray(); + Authenticator.setDefault(new Authenticator() + { + @Override + protected PasswordAuthentication getPasswordAuthentication() + { + return new PasswordAuthentication(username, + password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel() + .transferFrom(rbc, + 0, + Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..2cc7d4a5 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..642d572c --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar diff --git a/mvnw b/mvnw new file mode 100755 index 00000000..3c8a5537 --- /dev/null +++ b/mvnw @@ -0,0 +1,322 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ]; then + + if [ -f /etc/mavenrc ]; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ]; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false +darwin=false +mingw=false +case "$(uname)" in +CYGWIN*) cygwin=true ;; +MINGW*) mingw=true ;; +Darwin*) + darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="$(/usr/libexec/java_home)" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ]; then + if [ -r /etc/gentoo-release ]; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +if [ -z "$M2_HOME" ]; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ]; do + ls=$(ls -ld "$PRG") + link=$(expr "$ls" : '.*-> \(.*\)$') + if expr "$link" : '/.*' >/dev/null; then + PRG="$link" + else + PRG="$(dirname "$PRG")/$link" + fi + done + + saveddir=$(pwd) + + M2_HOME=$(dirname "$PRG")/.. + + # make it fully qualified + M2_HOME=$(cd "$M2_HOME" && pwd) + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=$(cygpath --unix "$M2_HOME") + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw; then + [ -n "$M2_HOME" ] && + M2_HOME="$( ( + cd "$M2_HOME" + pwd + ))" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="$( ( + cd "$JAVA_HOME" + pwd + ))" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr \"$javaExecutable\" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! $(expr "$readLink" : '\([^ ]*\)') = "no" ]; then + if $darwin; then + javaHome="$(dirname \"$javaExecutable\")" + javaExecutable="$(cd \"$javaHome\" && pwd -P)/javac" + else + javaExecutable="$(readlink -f \"$javaExecutable\")" + fi + javaHome="$(dirname \"$javaExecutable\")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ]; then + if [ -n "$JAVA_HOME" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$(which java)" + fi +fi + +if [ ! -x "$JAVACMD" ]; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ]; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ]; then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ]; do + if [ -d "$wdir"/.mvn ]; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$( + cd "$wdir/.." + pwd + ) + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' <"$1")" + fi +} + +BASE_DIR=$(find_maven_basedir "$(pwd)") +if [ -z "$BASE_DIR" ]; then + exit 1 +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + fi + while IFS="=" read key value; do + case "$key" in wrapperUrl) + jarUrl="$value" + break + ;; + esac + done <"$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget >/dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" + fi + elif command -v curl >/dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=$(cygpath --path --windows "$M2_HOME") + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 00000000..c8d43372 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,182 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + +FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..aaf217fd --- /dev/null +++ b/pom.xml @@ -0,0 +1,73 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.4.0 + + + com.lambdaschool + zoos + 0.0.1-SNAPSHOT + zoos + Demo project for Spring Boot + + + 15 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + com.h2database + h2 + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + io.springfox + springfox-core + 2.9.2 + + + io.springfox + springfox-spring-web + 2.9.2 + + + io.springfox + springfox-swagger2 + 2.9.2 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/com/lambdaschool/zoos/ZoosApplication.java b/src/main/java/com/lambdaschool/zoos/ZoosApplication.java new file mode 100644 index 00000000..9122e9d0 --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/ZoosApplication.java @@ -0,0 +1,18 @@ +package com.lambdaschool.zoos; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@EnableJpaAuditing +@SpringBootApplication +public class ZoosApplication +{ + + public static void main(String[] args) + { + SpringApplication.run(ZoosApplication.class, + args); + } + +} diff --git a/src/main/java/com/lambdaschool/zoos/config/H2ServerConfiguration.java b/src/main/java/com/lambdaschool/zoos/config/H2ServerConfiguration.java new file mode 100644 index 00000000..2ea24616 --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/config/H2ServerConfiguration.java @@ -0,0 +1,44 @@ +package com.lambdaschool.zoos.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 +public class H2ServerConfiguration +{ + + @Value("${h2.tcp.port:9092}") + private String h2TcpPort; + + @Value("${h2.web.port:8082}") + private String h2WebPort; + + @Bean + @ConditionalOnExpression("${h2.tcp.enabled:true}") + public Server h2TcpServer() throws + SQLException + { + return Server.createTcpServer("-tcp", + "-tcpAllowOthers", + "-tcpPort", + h2TcpPort) + .start(); + } + + @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/src/main/java/com/lambdaschool/zoos/config/Swagger2Config.java b/src/main/java/com/lambdaschool/zoos/config/Swagger2Config.java new file mode 100644 index 00000000..f7d97ed4 --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/config/Swagger2Config.java @@ -0,0 +1,45 @@ +package com.lambdaschool.zoos.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +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; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +/** + * Configures the default Swagger Documentation + */ +@Configuration +@EnableSwagger2 +public class Swagger2Config +{ + @Bean + public Docket api() + { + return new Docket(DocumentationType.SWAGGER_2) + .select() + .apis(RequestHandlerSelectors + .basePackage("com.lambdaschool.zoos")) + .paths(PathSelectors.regex("/.*")) + .build() + .apiInfo(apiEndPointsInfo()); + } + + private ApiInfo apiEndPointsInfo() + { + return new ApiInfoBuilder().title("Zoos Module Project") + .description("Zoos Module Project") + .contact(new Contact("John Mitchell", + "http://www.lambdaschool.com", + "john@lambdaschool.com")) + .license("MIT") + .licenseUrl("https://github.com/LambdaSchool/java-zoos/blob/master/LICENSE") + .version("1.0.0") + .build(); + } +} diff --git a/src/main/java/com/lambdaschool/zoos/controllers/AnimalController.java b/src/main/java/com/lambdaschool/zoos/controllers/AnimalController.java new file mode 100644 index 00000000..b974fdc1 --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/controllers/AnimalController.java @@ -0,0 +1,25 @@ +package com.lambdaschool.zoos.controllers; + +import com.lambdaschool.zoos.services.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.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(value = "/animals") +public class AnimalController +{ + @Autowired + private AnimalService animalService; + + @GetMapping(value = "/count", + produces = {"application/json"}) + public ResponseEntity getNumZoosAnimalsIn() + { + return new ResponseEntity<>(animalService.getCountAnimalInZoo(), + HttpStatus.OK); + } +} \ No newline at end of file diff --git a/src/main/java/com/lambdaschool/zoos/controllers/ZooController.java b/src/main/java/com/lambdaschool/zoos/controllers/ZooController.java new file mode 100644 index 00000000..c84b9ad7 --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/controllers/ZooController.java @@ -0,0 +1,102 @@ +package com.lambdaschool.zoos.controllers; + +import com.lambdaschool.zoos.models.Zoo; +import com.lambdaschool.zoos.services.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 = "/zoos") +public class ZooController +{ + @Autowired + private ZooService zooService; + + @GetMapping(value = "/zoos", + produces = {"application/json"}) + public ResponseEntity listAllZoos() + { + return new ResponseEntity<>(zooService.findAll(), + HttpStatus.OK); + } + + @GetMapping(value = "/zoo/{id}", + produces = {"application/json"}) + public ResponseEntity findZooById( + @PathVariable + long id) + { + Zoo z = zooService.findZooById(id); + return new ResponseEntity<>(z, + HttpStatus.OK); + } + + @PostMapping(value = "/zoo", + consumes = {"application/json"}) + public ResponseEntity addNewZoo( + @Valid + @RequestBody + Zoo newZoo) throws URISyntaxException + { + // nullify the zoo id + newZoo.setZooid(0); + newZoo = zooService.save(newZoo); + + // set the location header for the newly created resource + HttpHeaders responseHeaders = new HttpHeaders(); + URI newRestaurantURI = ServletUriComponentsBuilder.fromCurrentRequest() + .path("/{zooid}") + .buildAndExpand(newZoo.getZooid()) + .toUri(); + responseHeaders.setLocation(newRestaurantURI); + + return new ResponseEntity<>(null, + responseHeaders, + HttpStatus.CREATED); + } + + @PutMapping(value = "/zoo/{id}", + consumes = {"application/json"}) + public ResponseEntity putUpdateZoo( + @RequestBody + Zoo updateZoo, + @PathVariable + long id) + { + updateZoo.setZooid(id); + zooService.save(updateZoo); + + return new ResponseEntity<>(HttpStatus.OK); + } + + @PatchMapping(value = "/zoo/{id}", + consumes = {"application/json"}) + public ResponseEntity patchUpdateUser( + @RequestBody + Zoo updateZoo, + @PathVariable + long id) + { + updateZoo.setZooid(id); + zooService.update(updateZoo); + return new ResponseEntity<>(HttpStatus.OK); + } + + @DeleteMapping(value = "/zoo/{id}") + public ResponseEntity deleteZoo( + @PathVariable + long id) + { + zooService.delete(id); + return new ResponseEntity<>(HttpStatus.OK); + } + +} diff --git a/src/main/java/com/lambdaschool/zoos/models/Animal.java b/src/main/java/com/lambdaschool/zoos/models/Animal.java new file mode 100644 index 00000000..12c3d81e --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/models/Animal.java @@ -0,0 +1,62 @@ +package com.lambdaschool.zoos.models; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +@Entity +@Table(name = "animals") +public class Animal extends Auditable +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long animalid; + + @Column(nullable = false, + unique = true) + private String animaltype; + + @OneToMany(mappedBy = "animal", + cascade = CascadeType.ALL) + @JsonIgnoreProperties(value = "animal", + allowSetters = true) + private Set zoos = new HashSet<>(); + + public Animal() + { + } + + 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 Set getZoos() + { + return zoos; + } + + public void setZoos(Set zoos) + { + this.zoos = zoos; + } +} \ No newline at end of file diff --git a/src/main/java/com/lambdaschool/zoos/models/Auditable.java b/src/main/java/com/lambdaschool/zoos/models/Auditable.java new file mode 100644 index 00000000..121077bc --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/models/Auditable.java @@ -0,0 +1,33 @@ +package com.lambdaschool.zoos.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; +} \ No newline at end of file diff --git a/src/main/java/com/lambdaschool/zoos/models/Telephone.java b/src/main/java/com/lambdaschool/zoos/models/Telephone.java new file mode 100644 index 00000000..8fcf5a6c --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/models/Telephone.java @@ -0,0 +1,81 @@ +package com.lambdaschool.zoos.models; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import javax.persistence.*; + +@Entity +@Table(name = "telephones") +public class Telephone extends Auditable +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long phoneid; + + @Column(nullable = false) + private String phonetype; + + @Column(nullable = false) + private String phonenumber; + + @ManyToOne + @JoinColumn(name = "zooid", + nullable = false) + @JsonIgnoreProperties(value = "telephones", + allowSetters = true) + private Zoo zoo; + + public Telephone() + { + } + + public Telephone( + String phonetype, + String phonenumber, + Zoo zoo) + { + this.phonetype = phonetype; + this.phonenumber = phonenumber; + this.zoo = zoo; + } + + 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/zoos/models/Zoo.java b/src/main/java/com/lambdaschool/zoos/models/Zoo.java new file mode 100644 index 00000000..06de1ee5 --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/models/Zoo.java @@ -0,0 +1,74 @@ +package com.lambdaschool.zoos.models; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +@Entity +@Table(name = "zoos") +public class Zoo extends Auditable +{ + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long zooid; + + @Column(nullable = true, + unique = true) + private String zooname; + + @OneToMany(mappedBy = "zoo", + cascade = CascadeType.ALL, + orphanRemoval = true) + @JsonIgnoreProperties("zoo") + private List telephones = new ArrayList<>(); + + @OneToMany(mappedBy = "zoo", + cascade = CascadeType.ALL) + @JsonIgnoreProperties(value = "zoo", + allowSetters = true) + private Set animals = new HashSet<>(); + + 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 Set getAnimals() + { + return animals; + } + + public void setAnimals(Set animals) + { + this.animals = animals; + } +} diff --git a/src/main/java/com/lambdaschool/zoos/models/ZooAnimals.java b/src/main/java/com/lambdaschool/zoos/models/ZooAnimals.java new file mode 100644 index 00000000..50c0baa5 --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/models/ZooAnimals.java @@ -0,0 +1,102 @@ +package com.lambdaschool.zoos.models; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Objects; + +@Entity +@Table(name = "zooanimals") +@IdClass(ZooAnimalsId.class) +public class ZooAnimals extends Auditable implements Serializable +{ + @Id + @ManyToOne + @JoinColumn(name = "zooid") + @JsonIgnoreProperties(value = "animals", allowSetters = true) + private Zoo zoo; + + @Id + @ManyToOne + @JoinColumn(name = "animalid") + @JsonIgnoreProperties(value = "zoos", allowSetters = true) + private Animal animal; + + String incomingzoo; + + public ZooAnimals() + { + } + + public ZooAnimals( + Zoo zoo, + Animal animal, + String incomingzoo) + { + this.zoo = zoo; + this.animal = animal; + this.incomingzoo = incomingzoo; + } + + public ZooAnimals( + Zoo zoo, + Animal animal) + { + this.zoo = zoo; + this.animal = animal; + this.incomingzoo = null; + } + + public Zoo getZoo() + { + return zoo; + } + + public void setZoo(Zoo zoo) + { + this.zoo = zoo; + } + + public Animal getAnimal() + { + return animal; + } + + public void setAnimal(Animal animal) + { + this.animal = animal; + } + + public String getIncomingzoo() + { + return incomingzoo; + } + + public void setIncomingzoo(String incomingzoo) + { + this.incomingzoo = incomingzoo; + } + + @Override + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + ZooAnimals that = (ZooAnimals) o; + return ((this.zoo == null) ? 0 : this.zoo.getZooid()) == ((that.zoo == null) ? 0 : that.zoo.getZooid()) && + ((this.animal == null) ? 0 : this.animal.getAnimalid()) == ((that.animal == null) ? 0 : that.animal.getAnimalid()); + } + + @Override + public int hashCode() + { + return 37; + } +} \ No newline at end of file diff --git a/src/main/java/com/lambdaschool/zoos/models/ZooAnimalsId.java b/src/main/java/com/lambdaschool/zoos/models/ZooAnimalsId.java new file mode 100644 index 00000000..f6dcedf9 --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/models/ZooAnimalsId.java @@ -0,0 +1,59 @@ +package com.lambdaschool.zoos.models; + +import javax.persistence.Embeddable; +import java.io.Serializable; + +@Embeddable +public class ZooAnimalsId implements Serializable { + + private long zoo; + + private long animal; + + public ZooAnimalsId() + { + } + + public long getZoo() + { + return zoo; + } + + public void setZoo(long zoo) + { + this.zoo = zoo; + } + + public long getAnimal() + { + return animal; + } + + public void setAnimal(long animal) + { + this.animal = animal; + } + + @Override + public boolean equals(Object o) + { + if (this == o) + { + return true; + } + // boolean temp = (o.getClass() instanceof Class); + if (o == null || getClass() != o.getClass()) + { + return false; + } + ZooAnimalsId that = (ZooAnimalsId) o; + return zoo == that.zoo && + animal == that.animal; + } + + @Override + public int hashCode() + { + return 37; + } +} diff --git a/src/main/java/com/lambdaschool/zoos/repositories/AnimalRepository.java b/src/main/java/com/lambdaschool/zoos/repositories/AnimalRepository.java new file mode 100644 index 00000000..bd2d6879 --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/repositories/AnimalRepository.java @@ -0,0 +1,15 @@ +package com.lambdaschool.zoos.repositories; + +import com.lambdaschool.zoos.models.Animal; +import com.lambdaschool.zoos.views.CountAnimalInZoo; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; + +import java.util.ArrayList; + +public interface AnimalRepository extends CrudRepository +{ + @Query(value = "SELECT a.animalid, a.animaltype, count(z.zooid) as countzoos FROM zooanimals z RIGHT JOIN animals a ON z.animalid=a.animalid GROUP BY a.animalid, a.animaltype ORDER BY a.animaltype", + nativeQuery = true) + ArrayList getCountAnimalInZoo(); +} diff --git a/src/main/java/com/lambdaschool/zoos/repositories/ZooRepository.java b/src/main/java/com/lambdaschool/zoos/repositories/ZooRepository.java new file mode 100644 index 00000000..bfc632f4 --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/repositories/ZooRepository.java @@ -0,0 +1,16 @@ +package com.lambdaschool.zoos.repositories; + +import com.lambdaschool.zoos.models.Zoo; +import com.lambdaschool.zoos.views.JustTheCount; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; + +import javax.transaction.Transactional; +import java.util.ArrayList; + + +public interface ZooRepository extends CrudRepository +{ + ArrayList findByZoonameContainingIgnoringCase(String name); +} diff --git a/src/main/java/com/lambdaschool/zoos/services/AnimalService.java b/src/main/java/com/lambdaschool/zoos/services/AnimalService.java new file mode 100644 index 00000000..63e0a0cc --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/services/AnimalService.java @@ -0,0 +1,10 @@ +package com.lambdaschool.zoos.services; + +import com.lambdaschool.zoos.views.CountAnimalInZoo; + +import java.util.ArrayList; + +public interface AnimalService +{ + ArrayList getCountAnimalInZoo(); +} diff --git a/src/main/java/com/lambdaschool/zoos/services/AnimalServiceImpl.java b/src/main/java/com/lambdaschool/zoos/services/AnimalServiceImpl.java new file mode 100644 index 00000000..b1dc98ff --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/services/AnimalServiceImpl.java @@ -0,0 +1,21 @@ +package com.lambdaschool.zoos.services; + +import com.lambdaschool.zoos.repositories.AnimalRepository; +import com.lambdaschool.zoos.views.CountAnimalInZoo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; + +@Service(value = "animalService") +public class AnimalServiceImpl implements AnimalService +{ + @Autowired + private AnimalRepository animalrepos; + + @Override + public ArrayList getCountAnimalInZoo() + { + return animalrepos.getCountAnimalInZoo(); + } +} \ No newline at end of file diff --git a/src/main/java/com/lambdaschool/zoos/services/ZooService.java b/src/main/java/com/lambdaschool/zoos/services/ZooService.java new file mode 100644 index 00000000..ef8ea1a9 --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/services/ZooService.java @@ -0,0 +1,18 @@ +package com.lambdaschool.zoos.services; + +import com.lambdaschool.zoos.models.Zoo; + +import java.util.ArrayList; + +public interface ZooService +{ + ArrayList findAll(); + + Zoo findZooById(long id); + + Zoo save(Zoo zoo); + + Zoo update(Zoo zoo); + + void delete(long id); +} \ No newline at end of file diff --git a/src/main/java/com/lambdaschool/zoos/services/ZooServiceImpl.java b/src/main/java/com/lambdaschool/zoos/services/ZooServiceImpl.java new file mode 100644 index 00000000..35009526 --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/services/ZooServiceImpl.java @@ -0,0 +1,149 @@ +package com.lambdaschool.zoos.services; + +import com.lambdaschool.zoos.models.Animal; +import com.lambdaschool.zoos.models.Telephone; +import com.lambdaschool.zoos.models.Zoo; +import com.lambdaschool.zoos.models.ZooAnimals; +import com.lambdaschool.zoos.repositories.AnimalRepository; +import com.lambdaschool.zoos.repositories.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; + +@Service(value = "zooService") +public class ZooServiceImpl implements ZooService +{ + @Autowired + private ZooRepository zoorepos; + + @Autowired + private AnimalRepository animalrepos; + + @Override + public ArrayList findAll() + { + ArrayList list = new ArrayList<>(); + zoorepos.findAll() + .iterator() + .forEachRemaining(list::add); + return list; + } + + @Override + public Zoo findZooById(long id) + { + return zoorepos.findById(id) + .orElseThrow(() -> new EntityNotFoundException("Zoo id " + id + " not found!")); + } + + @Transactional + @Override + public Zoo save(Zoo zoo) + { + Zoo newZoo = new Zoo(); + + if (zoo.getZooid() != 0) + { + Zoo oldZoo = zoorepos.findById(zoo.getZooid()) + .orElseThrow(() -> new EntityNotFoundException("Zoo id " + zoo.getZooid() + " not found!")); + + newZoo.setZooid(zoo.getZooid()); + } + + newZoo.setZooname(zoo.getZooname()); + + newZoo.getAnimals() + .clear(); + for (ZooAnimals za : zoo.getAnimals()) + { + Animal newAnimal = animalrepos.findById(za.getAnimal() + .getAnimalid()) + .orElseThrow(() -> new EntityNotFoundException("Animal id " + za.getAnimal() + .getAnimalid())); + + newZoo.getAnimals() + .add(new ZooAnimals(newZoo, + newAnimal, + za.getIncomingzoo())); + } + + // work with telephone list + newZoo.getTelephones() + .clear(); + for (Telephone t : zoo.getTelephones()) + + { + newZoo.getTelephones() + .add(new Telephone(t.getPhonetype(), + t.getPhonenumber(), + newZoo)); + } + + return zoorepos.save(newZoo); + } + + @Transactional + @Override + public Zoo update(Zoo zoo) + { + Zoo currentZoo = zoorepos.findById(zoo.getZooid()) + .orElseThrow(() -> new EntityNotFoundException("Zoo id " + zoo.getZooid() + " not found!")); + + if (zoo.getZooname() != null) + { + currentZoo.setZooname(zoo.getZooname()); + } + + if (zoo.getAnimals() + .size() > 0) + { + for (ZooAnimals za : zoo.getAnimals()) + { + Animal newAnimal = animalrepos.findById(za.getAnimal() + .getAnimalid()) + .orElseThrow(() -> new EntityNotFoundException("Animal id " + za.getAnimal() + .getAnimalid())); + + currentZoo.getAnimals() + .add(new ZooAnimals(currentZoo, + newAnimal, + za.getIncomingzoo())); + } + } + + if (zoo.getTelephones() + .size() > 0) + { + currentZoo.getAnimals() + .clear(); + // adds new phone numbers to list + for (Telephone t : zoo.getTelephones()) + { + currentZoo.getTelephones() + .add(new Telephone(t.getPhonetype(), + t.getPhonenumber(), + currentZoo)); + } + } + + return zoorepos.save(currentZoo); + } + + @Transactional + @Override + public void delete(long id) throws EntityNotFoundException + { + if (zoorepos.findById(id) + .isPresent()) + { + zoorepos.deleteById(id); + } else + { + throw new EntityNotFoundException("Zoo id " + id + " not found!"); + } + } + +} diff --git a/src/main/java/com/lambdaschool/zoos/views/CountAnimalInZoo.java b/src/main/java/com/lambdaschool/zoos/views/CountAnimalInZoo.java new file mode 100644 index 00000000..441805cb --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/views/CountAnimalInZoo.java @@ -0,0 +1,10 @@ +package com.lambdaschool.zoos.views; + +public interface CountAnimalInZoo +{ + long getAnimalid(); + + String getAnimaltype(); + + int getCountzoos(); +} diff --git a/src/main/java/com/lambdaschool/zoos/views/JustTheCount.java b/src/main/java/com/lambdaschool/zoos/views/JustTheCount.java new file mode 100644 index 00000000..369b6f77 --- /dev/null +++ b/src/main/java/com/lambdaschool/zoos/views/JustTheCount.java @@ -0,0 +1,6 @@ +package com.lambdaschool.zoos.views; + +public interface JustTheCount +{ + int getCount(); +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000..9758fe0c --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,25 @@ +# Configurations useful for working with H2 +spring.h2.console.enabled=true +spring.h2.console.path=/h2-console +# +# We set a port that is not frequently used +server.port=${PORT:2019} +# +# 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 +# +# keeps a transaction inside of the same entity manager +# This property register an EntityManager to the current thread, +# so you will have the same EntityManager until the web request is finished. +spring.jpa.open-in-view=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 +# +# Good for production! +# spring.jpa.hibernate.ddl-auto=update +# since we have our data in SeedData, do not also load it from data.sql +# spring.datasource.initialization-mode=never diff --git a/data.sql b/src/main/resources/data.sql similarity index 100% rename from data.sql rename to src/main/resources/data.sql diff --git a/src/test/java/com/lambdaschool/zoos/ZoosApplicationTests.java b/src/test/java/com/lambdaschool/zoos/ZoosApplicationTests.java new file mode 100644 index 00000000..0a68155c --- /dev/null +++ b/src/test/java/com/lambdaschool/zoos/ZoosApplicationTests.java @@ -0,0 +1,15 @@ +package com.lambdaschool.zoos; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ZoosApplicationTests +{ + + @Test + void contextLoads() + { + } + +}