From 3f59723caff565a029d5bbfeeed111b5ad5fcfa5 Mon Sep 17 00:00:00 2001 From: Charlotte Beale Date: Thu, 12 Dec 2019 11:55:38 -0500 Subject: [PATCH 1/6] Creating classes --- .idea/.gitignore | 2 + .idea/Maven.Spring-BeansLearnerLab.iml | 11 + .idea/misc.xml | 7 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + demo/.gitignore | 31 ++ demo/.mvn/wrapper/MavenWrapperDownloader.java | 117 +++++++ demo/.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 50710 bytes demo/.mvn/wrapper/maven-wrapper.properties | 2 + demo/mvnw | 310 ++++++++++++++++++ demo/mvnw.cmd | 182 ++++++++++ demo/pom.xml | 55 ++++ demo/src/main/.DS_Store | Bin 0 -> 6148 bytes demo/src/main/java/.DS_Store | Bin 0 -> 6148 bytes demo/src/main/java/com/.DS_Store | Bin 0 -> 6148 bytes demo/src/main/java/com/example/.DS_Store | Bin 0 -> 6148 bytes .../main/java/com/example/demo/Classroom.java | 17 + .../com/example/demo/DemoApplication.java | 13 + .../java/com/example/demo/Instructor.java | 23 ++ .../java/com/example/demo/Instructors.java | 9 + .../main/java/com/example/demo/Learner.java | 5 + .../main/java/com/example/demo/People.java | 63 ++++ .../main/java/com/example/demo/Person.java | 24 ++ .../main/java/com/example/demo/Student.java | 16 + .../main/java/com/example/demo/Students.java | 12 + .../main/java/com/example/demo/Teacher.java | 7 + .../src/main/resources/application.properties | 1 + .../example/demo/DemoApplicationTests.java | 13 + 28 files changed, 934 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/Maven.Spring-BeansLearnerLab.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 demo/.gitignore create mode 100644 demo/.mvn/wrapper/MavenWrapperDownloader.java create mode 100644 demo/.mvn/wrapper/maven-wrapper.jar create mode 100644 demo/.mvn/wrapper/maven-wrapper.properties create mode 100755 demo/mvnw create mode 100644 demo/mvnw.cmd create mode 100644 demo/pom.xml create mode 100644 demo/src/main/.DS_Store create mode 100644 demo/src/main/java/.DS_Store create mode 100644 demo/src/main/java/com/.DS_Store create mode 100644 demo/src/main/java/com/example/.DS_Store create mode 100644 demo/src/main/java/com/example/demo/Classroom.java create mode 100644 demo/src/main/java/com/example/demo/DemoApplication.java create mode 100644 demo/src/main/java/com/example/demo/Instructor.java create mode 100644 demo/src/main/java/com/example/demo/Instructors.java create mode 100644 demo/src/main/java/com/example/demo/Learner.java create mode 100644 demo/src/main/java/com/example/demo/People.java create mode 100644 demo/src/main/java/com/example/demo/Person.java create mode 100644 demo/src/main/java/com/example/demo/Student.java create mode 100644 demo/src/main/java/com/example/demo/Students.java create mode 100644 demo/src/main/java/com/example/demo/Teacher.java create mode 100644 demo/src/main/resources/application.properties create mode 100644 demo/src/test/java/com/example/demo/DemoApplicationTests.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..5c98b42 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml \ No newline at end of file diff --git a/.idea/Maven.Spring-BeansLearnerLab.iml b/.idea/Maven.Spring-BeansLearnerLab.iml new file mode 100644 index 0000000..42d63f1 --- /dev/null +++ b/.idea/Maven.Spring-BeansLearnerLab.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..034840c --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..8c06252 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/demo/.gitignore b/demo/.gitignore new file mode 100644 index 0000000..a2a3040 --- /dev/null +++ b/demo/.gitignore @@ -0,0 +1,31 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ + +### VS Code ### +.vscode/ diff --git a/demo/.mvn/wrapper/MavenWrapperDownloader.java b/demo/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..2281075 --- /dev/null +++ b/demo/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,117 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import java.net.*; +import java.io.*; +import java.nio.channels.*; +import java.util.Properties; + +public class MavenWrapperDownloader { + + private static final String WRAPPER_VERSION = "0.5.5"; + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" + + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { + String username = System.getenv("MVNW_USERNAME"); + char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); + Authenticator.setDefault(new Authenticator() { + @Override + protected PasswordAuthentication getPasswordAuthentication() { + return new PasswordAuthentication(username, password); + } + }); + } + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/demo/.mvn/wrapper/maven-wrapper.jar b/demo/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..0d5e649888a4843c1520054d9672f80c62ebbb48 GIT binary patch literal 50710 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�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 JS$+5G{{hr`vzY(@ literal 0 HcmV?d00001 diff --git a/demo/.mvn/wrapper/maven-wrapper.properties b/demo/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..7d59a01 --- /dev/null +++ b/demo/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.2/apache-maven-3.6.2-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar diff --git a/demo/mvnw b/demo/mvnw new file mode 100755 index 0000000..21d3ee8 --- /dev/null +++ b/demo/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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +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.5/maven-wrapper-0.5.5.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.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/demo/mvnw.cmd b/demo/mvnw.cmd new file mode 100644 index 0000000..84d60ab --- /dev/null +++ b/demo/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 Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing 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.5/maven-wrapper-0.5.5.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.5/maven-wrapper-0.5.5.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/demo/pom.xml b/demo/pom.xml new file mode 100644 index 0000000..46d6600 --- /dev/null +++ b/demo/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.2.2.RELEASE + + + 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.junit.vintage + junit-vintage-engine + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/demo/src/main/.DS_Store b/demo/src/main/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..55c1fcbeb4ba2bef02771ea2748f3e4b0ea5c07d GIT binary patch literal 6148 zcmeH~J&wXa427SU6iC~oq@0EW>)m< zk%er^j=Knh3!DIf); zz>E~gV|@8Jqi52iNC7D@4+Z@DQ0UH@Y@PAxV2BZb99RzHI%Wy7c!8|R*2xOZa(b|A zwHQOZ9_?hw>uR!f_I6kfAC`AEpJHg%+hK(X&1yhF3P^#80*juHe*W+1ujcQ^n8@Auu4PPqH)~DC=`aY|^Zges(XZZ6Iz{HQ@6+Mjm#TR5vwoX=P`Vj~j6r{kv GD)0dNyb`AX literal 0 HcmV?d00001 diff --git a/demo/src/main/java/.DS_Store b/demo/src/main/java/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..35a54bf0595027f28217af82c3d32981e121b5e7 GIT binary patch literal 6148 zcmeH~Jr2S!425mVP>H1@V-^m;4I%_5-~tF3K^+i#j?VMXLSaS~dY0@jc51bKLsN^0 z?w;4J$RHv;+$b9h6I0}!Tx68{^>MkK$MI$*w?)zl@IfZ~xlK?3DnJFO02QDDGg2TA z@_sd=XX2w!0V*&L1?>A!;KrJ4LH~3h_y_tMAK>5S|49o|DnJGPOaWc) zkNX{7D$mxB*R%R5tF~@%&@V@L`w2i|NAVi&hW%m-uqIm&6&Qa6Tm}Xz@KXg|*oF~o literal 0 HcmV?d00001 diff --git a/demo/src/main/java/com/.DS_Store b/demo/src/main/java/com/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..57a55533b24c0913b16270b1e0331e8066b90fde GIT binary patch literal 6148 zcmeHKJ5EC}5S)cbL`st~rLVvZtSC7_E&wFy9tsjdqI?zS;%J%u6hsfYP=IEo_1Nnj zTb|cR1o5k9hvd zKMlSmlLAse3P=GdAO)_hKo!{e;>zdhI4K|n{=NeKeQ0#YUN|Pkr-MVZ0K^%?VVp-V zL2Mo%_QEld5t=2Hm{hA4!;;Q;tGr$~CMF$L&4<;^Rvn7P?L5ClI;b>!3`IW^4*{}x%&4UY=naG*IYBQFB<_~NLy=ua&nLyDZs)=XJ^}KHlnL8^ zuuK4Ud`$1a2w+Ed;?2XtjQM~GpZLN&ec$fadA@s*w&{SU^bw2w+!myO6p#W^Knh5K z6)BL%_-?NP&d{+n$ep{-5c8&HsxQrBXl& zyqE$uoIXxRzEqyAzh2Mlm#q4_(aE@+;m1z^6F-U%^f2xhUywD~I$5FVM<8TSkOKdz Fz!O6Z5~=_I literal 0 HcmV?d00001 diff --git a/demo/src/main/java/com/example/demo/Classroom.java b/demo/src/main/java/com/example/demo/Classroom.java new file mode 100644 index 0000000..5ec4cee --- /dev/null +++ b/demo/src/main/java/com/example/demo/Classroom.java @@ -0,0 +1,17 @@ +package com.example.demo; +import java.util.*; +import com.example.demo.Teacher; + +public class Classroom { + Instructor instructorList; + Students studentList; + + public Classroom(Instructor instructorList, Students studentList) { + this.instructorList = instructorList; + this.studentList = studentList; + } + + public void hostLecture(Teacher teacher, double numberOfHours){ + teacher.lecture(studentList, numberOfHours); + } +} diff --git a/demo/src/main/java/com/example/demo/DemoApplication.java b/demo/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..64b538a --- /dev/null +++ b/demo/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/demo/src/main/java/com/example/demo/Instructor.java b/demo/src/main/java/com/example/demo/Instructor.java new file mode 100644 index 0000000..79d5631 --- /dev/null +++ b/demo/src/main/java/com/example/demo/Instructor.java @@ -0,0 +1,23 @@ +package com.example.demo; +import com.example.demo.*; + +public class Instructor extends Person implements Teacher{ + + Learner learner; + + public Instructor(Long id, String name) { + super(id, name); + } + + public void teach(Learner learner, double numberOfHours) { + learner.learn(numberOfHours); + + } + + + public void lecture(Iterable learners, double numberOfHours) { + double numberOfHoursPerLearner = numberOfHours / learners.length; + for(Learner each : learners) + each.learn(numberOfHours); + } +} diff --git a/demo/src/main/java/com/example/demo/Instructors.java b/demo/src/main/java/com/example/demo/Instructors.java new file mode 100644 index 0000000..129a139 --- /dev/null +++ b/demo/src/main/java/com/example/demo/Instructors.java @@ -0,0 +1,9 @@ +package com.example.demo; +import com.example.demo.*; +import java.util.*; + +public class Instructors extends People { + public Instructors(List personList) { + super(personList); + } +} diff --git a/demo/src/main/java/com/example/demo/Learner.java b/demo/src/main/java/com/example/demo/Learner.java new file mode 100644 index 0000000..d53d5d1 --- /dev/null +++ b/demo/src/main/java/com/example/demo/Learner.java @@ -0,0 +1,5 @@ +package com.example.demo; + +public interface Learner { + void learn(double numberOfHours); +} diff --git a/demo/src/main/java/com/example/demo/People.java b/demo/src/main/java/com/example/demo/People.java new file mode 100644 index 0000000..a0bef63 --- /dev/null +++ b/demo/src/main/java/com/example/demo/People.java @@ -0,0 +1,63 @@ +package com.example.demo; +import java.util.*; +import java.util.function.Consumer; + +public abstract class People implements Iterable { + + List personList; + + + public People(java.util.List personList) { + this.personList = personList; + } + public void add(PersonType personType) { + this.personList.add(personType); + } + + public void remove(PersonType personType){ + this.personList.remove(personType); + } + + public int size() { + return this.personList.size(); + } + + public void clear() { + this.personList.clear(); + } + + public void addAll(Iterable personTypes){ + for(PersonType personType : personTypes) + personList.add(personType); + } + + public PersonType findById(long id) { + for(PersonType p: personList){ + if(p.getId() == id){ + return p; + } + } return null; + } + + public List findAll (){ + return personList; + + } + @Override + public Iterator iterator() { + return null; + } + + + @Override + public void forEach(Consumer action) { + + } + + + @Override + public Spliterator spliterator() { + return null; + } + +} diff --git a/demo/src/main/java/com/example/demo/Person.java b/demo/src/main/java/com/example/demo/Person.java new file mode 100644 index 0000000..5149cc9 --- /dev/null +++ b/demo/src/main/java/com/example/demo/Person.java @@ -0,0 +1,24 @@ +package com.example.demo; + +public class Person { + final Long id; + private String name; + + + 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; + } +} diff --git a/demo/src/main/java/com/example/demo/Student.java b/demo/src/main/java/com/example/demo/Student.java new file mode 100644 index 0000000..903ce9c --- /dev/null +++ b/demo/src/main/java/com/example/demo/Student.java @@ -0,0 +1,16 @@ +package com.example.demo; +import com.example.demo.Person; +import com.example.demo.Learner; + +public class Student extends Person implements Learner{ + double totalStudyTime; + + public Student(Long id, String name) { + super(id, name); + } + + @Override + public void learn(double numberOfHours) { + totalStudyTime += numberOfHours; + } +} diff --git a/demo/src/main/java/com/example/demo/Students.java b/demo/src/main/java/com/example/demo/Students.java new file mode 100644 index 0000000..7047577 --- /dev/null +++ b/demo/src/main/java/com/example/demo/Students.java @@ -0,0 +1,12 @@ +package com.example.demo; +import java.util.*; +import java.util.function.Consumer; +import com.example.demo.Student; + +public class Students extends People { + + + public Students(List personList) { + super(personList); + } +} diff --git a/demo/src/main/java/com/example/demo/Teacher.java b/demo/src/main/java/com/example/demo/Teacher.java new file mode 100644 index 0000000..642aec3 --- /dev/null +++ b/demo/src/main/java/com/example/demo/Teacher.java @@ -0,0 +1,7 @@ +package com.example.demo; +import com.example.demo.Learner; + +public interface Teacher { + void teach(Learner learner, double numberOfHours); + void lecture(Iterable learners, double numberOfHours); +} diff --git a/demo/src/main/resources/application.properties b/demo/src/main/resources/application.properties new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/demo/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/demo/src/test/java/com/example/demo/DemoApplicationTests.java b/demo/src/test/java/com/example/demo/DemoApplicationTests.java new file mode 100644 index 0000000..2778a6a --- /dev/null +++ b/demo/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() { + } + +} From bad77f2ac9dab6668f7e03670e6f44796dd2e4cc Mon Sep 17 00:00:00 2001 From: Charlotte Beale Date: Sat, 14 Dec 2019 13:56:27 -0500 Subject: [PATCH 2/6] Almost Done --- .idea/uiDesigner.xml | 124 ++++++++++++++++++ demo/pom.xml | 12 +- .../learner/lab}/demo/Classroom.java | 7 +- .../learner/lab}/demo/DemoApplication.java | 2 +- .../learner/lab}/demo/Instructor.java | 10 +- .../learner/lab}/demo/Instructors.java | 5 +- .../learner/lab}/demo/Learner.java | 2 +- .../learner/lab}/demo/People.java | 2 +- .../learner/lab}/demo/Person.java | 2 +- .../learner/lab}/demo/Student.java | 4 +- .../learner/lab}/demo/Students.java | 4 +- .../learner/lab}/demo/Teacher.java | 3 +- .../demo/configuration/ClassroomConfig.java | 27 ++++ .../demo/configuration/InstructorConfig.java | 44 +++++++ .../lab/demo/configuration/StudentConfig.java | 36 +++++ 15 files changed, 256 insertions(+), 28 deletions(-) create mode 100644 .idea/uiDesigner.xml rename demo/src/main/java/com/{example => beans/learner/lab}/demo/Classroom.java (66%) rename demo/src/main/java/com/{example => beans/learner/lab}/demo/DemoApplication.java (88%) rename demo/src/main/java/com/{example => beans/learner/lab}/demo/Instructor.java (67%) rename demo/src/main/java/com/{example => beans/learner/lab}/demo/Instructors.java (66%) rename demo/src/main/java/com/{example => beans/learner/lab}/demo/Learner.java (65%) rename demo/src/main/java/com/{example => beans/learner/lab}/demo/People.java (97%) rename demo/src/main/java/com/{example => beans/learner/lab}/demo/Person.java (90%) rename demo/src/main/java/com/{example => beans/learner/lab}/demo/Student.java (74%) rename demo/src/main/java/com/{example => beans/learner/lab}/demo/Students.java (61%) rename demo/src/main/java/com/{example => beans/learner/lab}/demo/Teacher.java (73%) create mode 100644 demo/src/main/java/com/beans/learner/lab/demo/configuration/ClassroomConfig.java create mode 100644 demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java create mode 100644 demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java 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/demo/pom.xml b/demo/pom.xml index 46d6600..b197b0d 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -8,7 +8,7 @@ 2.2.2.RELEASE - com.example + com.beans.learner.lab demo 0.0.1-SNAPSHOT demo @@ -41,6 +41,16 @@ + + org.springframework + spring-context + 5.2.2.RELEASE + + + junit + junit + test + diff --git a/demo/src/main/java/com/example/demo/Classroom.java b/demo/src/main/java/com/beans/learner/lab/demo/Classroom.java similarity index 66% rename from demo/src/main/java/com/example/demo/Classroom.java rename to demo/src/main/java/com/beans/learner/lab/demo/Classroom.java index 5ec4cee..8a21414 100644 --- a/demo/src/main/java/com/example/demo/Classroom.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/Classroom.java @@ -1,12 +1,9 @@ -package com.example.demo; -import java.util.*; -import com.example.demo.Teacher; - +package com.beans.learner.lab.demo; public class Classroom { Instructor instructorList; Students studentList; - public Classroom(Instructor instructorList, Students studentList) { + public Classroom(Instructors instructorList, Students studentList) { this.instructorList = instructorList; this.studentList = studentList; } diff --git a/demo/src/main/java/com/example/demo/DemoApplication.java b/demo/src/main/java/com/beans/learner/lab/demo/DemoApplication.java similarity index 88% rename from demo/src/main/java/com/example/demo/DemoApplication.java rename to demo/src/main/java/com/beans/learner/lab/demo/DemoApplication.java index 64b538a..865c78c 100644 --- a/demo/src/main/java/com/example/demo/DemoApplication.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/DemoApplication.java @@ -1,4 +1,4 @@ -package com.example.demo; +package com.beans.learner.lab.demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/demo/src/main/java/com/example/demo/Instructor.java b/demo/src/main/java/com/beans/learner/lab/demo/Instructor.java similarity index 67% rename from demo/src/main/java/com/example/demo/Instructor.java rename to demo/src/main/java/com/beans/learner/lab/demo/Instructor.java index 79d5631..f29f252 100644 --- a/demo/src/main/java/com/example/demo/Instructor.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/Instructor.java @@ -1,18 +1,14 @@ -package com.example.demo; -import com.example.demo.*; +package com.beans.learner.lab.demo; +import com.beans.learner.lab.demo.*; public class Instructor extends Person implements Teacher{ - Learner learner; public Instructor(Long id, String name) { super(id, name); } - public void teach(Learner learner, double numberOfHours) { - learner.learn(numberOfHours); - - } + public void teach(Learner learner, double numberOfHours) { learner.learn(numberOfHours); } public void lecture(Iterable learners, double numberOfHours) { diff --git a/demo/src/main/java/com/example/demo/Instructors.java b/demo/src/main/java/com/beans/learner/lab/demo/Instructors.java similarity index 66% rename from demo/src/main/java/com/example/demo/Instructors.java rename to demo/src/main/java/com/beans/learner/lab/demo/Instructors.java index 129a139..c309949 100644 --- a/demo/src/main/java/com/example/demo/Instructors.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/Instructors.java @@ -1,6 +1,5 @@ -package com.example.demo; -import com.example.demo.*; -import java.util.*; +package com.beans.learner.lab.demo; +import java.util.List; public class Instructors extends People { public Instructors(List personList) { diff --git a/demo/src/main/java/com/example/demo/Learner.java b/demo/src/main/java/com/beans/learner/lab/demo/Learner.java similarity index 65% rename from demo/src/main/java/com/example/demo/Learner.java rename to demo/src/main/java/com/beans/learner/lab/demo/Learner.java index d53d5d1..e34986c 100644 --- a/demo/src/main/java/com/example/demo/Learner.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/Learner.java @@ -1,4 +1,4 @@ -package com.example.demo; +package com.beans.learner.lab.demo; public interface Learner { void learn(double numberOfHours); diff --git a/demo/src/main/java/com/example/demo/People.java b/demo/src/main/java/com/beans/learner/lab/demo/People.java similarity index 97% rename from demo/src/main/java/com/example/demo/People.java rename to demo/src/main/java/com/beans/learner/lab/demo/People.java index a0bef63..b97ab30 100644 --- a/demo/src/main/java/com/example/demo/People.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/People.java @@ -1,4 +1,4 @@ -package com.example.demo; +package com.beans.learner.lab.demo; import java.util.*; import java.util.function.Consumer; diff --git a/demo/src/main/java/com/example/demo/Person.java b/demo/src/main/java/com/beans/learner/lab/demo/Person.java similarity index 90% rename from demo/src/main/java/com/example/demo/Person.java rename to demo/src/main/java/com/beans/learner/lab/demo/Person.java index 5149cc9..8122860 100644 --- a/demo/src/main/java/com/example/demo/Person.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/Person.java @@ -1,4 +1,4 @@ -package com.example.demo; +package com.beans.learner.lab.demo; public class Person { final Long id; diff --git a/demo/src/main/java/com/example/demo/Student.java b/demo/src/main/java/com/beans/learner/lab/demo/Student.java similarity index 74% rename from demo/src/main/java/com/example/demo/Student.java rename to demo/src/main/java/com/beans/learner/lab/demo/Student.java index 903ce9c..1b4b1ce 100644 --- a/demo/src/main/java/com/example/demo/Student.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/Student.java @@ -1,6 +1,4 @@ -package com.example.demo; -import com.example.demo.Person; -import com.example.demo.Learner; +package com.beans.learner.lab.demo; public class Student extends Person implements Learner{ double totalStudyTime; diff --git a/demo/src/main/java/com/example/demo/Students.java b/demo/src/main/java/com/beans/learner/lab/demo/Students.java similarity index 61% rename from demo/src/main/java/com/example/demo/Students.java rename to demo/src/main/java/com/beans/learner/lab/demo/Students.java index 7047577..9e496f8 100644 --- a/demo/src/main/java/com/example/demo/Students.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/Students.java @@ -1,7 +1,5 @@ -package com.example.demo; +package com.beans.learner.lab.demo; import java.util.*; -import java.util.function.Consumer; -import com.example.demo.Student; public class Students extends People { diff --git a/demo/src/main/java/com/example/demo/Teacher.java b/demo/src/main/java/com/beans/learner/lab/demo/Teacher.java similarity index 73% rename from demo/src/main/java/com/example/demo/Teacher.java rename to demo/src/main/java/com/beans/learner/lab/demo/Teacher.java index 642aec3..885e99c 100644 --- a/demo/src/main/java/com/example/demo/Teacher.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/Teacher.java @@ -1,5 +1,4 @@ -package com.example.demo; -import com.example.demo.Learner; +package com.beans.learner.lab.demo; public interface Teacher { void teach(Learner learner, double numberOfHours); diff --git a/demo/src/main/java/com/beans/learner/lab/demo/configuration/ClassroomConfig.java b/demo/src/main/java/com/beans/learner/lab/demo/configuration/ClassroomConfig.java new file mode 100644 index 0000000..bdabaf7 --- /dev/null +++ b/demo/src/main/java/com/beans/learner/lab/demo/configuration/ClassroomConfig.java @@ -0,0 +1,27 @@ +package com.beans.learner.lab.demo.configuration; + + +import com.beans.learner.lab.demo.Classroom; +import com.beans.learner.lab.demo.Instructors; +import com.beans.learner.lab.demo.Students; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; + + @Configuration + public class ClassroomConfig { + @Bean(name = "currentCohort") + @DependsOn({"instructors", "students"}) + public Classroom currentCohort(Instructors instructors, Students students) { + return new Classroom(instructors, students); + } + + @Bean(name = "previousCohort") + @DependsOn({"instructors", "previousStudents"}) + public Classroom previousCohort(Instructors instructors, Students previousStudents) { + return new Classroom(instructors, previousStudents); + } + } + + + diff --git a/demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java b/demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java new file mode 100644 index 0000000..c9a3d30 --- /dev/null +++ b/demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java @@ -0,0 +1,44 @@ +package com.beans.learner.lab.demo.configuration; + +import com.beans.learner.lab.demo.*; +import java.util.ArrayList; +import java.util.List; + + + +@Configuration +public class InstructorConfig { + @Bean(name = "tcUsaInstructors") + public com.beans.learner.lab.demo.Instructors tcUsaInstructors(){ + com.beans.learner.lab.demo.Instructor instructor1 = new com.beans.learner.lab.demo.Instructor(1L, "Nobles"); + com.beans.learner.lab.demo.Instructor instructor2 = new com.beans.learner.lab.demo.Instructor(2L, "Younger"); + List tcUsaTeachers = new ArrayList<>(); + tcUsaTeachers.add(instructor1); + tcUsaTeachers.add(instructor2); + return new com.beans.learner.lab.demo.Instructors(tcUsaTeachers); + + } + + @Bean(name = "tcUkInstructors") + public com.beans.learner.lab.demo.Instructors tcUkInstructors(){ + com.beans.learner.lab.demo.Instructor instructor4 = new com.beans.learner.lab.demo.Instructor(4l, "Dolio"); + com.beans.learner.lab.demo.Instructor instructor5 = new com.beans.learner.lab.demo.Instructor(5l, "Roberto"); + com.beans.learner.lab.demo.Instructor instructor6 = new com.beans.learner.lab.demo.Instructor(6l, "Frolio"); + List tcUkTeachers = new ArrayList<>(); + tcUkTeachers.add(instructor4); + tcUkTeachers.add(instructor5); + tcUkTeachers.add(instructor6); + return new com.beans.learner.lab.demo.Instructors(tcUkTeachers); + } + + @Primary + @Bean(name = "instructors") + public com.beans.learner.lab.demo.Instructors instructors(){ + ArrayList allInstructors = new ArrayList<>(); + allInstructors.addAll(tcUsaInstructors().findAll()); + allInstructors.addAll(tcUkInstructors().findAll()); + return new com.beans.learner.lab.demo.Instructors(allInstructors); + + } + +} diff --git a/demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java b/demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java new file mode 100644 index 0000000..8bff2b6 --- /dev/null +++ b/demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java @@ -0,0 +1,36 @@ +package com.beans.learner.lab.demo.configuration; +import com.example.demo.*; +import java.util.*; +import org.springframefork.context.annotation.*; + + +@Configuration +public class StudentConfig { + + @Bean(name = "students") + public com.beans.learner.lab.demo.Students currentStudents() { + com.beans.learner.lab.demo.Student student1 = new com.beans.learner.lab.demo.Student(1L, "Charlotte"); + com.beans.learner.lab.demo.Student student2 = new com.beans.learner.lab.demo.Student(2L, "Chung"); + com.beans.learner.lab.demo.Student student3 = new com.beans.learner.lab.demo.Student(3L, "Josh"); + List cohort52 = new ArrayList<>(); + cohort52.add(student1); + cohort52.add(student2); + cohort52.add(student3); + return new com.beans.learner.lab.demo.Students(cohort52); + } + + @Bean(name = "previousStudents") + public com.beans.learner.lab.demo.Students previousStudents() { + com.beans.learner.lab.demo.Student student4 = new com.beans.learner.lab.demo.Student(4L, "Eddie"); + com.beans.learner.lab.demo.Student student5 = new com.beans.learner.lab.demo.Student(5L, "David"); + com.beans.learner.lab.demo.Student student6 = new com.beans.learner.lab.demo.Student(6L, "Jack"); + + List cohort51 = new ArrayList<>(); + cohort51.add(student4); + cohort51.add(student5); + cohort51.add(student6); + return new com.beans.learner.lab.demo.Students(cohort51); + } + + +} From e7f5ad11f93a81de87f106d0aa59316e42bfa895 Mon Sep 17 00:00:00 2001 From: Charlotte Beale Date: Sat, 14 Dec 2019 15:08:48 -0500 Subject: [PATCH 3/6] Still working at it --- demo/README.md | 239 ++++++++++++++++++ .../com/beans/learner/lab/demo/Alumni.java | 47 ++++ .../demo/configuration/InstructorConfig.java | 29 ++- .../lab/demo/configuration/StudentConfig.java | 25 +- .../java/com/example/demo/AlumniTest.java | 70 +++++ .../demo/configtest/StudentConfig.java | 5 + 6 files changed, 390 insertions(+), 25 deletions(-) create mode 100644 demo/README.md create mode 100644 demo/src/main/java/com/beans/learner/lab/demo/Alumni.java create mode 100644 demo/src/test/java/com/example/demo/AlumniTest.java create mode 100644 demo/src/test/java/com/example/demo/configtest/StudentConfig.java diff --git a/demo/README.md b/demo/README.md new file mode 100644 index 0000000..f4021cc --- /dev/null +++ b/demo/README.md @@ -0,0 +1,239 @@ +# Bean Flavored Learner Lab +* **Objective** - to register a `Classroom` bean which _mediates_ a _composite_ `Students` and `Instructors` bean reference. +* **Purpose** - to demonstrate the use of + * Bean registration + * Dependency Injection + * IOC Container + * `AnnotationConfigApplicationContext` + * Annotations + * `@Bean` + * `@DependsOn` + * `@Autowired` + * `@PostConstruct` + * `@Config` + * `@SpringBootTest` + * `@Qualifier` + + +## Developmental Notes +* Do NOT clone this repository until completing `Part 0.0` +* You may structure this project and the packaging how you please, however keep in mind that `@Configuration` scans from current directory down. +* Until `Part 10`, this project is nearly identical to the `LearnerLab` completed in the past. + +### Part 0.0 - Generating Project +* Navigate to [start.spring.io](https://start.spring.io/) +* In the `Search for Dependencies` input box search for + * `DevTools` + * `Web` +* Select `Generate Project` +* After the project has completed downloading, navigate to the download directory and unzip the project folder. +* At the root directory of the project, clone this repository. +* Move all files from the `demo` project generated by `start.spring.io`, into the newly cloned `learnerlab` folder. +* Open the project via its `pom.xml` from IntelliJ > File > Open + * Be sure to `Open as Project` when prompted + +### Part 1.0 - Create `Person` Class +* Create a `Person` class. + * The class should declare a `final` field named `id` of type `long`. + * The class should declare a field named `name` of type `String`. + * `Person` constructor should have a parameter of type `Long id, String name` which sets each of the fields to their respective value. + * The class should define a `getId()` method which returns the `Person` object's `id` field. + * The class should define a `getName()` method which returns the `Person` object's `name` field. + * The class should define a `setName()` method which sets the `Person` object's `name` field. + +- +### Part 2.0 - Create `Learner` Interface +* Create a `Learner` interface. + * `Learner` should declare one method signature: + * Method name: `learn` + * Method parameters: `double numberOfHours` + * Method return-type: `void` + +- +### Part 3.0 - Create `Student` Class +* Create a `Student` class such that: + * `Student` is a subclass of `Person` + * `Student` implements the `Learner` interface + * `Student` should have an instance variable `totalStudyTime` of type `double` + * `Student` should have a concrete implementation of the `learn` method which increments the `totalStudyTime` variable by the specified `numberOfHours` argument. + * `Student` should have a `getTotalStudyTime()` method which returns the `totalStudyTime` instance variable. + + +- +### Part 4.0 - Create `Teacher` Interface +* Create a `Teacher` interface. + * `Teacher` should declare a `teach` method signature: + * Method name: `teach` + * Method parameters: + * `Learner learner` + * `double numberOfHours` + * Method return-type: `void` + + * `Teacher` should declare a `lecture` method signature: + * Method name: `lecture` + * Method parameters: + * `Iterable learners` + * `double numberOfHours` + * Method return-type: `void` + + +- +### Part 5.0 - Create `Instructor` Class +* Create an `Instructor` class such that: + * `Instructor` is a subclass of `Person` + * `Instructor` implements the `Teacher` interface + * `Instructor` should have a concrete implementation of the `teach` method which invokes the `learn` method on the specified `Learner` object. + * `Instructor` should have a concrete implementation of the `lecture` method which invokes the `learn` method on each of the elements in the specified array of `Learner` objects. + * `numberOfHours` should be evenly split amongst the learners. + * `double numberOfHoursPerLearner = numberOfHours / learners.length;` + +### Part 6.0 - Create `People` +* Create an abstract `People` class + * The class signature should be parameterized with `PersonType` such that `PersonType` is a sub class of `Person`. + * The class should implement `Iterable` of type `PersonType`. + * Upon construction `People` should consume a `List` of `PersonType` and set it to a respective `personList` field. + * The class should define a constructor which consumes a variable number of `PersonType` objects and sets the `personList` field respectively. + * The class should define a method named `add` which adds a `PersonType` to the `personList`. + * The class should define a method named `remove` which removes a `PersonType` from the `personList`. + * The class should define a method named `size` which returns the size of `personList`. + * The class should define a method named `clear` which clears our `personList` field. + * The class should define a method named `addAll` which adds an `Iterable` of `PersonType` objects to the composite `personList`. + * This method will **NOT** take an argument of `Collection` + * The class should define a method named `findById` which makes use of a `long id` parameter to return a `PersonType` object with the respective `id` field. + * The class should define a method named `findAll` which returns the composite `personList`. + + +- +### Part 7.0 - Create `Students` +* Create a `Students` class. + * The class should be a subclass of `People` of parameterized type `Student`. + * The class should consume a variable number of `Student` objects upon construction and pass them to the super constructor. + +- +### Part 8.0 - Create `Instructors` +* Create a `Instructors` class. + * The class should be a subclass of `People` of parameterized type `Instructor`. + * The class should consume a variable number of `Instructor` objects upon construction and pass them to the super constructor. + + + +- +### Part 9.0 - Create `Classroom` +* Create a `Classroom` class. + * The class should consume and set composite reference to an `Instructors` and `Students` object upon construction + * The class should define a method `hostLecture` which makes use of a `Teacher teacher, double numberOfHours` parameter to host a `lecture` to the composite `personList` field in the `students` reference. + + +- +## Part 10.0 - Creating `Configuration` classes +* Each of the following `Config` classes should have a class-signature annotation of `@Configuration` + * this annotation tells spring to scan for `@Bean` definitions within the scope of the class, and register them to the [IOC Container](https://www.tutorialspoint.com/spring/spring_ioc_containers.htm) for `Inject` and `Autowire` use later. +* Classroom should define getters for each of its fields. + +### Developmental Notes +* `@Autowired` + * injects bean by type + * can be used alone. + * If is used alone, it will be wired by type + * If more than one bean of same type are declared in the container `@Autowired` does not know which beans to use for injection. + + +* `@Qualifier` + * injects bean by specified name + * supports fields, setter, constructors and multi-argument methods injection + * together with `@Autowired`, clarifies which beans to be wired by specifying the bean name (wired by name) + + + + +- +### Part 10.1 - Create `StudentConfig` +* **Note:** The creation of this class will demonstrate an implementation of _bean registration_ in Spring. +* The class should define a method named `currentStudents()` which returns a `Students` representative of the current cohort of students. + * the method should be annotated with `@Bean(name = "students")` + * this ensures the Spring container registers the bean with the respective name. + * a `@Bean` whose `name` attribute is not specified defaults to the name of the method it is annotating. +* The class should define a bean named `previousStudents()` which returns a `Students` representative of the previous cohort of students. + +- +### Part 10.2 - Create `InstructorsConfig` +* The class should define a bean named `tcUsaInstructors()` which returns an `Instructors` representative of the Tech Connect USA instructors. +* The class should define a bean named `tcUkInstructors()` which returns an `Instructors` representative of the Tech Connect UK instructors. +* The class should define a bean named `instructors` which returns all `Instructors` employed at ZipCodeWilmington + * annotate this bean with `@Primary` + * this ensures Spring will inject this bean in the case that an `Autowire` annotation is not supplied with a `Qualifier` annotation + + + +- +### Part 10.3 - Create `ClassroomConfig` +* The class should define a bean named `currentCohort()` which returns a `Classroom` object whose dependencies are `instructors` and `students` +* The class should define a bean named `previousCohort()` which returns an `Classroom` object whose dependencies are `instructors` and `previousStudents` +* **Note:** [it is sometimes useful](https://www.boraji.com/spring-dependson-annotation-example) (although not always necessary) to use the `@DependsOn` annotation to help the Spring framework and other readers of the code to understand what order beans should be executed. + * `@DependsOn({"instructors", "students"})` + + + + +- +## Part 11.0 - Test `Config` classes +* Each of the following `Test` classes should be annotated with + * `@RunWith(SpringRunner.class)` + * enforces which strategy `junit` should use to run tests + * `@SpringBootTest` + * indicates that this class is a Spring Boot test class + * provides support to scan for a `ContextConfiguration` that tells the test class how to load the `ApplicationContext`. + * If no `ContextConfiguration` classes are specified as a parameter to the `@SpringBootTest` annotation, the default behavior is to load the `ApplicationContext` by scanning for a `@SpringBootConfiguration` annotation on a class in the package root. +* Each bean can be injected into the class scope using `@Autowired` along with `@Qualifier(name = "beanname")` + + + +- +### Part 11.1 - Test `StudentConfig` Class +* Create a `TestStudentConfig` class in the `test` package. +* The class should ensure that each `Bean` in the `StudentConfig` class is configured as expected. +* **Tip:** You can use the `toString` method to get a representation of the aggregate state of any `People` object. + + +- +### Part 11.2 - Test `InstructorConfig` Class +* Create a `TestInstructorConfig` class in the `test` package. +* The class should ensure that each `Bean` in the `TestInstructorConfig` class is configured as expected. + + +- +### Part 11.3 - Test `ClassroomConfig` Class +* Create a `TestClassroomConfig` class in the `test` package. +* The class should ensure that each `Bean` in the `TestClassroomConfig` class is configured as expected. + + + + + + + +## Part 11.0 - Using `@Component` +* Annotating a class signature with `@Component` allows Spring to register the class as a `Bean` implicitly. + + +- +### Part 11.1 - Create `Alumni` Class +* Create an `Alumni` component which autowires `Students` of the previous cohort and `Instructors` +* Create an `executeBootcamp` method which teaches each `Student` in the composite `Students` a `totalNumberOfHours` of `1200`. + * Annotate this method with `@PostConstruct` + * denotes that this method must be executed before the class is put into an IoC container +* Create a getter for each of the fields. + +- +### Part 11.2 - Test `Alumni` Class +* Write a test class which ensures that each `Student` in the `Alumni` class has been taught `1200` hours upon injection of the `Alumni` dependency. +* Ensure the `numberOfHoursTaught` has been evenly distributed amongst each of the instructors. + +* **Tip:** How to derive `numberOfHoursTaught` dynamically +```java +int numberOfInstructors = instructors.size(); +int numberOfStudents = students.size(); +double numberOfHoursToTeachEachStudent = 1200; +double numberOfHoursToTeach = numberOfHoursToTeachEachStudent * numberOfStudents; +double numberOfHoursPerInstructor = numberOfHoursToTeach / numberOfInstructors; +``` diff --git a/demo/src/main/java/com/beans/learner/lab/demo/Alumni.java b/demo/src/main/java/com/beans/learner/lab/demo/Alumni.java new file mode 100644 index 0000000..ea56428 --- /dev/null +++ b/demo/src/main/java/com/beans/learner/lab/demo/Alumni.java @@ -0,0 +1,47 @@ +package com.beans.learner.lab.demo; + +import org.springframework.stereotype.Component; +import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.PostConstruct; + +@Component +public class Alumni { + + private Students previousStudents; + private Instructors instructors; + + @Autowired + public Alumni(Students previousStudents, Instructors instructors) { + this.previousStudents = previousStudents; + this.instructors = instructors; + } + + @PostConstruct + public void executeBootCamp() { + int numberOfInstructors = instructors.size(); + int numberOfStudents = previousStudents.size(); + double numberOfHoursToTeachEachStudent = 1200; + double numberOfHoursToTeach = numberOfHoursToTeachEachStudent * numberOfStudents; + double numberOfHoursPerInstructor = numberOfHoursToTeach / numberOfInstructors; + + for(Instructor instructor: instructors) + instructor.lecture(previousStudents, numberOfHoursPerInstructor); + } + + public Students getPreviousStudents() { + return previousStudents; + } + + public void setPreviousStudents(Students previousStudents) { + this.previousStudents = previousStudents; + } + + public Instructors getInstructors() { + return instructors; + } + + public void setInstructors(Instructors instructors) { + this.instructors = instructors; + } + +} diff --git a/demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java b/demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java index c9a3d30..ca660e0 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java @@ -3,36 +3,39 @@ import com.beans.learner.lab.demo.*; import java.util.ArrayList; import java.util.List; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; -@Configuration +@org.springframework.context.annotation.Configuration public class InstructorConfig { - @Bean(name = "tcUsaInstructors") + @org.springframework.context.annotation.Bean(name = "tcUsaInstructors") public com.beans.learner.lab.demo.Instructors tcUsaInstructors(){ - com.beans.learner.lab.demo.Instructor instructor1 = new com.beans.learner.lab.demo.Instructor(1L, "Nobles"); - com.beans.learner.lab.demo.Instructor instructor2 = new com.beans.learner.lab.demo.Instructor(2L, "Younger"); - List tcUsaTeachers = new ArrayList<>(); + Instructor instructor1 = new Instructor(1L, "Nobles"); + Instructor instructor2 = new Instructor(2L, "Younger"); + List tcUsaTeachers = new ArrayList<>(); tcUsaTeachers.add(instructor1); tcUsaTeachers.add(instructor2); - return new com.beans.learner.lab.demo.Instructors(tcUsaTeachers); + return new Instructors(tcUsaTeachers); } - @Bean(name = "tcUkInstructors") + @org.springframework.context.annotation.Bean(name = "tcUkInstructors") public com.beans.learner.lab.demo.Instructors tcUkInstructors(){ - com.beans.learner.lab.demo.Instructor instructor4 = new com.beans.learner.lab.demo.Instructor(4l, "Dolio"); - com.beans.learner.lab.demo.Instructor instructor5 = new com.beans.learner.lab.demo.Instructor(5l, "Roberto"); - com.beans.learner.lab.demo.Instructor instructor6 = new com.beans.learner.lab.demo.Instructor(6l, "Frolio"); - List tcUkTeachers = new ArrayList<>(); + Instructor instructor4 = new Instructor(4l, "Dolio"); + Instructor instructor5 = new Instructor(5l, "Roberto"); + Instructor instructor6 = new Instructor(6l, "Frolio"); + List tcUkTeachers = new ArrayList<>(); tcUkTeachers.add(instructor4); tcUkTeachers.add(instructor5); tcUkTeachers.add(instructor6); return new com.beans.learner.lab.demo.Instructors(tcUkTeachers); } - @Primary - @Bean(name = "instructors") + @org.springframework.context.annotation.Primary + @org.springframework.context.annotation.Bean(name = "instructors") public com.beans.learner.lab.demo.Instructors instructors(){ ArrayList allInstructors = new ArrayList<>(); allInstructors.addAll(tcUsaInstructors().findAll()); diff --git a/demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java b/demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java index 8bff2b6..153496f 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java @@ -1,7 +1,8 @@ package com.beans.learner.lab.demo.configuration; -import com.example.demo.*; +import com.beans.learner.lab.demo.*; import java.util.*; -import org.springframefork.context.annotation.*; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; @Configuration @@ -9,27 +10,27 @@ public class StudentConfig { @Bean(name = "students") public com.beans.learner.lab.demo.Students currentStudents() { - com.beans.learner.lab.demo.Student student1 = new com.beans.learner.lab.demo.Student(1L, "Charlotte"); - com.beans.learner.lab.demo.Student student2 = new com.beans.learner.lab.demo.Student(2L, "Chung"); - com.beans.learner.lab.demo.Student student3 = new com.beans.learner.lab.demo.Student(3L, "Josh"); - List cohort52 = new ArrayList<>(); + Student student1 = new Student(1L, "Charlotte"); + Student student2 = new Student(2L, "Chung"); + Student student3 = new Student(3L, "Josh"); + List cohort52 = new ArrayList<>(); cohort52.add(student1); cohort52.add(student2); cohort52.add(student3); - return new com.beans.learner.lab.demo.Students(cohort52); + return new Students(cohort52); } @Bean(name = "previousStudents") public com.beans.learner.lab.demo.Students previousStudents() { - com.beans.learner.lab.demo.Student student4 = new com.beans.learner.lab.demo.Student(4L, "Eddie"); - com.beans.learner.lab.demo.Student student5 = new com.beans.learner.lab.demo.Student(5L, "David"); - com.beans.learner.lab.demo.Student student6 = new com.beans.learner.lab.demo.Student(6L, "Jack"); + Student student4 = new Student(4L, "Eddie"); + Student student5 = new Student(5L, "David"); + Student student6 = new Student(6L, "Jack"); - List cohort51 = new ArrayList<>(); + List cohort51 = new ArrayList<>(); cohort51.add(student4); cohort51.add(student5); cohort51.add(student6); - return new com.beans.learner.lab.demo.Students(cohort51); + return new Students(cohort51); } diff --git a/demo/src/test/java/com/example/demo/AlumniTest.java b/demo/src/test/java/com/example/demo/AlumniTest.java new file mode 100644 index 0000000..ad848df --- /dev/null +++ b/demo/src/test/java/com/example/demo/AlumniTest.java @@ -0,0 +1,70 @@ +package com.example.demo; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import com.beans.learner.lab.demo.*; +import java.util.ArrayList; +import java.util.List; + + public class AlumniTest { + @Autowired + private Alumni alumni; + + List previousStudentList; + List instructorList; + Students students; + Instructors instructors; + + @Before + public void setUp() throws Exception { + //Test 2 students, 3 instructors + Student student1 = new Student(1L, "Charlotte"); + Student student2 = new Student(2L, "Chung"); + previousStudentList = new ArrayList<>(); + previousStudentList.add(student1); + previousStudentList.add(student2); + + Instructor instructor1 = new Instructor(3L, "Dolio"); + Instructor instructor2 = new Instructor(4L, "Frolio"); + Instructor instructor3 = new Instructor(5L, "Nobles"); + instructorList = new java.util.ArrayList<>(); + instructorList.add(instructor1); + instructorList.add(instructor2); + instructorList.add(instructor3); + + students = new Students(previousStudentList); + instructors = new Instructors(instructorList); + + alumni = new Alumni(students, instructors); + } + + @After + public void tearDown() throws Exception { + } + + @Test + public void executeBootCampTest() { + alumni.executeBootCamp(); + Assert.assertEquals(1200, previousStudentList.get(0).getTotalStudyTime(), 0.0); + + } + + @Test + public void getPreviousStudents() { + } + + @Test + public void setPreviousStudents() { + } + + @Test + public void getInstructors() { + } + + @Test + public void setInstructors() { + } +} diff --git a/demo/src/test/java/com/example/demo/configtest/StudentConfig.java b/demo/src/test/java/com/example/demo/configtest/StudentConfig.java new file mode 100644 index 0000000..e46a64a --- /dev/null +++ b/demo/src/test/java/com/example/demo/configtest/StudentConfig.java @@ -0,0 +1,5 @@ +package com.example.demo.configtest; + +public class StudentConfig { + +} From d77726d965c4436ec46bb411a8dff9b8ea1a06ed Mon Sep 17 00:00:00 2001 From: Charlotte Beale Date: Sat, 14 Dec 2019 15:51:32 -0500 Subject: [PATCH 4/6] Created All test Classes --- .../com/beans/learner/lab/demo/Classroom.java | 2 +- .../java/com/example/demo/AlumniTest.java | 3 +- .../demo/configtest/TestClassroomConfig.java | 4 ++ .../demo/configtest/TestInstructorConfig.java | 49 +++++++++++++++++++ ...dentConfig.java => TestStudentConfig.java} | 3 +- 5 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 demo/src/test/java/com/example/demo/configtest/TestClassroomConfig.java create mode 100644 demo/src/test/java/com/example/demo/configtest/TestInstructorConfig.java rename demo/src/test/java/com/example/demo/configtest/{StudentConfig.java => TestStudentConfig.java} (54%) diff --git a/demo/src/main/java/com/beans/learner/lab/demo/Classroom.java b/demo/src/main/java/com/beans/learner/lab/demo/Classroom.java index 8a21414..b0810df 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/Classroom.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/Classroom.java @@ -3,7 +3,7 @@ public class Classroom { Instructor instructorList; Students studentList; - public Classroom(Instructors instructorList, Students studentList) { + public Classroom(Instructor instructorList, Students studentList) { this.instructorList = instructorList; this.studentList = studentList; } diff --git a/demo/src/test/java/com/example/demo/AlumniTest.java b/demo/src/test/java/com/example/demo/AlumniTest.java index ad848df..4d516e8 100644 --- a/demo/src/test/java/com/example/demo/AlumniTest.java +++ b/demo/src/test/java/com/example/demo/AlumniTest.java @@ -47,8 +47,7 @@ public void tearDown() throws Exception { @Test public void executeBootCampTest() { - alumni.executeBootCamp(); - Assert.assertEquals(1200, previousStudentList.get(0).getTotalStudyTime(), 0.0); + } diff --git a/demo/src/test/java/com/example/demo/configtest/TestClassroomConfig.java b/demo/src/test/java/com/example/demo/configtest/TestClassroomConfig.java new file mode 100644 index 0000000..da296b2 --- /dev/null +++ b/demo/src/test/java/com/example/demo/configtest/TestClassroomConfig.java @@ -0,0 +1,4 @@ +package com.example.demo.configtest; + +public class TestClassroomConfig { +} diff --git a/demo/src/test/java/com/example/demo/configtest/TestInstructorConfig.java b/demo/src/test/java/com/example/demo/configtest/TestInstructorConfig.java new file mode 100644 index 0000000..ee5be41 --- /dev/null +++ b/demo/src/test/java/com/example/demo/configtest/TestInstructorConfig.java @@ -0,0 +1,49 @@ +package com.example.demo.configtest; + +import com.beans.learner.lab.demo.Instructor; +import com.beans.learner.lab.demo.Instructors; +import com.beans.learner.lab.demo.Student; +import com.beans.learner.lab.demo.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.junit4.SpringRunner; + +import static org.junit.Assert.*; + +@RunWith(SpringRunner.class) +@SpringBootTest + +public class TestInstructorConfig { + + @Autowired + @Qualifier("tcUsaInstructors") + private Instructors tcUsaInstructors; + @Autowired + @Qualifier("tcUkaInstructors") + private Instructors tcUkInstructors; + @Autowired + @Qualifier("instructors") + private Instructors instructors; + + @Test + public void tcUsaInstructors(){ + Assert.assertEquals(1, tcUsaInstructors.size()); + } + + @Test + public void tcUkInstructors(){ + Assert.assertEquals(2, tcUsaInstructors.size()); + } + + @Test + public void instructors(){ + Assert.assertEquals(2, tcUsaInstructors.size()); + } + + + +} diff --git a/demo/src/test/java/com/example/demo/configtest/StudentConfig.java b/demo/src/test/java/com/example/demo/configtest/TestStudentConfig.java similarity index 54% rename from demo/src/test/java/com/example/demo/configtest/StudentConfig.java rename to demo/src/test/java/com/example/demo/configtest/TestStudentConfig.java index e46a64a..2a0d8f9 100644 --- a/demo/src/test/java/com/example/demo/configtest/StudentConfig.java +++ b/demo/src/test/java/com/example/demo/configtest/TestStudentConfig.java @@ -1,5 +1,6 @@ package com.example.demo.configtest; -public class StudentConfig { +public class TestStudentConfig { + } From 4f001657f8fd7d43559d7bdbfe0d7044f436d05c Mon Sep 17 00:00:00 2001 From: Charlotte Beale Date: Sun, 15 Dec 2019 13:18:09 -0500 Subject: [PATCH 5/6] Almost complete --- .../com/beans/learner/lab/demo/Classroom.java | 25 +++++++--- .../beans/learner/lab/demo/Instructor.java | 24 ++++++--- .../com/beans/learner/lab/demo/People.java | 23 ++++----- .../com/beans/learner/lab/demo/Student.java | 4 ++ .../demo/configuration/ClassroomConfig.java | 18 ++++--- .../demo/configuration/InstructorConfig.java | 50 ++++++++----------- .../lab/demo/configuration/StudentConfig.java | 35 ++++++------- .../java/com/example/demo/AlumniTest.java | 43 ++++------------ .../demo/configtest/TestClassroomConfig.java | 31 ++++++++++++ .../demo/configtest/TestInstructorConfig.java | 16 ++---- .../demo/configtest/TestStudentConfig.java | 30 +++++++++++ 11 files changed, 177 insertions(+), 122 deletions(-) diff --git a/demo/src/main/java/com/beans/learner/lab/demo/Classroom.java b/demo/src/main/java/com/beans/learner/lab/demo/Classroom.java index b0810df..23d986c 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/Classroom.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/Classroom.java @@ -1,14 +1,27 @@ package com.beans.learner.lab.demo; public class Classroom { - Instructor instructorList; - Students studentList; + Instructors instructors; + Students students; - public Classroom(Instructor instructorList, Students studentList) { - this.instructorList = instructorList; - this.studentList = studentList; + public Classroom(Instructors instructors, Students students) { + this.instructors = instructors; + this.students = students; } public void hostLecture(Teacher teacher, double numberOfHours){ - teacher.lecture(studentList, numberOfHours); + teacher.lecture(students, numberOfHours); + } + + public Instructors getInstructors() { + return instructors; + } + + + public Students getStudents() { + return students; + } + + public void setStudents(Students students) { + this.students = students; } } diff --git a/demo/src/main/java/com/beans/learner/lab/demo/Instructor.java b/demo/src/main/java/com/beans/learner/lab/demo/Instructor.java index f29f252..ba26b8f 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/Instructor.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/Instructor.java @@ -1,19 +1,31 @@ package com.beans.learner.lab.demo; -import com.beans.learner.lab.demo.*; + import java.util.*; public class Instructor extends Person implements Teacher{ - + Iterable learners; public Instructor(Long id, String name) { super(id, name); + learners = new ArrayList<>(); + } + + public void teach(Learner learner, double numberOfHours) { + learner.learn(numberOfHours); + } + + private int getSize(Iterable learners) { + int size = 0; + for(Learner learner : learners) { + size++; + } + return size; } - public void teach(Learner learner, double numberOfHours) { learner.learn(numberOfHours); } public void lecture(Iterable learners, double numberOfHours) { - double numberOfHoursPerLearner = numberOfHours / learners.length; - for(Learner each : learners) - each.learn(numberOfHours); + for (Learner learner : learners) { + teach(learner, numberOfHours / getSize(learners)); + } } } diff --git a/demo/src/main/java/com/beans/learner/lab/demo/People.java b/demo/src/main/java/com/beans/learner/lab/demo/People.java index b97ab30..a87eff9 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/People.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/People.java @@ -7,15 +7,15 @@ public abstract class People implements Iterable personList; - public People(java.util.List personList) { + public People(List personList) { this.personList = personList; } - public void add(PersonType personType) { - this.personList.add(personType); + public void add(PersonType person) { + this.personList.add(person); } - public void remove(PersonType personType){ - this.personList.remove(personType); + public void remove(PersonType person){ + this.personList.remove(person); } public int size() { @@ -26,15 +26,14 @@ public void clear() { this.personList.clear(); } - public void addAll(Iterable personTypes){ - for(PersonType personType : personTypes) - personList.add(personType); + public void addAll(Iterable personList){ + this.personList.addAll((Collection)personList); } public PersonType findById(long id) { - for(PersonType p: personList){ - if(p.getId() == id){ - return p; + for(PersonType person: personList){ + if(person.getId() == id){ + return person; } } return null; } @@ -45,7 +44,7 @@ public List findAll (){ } @Override public Iterator iterator() { - return null; + return personList.iterator(); } diff --git a/demo/src/main/java/com/beans/learner/lab/demo/Student.java b/demo/src/main/java/com/beans/learner/lab/demo/Student.java index 1b4b1ce..7f09a37 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/Student.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/Student.java @@ -11,4 +11,8 @@ public Student(Long id, String name) { public void learn(double numberOfHours) { totalStudyTime += numberOfHours; } + + public double getTotalStudyTime() { + return totalStudyTime; + } } diff --git a/demo/src/main/java/com/beans/learner/lab/demo/configuration/ClassroomConfig.java b/demo/src/main/java/com/beans/learner/lab/demo/configuration/ClassroomConfig.java index bdabaf7..07a025e 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/configuration/ClassroomConfig.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/configuration/ClassroomConfig.java @@ -1,22 +1,24 @@ package com.beans.learner.lab.demo.configuration; -import com.beans.learner.lab.demo.Classroom; -import com.beans.learner.lab.demo.Instructors; -import com.beans.learner.lab.demo.Students; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.DependsOn; +import com.beans.learner.lab.demo.*; +import org.springframework.context.annotation.*; +import org.springframework.beans.factory.annotation.Qualifier; @Configuration public class ClassroomConfig { - @Bean(name = "currentCohort") + + + + @Bean + @Qualifier("currentCohort") @DependsOn({"instructors", "students"}) public Classroom currentCohort(Instructors instructors, Students students) { return new Classroom(instructors, students); } - @Bean(name = "previousCohort") + @Bean + @Qualifier("previousCohort") @DependsOn({"instructors", "previousStudents"}) public Classroom previousCohort(Instructors instructors, Students previousStudents) { return new Classroom(instructors, previousStudents); diff --git a/demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java b/demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java index ca660e0..dc4e6b3 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java @@ -1,46 +1,40 @@ package com.beans.learner.lab.demo.configuration; import com.beans.learner.lab.demo.*; -import java.util.ArrayList; -import java.util.List; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.DependsOn; +import java.util.*; +import org.springframework.context.annotation.*; +import org.springframework.beans.factory.annotation.Qualifier; - -@org.springframework.context.annotation.Configuration +@Configuration public class InstructorConfig { - @org.springframework.context.annotation.Bean(name = "tcUsaInstructors") - public com.beans.learner.lab.demo.Instructors tcUsaInstructors(){ - Instructor instructor1 = new Instructor(1L, "Nobles"); - Instructor instructor2 = new Instructor(2L, "Younger"); + @Bean + @Qualifier("tcUsaInstructors") + public Instructors tcUsaInstructors(){ List tcUsaTeachers = new ArrayList<>(); - tcUsaTeachers.add(instructor1); - tcUsaTeachers.add(instructor2); + tcUsaTeachers.add(new Instructor(1L, "Nobles")); + tcUsaTeachers.add(new Instructor(2L, "Younger")); return new Instructors(tcUsaTeachers); } + @Bean + @Qualifier("tcUkInstructors") + public Instructors tcUkInstructors(){ - @org.springframework.context.annotation.Bean(name = "tcUkInstructors") - public com.beans.learner.lab.demo.Instructors tcUkInstructors(){ - Instructor instructor4 = new Instructor(4l, "Dolio"); - Instructor instructor5 = new Instructor(5l, "Roberto"); - Instructor instructor6 = new Instructor(6l, "Frolio"); List tcUkTeachers = new ArrayList<>(); - tcUkTeachers.add(instructor4); - tcUkTeachers.add(instructor5); - tcUkTeachers.add(instructor6); - return new com.beans.learner.lab.demo.Instructors(tcUkTeachers); + tcUkTeachers.add(new Instructor(4L, "Dolio")); + tcUkTeachers.add(new Instructor(5L, "Roberto")); + tcUkTeachers.add(new Instructor(6L, "Frolio")); + return new Instructors(tcUkTeachers); } - - @org.springframework.context.annotation.Primary - @org.springframework.context.annotation.Bean(name = "instructors") - public com.beans.learner.lab.demo.Instructors instructors(){ - ArrayList allInstructors = new ArrayList<>(); + @Bean + @Primary + @Qualifier("instructors") + public Instructors instructors(){ + ArrayList allInstructors = new ArrayList<>(); allInstructors.addAll(tcUsaInstructors().findAll()); allInstructors.addAll(tcUkInstructors().findAll()); - return new com.beans.learner.lab.demo.Instructors(allInstructors); + return new Instructors(allInstructors); } diff --git a/demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java b/demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java index 153496f..7e014c1 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java @@ -1,35 +1,32 @@ package com.beans.learner.lab.demo.configuration; + import com.beans.learner.lab.demo.*; import java.util.*; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.*; +import org.springframework.beans.factory.annotation.Qualifier; + @Configuration public class StudentConfig { - @Bean(name = "students") - public com.beans.learner.lab.demo.Students currentStudents() { - Student student1 = new Student(1L, "Charlotte"); - Student student2 = new Student(2L, "Chung"); - Student student3 = new Student(3L, "Josh"); + @Bean + @Qualifier("students") + public Students currentStudents() { List cohort52 = new ArrayList<>(); - cohort52.add(student1); - cohort52.add(student2); - cohort52.add(student3); + cohort52.add(new Student(1L, "Charlotte")); + cohort52.add(new Student(2L, "Chung")); + cohort52.add(new Student(3L, "Josh")); return new Students(cohort52); } - @Bean(name = "previousStudents") - public com.beans.learner.lab.demo.Students previousStudents() { - Student student4 = new Student(4L, "Eddie"); - Student student5 = new Student(5L, "David"); - Student student6 = new Student(6L, "Jack"); - + @Bean + @Qualifier("previousStudents") + public Students previousStudents() { List cohort51 = new ArrayList<>(); - cohort51.add(student4); - cohort51.add(student5); - cohort51.add(student6); + cohort51.add(new Student(4L, "Eddie")); + cohort51.add(new Student(5L, "David")); + cohort51.add(new Student(6L, "Jack")); return new Students(cohort51); } diff --git a/demo/src/test/java/com/example/demo/AlumniTest.java b/demo/src/test/java/com/example/demo/AlumniTest.java index 4d516e8..35a0174 100644 --- a/demo/src/test/java/com/example/demo/AlumniTest.java +++ b/demo/src/test/java/com/example/demo/AlumniTest.java @@ -1,13 +1,9 @@ package com.example.demo; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.*; import org.springframework.beans.factory.annotation.Autowired; import com.beans.learner.lab.demo.*; -import java.util.ArrayList; -import java.util.List; +import java.util.*; public class AlumniTest { @Autowired @@ -21,23 +17,17 @@ public class AlumniTest { @Before public void setUp() throws Exception { //Test 2 students, 3 instructors - Student student1 = new Student(1L, "Charlotte"); - Student student2 = new Student(2L, "Chung"); previousStudentList = new ArrayList<>(); - previousStudentList.add(student1); - previousStudentList.add(student2); + previousStudentList.add(new Student(1L, "Charlotte")); + previousStudentList.add(new Student(2L, "Chung")); - Instructor instructor1 = new Instructor(3L, "Dolio"); - Instructor instructor2 = new Instructor(4L, "Frolio"); - Instructor instructor3 = new Instructor(5L, "Nobles"); - instructorList = new java.util.ArrayList<>(); - instructorList.add(instructor1); - instructorList.add(instructor2); - instructorList.add(instructor3); + instructorList = new ArrayList<>(); + instructorList.add(new Instructor(3L, "Dolio")); + instructorList.add(new Instructor(4L, "Frolio")); + instructorList.add(new Instructor(5L, "Nobles")); students = new Students(previousStudentList); instructors = new Instructors(instructorList); - alumni = new Alumni(students, instructors); } @@ -47,23 +37,12 @@ public void tearDown() throws Exception { @Test public void executeBootCampTest() { + for(Student s: alumni.getPreviousStudents()) { + Assert.assertEquals(1200.0, s.getTotalStudyTime(), 0.000001); + } } - @Test - public void getPreviousStudents() { - } - - @Test - public void setPreviousStudents() { - } - @Test - public void getInstructors() { - } - - @Test - public void setInstructors() { - } } diff --git a/demo/src/test/java/com/example/demo/configtest/TestClassroomConfig.java b/demo/src/test/java/com/example/demo/configtest/TestClassroomConfig.java index da296b2..c562ecc 100644 --- a/demo/src/test/java/com/example/demo/configtest/TestClassroomConfig.java +++ b/demo/src/test/java/com/example/demo/configtest/TestClassroomConfig.java @@ -1,4 +1,35 @@ package com.example.demo.configtest; +import com.beans.learner.lab.demo.*; +import org.junit.*; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.*; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest public class TestClassroomConfig { + @Autowired + @Qualifier("currentCohort") + Classroom currentCohort; + + @Autowired + @Qualifier("previousCohort") + Classroom previousCohort; + + + + + @Test + public void currentCohortTest() { + Assert.assertEquals("Nobles", currentCohort.getInstructors().findById(1L).getName()); + Assert.assertEquals("Chung", currentCohort.getStudents().findById(2L).getName()); + } + + @Test + public void previousCohortTest() { + Assert.assertEquals("Frolio", previousCohort.getInstructors().findById(6L).getName()); + Assert.assertEquals("David", previousCohort.getStudents().findById(5L).getName()); + } } diff --git a/demo/src/test/java/com/example/demo/configtest/TestInstructorConfig.java b/demo/src/test/java/com/example/demo/configtest/TestInstructorConfig.java index ee5be41..1e8173c 100644 --- a/demo/src/test/java/com/example/demo/configtest/TestInstructorConfig.java +++ b/demo/src/test/java/com/example/demo/configtest/TestInstructorConfig.java @@ -1,18 +1,12 @@ package com.example.demo.configtest; -import com.beans.learner.lab.demo.Instructor; import com.beans.learner.lab.demo.Instructors; -import com.beans.learner.lab.demo.Student; -import com.beans.learner.lab.demo.Students; -import org.junit.Assert; -import org.junit.Test; +import org.junit.*; import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.annotation.*; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import static org.junit.Assert.*; @RunWith(SpringRunner.class) @SpringBootTest @@ -31,17 +25,17 @@ public class TestInstructorConfig { @Test public void tcUsaInstructors(){ - Assert.assertEquals(1, tcUsaInstructors.size()); + Assert.assertEquals("Nobles", tcUsaInstructors.findById(1L).getName()); } @Test public void tcUkInstructors(){ - Assert.assertEquals(2, tcUsaInstructors.size()); + Assert.assertEquals("Dolio", tcUsaInstructors.findById(4L).getName()); } @Test public void instructors(){ - Assert.assertEquals(2, tcUsaInstructors.size()); + Assert.assertEquals("Roberto", instructors.findById(5L).getName()); } diff --git a/demo/src/test/java/com/example/demo/configtest/TestStudentConfig.java b/demo/src/test/java/com/example/demo/configtest/TestStudentConfig.java index 2a0d8f9..98575fe 100644 --- a/demo/src/test/java/com/example/demo/configtest/TestStudentConfig.java +++ b/demo/src/test/java/com/example/demo/configtest/TestStudentConfig.java @@ -1,6 +1,36 @@ package com.example.demo.configtest; +import com.beans.learner.lab.demo.Students; +import org.junit.*; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.*; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + + +@RunWith(SpringRunner.class) +@SpringBootTest public class TestStudentConfig { + @Autowired + @Qualifier("students") + Students students; + + @Autowired + @Qualifier("previousStudents") + private Students previousStudents; + + + + @Test + public void currentStudents() { + + Assert.assertEquals("Charlotte", students.findById(1L).getName()); + } + + @Test + public void previousStudents() { + Assert.assertEquals("David", previousStudents.findById(5L).getName()); + } } From a0f52e4ce24145989088bfb964d31b72a77989c0 Mon Sep 17 00:00:00 2001 From: Charlotte Beale Date: Tue, 17 Dec 2019 20:54:46 -0500 Subject: [PATCH 6/6] Complete and passing all test --- demo/pom.xml | 10 ++-- .../com/beans/learner/lab/demo/Alumni.java | 12 +++-- .../beans/learner/lab/demo/Instructors.java | 1 + .../com/beans/learner/lab/demo/People.java | 1 + .../demo/configuration/ClassroomConfig.java | 12 ++--- .../demo/configuration/InstructorConfig.java | 3 -- .../lab/demo/configuration/StudentConfig.java | 3 +- .../beans/learner/lab/demo/AlumniTest.java | 27 +++++++++++ .../lab}/demo/DemoApplicationTests.java | 2 +- .../lab/demo}/TestClassroomConfig.java | 2 +- .../lab/demo}/TestInstructorConfig.java | 10 ++-- .../learner/lab/demo}/TestStudentConfig.java | 4 +- .../java/com/example/demo/AlumniTest.java | 48 ------------------- 13 files changed, 57 insertions(+), 78 deletions(-) create mode 100644 demo/src/test/java/com/beans/learner/lab/demo/AlumniTest.java rename demo/src/test/java/com/{example => beans/learner/lab}/demo/DemoApplicationTests.java (83%) rename demo/src/test/java/com/{example/demo/configtest => beans/learner/lab/demo}/TestClassroomConfig.java (96%) rename demo/src/test/java/com/{example/demo/configtest => beans/learner/lab/demo}/TestInstructorConfig.java (77%) rename demo/src/test/java/com/{example/demo/configtest => beans/learner/lab/demo}/TestStudentConfig.java (91%) delete mode 100644 demo/src/test/java/com/example/demo/AlumniTest.java diff --git a/demo/pom.xml b/demo/pom.xml index b197b0d..d8123e7 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -41,11 +41,11 @@ - - org.springframework - spring-context - 5.2.2.RELEASE - + + + + + junit junit diff --git a/demo/src/main/java/com/beans/learner/lab/demo/Alumni.java b/demo/src/main/java/com/beans/learner/lab/demo/Alumni.java index ea56428..189bd9e 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/Alumni.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/Alumni.java @@ -3,15 +3,19 @@ import org.springframework.stereotype.Component; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.PostConstruct; +import org.springframework.beans.factory.annotation.*; @Component public class Alumni { + @Autowired + @Qualifier("previousStudents") private Students previousStudents; - private Instructors instructors; @Autowired - public Alumni(Students previousStudents, Instructors instructors) { + private Instructors instructors; + + public Alumni(@Qualifier("previousStudents") Students previousStudents, Instructors instructors) { this.previousStudents = previousStudents; this.instructors = instructors; } @@ -24,8 +28,8 @@ public void executeBootCamp() { double numberOfHoursToTeach = numberOfHoursToTeachEachStudent * numberOfStudents; double numberOfHoursPerInstructor = numberOfHoursToTeach / numberOfInstructors; - for(Instructor instructor: instructors) - instructor.lecture(previousStudents, numberOfHoursPerInstructor); + for(Instructor instructor: instructors.personList) + instructor.lecture(previousStudents.personList, numberOfHoursPerInstructor); } public Students getPreviousStudents() { diff --git a/demo/src/main/java/com/beans/learner/lab/demo/Instructors.java b/demo/src/main/java/com/beans/learner/lab/demo/Instructors.java index c309949..05d2589 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/Instructors.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/Instructors.java @@ -5,4 +5,5 @@ public class Instructors extends People { public Instructors(List personList) { super(personList); } + } diff --git a/demo/src/main/java/com/beans/learner/lab/demo/People.java b/demo/src/main/java/com/beans/learner/lab/demo/People.java index a87eff9..b97d66d 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/People.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/People.java @@ -10,6 +10,7 @@ public abstract class People implements Iterable personList) { this.personList = personList; } + public void add(PersonType person) { this.personList.add(person); } diff --git a/demo/src/main/java/com/beans/learner/lab/demo/configuration/ClassroomConfig.java b/demo/src/main/java/com/beans/learner/lab/demo/configuration/ClassroomConfig.java index 07a025e..ec969e6 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/configuration/ClassroomConfig.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/configuration/ClassroomConfig.java @@ -1,6 +1,5 @@ package com.beans.learner.lab.demo.configuration; - import com.beans.learner.lab.demo.*; import org.springframework.context.annotation.*; import org.springframework.beans.factory.annotation.Qualifier; @@ -10,17 +9,16 @@ public class ClassroomConfig { - @Bean - @Qualifier("currentCohort") - @DependsOn({"instructors", "students"}) - public Classroom currentCohort(Instructors instructors, Students students) { + @Bean("currentCohort") + @DependsOn({"instructors", "currentStudents"}) + public Classroom currentCohort(Instructors instructors, @Qualifier("currentStudents")Students students) { return new Classroom(instructors, students); } @Bean - @Qualifier("previousCohort") + @DependsOn({"instructors", "previousStudents"}) - public Classroom previousCohort(Instructors instructors, Students previousStudents) { + public Classroom previousCohort(Instructors instructors, @Qualifier("previousStudents") Students previousStudents) { return new Classroom(instructors, previousStudents); } } diff --git a/demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java b/demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java index dc4e6b3..c3b3dd9 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/configuration/InstructorConfig.java @@ -9,7 +9,6 @@ @Configuration public class InstructorConfig { @Bean - @Qualifier("tcUsaInstructors") public Instructors tcUsaInstructors(){ List tcUsaTeachers = new ArrayList<>(); tcUsaTeachers.add(new Instructor(1L, "Nobles")); @@ -18,7 +17,6 @@ public Instructors tcUsaInstructors(){ } @Bean - @Qualifier("tcUkInstructors") public Instructors tcUkInstructors(){ List tcUkTeachers = new ArrayList<>(); @@ -29,7 +27,6 @@ public Instructors tcUkInstructors(){ } @Bean @Primary - @Qualifier("instructors") public Instructors instructors(){ ArrayList allInstructors = new ArrayList<>(); allInstructors.addAll(tcUsaInstructors().findAll()); diff --git a/demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java b/demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java index 7e014c1..46ae56b 100644 --- a/demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java +++ b/demo/src/main/java/com/beans/learner/lab/demo/configuration/StudentConfig.java @@ -10,8 +10,7 @@ @Configuration public class StudentConfig { - @Bean - @Qualifier("students") + @Bean(name = "currentStudents") public Students currentStudents() { List cohort52 = new ArrayList<>(); cohort52.add(new Student(1L, "Charlotte")); diff --git a/demo/src/test/java/com/beans/learner/lab/demo/AlumniTest.java b/demo/src/test/java/com/beans/learner/lab/demo/AlumniTest.java new file mode 100644 index 0000000..ca224f4 --- /dev/null +++ b/demo/src/test/java/com/beans/learner/lab/demo/AlumniTest.java @@ -0,0 +1,27 @@ +package com.beans.learner.lab.demo; + +import org.junit.*; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.beans.factory.annotation.Autowired; +import com.beans.learner.lab.demo.*; +import java.util.*; +import org.junit.runner.*; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest + public class AlumniTest { + @Autowired + private Alumni alumni; + + @Test + public void executeBootCampTest() { + for(Student s: alumni.getPreviousStudents().personList) { + Assert.assertEquals(1200.0, s.getTotalStudyTime(), 0.000001); + } + + + } + + +} diff --git a/demo/src/test/java/com/example/demo/DemoApplicationTests.java b/demo/src/test/java/com/beans/learner/lab/demo/DemoApplicationTests.java similarity index 83% rename from demo/src/test/java/com/example/demo/DemoApplicationTests.java rename to demo/src/test/java/com/beans/learner/lab/demo/DemoApplicationTests.java index 2778a6a..7488610 100644 --- a/demo/src/test/java/com/example/demo/DemoApplicationTests.java +++ b/demo/src/test/java/com/beans/learner/lab/demo/DemoApplicationTests.java @@ -1,4 +1,4 @@ -package com.example.demo; +package com.beans.learner.lab.demo; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; diff --git a/demo/src/test/java/com/example/demo/configtest/TestClassroomConfig.java b/demo/src/test/java/com/beans/learner/lab/demo/TestClassroomConfig.java similarity index 96% rename from demo/src/test/java/com/example/demo/configtest/TestClassroomConfig.java rename to demo/src/test/java/com/beans/learner/lab/demo/TestClassroomConfig.java index c562ecc..1867f63 100644 --- a/demo/src/test/java/com/example/demo/configtest/TestClassroomConfig.java +++ b/demo/src/test/java/com/beans/learner/lab/demo/TestClassroomConfig.java @@ -1,4 +1,4 @@ -package com.example.demo.configtest; +package com.beans.learner.lab.demo; import com.beans.learner.lab.demo.*; import org.junit.*; diff --git a/demo/src/test/java/com/example/demo/configtest/TestInstructorConfig.java b/demo/src/test/java/com/beans/learner/lab/demo/TestInstructorConfig.java similarity index 77% rename from demo/src/test/java/com/example/demo/configtest/TestInstructorConfig.java rename to demo/src/test/java/com/beans/learner/lab/demo/TestInstructorConfig.java index 1e8173c..52bf800 100644 --- a/demo/src/test/java/com/example/demo/configtest/TestInstructorConfig.java +++ b/demo/src/test/java/com/beans/learner/lab/demo/TestInstructorConfig.java @@ -1,4 +1,4 @@ -package com.example.demo.configtest; +package com.beans.learner.lab.demo; import com.beans.learner.lab.demo.Instructors; import org.junit.*; @@ -15,10 +15,10 @@ public class TestInstructorConfig { @Autowired @Qualifier("tcUsaInstructors") - private Instructors tcUsaInstructors; + Instructors tcUsaInstructors; @Autowired - @Qualifier("tcUkaInstructors") - private Instructors tcUkInstructors; + @Qualifier("tcUkInstructors") + Instructors tcUkInstructors; @Autowired @Qualifier("instructors") private Instructors instructors; @@ -30,7 +30,7 @@ public void tcUsaInstructors(){ @Test public void tcUkInstructors(){ - Assert.assertEquals("Dolio", tcUsaInstructors.findById(4L).getName()); + Assert.assertEquals("Dolio", tcUkInstructors.findById(4L).getName()); } @Test diff --git a/demo/src/test/java/com/example/demo/configtest/TestStudentConfig.java b/demo/src/test/java/com/beans/learner/lab/demo/TestStudentConfig.java similarity index 91% rename from demo/src/test/java/com/example/demo/configtest/TestStudentConfig.java rename to demo/src/test/java/com/beans/learner/lab/demo/TestStudentConfig.java index 98575fe..7730e3b 100644 --- a/demo/src/test/java/com/example/demo/configtest/TestStudentConfig.java +++ b/demo/src/test/java/com/beans/learner/lab/demo/TestStudentConfig.java @@ -1,4 +1,4 @@ -package com.example.demo.configtest; +package com.beans.learner.lab.demo; import com.beans.learner.lab.demo.Students; import org.junit.*; @@ -13,7 +13,7 @@ public class TestStudentConfig { @Autowired - @Qualifier("students") + @Qualifier("currentStudents") Students students; @Autowired diff --git a/demo/src/test/java/com/example/demo/AlumniTest.java b/demo/src/test/java/com/example/demo/AlumniTest.java deleted file mode 100644 index 35a0174..0000000 --- a/demo/src/test/java/com/example/demo/AlumniTest.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.example.demo; - -import org.junit.*; -import org.springframework.beans.factory.annotation.Autowired; -import com.beans.learner.lab.demo.*; -import java.util.*; - - public class AlumniTest { - @Autowired - private Alumni alumni; - - List previousStudentList; - List instructorList; - Students students; - Instructors instructors; - - @Before - public void setUp() throws Exception { - //Test 2 students, 3 instructors - previousStudentList = new ArrayList<>(); - previousStudentList.add(new Student(1L, "Charlotte")); - previousStudentList.add(new Student(2L, "Chung")); - - instructorList = new ArrayList<>(); - instructorList.add(new Instructor(3L, "Dolio")); - instructorList.add(new Instructor(4L, "Frolio")); - instructorList.add(new Instructor(5L, "Nobles")); - - students = new Students(previousStudentList); - instructors = new Instructors(instructorList); - alumni = new Alumni(students, instructors); - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void executeBootCampTest() { - for(Student s: alumni.getPreviousStudents()) { - Assert.assertEquals(1200.0, s.getTotalStudyTime(), 0.000001); - } - - - } - - -}