From 9d394df4b7943afd130b64fdc8a0f5e0268f658b Mon Sep 17 00:00:00 2001 From: jgiroso Date: Mon, 16 Aug 2021 11:55:29 -0400 Subject: [PATCH 01/16] part 0.0 complete --- .DS_Store | Bin 0 -> 6148 bytes .idea/.gitignore | 3 + .idea/compiler.xml | 18 + .idea/encodings.xml | 6 + .idea/jarRepositories.xml | 20 ++ .idea/misc.xml | 12 + .idea/runConfigurations.xml | 10 + .idea/vcs.xml | 6 + HELP.md | 18 + mvnw | 310 ++++++++++++++++++ mvnw.cmd | 182 ++++++++++ pom.xml | 47 +++ .../com/example/demo/DemoApplication.java | 13 + src/main/resources/application.properties | 1 + .../example/demo/DemoApplicationTests.java | 13 + target/classes/application.properties | 1 + .../com/example/demo/DemoApplication.class | Bin 0 -> 733 bytes .../example/demo/DemoApplicationTests.class | Bin 0 -> 531 bytes 18 files changed, 660 insertions(+) create mode 100644 .DS_Store create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml create mode 100644 HELP.md create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/com/example/demo/DemoApplication.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/com/example/demo/DemoApplicationTests.java create mode 100644 target/classes/application.properties create mode 100644 target/classes/com/example/demo/DemoApplication.class create mode 100644 target/test-classes/com/example/demo/DemoApplicationTests.class diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..8d53f6df21c64da592026510c8cd4690577e334d GIT binary patch literal 6148 zcmeHKO-sW-5Ph2jo8qP5#bbU!z?0WlQczJ4{R7hW7_BIN9OIAi_xTg_&CawoX}yY+ z8Q6K7**BZb+mOuw2;=AZ5ikOfvk4|cx-BN-(l#uy$R07oIZE7Ne%35z(`JM1f&Zw0 z?A-vTnBW3eSlhqFlp}mCl4Iieml^vR_xJ_(c-4Jg@jiOIe97aiv!C~3$xjb@`~e=Y zAg{z5ebb#ieebb{xaOKqP~(!gW!)SDN?kU4K#C_kV%D4YlOyX-7pd-C0aw5k*l`7T zW{c(fitb$jSHKlmDInj6f=#e8Y!&0DgD#c;#Eju+>`N^nIfY?m*eY^_7BrQpsliH& zpy`Yk#;XilMNLPr;v?9dgHtT1 zN`a8oH}#m0WM}Kf!^v4&u-&qW39nULrLYr^VshmuK4go=cp)8PW!Ne*Lh~PiD1$p! I;7=9!2AKn4761SM literal 0 HcmV?d00001 diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..07e72e7 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..63e9001 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..4555257 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..797acea --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/HELP.md b/HELP.md new file mode 100644 index 0000000..5b3dabd --- /dev/null +++ b/HELP.md @@ -0,0 +1,18 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) +* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.5.3/maven-plugin/reference/html/) +* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.5.3/maven-plugin/reference/html/#build-image) +* [Spring Web](https://docs.spring.io/spring-boot/docs/2.5.3/reference/htmlsingle/#boot-features-developing-web-applications) +* [Spring Boot DevTools](https://docs.spring.io/spring-boot/docs/2.5.3/reference/htmlsingle/#using-boot-devtools) + +### Guides +The following guides illustrate how to use some features concretely: + +* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) +* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) +* [Building REST services with Spring](https://spring.io/guides/tutorials/bookmarks/) + diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..a16b543 --- /dev/null +++ b/mvnw @@ -0,0 +1,310 @@ +#!/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 0000000..c8d4337 --- /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 0000000..e70006e --- /dev/null +++ b/pom.xml @@ -0,0 +1,47 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.5.3 + + + com.example + demo + 0.0.1-SNAPSHOT + demo + Demo project for Spring Boot + + 1.8 + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..64b538a --- /dev/null +++ b/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/src/test/java/com/example/demo/DemoApplicationTests.java b/src/test/java/com/example/demo/DemoApplicationTests.java new file mode 100644 index 0000000..2778a6a --- /dev/null +++ b/src/test/java/com/example/demo/DemoApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DemoApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/target/classes/application.properties b/target/classes/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/target/classes/application.properties @@ -0,0 +1 @@ + diff --git a/target/classes/com/example/demo/DemoApplication.class b/target/classes/com/example/demo/DemoApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..57b2435c0414ed0ce57a4d5b5d88a313ae8ba3d3 GIT binary patch literal 733 zcmah{OHbQC5dJnKI3#HU;nC8ER5*nk*h|GF2nka47l2!vp5U(ZnRz({uU=t z5B&lBD8#HA39E`!OPz6qg!a99iY>}GdyP)7@P2X zZk0~Xt;pn+v6nnD#_@6KtW;7LTWE%;A3jYoN=2Rze^xwW=fQ>t;WFgdXeX~79~phF zlER88m6aCc_TeEzePpJRp&KeKKNndf?RTHc&Q<A(#ET+S#nYl-OYhljtf{-nlFe%WmM6i3KfoU) zPGSW?59aVD^Jd=5WZpks-vAt8qk#&lb<|o|z#>CuDjo$-g`V)6cq$Xeuz0Gpa%T+H z-MvvAOAOnI$+(<}EKemL%gpdgf_|Q-DiKZ@J(Ptj7-|=0EE(F7((<~@VrhpWPKoJ8 zCK2gKSmpCMS#$S_L_5*H+)o%u1NYW&1eKk;Ap$u51Y9)vdDD!>4 agv}p9T2m0VsnOeZC|0l*u#0bY9ry$nvwRu= literal 0 HcmV?d00001 From 1b37ceca15030e2950d71f547e01bffa3d72ef1d Mon Sep 17 00:00:00 2001 From: jgiroso Date: Mon, 16 Aug 2021 12:00:25 -0400 Subject: [PATCH 02/16] person and learner classes/interface created --- src/main/java/com/example/demo/Learner.java | 7 ++++++ src/main/java/com/example/demo/Person.java | 28 +++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 src/main/java/com/example/demo/Learner.java create mode 100644 src/main/java/com/example/demo/Person.java diff --git a/src/main/java/com/example/demo/Learner.java b/src/main/java/com/example/demo/Learner.java new file mode 100644 index 0000000..3549876 --- /dev/null +++ b/src/main/java/com/example/demo/Learner.java @@ -0,0 +1,7 @@ +package com.example.demo; + +public interface Learner { + + void learn(double numberOfHours); + +} diff --git a/src/main/java/com/example/demo/Person.java b/src/main/java/com/example/demo/Person.java new file mode 100644 index 0000000..1d458f1 --- /dev/null +++ b/src/main/java/com/example/demo/Person.java @@ -0,0 +1,28 @@ +package com.example.demo; + +public class Person { + + private final Long id; + private String name; + + public Person(Long id) { + this.id = id; + } + + public Person(Long id, String name) { + this.id = id; + this.name = name; + } + + public Long getId() { + return id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} From be13627fa517ea7f7221947a51854e311bb251bc Mon Sep 17 00:00:00 2001 From: jgiroso Date: Mon, 16 Aug 2021 12:10:49 -0400 Subject: [PATCH 03/16] student class created --- .idea/compiler.xml | 1 + .idea/misc.xml | 2 +- src/main/java/com/example/demo/Student.java | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/example/demo/Student.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 07e72e7..767611c 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -9,6 +9,7 @@ + - + \ No newline at end of file diff --git a/src/main/java/com/example/demo/Student.java b/src/main/java/com/example/demo/Student.java new file mode 100644 index 0000000..20afb0f --- /dev/null +++ b/src/main/java/com/example/demo/Student.java @@ -0,0 +1,21 @@ +package com.example.demo; + +public class Student extends Person implements Learner{ + + double totalStudyTime; + + public Student(Long id) { + super(id); + } + + public Student(Long id, String name) { + super(id, name); + } + + @Override + public void learn(double numberOfHours) { + this.totalStudyTime += numberOfHours; + } + + public double getTotalStudyTime() {return totalStudyTime;} +} From ad1d1e40aa3ac361e07a149b0b959e10fd61f2a4 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Mon, 16 Aug 2021 12:14:22 -0400 Subject: [PATCH 04/16] teacher interface created --- src/main/java/com/example/demo/Teacher.java | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/main/java/com/example/demo/Teacher.java diff --git a/src/main/java/com/example/demo/Teacher.java b/src/main/java/com/example/demo/Teacher.java new file mode 100644 index 0000000..ba15c9e --- /dev/null +++ b/src/main/java/com/example/demo/Teacher.java @@ -0,0 +1,8 @@ +package com.example.demo; + +public interface Teacher { + + void teach(Learner learner, double numberOfHours); + void lecture(Iterable learners, double numberOfHours); + +} From b80681423130ce388ed620fe93058651e235fc01 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Mon, 16 Aug 2021 12:29:27 -0400 Subject: [PATCH 05/16] Instructor class created --- .../java/com/example/demo/Instructor.java | 38 ++++++++++++++++++ .../com/example/demo/DemoApplication.class | Bin 733 -> 733 bytes target/classes/com/example/demo/Learner.class | Bin 0 -> 181 bytes target/classes/com/example/demo/Person.class | Bin 0 -> 903 bytes target/classes/com/example/demo/Student.class | Bin 0 -> 833 bytes target/classes/com/example/demo/Teacher.class | Bin 0 -> 368 bytes .../example/demo/DemoApplicationTests.class | Bin 531 -> 531 bytes 7 files changed, 38 insertions(+) create mode 100644 src/main/java/com/example/demo/Instructor.java create mode 100644 target/classes/com/example/demo/Learner.class create mode 100644 target/classes/com/example/demo/Person.class create mode 100644 target/classes/com/example/demo/Student.class create mode 100644 target/classes/com/example/demo/Teacher.class diff --git a/src/main/java/com/example/demo/Instructor.java b/src/main/java/com/example/demo/Instructor.java new file mode 100644 index 0000000..6c2c8e1 --- /dev/null +++ b/src/main/java/com/example/demo/Instructor.java @@ -0,0 +1,38 @@ +package com.example.demo; + +import java.util.ArrayList; +import java.util.List; + +public class Instructor extends Person implements Teacher{ + + List learners; + + public Instructor(Long id) { + super(id); + } + + public Instructor(Long id, String name) { + super(id, name); + } + + @Override + public void teach(Learner learner, double numberOfHours) { + learner.learn(numberOfHours); + } + + @Override + public void lecture(Iterable learners, double numberOfHours) { + List listOfLearners = iterableToList(learners); + for(Learner learner : listOfLearners) { + teach(learner, (numberOfHours/listOfLearners.size())); + } + } + + public List iterableToList(Iterable learners) { + List listOfLearners= new ArrayList<>(); + for(Learner learner : learners) { + listOfLearners.add(learner); + } + return listOfLearners; + } +} diff --git a/target/classes/com/example/demo/DemoApplication.class b/target/classes/com/example/demo/DemoApplication.class index 57b2435c0414ed0ce57a4d5b5d88a313ae8ba3d3..25a3a3a6b963a50e4f39dabf4d68dc5745fc038f 100644 GIT binary patch delta 267 zcmYL@y-osA6okLCaJkE}Dt{u17RE-f*oIIMUV#ql)er+ARK(V2pz}41g~oyh;2n4s z5wGLuJ6?W8EwNUa+V+0pMBVu4Q;IUxsyU%qhe82q%6v&cR==uT~c&58hKO< zt`8_vQI(}iO-o#Okd%Q}w!I_S_j}%rN0(S~t|PjYcsx;8<5{l}6>iQ;f(@F=?%x*t E1A9Rk=l}o! diff --git a/target/classes/com/example/demo/Learner.class b/target/classes/com/example/demo/Learner.class new file mode 100644 index 0000000000000000000000000000000000000000..f297956baf7a053cf00844dade99aed0306d631d GIT binary patch literal 181 zcmXYrO$x#=5QX2=w$ZBK(j(}`Y&?R93#EeKK5fUJk~9)q@oX+UfQJ$ja5KaA-n_?r zzOOfcC58e6fsBx7R<0q$v(@}anC!T{*lMqwGTgGe6UI$v3U>KvW4plF!S9mSSIvac zHpJO2YV}ZrX=#n*r!qIqvSMT9-}lYoLTc5VWnR==wkd%S`ELM<2|dJ~6Hf^t4I+e} G5&A!|St_ys literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/Person.class b/target/classes/com/example/demo/Person.class new file mode 100644 index 0000000000000000000000000000000000000000..000e587265bc2b51d301d5b763aa561d8e503f9d GIT binary patch literal 903 zcmZ`&U2D`p6g`vOB)e(atm&7nA8j9m-L;q(-;}-x1!1j)%7TxxyTdkRlSnp|{;Ucu zf)D-xf0TG;64Pjvfw^1@l2pMx{#k` zw2p!$J(!g?czLM3ha!gSrVx$nS5HPXr_`ZI#u~HOF2vLohr_=*{RGqQ^Baf zvwO^qNvc8hEcRR#Z>ccs4;lrPMwiJGBXi@AbS>0f{w~;T@-^_iv+OdTs^eJeTPY`g zp_l2y!@ds(u8$770^9%5M|pS4e?PfU(?X!tAB=Ip?_~4iSqL?bc@c`%h9LY3Gd{gz zT8q{jeuWr5zlHV1)UNVgLyLEZNL?O}KCo3*BS4QH`wY6k1HNrR2L?W@;6Ku8kf4Si z9^RsL#}N`8oTQCaa;)(LhG)NQt9gQohfsPYgw>2)%P@8f>pC{btwlw&g4Q11z`Ewc zB05;AgQ3Cq%Yq7DV3W%3H@E(7-uh?rHXc@bk7)He9lgqiOwUAj^>1Vl$~8K*JjaNt M*H{YLF_Z890(L2np#T5? literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/Student.class b/target/classes/com/example/demo/Student.class new file mode 100644 index 0000000000000000000000000000000000000000..f87764e0b6d92df252df70beb131cf4b6d32170c GIT binary patch literal 833 zcmZ`$+iuf96r6S9nj}u!TxdhNwID>ABK*QzQD0gikPK8xREfuJyrf397nu!$uR=(m zN<8oZd=z5VHla#{ET28QJ7?z1*g>_nUBW+lD(0)N$9tu7^Dj_XO6BHZmET zdGvV_r%FJa2&_Ggv)CL7^oHR(`B4Um%w|ETv)SSPnLzzmM?`Lfai(6)({q(i6O z9!|fbwye~llkODC4w8HCswgc%vwY%=pQOY9gKm^C!RHl}bhvhpyn zFtARv(W)27N-Rs%&q>Tn*Y{7#N=+_dP+(vJ>IDHNAOus-AkC_^oq=&9 zSehM3vVjHJ890D!9*6=4P6jR@kAZ<3sF?|@SsTa$X-3y*22_L4$q3cS15^nzmlsGg QG4O#&exT_PQ2_=90F;{)-T(jq delta 241 zcmbQtGMUBx)W2Q(7#J8#7(}=jm>8JZ8CZB2SQ*$D83eKt%M$f-67$ma{gbj%lS>#G z*laTMGE3|j8JIOR!`K-(7#UP2#;R^q;byF7P+(vO>IVT32{eI$k%1G)(g)IvAQ7$Y z42&DW(p*3iB+UTS!VM&OAPRsqFObK;zz39N0&CU=@<8e^G;$+pWCUtd1?l7mVvxB4 QK$?j`5KIceMTHp{0QV~t`Tzg` From f4ed269e90aa5e92ac3c0734096790a7d996db12 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Mon, 16 Aug 2021 12:54:03 -0400 Subject: [PATCH 06/16] People class created --- .../java/com/example/demo/Instructor.java | 2 - src/main/java/com/example/demo/People.java | 47 ++++++++++++++++++ .../classes/com/example/demo/Instructor.class | Bin 0 -> 2096 bytes 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/example/demo/People.java create mode 100644 target/classes/com/example/demo/Instructor.class diff --git a/src/main/java/com/example/demo/Instructor.java b/src/main/java/com/example/demo/Instructor.java index 6c2c8e1..16f4b9a 100644 --- a/src/main/java/com/example/demo/Instructor.java +++ b/src/main/java/com/example/demo/Instructor.java @@ -5,8 +5,6 @@ public class Instructor extends Person implements Teacher{ - List learners; - public Instructor(Long id) { super(id); } diff --git a/src/main/java/com/example/demo/People.java b/src/main/java/com/example/demo/People.java new file mode 100644 index 0000000..d2e13a2 --- /dev/null +++ b/src/main/java/com/example/demo/People.java @@ -0,0 +1,47 @@ +package com.example.demo; + +import java.util.List; + +public abstract class People implements Iterable{ + + List personList; + + public People(List personList) { + this.personList = personList; + } + + public void add(PersonType person) { + personList.add(person); + } + + public void remove(PersonType person) { + personList.remove(person); + } + + public int size() { + return personList.size(); + } + + public void clear() { + personList.clear(); + } + + public void addAll(Iterable people) { + for(PersonType person : people) { + personList.add(person); + } + } + + public PersonType findById(Long id) { + for(PersonType person : personList) { + if(person.getId().equals(id)) { + return person; + } + } + return null; + } + + public List findAll() { + return personList; + } +} diff --git a/target/classes/com/example/demo/Instructor.class b/target/classes/com/example/demo/Instructor.class new file mode 100644 index 0000000000000000000000000000000000000000..fcba956b6508e5f5f8b7748bd2b88b97a3a9e3b4 GIT binary patch literal 2096 zcmah}+j1L45IwV&w7OX~wxh&Oe2a;rn57b)P*c+r>*J?#2 z`~cs;7vvRQ;xbgFc&7LQUh@~Jf^cSbb-{K_skFN@-F^C;?w zkhgEO1STsrr&%S#^Qo! z^3P_WYM-)#Qf)g@r@;JaK;`T)zLfCoX^v-SJdW}|s^e8Qx@O+7Z?_r6BNn#UQtWFYN;L9Yc*yd=QI2J*pllTfdNlasg=TJ?sYRE0uHJ-|9 zNcj6YzE0u+9tvDMfz#t8aQ=jKi$}?^Ps_h8PloAo@OoMO@{ja3)O_;f@+7GN=BkK0i(_<n$wC{!UxWENiLHyV=;%f zdue95HK)>C!93xmm_Nx@=ev~4KS!t(8V?;w&86^o_y`e!pKw`z=>oqaT8iYxBN^!u z6Zp}2j`*|Je@S8?Ro65t3ewP7$9amn!7ARQMp@$}+UD6ONi8Dtb?KIH6&Xdh6wuXq zsItfrHBV2!JJPE_FW Date: Mon, 16 Aug 2021 13:08:24 -0400 Subject: [PATCH 07/16] Students class created --- src/main/java/com/example/demo/Students.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/main/java/com/example/demo/Students.java diff --git a/src/main/java/com/example/demo/Students.java b/src/main/java/com/example/demo/Students.java new file mode 100644 index 0000000..3a25b1c --- /dev/null +++ b/src/main/java/com/example/demo/Students.java @@ -0,0 +1,20 @@ +package com.example.demo; + + +import java.util.Iterator; +import java.util.List; +import java.util.Spliterator; +import java.util.function.Consumer; + +public class Students extends People{ + + public Students(List studentList) { + super(studentList); + } + + @Override + public Iterator iterator() { + return null; + } + +} From 4696e484320ca3c3966c6019b6bdd0fa81944249 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Mon, 16 Aug 2021 13:11:46 -0400 Subject: [PATCH 08/16] Instructors class created --- src/main/java/com/example/demo/Instructors.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/main/java/com/example/demo/Instructors.java diff --git a/src/main/java/com/example/demo/Instructors.java b/src/main/java/com/example/demo/Instructors.java new file mode 100644 index 0000000..9a4c754 --- /dev/null +++ b/src/main/java/com/example/demo/Instructors.java @@ -0,0 +1,16 @@ +package com.example.demo; + +import java.util.Iterator; +import java.util.List; + +public class Instructors extends People{ + + public Instructors(List instructorList) { + super(instructorList); + } + + @Override + public Iterator iterator() { + return null; + } +} From ed07b918d58ce3db361274030e2a457d5d63c39c Mon Sep 17 00:00:00 2001 From: jgiroso Date: Mon, 16 Aug 2021 13:24:50 -0400 Subject: [PATCH 09/16] Classroom class created --- src/main/java/com/example/demo/Classroom.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/main/java/com/example/demo/Classroom.java diff --git a/src/main/java/com/example/demo/Classroom.java b/src/main/java/com/example/demo/Classroom.java new file mode 100644 index 0000000..096a18f --- /dev/null +++ b/src/main/java/com/example/demo/Classroom.java @@ -0,0 +1,16 @@ +package com.example.demo; + +public class Classroom { + + Instructors instructors; + Students students; + + public Classroom(Instructors instructors, Students students) { + this.instructors = instructors; + this.students = students; + } + + public void hostLecture(Teacher teacher, double numberOfHours) { + teacher.lecture(students.findAll(), numberOfHours); + } +} From 8cf4a830b10f8932c83ded49c4d264366577e956 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Mon, 16 Aug 2021 13:44:19 -0400 Subject: [PATCH 10/16] StudentConfig created --- src/main/java/com/example/demo/Classroom.java | 16 ++++++++++++++ .../java/com/example/demo/StudentConfig.java | 20 ++++++++++++++++++ .../classes/com/example/demo/Classroom.class | Bin 0 -> 1408 bytes .../com/example/demo/Instructors.class | Bin 0 -> 783 bytes target/classes/com/example/demo/People.class | Bin 0 -> 2470 bytes .../com/example/demo/StudentConfig.class | Bin 0 -> 760 bytes .../classes/com/example/demo/Students.class | Bin 0 -> 762 bytes 7 files changed, 36 insertions(+) create mode 100644 src/main/java/com/example/demo/StudentConfig.java create mode 100644 target/classes/com/example/demo/Classroom.class create mode 100644 target/classes/com/example/demo/Instructors.class create mode 100644 target/classes/com/example/demo/People.class create mode 100644 target/classes/com/example/demo/StudentConfig.class create mode 100644 target/classes/com/example/demo/Students.class diff --git a/src/main/java/com/example/demo/Classroom.java b/src/main/java/com/example/demo/Classroom.java index 096a18f..2a0ff15 100644 --- a/src/main/java/com/example/demo/Classroom.java +++ b/src/main/java/com/example/demo/Classroom.java @@ -13,4 +13,20 @@ public Classroom(Instructors instructors, Students students) { public void hostLecture(Teacher teacher, double numberOfHours) { teacher.lecture(students.findAll(), numberOfHours); } + + public Instructors getInstructors() { + return instructors; + } + + public void setInstructors(Instructors instructors) { + this.instructors = instructors; + } + + public Students getStudents() { + return students; + } + + public void setStudents(Students students) { + this.students = students; + } } diff --git a/src/main/java/com/example/demo/StudentConfig.java b/src/main/java/com/example/demo/StudentConfig.java new file mode 100644 index 0000000..d456d4b --- /dev/null +++ b/src/main/java/com/example/demo/StudentConfig.java @@ -0,0 +1,20 @@ +package com.example.demo; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class StudentConfig { + + Students students; + + @Bean(name = "students") + public Students currentStudents() { + return students; + } + + @Bean(name = "previous_students") + public Students previousStudents() { + return students; + } +} diff --git a/target/classes/com/example/demo/Classroom.class b/target/classes/com/example/demo/Classroom.class new file mode 100644 index 0000000000000000000000000000000000000000..4444330266fe43b43bcc2a3c78c2914cad816ae1 GIT binary patch literal 1408 zcmZ`(+iuf95IyT$+{A8D3WT(!H?C<~YA$_iRSC61R7xqRRV5zXWZSrMY-Br#&jN{p z;DHa|qY!6fI}LG2p_(`7BlH zDKPB~6d#?x_WO!O>RMfyGHI={6}0 zQl!(#1xRj4Q06KphI97JCirQB3Ngs!-rZhy%|kmTAW| q<;FG5Pt>%+rp8VCN7G2J;;JoC)AD~bsm_Q&XQ(Oe$~`L6aQ`nRFdgLp literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/Instructors.class b/target/classes/com/example/demo/Instructors.class new file mode 100644 index 0000000000000000000000000000000000000000..870bcd6455d4300fd1bff905c86e96291c88de11 GIT binary patch literal 783 zcmah{+e*Vg5S>kHdegSnOT8iZ)~Xm3AB0L@1VM;WsQA9Ni(P55CE1Anl|BhR_yK;D zcs8k4+fo;jopWY(&dkn!e7?OC(J^i2DMf1;TF=l1Bl}ePQa2eb)!cjjz@13TzT?VJ zH|jTx(r2nG7?oVt`H6~Q&X?SrYfs>Ay?Jdg$t$+YgtkkPi=QJy0nxi{zwrz&E~(pvpjNf$#Nx`$I8Q?j>Elk($QPbRx*359!{a%^;| z@zH!+ML|cLOEaJH$Qd4(!Ol~f<``|w8V#fBgga5E9kTFj%(4j2g64p1pcb%&-QL}M zCH4Xz&gKi1gRFDUJ~%8n z*`jk$$!JDZ~pU$FBN2@gba*Qc2-V zfW2gw_p)o`BL%I4k*X;S>(-p~P?%|BZXvGFyXD!1@7C=@zs?3W73SLA*b*o-y1#YH z#VhyMShmG*NWN0u%cVQkQ6b_oBv7Ug+K-?bPiG02PQj2H{i+P6(ye+_m^x)_L9MX2 z)D-yTju4kamAkQf$0>NZkfq*)rOxqGvbj|`surA8S2~o?0>3Da(ZUE8EWCt41D{%$ z!c7bFGMq=sLR!wYu+2_b_zXK1ZsBvPpv{vJxmoxEw+(!0;Vay1@1`{};C~1FYHLP( zqfJwtQr+l(FMOj{p(OiGenb>T!kr2#l)g<#xFS$LCV8S6^;|5Bv2WKloO}E@QTL3A zmHo|d-9Lnp-tj%h6NNPz9u|zo)v)l@INu-HrCMy7AJTqMWc)!&&3TBc2!_$k^$3!P z;tVajv_&|Z3%^4xEdGYbFWg1(GRHp7Ko4U4%=RFGv)m=MH%2kW9pi%R=T4lBH_nE6 z+XQ!UMMnf6CTX0)bO7O-0D`sfDh(>U$3BvR*?Bn(QAplkbfQ1>n!hB5ta;5>u z*=!TQOas6ijq@D=#M%HDB!Hp+7XbB67}A7Q&eAATDsU{d`k6c3gf9Oi>0fPWuYkKS zZd!z~lIO!wa$e^g%GssRTGLTBb?iUpUBrc;TR*ZNG3HORQ-;F&g=2IpJir(iJqk}@ zZU~Ev?&HH3f6KKoUr&R6-~{1MVvYhxu>+#1DW)D}eWj72xO6~JRvBC*4WZifnr(RL zHj7u5Ua!(Cfyi?h23~u{fIxT|+O_&$r`H?&yP>uJQ$QuF%bp0a8E>-5JchOS7`+b= z&pdkg;xF}x=`^7v;#|*CZF3|u&)TO5CEXx3j@|~TY=cx5m+)3VN}iMU(xk*oNC_1S z(dRHpW%3!l0xp+$pt-!w6z||&9!a}bxKo_t!bK2<)sqQzIUe9>sz)qxr%rpB3H2(6 JC0ZkR?_bAx+ob>i literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/StudentConfig.class b/target/classes/com/example/demo/StudentConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..06ce2e24379ff3cf577d533202ccffacb57a26b8 GIT binary patch literal 760 zcma)3O-}+b5PgLe1Q8IwKchD>(O!%fjERzXBATe-;=z=qVwG)4x2ygvO-xKY_yhb= z#$f@CMiLI4cBb#md((b=zP$t3#Yz?)7BWa;F^#1(mKnxF7d54JA;WUbHvyNABIvXw zZ_2>%^ZsRpA+@ixat92_&2pW=tD2@{DAbgeCsELl_Chq;R4LVrFWPlsRX6V!J$Iu> zVST7V)#z*0BAJ38SxbHf$_%TU<)O5Y7>j3-b}Eo{6)I9Z)Y>@Vl+h%(T{E`D!;V$D zb!|l;AB?@@zR^xTIxfDU{74E-y*y1AhGNIcdu5{V$Hmm3boKLK*>e+FUmmM??mo6R z$i1ZYjg41wNMk&QF{BvQhJ8wpLT0;Cye)K#pEho#@3281?9qoaTGWGL zlFrnUVumtKdwjR`3ieEe1hN!UaWRbvI_G)-+9xSv$fH20-{co0p8k+0{~;F%lcyF_ fv`Uv?A$ek$9<5<%q=qx(Z8o+thpt?Al6l|@mB*^? literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/Students.class b/target/classes/com/example/demo/Students.class new file mode 100644 index 0000000000000000000000000000000000000000..d6770037e34603be37f02fe313c17504aca2754d GIT binary patch literal 762 zcmaJkHTKi#ZtF5&sZ>@?!&{M^WAP7+cmEPB8u`5lsq#MzHr6<9IKfoU) zzD+7H7s?lmDy|I0O&r{b=$7A&fz(_zf9kdb)TIPbl zild>plx861pB5jPF_tJxYm8be2f?Vh5KBdAk1V_pvn;|3pfz|lJP*Ew-QGWVBlZd_ zLpl5l30gv4ney-(X%?*`VwO!sDuJmC+w3W_0jmNVRTi;T@maJ9uts%QM(_}xNw?Tb c5;bCWf@~&2DVa4BN*T6rHnp} Date: Mon, 16 Aug 2021 13:51:57 -0400 Subject: [PATCH 11/16] created InstructorsConfig --- .../com/example/demo/InstructorsConfig.java | 25 ++++++++++++++++++ .../com/example/demo/InstructorsConfig.class | Bin 0 -> 849 bytes 2 files changed, 25 insertions(+) create mode 100644 src/main/java/com/example/demo/InstructorsConfig.java create mode 100644 target/classes/com/example/demo/InstructorsConfig.class diff --git a/src/main/java/com/example/demo/InstructorsConfig.java b/src/main/java/com/example/demo/InstructorsConfig.java new file mode 100644 index 0000000..c630d90 --- /dev/null +++ b/src/main/java/com/example/demo/InstructorsConfig.java @@ -0,0 +1,25 @@ +package com.example.demo; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Primary; + +public class InstructorsConfig { + + Instructors instructors; + + @Bean(name = "tcUsaInstructors") + public Instructors tcUsaInstructors() { + return instructors; + } + + @Bean(name = "tcUkInstructors") + public Instructors tcUkInstructors() { + return instructors; + } + + @Primary + @Bean(name = "instructors") + public Instructors zipCodeInstructors() { + return instructors; + } +} diff --git a/target/classes/com/example/demo/InstructorsConfig.class b/target/classes/com/example/demo/InstructorsConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..1c3646d30e15c3880f8e090d179b2f6005773f1a GIT binary patch literal 849 zcma)4%SuBr5S{34t8IPNN3DvexKKgk!kr?hAP7apM>nq0+jx!kCM7rZ^;HUj;KC2^ zqr}rzY%5y2$RsnFbI!~pAD?gUM6^LON%Cm2pL!{mps55+GfF8PIa~Feu@R%$yl+A- z??qTCOJ0(p;Rnt8O-Au8rIp)e)Vs7?VC3zYl4LZLS6Uuc!=kijqF6>GlQ+I77lc(c z|2ycpD+Q6ojv{+TU#b97!_GgCM2kG5xuxZfSfFwzRqa$L3o24j-qG4P;gr!3Ud%YJNCDC`3S zlBcF>eYvk{Bb#VpYYbuSTHJ~>C8#e=F^V%<==3@b4CYot@v_hXKPp~J-_blC+`|W8 zSm1&6a0V@GKRk}Tez)>U>=}U`O2WqL!8oOGPB#*;55QwINJGeK2ft9y(=TxP5AZN@ r20<}`mAN1m)xFW~2uHdi90m1QcZAu02s3DJ9F;b!jDd8b-e2|$gZZ^F literal 0 HcmV?d00001 From fccb09cb1d2a7aba9926921b416b3d9289015deb Mon Sep 17 00:00:00 2001 From: jgiroso Date: Mon, 16 Aug 2021 15:11:00 -0400 Subject: [PATCH 12/16] StudentConfig tests pass --- .idea/uiDesigner.xml | 124 ++++++++++++++++++ pom.xml | 8 +- .../java/com/example/demo/Instructors.java | 16 --- .../java/com/example/demo/StudentConfig.java | 20 --- src/main/java/com/example/demo/Students.java | 20 --- .../demo/configuration/ClassroomConfig.java | 30 +++++ .../InstructorsConfig.java | 5 +- .../demo/configuration/StudentConfig.java | 29 ++++ .../example/demo/{ => models}/Classroom.java | 4 +- .../example/demo/{ => models}/Instructor.java | 7 +- .../com/example/demo/models/Instructors.java | 15 +++ .../com/example/demo/{ => models}/People.java | 7 +- .../com/example/demo/{ => models}/Person.java | 2 +- .../example/demo/{ => models}/Student.java | 7 +- .../com/example/demo/models/Students.java | 18 +++ .../demo/configuration/StudentConfigTest.java | 46 +++++++ .../classes/com/example/demo/Classroom.class | Bin 1408 -> 0 bytes .../classes/com/example/demo/Instructor.class | Bin 2096 -> 0 bytes .../com/example/demo/Instructors.class | Bin 783 -> 0 bytes .../com/example/demo/InstructorsConfig.class | Bin 849 -> 0 bytes target/classes/com/example/demo/People.class | Bin 2470 -> 0 bytes target/classes/com/example/demo/Student.class | Bin 833 -> 0 bytes .../com/example/demo/StudentConfig.class | Bin 760 -> 0 bytes .../classes/com/example/demo/Students.class | Bin 762 -> 0 bytes .../demo/configuration/ClassroomConfig.class | Bin 0 -> 1198 bytes .../configuration/InstructorsConfig.class | Bin 0 -> 960 bytes .../demo/configuration/StudentConfig.class | Bin 0 -> 1214 bytes .../com/example/demo/models/Classroom.class | Bin 0 -> 1485 bytes .../com/example/demo/models/Instructor.class | Bin 0 -> 2117 bytes .../com/example/demo/models/Instructors.class | Bin 0 -> 749 bytes .../com/example/demo/models/People.class | Bin 0 -> 2679 bytes .../example/demo/{ => models}/Person.class | Bin 903 -> 917 bytes .../com/example/demo/models/Student.class | Bin 0 -> 854 bytes .../com/example/demo/models/Students.class | Bin 0 -> 728 bytes .../configuration/StudentConfigTest.class | Bin 0 -> 1633 bytes 35 files changed, 291 insertions(+), 67 deletions(-) create mode 100644 .idea/uiDesigner.xml delete mode 100644 src/main/java/com/example/demo/Instructors.java delete mode 100644 src/main/java/com/example/demo/StudentConfig.java delete mode 100644 src/main/java/com/example/demo/Students.java create mode 100644 src/main/java/com/example/demo/configuration/ClassroomConfig.java rename src/main/java/com/example/demo/{ => configuration}/InstructorsConfig.java (76%) create mode 100644 src/main/java/com/example/demo/configuration/StudentConfig.java rename src/main/java/com/example/demo/{ => models}/Classroom.java (91%) rename src/main/java/com/example/demo/{ => models}/Instructor.java (84%) create mode 100644 src/main/java/com/example/demo/models/Instructors.java rename src/main/java/com/example/demo/{ => models}/People.java (85%) rename src/main/java/com/example/demo/{ => models}/Person.java (92%) rename src/main/java/com/example/demo/{ => models}/Student.java (67%) create mode 100644 src/main/java/com/example/demo/models/Students.java create mode 100644 src/test/java/com/example/demo/configuration/StudentConfigTest.java delete mode 100644 target/classes/com/example/demo/Classroom.class delete mode 100644 target/classes/com/example/demo/Instructor.class delete mode 100644 target/classes/com/example/demo/Instructors.class delete mode 100644 target/classes/com/example/demo/InstructorsConfig.class delete mode 100644 target/classes/com/example/demo/People.class delete mode 100644 target/classes/com/example/demo/Student.class delete mode 100644 target/classes/com/example/demo/StudentConfig.class delete mode 100644 target/classes/com/example/demo/Students.class create mode 100644 target/classes/com/example/demo/configuration/ClassroomConfig.class create mode 100644 target/classes/com/example/demo/configuration/InstructorsConfig.class create mode 100644 target/classes/com/example/demo/configuration/StudentConfig.class create mode 100644 target/classes/com/example/demo/models/Classroom.class create mode 100644 target/classes/com/example/demo/models/Instructor.class create mode 100644 target/classes/com/example/demo/models/Instructors.class create mode 100644 target/classes/com/example/demo/models/People.class rename target/classes/com/example/demo/{ => models}/Person.class (64%) create mode 100644 target/classes/com/example/demo/models/Student.class create mode 100644 target/classes/com/example/demo/models/Students.class create mode 100644 target/test-classes/com/example/demo/configuration/StudentConfigTest.class diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index e70006e..7e6f744 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,13 @@ spring-boot-starter-test test - + + junit + junit + 4.13.1 + test + + diff --git a/src/main/java/com/example/demo/Instructors.java b/src/main/java/com/example/demo/Instructors.java deleted file mode 100644 index 9a4c754..0000000 --- a/src/main/java/com/example/demo/Instructors.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.demo; - -import java.util.Iterator; -import java.util.List; - -public class Instructors extends People{ - - public Instructors(List instructorList) { - super(instructorList); - } - - @Override - public Iterator iterator() { - return null; - } -} diff --git a/src/main/java/com/example/demo/StudentConfig.java b/src/main/java/com/example/demo/StudentConfig.java deleted file mode 100644 index d456d4b..0000000 --- a/src/main/java/com/example/demo/StudentConfig.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.example.demo; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class StudentConfig { - - Students students; - - @Bean(name = "students") - public Students currentStudents() { - return students; - } - - @Bean(name = "previous_students") - public Students previousStudents() { - return students; - } -} diff --git a/src/main/java/com/example/demo/Students.java b/src/main/java/com/example/demo/Students.java deleted file mode 100644 index 3a25b1c..0000000 --- a/src/main/java/com/example/demo/Students.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.example.demo; - - -import java.util.Iterator; -import java.util.List; -import java.util.Spliterator; -import java.util.function.Consumer; - -public class Students extends People{ - - public Students(List studentList) { - super(studentList); - } - - @Override - public Iterator iterator() { - return null; - } - -} diff --git a/src/main/java/com/example/demo/configuration/ClassroomConfig.java b/src/main/java/com/example/demo/configuration/ClassroomConfig.java new file mode 100644 index 0000000..85df5aa --- /dev/null +++ b/src/main/java/com/example/demo/configuration/ClassroomConfig.java @@ -0,0 +1,30 @@ +package com.example.demo.configuration; + +import com.example.demo.models.Classroom; +import com.example.demo.models.Instructors; +import com.example.demo.models.Students; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; + +@Configuration +public class ClassroomConfig { + + Instructors instructors; + Students students; + + + @Bean(name = "currentCohort") + @DependsOn({"instructors", "students"}) + public Classroom currentCohort() { + Classroom classroom = new Classroom(instructors, students); + return classroom; + } + + @Bean(name = "previousCohort") + @DependsOn({"instructors", "previous_students"}) + public Classroom previousCohort() { + Classroom classroom = new Classroom(instructors, students); + return classroom; + } +} diff --git a/src/main/java/com/example/demo/InstructorsConfig.java b/src/main/java/com/example/demo/configuration/InstructorsConfig.java similarity index 76% rename from src/main/java/com/example/demo/InstructorsConfig.java rename to src/main/java/com/example/demo/configuration/InstructorsConfig.java index c630d90..3604526 100644 --- a/src/main/java/com/example/demo/InstructorsConfig.java +++ b/src/main/java/com/example/demo/configuration/InstructorsConfig.java @@ -1,8 +1,11 @@ -package com.example.demo; +package com.example.demo.configuration; +import com.example.demo.models.Instructors; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; +@Configuration public class InstructorsConfig { Instructors instructors; diff --git a/src/main/java/com/example/demo/configuration/StudentConfig.java b/src/main/java/com/example/demo/configuration/StudentConfig.java new file mode 100644 index 0000000..9091c1e --- /dev/null +++ b/src/main/java/com/example/demo/configuration/StudentConfig.java @@ -0,0 +1,29 @@ +package com.example.demo.configuration; + +import com.example.demo.models.Student; +import com.example.demo.models.Students; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class StudentConfig { + + + @Bean(name = "students") + public Students currentStudents() { + return new Students( + new Student(1L, "Jen"), + new Student(2L, "Jeremy"), + new Student(3L, "Char") + ); + } + + @Bean(name = "previous_students") + public Students previousStudents() { + return new Students( + new Student(1L, "Chris"), + new Student(2L, "Earl"), + new Student(3L, "Jack") + ); + } +} diff --git a/src/main/java/com/example/demo/Classroom.java b/src/main/java/com/example/demo/models/Classroom.java similarity index 91% rename from src/main/java/com/example/demo/Classroom.java rename to src/main/java/com/example/demo/models/Classroom.java index 2a0ff15..3578dc9 100644 --- a/src/main/java/com/example/demo/Classroom.java +++ b/src/main/java/com/example/demo/models/Classroom.java @@ -1,4 +1,6 @@ -package com.example.demo; +package com.example.demo.models; + +import com.example.demo.Teacher; public class Classroom { diff --git a/src/main/java/com/example/demo/Instructor.java b/src/main/java/com/example/demo/models/Instructor.java similarity index 84% rename from src/main/java/com/example/demo/Instructor.java rename to src/main/java/com/example/demo/models/Instructor.java index 16f4b9a..991daa1 100644 --- a/src/main/java/com/example/demo/Instructor.java +++ b/src/main/java/com/example/demo/models/Instructor.java @@ -1,9 +1,12 @@ -package com.example.demo; +package com.example.demo.models; + +import com.example.demo.Learner; +import com.example.demo.Teacher; import java.util.ArrayList; import java.util.List; -public class Instructor extends Person implements Teacher{ +public class Instructor extends Person implements Teacher { public Instructor(Long id) { super(id); diff --git a/src/main/java/com/example/demo/models/Instructors.java b/src/main/java/com/example/demo/models/Instructors.java new file mode 100644 index 0000000..9197d6b --- /dev/null +++ b/src/main/java/com/example/demo/models/Instructors.java @@ -0,0 +1,15 @@ +package com.example.demo.models; + +import java.util.Iterator; + +public class Instructors extends People { + + public Instructors(Instructor... instructors) { + super(instructors); + } + + @Override + public Iterator iterator() { + return null; + } +} diff --git a/src/main/java/com/example/demo/People.java b/src/main/java/com/example/demo/models/People.java similarity index 85% rename from src/main/java/com/example/demo/People.java rename to src/main/java/com/example/demo/models/People.java index d2e13a2..60139c7 100644 --- a/src/main/java/com/example/demo/People.java +++ b/src/main/java/com/example/demo/models/People.java @@ -1,13 +1,14 @@ -package com.example.demo; +package com.example.demo.models; +import java.util.Arrays; import java.util.List; public abstract class People implements Iterable{ List personList; - public People(List personList) { - this.personList = personList; + public People(PersonType... persons) { + personList = Arrays.asList(persons); } public void add(PersonType person) { diff --git a/src/main/java/com/example/demo/Person.java b/src/main/java/com/example/demo/models/Person.java similarity index 92% rename from src/main/java/com/example/demo/Person.java rename to src/main/java/com/example/demo/models/Person.java index 1d458f1..ad5651d 100644 --- a/src/main/java/com/example/demo/Person.java +++ b/src/main/java/com/example/demo/models/Person.java @@ -1,4 +1,4 @@ -package com.example.demo; +package com.example.demo.models; public class Person { diff --git a/src/main/java/com/example/demo/Student.java b/src/main/java/com/example/demo/models/Student.java similarity index 67% rename from src/main/java/com/example/demo/Student.java rename to src/main/java/com/example/demo/models/Student.java index 20afb0f..0ee588b 100644 --- a/src/main/java/com/example/demo/Student.java +++ b/src/main/java/com/example/demo/models/Student.java @@ -1,6 +1,9 @@ -package com.example.demo; +package com.example.demo.models; -public class Student extends Person implements Learner{ +import com.example.demo.Learner; +import com.example.demo.models.Person; + +public class Student extends Person implements Learner { double totalStudyTime; diff --git a/src/main/java/com/example/demo/models/Students.java b/src/main/java/com/example/demo/models/Students.java new file mode 100644 index 0000000..8b2d81d --- /dev/null +++ b/src/main/java/com/example/demo/models/Students.java @@ -0,0 +1,18 @@ +package com.example.demo.models; + + +import java.util.Iterator; + + +public class Students extends People { + + public Students(Student... students) { + super(students); + } + + @Override + public Iterator iterator() { + return null; + } + +} diff --git a/src/test/java/com/example/demo/configuration/StudentConfigTest.java b/src/test/java/com/example/demo/configuration/StudentConfigTest.java new file mode 100644 index 0000000..fc10a01 --- /dev/null +++ b/src/test/java/com/example/demo/configuration/StudentConfigTest.java @@ -0,0 +1,46 @@ +package com.example.demo.configuration; + +import com.example.demo.models.Students; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest +@RunWith(SpringRunner.class) +@ContextConfiguration +public class StudentConfigTest { + + @Autowired + @Qualifier("students") + Students currentStudents; + + @Autowired + @Qualifier("previous_students") + Students previousStudents; + + + @Test + public void testCurrentStudents() { + //given + String expected = "Jen"; + //when + String actual = currentStudents.findById(1L).getName(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void testPreviousStudents() { + //given + String expected = "Earl"; + //when + String actual = previousStudents.findById(2L).getName(); + //then + Assert.assertEquals(expected, actual); + } +} \ No newline at end of file diff --git a/target/classes/com/example/demo/Classroom.class b/target/classes/com/example/demo/Classroom.class deleted file mode 100644 index 4444330266fe43b43bcc2a3c78c2914cad816ae1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1408 zcmZ`(+iuf95IyT$+{A8D3WT(!H?C<~YA$_iRSC61R7xqRRV5zXWZSrMY-Br#&jN{p z;DHa|qY!6fI}LG2p_(`7BlH zDKPB~6d#?x_WO!O>RMfyGHI={6}0 zQl!(#1xRj4Q06KphI97JCirQB3Ngs!-rZhy%|kmTAW| q<;FG5Pt>%+rp8VCN7G2J;;JoC)AD~bsm_Q&XQ(Oe$~`L6aQ`nRFdgLp diff --git a/target/classes/com/example/demo/Instructor.class b/target/classes/com/example/demo/Instructor.class deleted file mode 100644 index fcba956b6508e5f5f8b7748bd2b88b97a3a9e3b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2096 zcmah}+j1L45IwV&w7OX~wxh&Oe2a;rn57b)P*c+r>*J?#2 z`~cs;7vvRQ;xbgFc&7LQUh@~Jf^cSbb-{K_skFN@-F^C;?w zkhgEO1STsrr&%S#^Qo! z^3P_WYM-)#Qf)g@r@;JaK;`T)zLfCoX^v-SJdW}|s^e8Qx@O+7Z?_r6BNn#UQtWFYN;L9Yc*yd=QI2J*pllTfdNlasg=TJ?sYRE0uHJ-|9 zNcj6YzE0u+9tvDMfz#t8aQ=jKi$}?^Ps_h8PloAo@OoMO@{ja3)O_;f@+7GN=BkK0i(_<n$wC{!UxWENiLHyV=;%f zdue95HK)>C!93xmm_Nx@=ev~4KS!t(8V?;w&86^o_y`e!pKw`z=>oqaT8iYxBN^!u z6Zp}2j`*|Je@S8?Ro65t3ewP7$9amn!7ARQMp@$}+UD6ONi8Dtb?KIH6&Xdh6wuXq zsItfrHBV2!JJPE_FWkHdegSnOT8iZ)~Xm3AB0L@1VM;WsQA9Ni(P55CE1Anl|BhR_yK;D zcs8k4+fo;jopWY(&dkn!e7?OC(J^i2DMf1;TF=l1Bl}ePQa2eb)!cjjz@13TzT?VJ zH|jTx(r2nG7?oVt`H6~Q&X?SrYfs>Ay?Jdg$t$+YgtkkPi=QJy0nxi{zwrz&E~(pvpjNf$#Nx`$I8Q?j>Elk($QPbRx*359!{a%^;| z@zH!+ML|cLOEaJH$Qd4(!Ol~f<``|w8V#fBgga5E9kTFj%(4j2g64p1pcb%&-QL}M zCH4Xnq0+jx!kCM7rZ^;HUj;KC2^ zqr}rzY%5y2$RsnFbI!~pAD?gUM6^LON%Cm2pL!{mps55+GfF8PIa~Feu@R%$yl+A- z??qTCOJ0(p;Rnt8O-Au8rIp)e)Vs7?VC3zYl4LZLS6Uuc!=kijqF6>GlQ+I77lc(c z|2ycpD+Q6ojv{+TU#b97!_GgCM2kG5xuxZfSfFwzRqa$L3o24j-qG4P;gr!3Ud%YJNCDC`3S zlBcF>eYvk{Bb#VpYYbuSTHJ~>C8#e=F^V%<==3@b4CYot@v_hXKPp~J-_blC+`|W8 zSm1&6a0V@GKRk}Tez)>U>=}U`O2WqL!8oOGPB#*;55QwINJGeK2ft9y(=TxP5AZN@ r20<}`mAN1m)xFW~2uHdi90m1QcZAu02s3DJ9F;b!jDd8b-e2|$gZZ^F diff --git a/target/classes/com/example/demo/People.class b/target/classes/com/example/demo/People.class deleted file mode 100644 index 213aca1a19aeb03ee8ee2e5f6d1ef6342b95aa40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2470 zcmb_e+in|G6kW%cOfsHa$i<~eb0tabq^`M@OC17fX&}W(LlaUcAThCrWQt=4ds4Oh zNxz^H@K7Wu3J+DE`3l5mR260IIb(a`*b)ys_+0kcd!M!TUT5S#|M}wyfH(2AiGD2i zpbzgS@Bvn2xFW+<89q#40M`;&#YZxHY+y~y*G!nWZsHT<4Xhj3FmOY`JanqHN;&V= zJcWV$9s91GJ@VXARxCM%o-KE;Yz&gKi1gRFDUJ~%8n z*`jk$$!JDZ~pU$FBN2@gba*Qc2-V zfW2gw_p)o`BL%I4k*X;S>(-p~P?%|BZXvGFyXD!1@7C=@zs?3W73SLA*b*o-y1#YH z#VhyMShmG*NWN0u%cVQkQ6b_oBv7Ug+K-?bPiG02PQj2H{i+P6(ye+_m^x)_L9MX2 z)D-yTju4kamAkQf$0>NZkfq*)rOxqGvbj|`surA8S2~o?0>3Da(ZUE8EWCt41D{%$ z!c7bFGMq=sLR!wYu+2_b_zXK1ZsBvPpv{vJxmoxEw+(!0;Vay1@1`{};C~1FYHLP( zqfJwtQr+l(FMOj{p(OiGenb>T!kr2#l)g<#xFS$LCV8S6^;|5Bv2WKloO}E@QTL3A zmHo|d-9Lnp-tj%h6NNPz9u|zo)v)l@INu-HrCMy7AJTqMWc)!&&3TBc2!_$k^$3!P z;tVajv_&|Z3%^4xEdGYbFWg1(GRHp7Ko4U4%=RFGv)m=MH%2kW9pi%R=T4lBH_nE6 z+XQ!UMMnf6CTX0)bO7O-0D`sfDh(>U$3BvR*?Bn(QAplkbfQ1>n!hB5ta;5>u z*=!TQOas6ijq@D=#M%HDB!Hp+7XbB67}A7Q&eAATDsU{d`k6c3gf9Oi>0fPWuYkKS zZd!z~lIO!wa$e^g%GssRTGLTBb?iUpUBrc;TR*ZNG3HORQ-;F&g=2IpJir(iJqk}@ zZU~Ev?&HH3f6KKoUr&R6-~{1MVvYhxu>+#1DW)D}eWj72xO6~JRvBC*4WZifnr(RL zHj7u5Ua!(Cfyi?h23~u{fIxT|+O_&$r`H?&yP>uJQ$QuF%bp0a8E>-5JchOS7`+b= z&pdkg;xF}x=`^7v;#|*CZF3|u&)TO5CEXx3j@|~TY=cx5m+)3VN}iMU(xk*oNC_1S z(dRHpW%3!l0xp+$pt-!w6z||&9!a}bxKo_t!bK2<)sqQzIUe9>sz)qxr%rpB3H2(6 JC0ZkR?_bAx+ob>i diff --git a/target/classes/com/example/demo/Student.class b/target/classes/com/example/demo/Student.class deleted file mode 100644 index f87764e0b6d92df252df70beb131cf4b6d32170c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 833 zcmZ`$+iuf96r6S9nj}u!TxdhNwID>ABK*QzQD0gikPK8xREfuJyrf397nu!$uR=(m zN<8oZd=z5VHla#{ET28QJ7?z1*g>_nUBW+lD(0)N$9tu7^Dj_XO6BHZmET zdGvV_r%FJa2&_Ggv)CL7^oHR(`B4Um%w|ETv)SSPnLzzmM?`Lfai(6)({q(i6O z9!|fbwye~llkOD(O!%fjERzXBATe-;=z=qVwG)4x2ygvO-xKY_yhb= z#$f@CMiLI4cBb#md((b=zP$t3#Yz?)7BWa;F^#1(mKnxF7d54JA;WUbHvyNABIvXw zZ_2>%^ZsRpA+@ixat92_&2pW=tD2@{DAbgeCsELl_Chq;R4LVrFWPlsRX6V!J$Iu> zVST7V)#z*0BAJ38SxbHf$_%TU<)O5Y7>j3-b}Eo{6)I9Z)Y>@Vl+h%(T{E`D!;V$D zb!|l;AB?@@zR^xTIxfDU{74E-y*y1AhGNIcdu5{V$Hmm3boKLK*>e+FUmmM??mo6R z$i1ZYjg41wNMk&QF{BvQhJ8wpLT0;Cye)K#pEho#@3281?9qoaTGWGL zlFrnUVumtKdwjR`3ieEe1hN!UaWRbvI_G)-+9xSv$fH20-{co0p8k+0{~;F%lcyF_ fv`Uv?A$ek$9<5<%q=qx(Z8o+thpt?Al6l|@mB*^? diff --git a/target/classes/com/example/demo/Students.class b/target/classes/com/example/demo/Students.class deleted file mode 100644 index d6770037e34603be37f02fe313c17504aca2754d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 762 zcmaJkHTKi#ZtF5&sZ>@?!&{M^WAP7+cmEPB8u`5lsq#MzHr6<9IKfoU) zzD+7H7s?lmDy|I0O&r{b=$7A&fz(_zf9kdb)TIPbl zild>plx861pB5jPF_tJxYm8be2f?Vh5KBdAk1V_pvn;|3pfz|lJP*Ew-QGWVBlZd_ zLpl5l30gv4ney-(X%?*`VwO!sDuJmC+w3W_0jmNVRTi;T@maJ9uts%QM(_}xNw?Tb c5;bCWf@~&2DVa4BN*T6rHnp}&Uyv8~qDM_Q{%#g2&hr6OoVumlTM0@4pM*-X=^yE9>SH}+>K z2n7XyfImvSvw2hrf#`?5GxzR2_nbR-=I5_(KL9*Ny?`95Ic()Ihizx>6p+GB4tI07 z$52!{jBM;h#)b?#P0s{eo{OO8OWu)z;eqK$Kjg13)AkwW!zk`Z9T8+}D&%OGL-})0 zl~&O+hIFmoV#qY8D8o`yY567&+S0xgZJ#2QrtyT|5>`2X7|cYciijRg5_v|SsBUaU zq>SbbUxcAGCTJvKqFwM}Ye{CqoEjTZd$syxkzs>lG~x2zs1(EYOo;Wjv5r(ATPjqf z{JGX9N>q{X2TfzUJnUJeyC+rz@{_S2IcbmNdBnvymA{Ze6MIHe4#T5aVJ~G*>P~p* zu-U%wV*)Sstn4cjhojb)M}ZHQqbnSl*n0Ana!0>1K7hgT?VX9fV0bdCiUDdki~SNx zSYW75yG~=W66TRFp@5=;)EM?AAaqjGr_4}xLb)$=mmjvzq(^f;s7)Q(pZ9ob()i}q zTd2~L$k=OG~9#5C!$Y2P2Tk5MzA7m?(*fNu$P(zW6jhMX-4bannthl%bMM@H&bfEy?AOmz01t7yi3n>A%woNcn|0h0STHsVK97U* znZVs{>{6*uR60zw+}Ej-soU2{CSP2n?F!T$8*9Q7f!U4Coq1FIHTS#D4`ep<#tsg=O7$n_k0k{KeG;VllPaHSWho@G%wfya zb37rZ^TiB{aZChvs-nO4CRP4337T(R?qmJj6mwi1LmSOv`$&CM0*|T!kE+f`yW2t? z^DWGwCa^R0Q&r`TAFJ`;y`%<}4E8Dp%(NL{@ss)c{v20WK4I fr5fP+KL9&y?;4d}sGMVDwe0UYiXMvb+yH(9(f`~F literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/configuration/StudentConfig.class b/target/classes/com/example/demo/configuration/StudentConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..00197c81d00ffa357cc9d65aa3bff92129916ce9 GIT binary patch literal 1214 zcma)*YflqF6o%jFZMRM3E;lcLg0=`<6+{h2QKBE3MiOgC2p`O_4DG<~EScR!^jGO8 zj6{EcKgxJ!TddL$x|__*dFRZTXU>`V_51rz0LyqNHcs1EEFgu74adfP8xJfzw6MgGdnT2Po-?FNZT<&dhEsfn4Gf`8943(N2_>MT{{-GzFUEv3g8>l_mh&7L7pqzRX?+O*IC*mrF zcVn$dXzLVWwp8v8;uDJ(o~;gP;l#UGMba0WGL(ezQmG(HwxAG;wLmwV@K8(D*wfq> z9|L`0Kq7G*IsC7y^Ga|w?aLLwJYApBrk2> z*4Zli{D?EG^or72)lSoD5yKc^nC{BvxkNBbUE*S4xrj$tp|VzmGI1YMsjET@|C1?l zlWQYBVaTpGwW(p|HP;?>Rqh@zEOf=EJYG~#N}M^i<8jq+Hg@)f8!_~Cq*|aF4Av3% zVzIHuFkGsZYyVGEIp#{|wSVk-WU9JqZs=TT`?8xtewe`^y$|!HL0e*k+N)$a)HCX{ z^Cw_mX^_GwwYfyhV~obdmIKByK^DU#u925n{2BRVZtWDQt=tc!x6-H76uu!dls!SN zzLhcd2rQ%I6D8YH5}%?`PH^Q5#cJ(43iCw!&`e!h~VZn wScoYaP4~ps*TvS~#WrvO+Zd6J6Wau_O%mH!Pi!-EzFWyDZ^MwA{LTV@00ng%fB*mh literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/models/Classroom.class b/target/classes/com/example/demo/models/Classroom.class new file mode 100644 index 0000000000000000000000000000000000000000..9927be3450133dd3ef62af0f6b535f4d9858f636 GIT binary patch literal 1485 zcmaJ>YfsZq7=BK7DXe8fRGf-BZZZZ^FMPw07>H3bMFS!6W7!U@q!-h6#-F8$X!L_W zz#nCNPP+~qt4sQxp40bzp69)s{r>aw7l2J{R-j{P5@jqabH9QWG!3kxrDILUx`5&M zQ5^O=aS%oV%k56!S@M(ZeQ>4Km0nqk zop@W|RWsN9B15jz5OeiVptwVA0=2f|%Qt=RNQMXYk;{{rcF?iiLpyZTesEZfdk*z3 z=3?)-b`*s{;8F1OYZ>=~?pr&wJsC??8>1IQaa(rcen^VDV-h)#cBd!9tz9KfkJFvN zt;>v=r@)k-2;Vz?5%d*{*cGUr$oN7v1Xh}>modgRrW%ceHpl236R8v%q|NFpu=F3! z%!`FGNSJLoKlyB#)0U#D>@(YreD0`jRfmP&IJH08CQLjqF@Z@F6&N};OjvlR;MuI-;#dq<~inn0ncm>YS)nLc*z*zvp1T$gji8YDpd*m1446UEH9 zehFdFO-8!ec+{I|V4~n92S^Q~8VtNZ!UrJNLJRAC(@vMYqy)N5Fe@}M573MKxP xap85wJ=#%Cg;7m&V>LC{)U;{;Xu8m=v}z4%n$OXsIwO+KP*d8K1uE09_!mP>JNp0t literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/models/Instructor.class b/target/classes/com/example/demo/models/Instructor.class new file mode 100644 index 0000000000000000000000000000000000000000..e3e4473c72ec99bc03ed16703637c7bb7532c597 GIT binary patch literal 2117 zcmah}+j84f6kSJgEXP(7H%&|v(o3$jW2YvN7HWq;X()AZE|8GY^1vvznyA=PMwXeD zAK)AKg1*8_GlrQC&kSF{D}TWZly#2e3%M~KOFC!oz4lsr?{j|p=jT@dmhn{_NxUZ? zw-bn=5XUfz39R7#1Xl5Ze0-?mj@Q$u=Iey1HS#5=;d{-B?|MZ6&8`Y0k7wo9y5%3Z)h*LA z>y~eMM4UT8t|x5U_v|)Zhar+&S4wCV==UwNav*ReeUe_;GCjxgifdA{UJF(N6K8u0 z3_7YFn@{e$P03NLsnCkw^hn`SFXIwb$T9`^u@Ijzqdi1BP69(UyWwv>30cuEtWwjr zYxy#5tX}HB4S0UoZo<+jm@C<{m8=ph7sPb%SI&1I-1g1NH|yr1>bs6lb(94Lw(Wh# z4CLQDP5${TRPBfCuv9y))G0838c;EFj4vg8eVXI>8IPme7eyQ6$V z4x51yT$GPV1MAo@@D7$)7z3NwVs#9BhR+RbV~3-0;&g@4P3=F9!E97sv&ng z&wMVcA>kkD_|m{5JQkQffpg-NaoW#v+Ty`-ozvLt$a7+O9K$Y$pcy0G4K=Mi$2?bR zoOxBGRR?3LgUXUh_g1(a!CvVHW@E#8#`gB5GgK0B)MB*lukN7Dy{A@1PI{zaf5(c` zwWOXrq5%=*reM{T)Mr+Cp^Wv;L5Pugj49rPNeEov9oo+~y9EuST&?o0@f}^r9zp!X zFAZaS#?`Jt??I%vP6b|g1DCj>KgKaZq&NB9FSvk$our$DEuoJ;Kwrq_j-VaKO)~z1 z!o3!_b#V0%m!Y_fD}<971~ir7vdY2<39~$4aD;oYY`TTMJ{(UoMvzobnph`Ij3t>S zW5!|zv)wdP+?r8o<}goqDdu;w)%h+gWM3juh>S;CQgfkyyuXF0zz>*~U%J4rh!vs> z=QS;ucljrcPPoW!mQ1CrK?T^L6MJa2;ty zw-D0RdBieUAZnJLL3gBAj$VOnk+vJO4MF=GNga6|Z~aA-u%6dxl0ujG*YGyOcxFSv zE$&E~OTQrT=m^GowuM1~jm1#z1V2Kxk(`t|q~YO<*MH`IWKgfpDVBGdX=cc47J1Am zos#to29!?OzNL=NrBG*#+N3(IN1e1ub%AY>wvM{twz{kBd6en`Wj7geiz^N9{tNvK B$L0V4 literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/models/Instructors.class b/target/classes/com/example/demo/models/Instructors.class new file mode 100644 index 0000000000000000000000000000000000000000..3935b7e04482e4ff071c9d213063dcbe425458ea GIT binary patch literal 749 zcma)4O;5r=5Pe&rKmkEi)QgEx6HsF>9!wxyOh`zoA;EC*w3LmkX}hK$#;gBGPbMDx z0sbiCY$57FkREpSy?y&;cBUVnZ|?xkuw!8bn>o~T*kUl-GLUhHq0zW;T;<#1k^A?a zu*bqzwy(y*i|k$y#bM&cDr_}}44Dg}87htp#8u*tM0m|d9x*jXx!fD_P-;9QGx0=5 z42Mg&M=ge;{7$BCEmagl^-{zWHSY6}`yv)0UCm31oN8vMH=52Jf8cf!OV94jcuH0n z$lHL&Nl3+?|0!zEExS)yRM6^>O?QDvQ8VY8{OYVWvIZ&%UD1`go7JDg=v0?qLI&Fm z`~Q!Lp1(U!)fc)XhJytIpS`U)#2yU#UG!(*iSlPDnuIzO4T|Q`@hjL%dY+@zO4&T= z3dj?#PgR60LZn9#B`}m}pQUM2U|2`iVW$#({t#rNS6w+eJD0Hto+a;@3uh{^ zb-v*gOeB{T!nuNNRrE@H2yU@ZP#8+M>KClic6ym)M41LAsk_2JCl7`34(7w9Td!HU zuU4#GU3&veJ=rPafk2_rb=N87uk0Y(+lRU1f3IT_aUh8XiI*{#t_%MG3 z*=CYh7pFgwJa9MIh4Dki1K<_v^Q{|n`8cEtzB=C6x@YHV8K0#g$^5a$5L$G-T(9Kp zB}Zh7t=XdAtlWJQgP1jN%fu)6)I>i{8n|s@0-GjMGEC#Vi5bkA_za&@CKF%aOA~is zv0z7Ec@ta68OWQkv3aDo+fIG@G17{-bonl{Obxybqkgosu~ugHy20AGSgBZhym}F< z>OOOme4Sbcd8OF51H7#Uje_gi<)zBFK5&EF`{44%hP(029{0iU{y6`Qv z9YPQ<(qhvV;M|k?1u8ZDD*`_w_#+KLyu|SYXCR6Y|1wPePIEQr24EO3bHz}M;0zOt zw(Z4bOYe2f%CsFfoO5 zZ2)91&RihmDI{6|rf6~tk)$#8p8&!g0GuR%f&Ui(FA-sg4ojRxtEg099}$HgxN=2^ z=$#>*+H}18lXGxG#J(@${XA;L3{A3gs|J?3#Pp+SWCJ;~0NK0C*jN>YJTlhg>WK!a4e zNh*y?xa^UV>*RX5q{J)EGlhzY;4?%?W%Mb%JT8~G;d06Fh@IJkb4m8}HB>z~aBvaV1^= literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/Person.class b/target/classes/com/example/demo/models/Person.class similarity index 64% rename from target/classes/com/example/demo/Person.class rename to target/classes/com/example/demo/models/Person.class index 000e587265bc2b51d301d5b763aa561d8e503f9d..3b861cbb486be74db3acf083c91fd9467fd133b6 100644 GIT binary patch delta 65 zcmZo?pUOUArKEySa(=FUYDHphK~AcEN@{Mter|qBYEJRQ-RC9baL8?*&G?2904Q=9 AH~;_u delta 51 tcmbQr-p)Q@rI4gga(=FUYDHphK~AcEN@{NY#6#x=#nA;fuVj3~2mtU%6UzVq diff --git a/target/classes/com/example/demo/models/Student.class b/target/classes/com/example/demo/models/Student.class new file mode 100644 index 0000000000000000000000000000000000000000..22fb4ed4e998cb7ab04aa6036afcce1c2845619c GIT binary patch literal 854 zcmah`TWb?R7(KJec1^Nv+9tK});5ZmrsBT%R_RNND6CpYDEK(dPScgW$aW+8t3*%= zKKKLtQR4Y_*H}_SmYw-#=FGW#^YhpD9{`@>K@&Fa$*|Qx9or6e9P}OBS6Io@Tt}mP z7JM3qu~AS*3QNzzB+L&KIs^Zm{-C``CsWT)lj;8Mi9-D_4Tx;}VPam-;!~52^=ZVN zbw8cx=tO6stgFp>ejZ*Z^!-U1d*-8#-$%v^Oq_Z#X`%~H#7&a#D_CKmu(~M8tyd;L zPlIEf>Dc5ZBi+Mm&aPY=~D_hRKbpn&JyMs97(L@q{#B->_s{giM6T8 z#|z!54R+a|=7@-ic^*n=xAOl)6kIgWl%eCo!3~A&|D;yf`WNDuK~vi6T?6>y+hpkT zF>Ua@_(SwK)>+d7EVQ^f;B0YT8tz>}ePLz6iOL z55P%iJA?`COVs#La=7>S64oMbySOjBJ0)z+>r}krwu=qYi9*9F6uK-Gt!!2*hqNau zt>N3Rs6Co|Lv2y1%Oo3D613(@E%exrd4gWSeG9j_B?&xgNYm^gsXwzQ`%-ptvtV>f MK*gwVr$F8P4dUOM8vpui0GD2d}5lensR^4BWZ9>7WIRS84ea% z$6ba>oRu;9#l0{zu7!S3-jGK;5L!gEuOcaOts;h2yW>9cXYM3g`p#9(Q<>^W-iKT# z5%qlWuc$Y(+aXm^VYg23E#JyJ`}F~cIh209kyB}M=QR#7LJu{|ZkC>Ge8nPDugl&Pn7W~<>dyGEL?5zewE)>CHV E7mWe9<^TWy literal 0 HcmV?d00001 diff --git a/target/test-classes/com/example/demo/configuration/StudentConfigTest.class b/target/test-classes/com/example/demo/configuration/StudentConfigTest.class new file mode 100644 index 0000000000000000000000000000000000000000..e617c26a39e53f9849a544a0490d22cd97b4885e GIT binary patch literal 1633 zcmb7E?{5=F5PfSWK4XsHIxd0GK!5^v2rNx0(1rp@no313zk_5(@abM4xYpxSbr|nPy1x%Xzr#;ah=|&DdIH+?I=5Tq1#sjb_-B>LBRtb(L(X zUMPEEOLZf8=(8$t=6P(K?x}4Z>7A}xGbVI_)1e{2-9~6TGTO7+blNuPsaK)>P41|` zM6w+;U1(p+U=SeJVi&&BR<#KGKSQ6zL07l6vJ9Qx54y1uC`JP%^kjP z*7*@4Ha13C$?^C_yO*Rp8TBK;RKl$cmyrZu;GKzdJ_@9Sgi&8fR_RqAr*VeOe58zz zlPG)m&c`b5dHCMPeLN62|A_(j@epes)_rW?2M)w$V7op}p)7E7ERT9(^`N16USzyb`+sLKAsuC zQ)Q#jFooAq?lCW`K(#i?U@&*(7}<2e{hq-Sw0J? zv5YUc_xlc5z&XBg3K*PAgB8K@w4JTw8cTm7UwVhBH<gU^%OB6SM-6zFw Date: Mon, 16 Aug 2021 15:27:50 -0400 Subject: [PATCH 13/16] InstructorConfigTests pass --- .../demo/configuration/InstructorsConfig.java | 21 +++++-- .../configuration/InstructorsConfigTest.java | 59 ++++++++++++++++++ .../configuration/InstructorsConfig.class | Bin 960 -> 1489 bytes .../configuration/InstructorsConfigTest.class | Bin 0 -> 1797 bytes 4 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 src/test/java/com/example/demo/configuration/InstructorsConfigTest.java create mode 100644 target/test-classes/com/example/demo/configuration/InstructorsConfigTest.class diff --git a/src/main/java/com/example/demo/configuration/InstructorsConfig.java b/src/main/java/com/example/demo/configuration/InstructorsConfig.java index 3604526..492a9cb 100644 --- a/src/main/java/com/example/demo/configuration/InstructorsConfig.java +++ b/src/main/java/com/example/demo/configuration/InstructorsConfig.java @@ -1,5 +1,6 @@ package com.example.demo.configuration; +import com.example.demo.models.Instructor; import com.example.demo.models.Instructors; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -8,21 +9,31 @@ @Configuration public class InstructorsConfig { - Instructors instructors; - @Bean(name = "tcUsaInstructors") public Instructors tcUsaInstructors() { - return instructors; + return new Instructors( + new Instructor(1L, "Stewart"), + new Instructor(2L, "Colin"), + new Instructor(3L, "Tom") + ); } @Bean(name = "tcUkInstructors") public Instructors tcUkInstructors() { - return instructors; + return new Instructors( + new Instructor(1L, "Harry"), + new Instructor(2L, "Ron"), + new Instructor(3L, "Hermione") + ); } @Primary @Bean(name = "instructors") public Instructors zipCodeInstructors() { - return instructors; + return new Instructors( + new Instructor(1L, "Leon"), + new Instructor(2L, "Dolio"), + new Instructor(3L, "Kris") + ); } } diff --git a/src/test/java/com/example/demo/configuration/InstructorsConfigTest.java b/src/test/java/com/example/demo/configuration/InstructorsConfigTest.java new file mode 100644 index 0000000..6f6fd4a --- /dev/null +++ b/src/test/java/com/example/demo/configuration/InstructorsConfigTest.java @@ -0,0 +1,59 @@ +package com.example.demo.configuration; + +import com.example.demo.models.Instructors; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest +@RunWith(SpringRunner.class) +@ContextConfiguration +public class InstructorsConfigTest { + + @Autowired + @Qualifier("tcUsaInstructors") + Instructors tcUsaInstructors; + + @Autowired + @Qualifier("tcUkInstructors") + Instructors tcUkInstructors; + + @Autowired + @Qualifier("instructors") + Instructors instructors; + + @Test + public void tcUsaInstructors() { + //given + String expected = "Stewart"; + //when + String actual = tcUsaInstructors.findById(1L).getName(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void tcUkInstructors() { + //given + String expected = "Hermione"; + //when + String actual = tcUkInstructors.findById(3L).getName(); + //then + Assert.assertEquals(expected, actual); + } + + @Test + public void zipCodeInstructors() { + //given + String expected = "Leon"; + //when + String actual = instructors.findById(1L).getName(); + //then + Assert.assertEquals(expected, actual); + } +} \ No newline at end of file diff --git a/target/classes/com/example/demo/configuration/InstructorsConfig.class b/target/classes/com/example/demo/configuration/InstructorsConfig.class index 83ba2d369a3cacaed5ec8f8241870a2b9291a2e8..29aaecc26bfe377c9354a07e8cc8e97c72528c74 100644 GIT binary patch literal 1489 zcma)+YflqF6o%jFb*aduAO*aZi?k>#0^$V}6k|{uF%(G%pN2Bjf$k2O-E#X?`UxY^ zAK;HNp4lQTZqRO%**Wi=IrGdpXZ!Qlw;uqev5>+wk1RY+;z<%u84`2SmHu;vXfD6T5L;ARf}y=2UGcu^ zYzn=~H!Gy13#!B`Yg|iXpNTR5lk^xS3nk^);*dLg6=81)N7*IiZp(62b6+age&c$+ zu9keIy~SW*mZ8Hhee`(43d2Y)ACBY@P{nHuL7V$ls;(~`u_ir9I4@jR`N2^{GgeT# zYOkZSNo;lF2#zu~`p4|&L>0`NP(s4nYXg2x>Egi0p z=zuG-etm{iQB`$Gyp|@bJq@vInHk^V`*<)(E&JsP_iXLPb21E4-XOUsx|6WN@ z$T>V?NEUr@z_o8qpl*pTs)}@}YgUzGq_;D`le}S&4-Z7Z8Xt~60{13{+8MXzV4+rZ=N^eDnnD3r!;EqcIVPDfH94 zwdR29xIq@fP23_cv-ub;!P>$pBI}9oh^|LZX-IuVEFC{VqPQM2b~lnnX$h2gO$mHj zjdFskpD9-D+#Z;Jg*LR)FN+RLp%e3D*Etr>IBo}i40nhiy8-4A7j;WhY;7U7_7Gdg zC2ScY>m{~6V(TZiOjB$F#5ULzTW5$Z9b)Ucge^;K1H?8+Y(vDBy@V}I*&d?&)pIvY Q%H5y}BQTjY_0Ivn0kgbUtpET3 delta 412 zcma)&y9&ZU5Jm5|(|j$0 zyI5v4WGtvi2M;;zqDQAflHj4ps4!;_qaGYn)q_DT9lh%?nOmP;3t3hIIpiUsGas>v zIKwmKk%Gk6od01iuqQ`Lk*BnP@S>_510E8I_Fu#@*>;SW2yFfWI-Ie@O)9*?iq`mdN_ zDAR{dpZlXa{Z`i43N}sa8B41@d%nv#NBZmU-~RxxgnK2Fu~@|ULzu#a5-viNa0%bK zxLiU3-<5dgN)cCWczKd3_Lnc>n%%hW;)aVA2W8WI5%~{-$mqCfLLE6c(`bf0A@}^= zPFISS?1iEiwq!RFnPW^n@hlFE>d8$NsjaSD4T8}4Muh<}t~Em45z&rTL8q<#p4<)f zE3qa0AQElg61@@rAVI9gCfrq8wg~$_Q=i6uSGASYOr3n~cVp>bil$y=#5y>vvJMM3 zRiMl*2l-lk)4{|#?J=vN0{JNJZAtyyry&QGM%eVbo4!`|Io+HvFBKhL9j#I`4BDy_ z>!b+TVy!2E=Q1)BS(JM_vT0DwCjQ{HMuijIRoYQg6J ztjtRa9*?>YFfp-|;xdx}Ok5r-XI~;MSVes&X=PVDoIurqyJ6(6uZ@S#QE_q8!}qx5 z;4gK+YXM_9@aA>VZ$ub{0Q~v>qzl!6|~mgJm6Seu6+zrA05^d zWW~%XW79)3_Q%Qqzj(CyP73a9;UJoXhg|?XF~$q&xLZ ze8VqL*?x`qXYWAgTumW|Y2Lr!^Rb8l*fxw0&M?Tnj1L~i1OuEAUT1kw@b2(Fx$qmD zw_N1#C9j2Kvy3^ez5W4wg|GSKki5!MHd#`o)j3U;2QF_n7<>h4*lOT0H*& z#UW&c%%HtI=4s;$LCz-dC;Jd7e4f%z@|43f1)Sn4mlVJXnosCw2J{_fTKc)lAxmGH z#^HknEHdQ+izn#wQbxesKtMGWF!Kokrw0Ot{y(z1 Date: Mon, 16 Aug 2021 16:07:12 -0400 Subject: [PATCH 14/16] classroomConfigTests pass --- .../demo/configuration/ClassroomConfig.java | 14 ++--- .../configuration/ClassroomConfigTest.java | 51 ++++++++++++++++++ .../demo/configuration/ClassroomConfig.class | Bin 1198 -> 1344 bytes .../configuration/ClassroomConfigTest.class | Bin 0 -> 2077 bytes 4 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 src/test/java/com/example/demo/configuration/ClassroomConfigTest.java create mode 100644 target/test-classes/com/example/demo/configuration/ClassroomConfigTest.class diff --git a/src/main/java/com/example/demo/configuration/ClassroomConfig.java b/src/main/java/com/example/demo/configuration/ClassroomConfig.java index 85df5aa..5c5bcf8 100644 --- a/src/main/java/com/example/demo/configuration/ClassroomConfig.java +++ b/src/main/java/com/example/demo/configuration/ClassroomConfig.java @@ -3,6 +3,7 @@ import com.example.demo.models.Classroom; import com.example.demo.models.Instructors; import com.example.demo.models.Students; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.DependsOn; @@ -10,21 +11,16 @@ @Configuration public class ClassroomConfig { - Instructors instructors; - Students students; - @Bean(name = "currentCohort") @DependsOn({"instructors", "students"}) - public Classroom currentCohort() { - Classroom classroom = new Classroom(instructors, students); - return classroom; + public Classroom currentCohort(Instructors instructors, Students students) { + return new Classroom(instructors, students); } @Bean(name = "previousCohort") @DependsOn({"instructors", "previous_students"}) - public Classroom previousCohort() { - Classroom classroom = new Classroom(instructors, students); - return classroom; + public Classroom previousCohort(Instructors instructors, @Qualifier("previous_students") Students students) { + return new Classroom(instructors, students); } } diff --git a/src/test/java/com/example/demo/configuration/ClassroomConfigTest.java b/src/test/java/com/example/demo/configuration/ClassroomConfigTest.java new file mode 100644 index 0000000..cb32ed6 --- /dev/null +++ b/src/test/java/com/example/demo/configuration/ClassroomConfigTest.java @@ -0,0 +1,51 @@ +package com.example.demo.configuration; + +import com.example.demo.models.Classroom; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest +@RunWith(SpringRunner.class) +@ContextConfiguration +public class ClassroomConfigTest { + + @Autowired + @Qualifier("currentCohort") + Classroom currentCohort; + + @Autowired + @Qualifier("previousCohort") + Classroom previousCohort; + + @Test + public void currentCohort() { + //given + String studentExpected = "Char"; + String instructorExpected = "Leon"; + //when + String actualStudent = currentCohort.getStudents().findById(3L).getName(); + String actualInstructor = currentCohort.getInstructors().findById(1L).getName(); + //then + Assert.assertEquals(studentExpected, actualStudent); + Assert.assertEquals(instructorExpected, actualInstructor); + } + + @Test + public void previousCohort() { + //given + String studentExpected = "Chris"; + String instructorExpected = "Dolio"; + //when + String studentActual = previousCohort.getStudents().findById(1L).getName(); + String instructorActual = previousCohort.getInstructors().findById(2L).getName(); + //then + Assert.assertEquals(studentExpected, studentActual); + Assert.assertEquals(instructorExpected, instructorActual); + } +} \ No newline at end of file diff --git a/target/classes/com/example/demo/configuration/ClassroomConfig.class b/target/classes/com/example/demo/configuration/ClassroomConfig.class index 7daf2fca4a1995d7a62d0e546dcc17dc1dd8187b..974e576ac0a3e4783b3cdd693a94bba6b2c3d54f 100644 GIT binary patch delta 569 zcma)&%SyvQ6o&tqv`v$$y=iT$)n2?T6tZz4bmdM#L0t%?pro3%!8Vahin!|9g^L;= zz$XxQ6$NqaL#ZcGDuRm+%;B7W&VS~cc~IWe!u!YbD}W8Gs0gDdqojhPETbZ0X>fDR zI^HMWxs`I>Jy%$Du-Z;0_6)aepY7|8-Zfmq5uU|{$K}JG<(ggN$P{LyV~kF>EX#Iv z*R(Ccu(@kHElpfFrqyct_DkD2*BXXy39YH0y0&wr=_7-7(9=6+(=?o_SK%j-2xNwm z$D}O5#H0w8y(fN`4iUJ&Brs45#i(aXnZ80=geqVHY7qTAj2P7*eG*gTiBi6e5M_Y+ z0$y8NA3}PhisN@eDwt6G?)sTP{fHwG+@K$KS^Plc7gO6>dMr?1l>AI zdA1HN5Eo=)$Pq|rOpxr@Ahi+6{~)=)AbHFY>lCNJFz+J@?t|68|?BfiHs7 BQd$52 delta 469 zcmb7=Jx;?w5QX2Y6FYX+#3UsA#1Kqy5&{wpr$Af)MHC1M3Q#0`fRuDdmbn2v0tple zBt*?+fD0hr+ECCzv2SN~XWlovFW!yYfBk%X2C#z-4-O&+Yc6bbjjVf6h#mAC^s|PX zq@4>D57M`u?;f2VCdv7Dd?x6o?{Ri1581Ukur+)^lzv1tjS5^14^<6~LAGUGO>7cC zPnbI@%r(`5u*Rp(Fx%!X+{?o$~KXm-uAJyq|H-SWxI5socJ@?%6@;v99d-tDz|N0xiB7U}U0gG9DnZ=!R_!M_- zEa6@c_slPC<35&cJiu2LR&3aKX!gIhv1&AHHu{Ywk4IUoXYtrX_~z6(W#L;38v=dB zSZf(Xd9|-}BrsJds+ud0z1m?_x+PgtZcUYBHFWb;FATL(wPk^k7jY2zHM#4D{$5qC z27!va$X7uquvAdG;)aLX4=QEt)#NLse{uJu7ldxvD@IDccD*wPcQuaGD__eJ!~Rd# z=doAy%f8ff?K$$Qu@vY()bhwzad=9o_kkby(TYHNdS+K3lP4R2fr1~%&A7HF^^Qjd z0=a@JdevP|`)1uxW}!N(@8`2lgn%V?@!$1_c)47dGMQ%iTE(;LJy{|l7c~0XVU1*vV$uaH*MedG+za&0tXi{ zV&RE{?@+Mt)WIgUEIf1Y94`c}bUOfzUO3psj)U*9YvHB9WH<9>t1SHB;79z#Db4R| zGf+K`RMl4w#xNqV&=!HU{qS(Hv&});+B@KQ2~4!bdH>`JoUh2J!GkcaPS3PYcEjn^ zinZ@=<|?S5B48zlZL2IWH2q|zWv0zG9mcyMISne1E&D-f?ezu^#lrOa5xS##CUvL+ zrm#q4lb4IYFiA84o}H?G8Z=u#ve!O9w#AUKr@Fy!F=GeJHCI1~N-q_F-g zPi~U21z5dH%k7$(T}<$5zQ8Lz#Xn~g0+%QaaDAEY&$u29xdAgToj1pj<_1Td&j}j3 zd<(vNX8(lvok9weeD)^FK}=D0>IS%q&$;4VK<8BA{2POr55>b=s*p=Ro&5uu6Z8zD z_YJZqIQJIz3C?fU)sCGg``)7e1OxXobMtR7czqEQT9p*fByFr!;}v1hK^A zD@Cxu+jP#7YG zI@T5fR64^L{%8ubOg=|Q^K8rw!njEaw@6{(BPm=az3XQb=G!Qw7}fO3O^6LK+fA-- Mk>F^NNp1uG0WTXDWB>pF literal 0 HcmV?d00001 From 62198b59e1528151e41c74e18f244e751b6d5513 Mon Sep 17 00:00:00 2001 From: jgiroso Date: Mon, 16 Aug 2021 19:25:45 -0400 Subject: [PATCH 15/16] all tests pass --- .../java/com/example/demo/models/Alumni.java | 72 ++++++++++++++++++ .../demo/configuration/AlumniTest.java | 53 +++++++++++++ .../com/example/demo/models/Alumni.class | Bin 0 -> 2816 bytes .../demo/configuration/AlumniTest.class | Bin 0 -> 1790 bytes 4 files changed, 125 insertions(+) create mode 100644 src/main/java/com/example/demo/models/Alumni.java create mode 100644 src/test/java/com/example/demo/configuration/AlumniTest.java create mode 100644 target/classes/com/example/demo/models/Alumni.class create mode 100644 target/test-classes/com/example/demo/configuration/AlumniTest.class diff --git a/src/main/java/com/example/demo/models/Alumni.java b/src/main/java/com/example/demo/models/Alumni.java new file mode 100644 index 0000000..664edc1 --- /dev/null +++ b/src/main/java/com/example/demo/models/Alumni.java @@ -0,0 +1,72 @@ +package com.example.demo.models; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Component; +import javax.annotation.PostConstruct; + +@Component +public class Alumni { + + @Autowired + Instructors instructors; + + @Autowired + @Qualifier("previous_students") + Students students; + + double numberOfHoursToTeachEachStudent = 1200; + + @Autowired + public Alumni(Instructors instructors, @Qualifier("previous_students") Students students) { + this.instructors = instructors; + this.students = students; + } + + @PostConstruct + public void executeBootcamp() { + for(Instructor instructor : instructors.findAll()) { + instructor.lecture(students.findAll(), totalHoursPerInstructor()); + } + } + + public int numberOfStudents() { + return students.size(); + } + + public int numberOfInstructors() { + return instructors.size(); + } + + public double hoursPerInstructor() { + return numberOfHoursToTeachEachStudent / numberOfInstructors(); + } + + public double totalHoursPerInstructor() { + return hoursPerInstructor() * numberOfStudents(); + } + + public Instructors getInstructors() { + return instructors; + } + + public void setInstructors(Instructors instructors) { + this.instructors = instructors; + } + + public Students getStudents() { + return students; + } + + public void setStudents(Students students) { + this.students = students; + } + + public double getNumberOfHoursToTeachEachStudent() { + return numberOfHoursToTeachEachStudent; + } + + public void setNumberOfHoursToTeachEachStudent(double numberOfHoursToTeachEachStudent) { + this.numberOfHoursToTeachEachStudent = numberOfHoursToTeachEachStudent; + } +} diff --git a/src/test/java/com/example/demo/configuration/AlumniTest.java b/src/test/java/com/example/demo/configuration/AlumniTest.java new file mode 100644 index 0000000..214342b --- /dev/null +++ b/src/test/java/com/example/demo/configuration/AlumniTest.java @@ -0,0 +1,53 @@ +package com.example.demo.configuration; + +import com.example.demo.models.Alumni; +import com.example.demo.models.Student; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringRunner; + +@SpringBootTest +@RunWith(SpringRunner.class) +@ContextConfiguration +public class AlumniTest { + + @Autowired + Alumni alumni; + + @Test + public void testExecuteBootcampStudent1() { + //given + double expected = 1200; + //when + Student student1 = alumni.getStudents().findById(1L); + double actual = student1.getTotalStudyTime(); + //then + Assert.assertEquals(expected, actual, 0.01); + } + + @Test + public void testExecuteBootcampStudent2() { + //given + double expected = 1200; + //when + Student student2 = alumni.getStudents().findById(1L); + double actual = student2.getTotalStudyTime(); + //then + Assert.assertEquals(expected, actual, 0.01); + } + + @Test + public void testExecuteBootcampStudent3() { + //given + double expected = 1200; + //when + Student student3 = alumni.getStudents().findById(1L); + double actual = student3.getTotalStudyTime(); + //then + Assert.assertEquals(expected, actual, 0.01); + } +} diff --git a/target/classes/com/example/demo/models/Alumni.class b/target/classes/com/example/demo/models/Alumni.class new file mode 100644 index 0000000000000000000000000000000000000000..82831da184abbefee2df5b3e643af7111dc98dfe GIT binary patch literal 2816 zcmb7F+j10D6kTVS3(PbLgb+l9gb-kuAg$plK_rA*;sgST@h)~|PLhV6?o?kO_-qyL zzWD{dSfy5(SomP^>__+^mZh%UGd(jIGJp@W`<&Bzuf6u(>-7Bb&u_m2I1M|Gy||XW z{OvPtfgR|_bul-@+{|MN(*=Bhase~ACFXVxvw7UXbe;}(^C)0Ww)5gj(~l3uEQt9i zhmUjkM4@22LFh-7(DMU@Bjt)$GxeHPTXnQq)iuwoc~$KM=2XjVTw(v+$PMk9Ua$ju z(a{sG>xEWmdoD4~mpy;k3|4*HU0(97nttT@56nevxq-Q4NutN5)eJBvqR@L}`?^Zl z?Lin-wHp#;xGR&nh7bM!XR14q<=9KM_8FRaXgQHq*uCoOhqf05_gc9J-Ke&x{o6}7 zy~q#dy?Jd_R<7~aNUfl*Dr7I(t{q-dm@anZ+TOLUPR)XjFDRrZ*>8p3vhC_yF^zeP z9aiWodlk!BuzXwgjl*=fVzXI8U9l&esOH+Nch`&#SG?-1B@+p?410L<5SyEP= z3P`Uf=m;&onjEBw1*UCPHS&U-i5C+Vm@wJ$#&*w^IE_oHVWz6<=>@VLCiF|4(#5N> z0Or`|ioR}(I16>1os?lJl(zf=1XP{&!pE!Hob+m|p393qZr~6`4Gdz)zyS6ccpY!# z@R@%077bKTWhF2FMCG6joW&UfOIS9rf-wW9#GID1cQB@Kup3If z63R|$F&)cYHg7N9*OidcijShucFZXjWARg_aJU=LCOzerY_~e$I0WI8TR3Gq2t`Dj zPxvLYn+XOs1tf_Xlv}ZaTY8PecqMt4(r&!zPyE}s(|f2J&qO8!bXaEObDpmi>l|Z< zI3>S1XT39;!*+A|owkwoJ zpJIo?cNpX%ukZ|onGrhB-aI`{>IK6%)bbcbop(*P@-g7VJA<;=k|K?-XFNGH%w*%wpr3h%jweq zS8^wK(izX{c6G)d-7=onsS$sMg$Z_n`O~a?_Y?0&Zrdr8+8_!|3cRJyL2RIp5PP0H z=!7`ACB!+LZ$OxQ3X6=)=%AjfCbDY|4L7meja(cfDr}_nKa1yO6 zx+bkQSwhmMbZ3*VY{}^|CKy!bRKKa&(lOrA&OTiyryE^3$-Qs(X^@;!xDwmRrmn97 F{{chRW*qKA6#g2P9h{7SfQo1kQDGOAmP@>0)P+UV+Cobxd>&?d*TLN$GSj1wROKnZ zAV0(^t5U@B!SXr(B7Y>6Z-yyW%nF=)8EfM=)v6!)YYkP>Ixw#B104z6sRUtNMjN58>$T8r zs&_&7My@GWN3!O6CJ48ryK5jzu?gP!p{mkt{=Tn$^FW}zP+S$r%@bCjyW(rL6gSsY zxZ)B`ptlluZe!IA{p6fo=FDrK@YnXU_X1t>>v5Pe%z{`^ks;!FL%Fc2yx6F@ATS<- zUN&)6X)`I%sWvy1XH-={lzEJH|6JOSlI19~PNHG3vD*;nNi(t@Gd6iV?o)@&|WSOKuGDk*j8o8X-ElEYjbnq+kVXUQFX8d_gps(<(SlRoV2E&KZXhC<@d|jQ} zddjYzDtznVa8@r=7zLUTrx?fz=e?1*+*;u?kPa*dq$ipDojxx`kqVg>$4xg2zi<*5 zcD_(9my4^o#OJAt&y?WDB2u2>E>GD@nWJQVxt``pQYLyG<9|bZ;HC{{xF*V==~=GM zjsga7jwgXZ8n>m!zf&*IyHQ>|8UG8pZFJZlk>7^(1)WPbwsGQaZfqde58gU0?`P0K zs{v9OB-(jgz>m0!p%iVLxAd5y+-_LIv=9vY`|!F<&sT{z zN{j+`#bbGm9LekQcj7fcUN^~WlDwwLYvx#9SB~J-Mh{7~N7F3!F|T7h7nsMQhjCm3 F{s#)?t6Bg6 literal 0 HcmV?d00001 From 251abb837d1fd51095e6e046fd3c0ff170d54b8d Mon Sep 17 00:00:00 2001 From: jgiroso Date: Mon, 16 Aug 2021 19:27:51 -0400 Subject: [PATCH 16/16] fixed student ID in alumni tests --- .../demo/configuration/AlumniTest.java | 4 ++-- .../demo/configuration/AlumniTest.class | Bin 1790 -> 1812 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/example/demo/configuration/AlumniTest.java b/src/test/java/com/example/demo/configuration/AlumniTest.java index 214342b..90666f3 100644 --- a/src/test/java/com/example/demo/configuration/AlumniTest.java +++ b/src/test/java/com/example/demo/configuration/AlumniTest.java @@ -34,7 +34,7 @@ public void testExecuteBootcampStudent2() { //given double expected = 1200; //when - Student student2 = alumni.getStudents().findById(1L); + Student student2 = alumni.getStudents().findById(2L); double actual = student2.getTotalStudyTime(); //then Assert.assertEquals(expected, actual, 0.01); @@ -45,7 +45,7 @@ public void testExecuteBootcampStudent3() { //given double expected = 1200; //when - Student student3 = alumni.getStudents().findById(1L); + Student student3 = alumni.getStudents().findById(3L); double actual = student3.getTotalStudyTime(); //then Assert.assertEquals(expected, actual, 0.01); diff --git a/target/test-classes/com/example/demo/configuration/AlumniTest.class b/target/test-classes/com/example/demo/configuration/AlumniTest.class index 27ec0fc84082415a84a2c55bc66b5bb694468ce8..f1408a59d378b0d02686a0655b7ddbdc686c52c8 100644 GIT binary patch delta 633 zcmaiy$ua{`6o$X<^gve!AtFQsA&Hn`o{2FrJb|qzuw}u*6Nu+fm7@Q;$WK>}oxj^&sG~?6OiWmd#`bQJ*%#E~`Fkw8rl;}vp%$j`vSm@AXi=hUu}#IKYB9x*r~c6S zYCZ?=Eq1Ay?3wKM+C4`sK+t9uzsZ5kAx9?1HYe0g8aAh#b@R^T%sCe(mo`^4U)s() zHB~XBuBbfFxpS`=JrxeZiUTpSE-2bR0wOG`Gl