commit 586e5935e4d2fa1bacf31f63000bfba81620bd9f Author: Mikayla Dobson <93477693+innocuous-symmetry@users.noreply.github.com> Date: Tue Jan 24 18:03:11 2023 -0600 init commit; established REST server with postgres diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +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 +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..c1dd12f 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 0000000..b74bf7f --- /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.8.6/apache-maven-3.8.6-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..8a8fb22 --- /dev/null +++ b/mvnw @@ -0,0 +1,316 @@ +#!/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 /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + 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="`\\unset -f command; \\command -v 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/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$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 \ + $MAVEN_DEBUG_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 0000000..1d8ab01 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,188 @@ +@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 "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\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/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq 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%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.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 "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\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% + +cmd /C exit /B %ERROR_CODE% diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..7a0772e --- /dev/null +++ b/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.0.2 + + + com.innocuoussymmetry + REST2 + 0.0.1-SNAPSHOT + REST2 + Demo project for Spring Boot + + 17 + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + org.hibernate.javax.persistence + hibernate-jpa-2.1-api + 1.0.0.Final + + + + org.postgresql + postgresql + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/com/innocuoussymmetry/REST2/Rest2Application.java b/src/main/java/com/innocuoussymmetry/REST2/Rest2Application.java new file mode 100644 index 0000000..13d8a3f --- /dev/null +++ b/src/main/java/com/innocuoussymmetry/REST2/Rest2Application.java @@ -0,0 +1,22 @@ +package com.innocuoussymmetry.REST2; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.domain.EntityScan; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +@SpringBootApplication +@EnableAutoConfiguration +@EnableTransactionManagement +@ComponentScan(basePackages = {"com.innocuoussymmetry.REST2"}) +@EntityScan(basePackages = {"com.innocuoussymmetry.REST2"}) +public class Rest2Application { + + public static void main(String[] args) { + SpringApplication.run(Rest2Application.class, args); + } + +} diff --git a/src/main/java/com/innocuoussymmetry/REST2/controllers/HelloController.java b/src/main/java/com/innocuoussymmetry/REST2/controllers/HelloController.java new file mode 100644 index 0000000..2936d00 --- /dev/null +++ b/src/main/java/com/innocuoussymmetry/REST2/controllers/HelloController.java @@ -0,0 +1,20 @@ +package com.innocuoussymmetry.REST2.controllers; + +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("/hello") +public class HelloController { + @GetMapping() + public String sayHello() { + return "Hello!"; + } + + @GetMapping("/{path}") + public String sayHello(@PathVariable(name="path") String path) { + return "Hello " + path; + } +} diff --git a/src/main/java/com/innocuoussymmetry/REST2/controllers/StuffController.java b/src/main/java/com/innocuoussymmetry/REST2/controllers/StuffController.java new file mode 100644 index 0000000..3697b21 --- /dev/null +++ b/src/main/java/com/innocuoussymmetry/REST2/controllers/StuffController.java @@ -0,0 +1,46 @@ +package com.innocuoussymmetry.REST2.controllers; + +import com.innocuoussymmetry.REST2.models.Stuff; +import com.innocuoussymmetry.REST2.repositories.StuffRepository; +import org.springframework.web.bind.annotation.*; + +import java.util.Optional; + +@RestController +@RequestMapping("/stuff") +public class StuffController { + private final StuffRepository stuffRepository; + + public StuffController(StuffRepository repo) { + this.stuffRepository = repo; + } + + @GetMapping() + public Iterable getAllStuff() { + return this.stuffRepository.findAll(); + } + + @GetMapping("/{id}") + public Stuff getStuffById(@PathVariable Integer id) { + Optional maybe = this.stuffRepository.findById(id); + return maybe.orElse(null); + } + + @PostMapping() + public Stuff addStuff(@RequestBody Stuff stuff) { + return this.stuffRepository.save(stuff); + } + + @PutMapping("/{id}") + public Stuff updateStuff(@PathVariable Integer id, @RequestParam String newName) { + Optional maybe = this.stuffRepository.findById(id); + + if (maybe.isEmpty()) { + return null; + } + + Stuff updated = maybe.get(); + updated.setName(newName); + return this.stuffRepository.save(updated); + } +} diff --git a/src/main/java/com/innocuoussymmetry/REST2/controllers/ThingsController.java b/src/main/java/com/innocuoussymmetry/REST2/controllers/ThingsController.java new file mode 100644 index 0000000..d9b178b --- /dev/null +++ b/src/main/java/com/innocuoussymmetry/REST2/controllers/ThingsController.java @@ -0,0 +1,59 @@ +package com.innocuoussymmetry.REST2.controllers; + +import com.innocuoussymmetry.REST2.models.Thing; +import com.innocuoussymmetry.REST2.repositories.ThingsRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.Optional; + +@RestController +@RequestMapping("/things") +public class ThingsController { + private final ThingsRepository thingsRepository; + + public ThingsController(ThingsRepository thingsRepository) { + this.thingsRepository = thingsRepository; + } + + @GetMapping() + public Iterable getAllThings() { + return this.thingsRepository.findAll(); + } + + @GetMapping("/{id}") + public Thing getThingById(@PathVariable Integer id) { + Optional maybe = this.thingsRepository.findById(id); + + return maybe.orElse(null); + } + + @PostMapping() + public void addThing(@RequestBody Thing thing) { + this.thingsRepository.save(thing); + } + + @PutMapping("/{id}") + public void updateThing(@PathVariable Integer id, @RequestParam(name="name") String newName) { + Optional maybe = this.thingsRepository.findById(id); + if (maybe.isEmpty()) { + return; + } + + Thing updated = maybe.get(); + updated.setName(newName); + this.thingsRepository.save(updated); + } + + @DeleteMapping("/{id}") + public Thing deleteThing(@PathVariable(name="id") Integer id) { + Optional maybe = this.thingsRepository.findById(id); + if (maybe.isEmpty()) { + return null; + } + + this.thingsRepository.delete(maybe.get()); + return maybe.get(); + } +} diff --git a/src/main/java/com/innocuoussymmetry/REST2/db/DBConn.java b/src/main/java/com/innocuoussymmetry/REST2/db/DBConn.java new file mode 100644 index 0000000..f6a5b9a --- /dev/null +++ b/src/main/java/com/innocuoussymmetry/REST2/db/DBConn.java @@ -0,0 +1,58 @@ +package com.innocuoussymmetry.REST2.db; + +import java.sql.*; + +public class DBConn { + private Connection conn; + private final String seedQuery = """ + CREATE TABLE IF NOT EXISTS things ( + id INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + name VARCHAR + ); + + CREATE TABLE IF NOT EXISTS stuff ( + id INT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + name VARCHAR + ); + """; + public DBConn(String constring) { + try { + this.conn = DriverManager.getConnection(constring); + } catch (SQLException e) { + System.out.println(e); + } + } + + public void insert(String name, String table) { + try { + PreparedStatement st = conn.prepareStatement("INSERT INTO ? (name) VALUES (?);"); + st.setString(1, table); + st.setString(2, name); + st.execute(); + st.close(); + } catch (SQLException e) { + System.out.println(e); + } + } + + private void setup() { + try { + Statement st = conn.createStatement(); + st.execute(this.seedQuery); + st.close(); + } catch (SQLException e) { + System.out.println(e); + } + } + + private void seed() { + this.setup(); + this.insert("tea", "things"); + this.insert("cat", "stuff"); + this.insert("apple", "things"); + } + + public static void main(String[] args) { + new DBConn("jdbc:postgresql://localhost:5432/rest2db?username=postgres&password=postgres").seed(); + } +} diff --git a/src/main/java/com/innocuoussymmetry/REST2/db/PGConnection.java b/src/main/java/com/innocuoussymmetry/REST2/db/PGConnection.java new file mode 100644 index 0000000..c4bb6fa --- /dev/null +++ b/src/main/java/com/innocuoussymmetry/REST2/db/PGConnection.java @@ -0,0 +1,16 @@ +package com.innocuoussymmetry.REST2.db; + +import java.sql.*; + +public class PGConnection { + private String url; + public PGConnection() { + try { + url = "postgresql://localhost:5432/rest2db?user=postgres&password=postgres&ssl=true"; + Connection conn = DriverManager.getConnection(url); + } catch (SQLException e) { + System.out.println(e); + } + + } +} diff --git a/src/main/java/com/innocuoussymmetry/REST2/models/BaseModel.java b/src/main/java/com/innocuoussymmetry/REST2/models/BaseModel.java new file mode 100644 index 0000000..2a1654c --- /dev/null +++ b/src/main/java/com/innocuoussymmetry/REST2/models/BaseModel.java @@ -0,0 +1,28 @@ +package com.innocuoussymmetry.REST2.models; + +import jakarta.persistence.*; + +public abstract class BaseModel { + @Id + @GeneratedValue(strategy= GenerationType.IDENTITY) + private Integer id; + + @Column(name="name") + private String name; + + public Integer getId() { + return id; + } + + public void setId(Integer newID) { + this.id = newID; + } + + public String getName() { + return name; + } + + public void setName(String newName) { + this.name= newName; + } +} diff --git a/src/main/java/com/innocuoussymmetry/REST2/models/Stuff.java b/src/main/java/com/innocuoussymmetry/REST2/models/Stuff.java new file mode 100644 index 0000000..d90f07c --- /dev/null +++ b/src/main/java/com/innocuoussymmetry/REST2/models/Stuff.java @@ -0,0 +1,29 @@ +package com.innocuoussymmetry.REST2.models; +import jakarta.persistence.*; +@Entity +@Table(name="stuff") +public class Stuff { + @Id + @Column(name="id") + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + @Column(name="name") + private String name; + + public Integer getId() { + return id; + } + + public void setId(Integer newID) { + this.id = newID; + } + + public String getName() { + return name; + } + + public void setName(String newName) { + this.name= newName; + } +} diff --git a/src/main/java/com/innocuoussymmetry/REST2/models/Thing.java b/src/main/java/com/innocuoussymmetry/REST2/models/Thing.java new file mode 100644 index 0000000..7242be3 --- /dev/null +++ b/src/main/java/com/innocuoussymmetry/REST2/models/Thing.java @@ -0,0 +1,30 @@ +package com.innocuoussymmetry.REST2.models; +import jakarta.persistence.*; + +@Entity +@Table(name="things") +public class Thing { + @Id + @Column(name="id") + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Integer id; + + @Column(name="name") + private String name; + + public Integer getId() { + return id; + } + + public void setId(Integer newID) { + this.id = newID; + } + + public String getName() { + return name; + } + + public void setName(String newName) { + this.name= newName; + } +} diff --git a/src/main/java/com/innocuoussymmetry/REST2/repositories/DataSourceConfig.java b/src/main/java/com/innocuoussymmetry/REST2/repositories/DataSourceConfig.java new file mode 100644 index 0000000..10d2aac --- /dev/null +++ b/src/main/java/com/innocuoussymmetry/REST2/repositories/DataSourceConfig.java @@ -0,0 +1,22 @@ +package com.innocuoussymmetry.REST2.repositories; + +import org.springframework.boot.jdbc.DataSourceBuilder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import javax.sql.*; + +@Configuration +public class DataSourceConfig { + + @Bean + public DataSource getDataSource() { + DataSourceBuilder dataSourceBuilder = DataSourceBuilder.create(); + dataSourceBuilder.driverClassName("org.postgresql.Driver"); + dataSourceBuilder.url("jdbc:postgresql://localhost:5432/rest2db?username=postgres&password=postgres"); + dataSourceBuilder.username("postgres"); + dataSourceBuilder.password("postgres"); + return dataSourceBuilder.build(); + } + +} diff --git a/src/main/java/com/innocuoussymmetry/REST2/repositories/StuffRepository.java b/src/main/java/com/innocuoussymmetry/REST2/repositories/StuffRepository.java new file mode 100644 index 0000000..d364e89 --- /dev/null +++ b/src/main/java/com/innocuoussymmetry/REST2/repositories/StuffRepository.java @@ -0,0 +1,7 @@ +package com.innocuoussymmetry.REST2.repositories; + +import com.innocuoussymmetry.REST2.models.Stuff; +import org.springframework.data.repository.CrudRepository; +import java.sql.*; + +public interface StuffRepository extends CrudRepository { } diff --git a/src/main/java/com/innocuoussymmetry/REST2/repositories/ThingsRepository.java b/src/main/java/com/innocuoussymmetry/REST2/repositories/ThingsRepository.java new file mode 100644 index 0000000..f57ce2e --- /dev/null +++ b/src/main/java/com/innocuoussymmetry/REST2/repositories/ThingsRepository.java @@ -0,0 +1,6 @@ +package com.innocuoussymmetry.REST2.repositories; + +import com.innocuoussymmetry.REST2.models.Thing; +import org.springframework.data.repository.CrudRepository; + +public interface ThingsRepository extends CrudRepository { } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..7301943 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,2 @@ +spring.datasource.url="jdbc:postgresql://localhost:5432/rest2db?username=postgres&password=postgres" +spring.datasource.driver-class-name="org.postgresql" diff --git a/src/test/java/com/innocuoussymmetry/REST2/Rest2ApplicationTests.java b/src/test/java/com/innocuoussymmetry/REST2/Rest2ApplicationTests.java new file mode 100644 index 0000000..2b654bd --- /dev/null +++ b/src/test/java/com/innocuoussymmetry/REST2/Rest2ApplicationTests.java @@ -0,0 +1,13 @@ +package com.innocuoussymmetry.REST2; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class Rest2ApplicationTests { + + @Test + void contextLoads() { + } + +}