From 49158baef6d2f2fbbfe27d410a70a3e5a96f30f8 Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Thu, 4 Sep 2025 15:13:33 -0400 Subject: [PATCH 01/15] added demo spring applicariton --- HELP.md | 25 ++ mvnw | 295 ++++++++++++++++++ mvnw.cmd | 189 +++++++++++ pom.xml | 60 ++++ .../com/example/demo/DemoApplication.java | 13 + src/main/resources/application.properties | 1 + .../example/demo/DemoApplicationTests.java | 13 + 7 files changed, 596 insertions(+) create mode 100644 HELP.md create mode 100755 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/java/com/example/demo/DemoApplication.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/com/example/demo/DemoApplicationTests.java diff --git a/HELP.md b/HELP.md new file mode 100644 index 0000000..567a044 --- /dev/null +++ b/HELP.md @@ -0,0 +1,25 @@ +# Getting Started + +### Reference Documentation +For further reference, please consider the following sections: + +* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) +* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/3.5.5/maven-plugin) +* [Create an OCI image](https://docs.spring.io/spring-boot/3.5.5/maven-plugin/build-image.html) +* [Spring Boot DevTools](https://docs.spring.io/spring-boot/3.5.5/reference/using/devtools.html) +* [Spring Web](https://docs.spring.io/spring-boot/3.5.5/reference/web/servlet.html) + +### Guides +The following guides illustrate how to use some features concretely: + +* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) +* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) +* [Building REST services with Spring](https://spring.io/guides/tutorials/rest/) + +### Maven Parent overrides + +Due to Maven's design, elements are inherited from the parent POM to the project POM. +While most of the inheritance is fine, it also inherits unwanted elements like `` and `` from the parent. +To prevent this, the project POM contains empty overrides for these elements. +If you manually switch to a different parent and actually want the inheritance, you need to remove those overrides. + diff --git a/mvnw b/mvnw new file mode 100755 index 0000000..e9cf8d3 --- /dev/null +++ b/mvnw @@ -0,0 +1,295 @@ +#!/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 +# +# http://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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.3 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + 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" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..2e2dbe0 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,189 @@ +<# : batch portion +@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 http://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 Apache Maven Wrapper startup batch script, version 3.3.3 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' + +$MAVEN_M2_PATH = "$HOME/.m2" +if ($env:MAVEN_USER_HOME) { + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" +} + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..b0d8895 --- /dev/null +++ b/pom.xml @@ -0,0 +1,60 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.5.5 + + + com.example + demo + 0.0.1-SNAPSHOT + demo + Demo project for Spring Boot + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/java/com/example/demo/DemoApplication.java b/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..64b538a --- /dev/null +++ b/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..2109a44 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=demo diff --git a/src/test/java/com/example/demo/DemoApplicationTests.java b/src/test/java/com/example/demo/DemoApplicationTests.java new file mode 100644 index 0000000..2778a6a --- /dev/null +++ b/src/test/java/com/example/demo/DemoApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DemoApplicationTests { + + @Test + void contextLoads() { + } + +} From a8d430e50ac765e731b2459c151f74f206e5ce88 Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Thu, 4 Sep 2025 15:23:26 -0400 Subject: [PATCH 02/15] finished person,java --- .../java/com/example/demo/model/Learner.java | 5 ++++ .../java/com/example/demo/model/Person.java | 25 +++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/main/java/com/example/demo/model/Learner.java create mode 100644 src/main/java/com/example/demo/model/Person.java diff --git a/src/main/java/com/example/demo/model/Learner.java b/src/main/java/com/example/demo/model/Learner.java new file mode 100644 index 0000000..f128120 --- /dev/null +++ b/src/main/java/com/example/demo/model/Learner.java @@ -0,0 +1,5 @@ +package main.java.com.example.demo.model; + +public interface Learner { + +} diff --git a/src/main/java/com/example/demo/model/Person.java b/src/main/java/com/example/demo/model/Person.java new file mode 100644 index 0000000..8ca5375 --- /dev/null +++ b/src/main/java/com/example/demo/model/Person.java @@ -0,0 +1,25 @@ +package main.java.com.example.demo.model; + +public class Person { + + final private long id; + private String name; + + public Person(long id, String name) { + this.id = id; + this.name = name; + } + + public long getId() { + return id; + } + + public void setName(String name) { + this.name = name; + } + + public String getName() { + return name; + } + +} From 9d8b5f3016fc5385177503c050d6deda06bd308d Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Thu, 4 Sep 2025 15:24:56 -0400 Subject: [PATCH 03/15] learner interface --- src/main/java/com/example/demo/model/Learner.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/example/demo/model/Learner.java b/src/main/java/com/example/demo/model/Learner.java index f128120..8d6ef7d 100644 --- a/src/main/java/com/example/demo/model/Learner.java +++ b/src/main/java/com/example/demo/model/Learner.java @@ -2,4 +2,5 @@ public interface Learner { + public void learn(double numberOfHours); } From 4595ccc23f01c4ef3a7ddadcff1d27c80eb65776 Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Thu, 4 Sep 2025 15:32:24 -0400 Subject: [PATCH 04/15] student calsss --- .../java/com/example/demo/model/Student.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 src/main/java/com/example/demo/model/Student.java diff --git a/src/main/java/com/example/demo/model/Student.java b/src/main/java/com/example/demo/model/Student.java new file mode 100644 index 0000000..27892f8 --- /dev/null +++ b/src/main/java/com/example/demo/model/Student.java @@ -0,0 +1,19 @@ +package main.java.com.example.demo.model; + +public class Student extends Person implements Learner{ + private double totalStudyTime; + + public Student(long id, String name){ + super(id, name); + totalStudyTime = 0.0; + } + + public double getTotalStudyTime() { + return totalStudyTime; + } + + @Override + public void learn(double numberOfHours){ + totalStudyTime+=numberOfHours; + } +} From 21096c71075f1bf3fb1eaeda21b53bd1854a979d Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Thu, 4 Sep 2025 15:40:16 -0400 Subject: [PATCH 05/15] teahcer interface and instructor class --- .../com/example/demo/model/Instructor.java | 22 +++++++++++++++++++ .../java/com/example/demo/model/Teacher.java | 6 +++++ 2 files changed, 28 insertions(+) create mode 100644 src/main/java/com/example/demo/model/Instructor.java create mode 100644 src/main/java/com/example/demo/model/Teacher.java diff --git a/src/main/java/com/example/demo/model/Instructor.java b/src/main/java/com/example/demo/model/Instructor.java new file mode 100644 index 0000000..8874c0e --- /dev/null +++ b/src/main/java/com/example/demo/model/Instructor.java @@ -0,0 +1,22 @@ +package main.java.com.example.demo.model; + +public class Instructor extends Person implements Teacher { + + public Instructor(long id, String name) { + super(id, name); + } + + @Override + public void teach(Learner learner, double numberOfHours) { + learner.learn(numberOfHours); + } + + @Override + public void lecture(Iterable learners, double numberOfHours) { + double numberOfHoursPerPerson = numberOfHours / learners.length; + + for (Learner learner : learners) { + learner.learn(numberOfHoursPerPerson); + } + } +} diff --git a/src/main/java/com/example/demo/model/Teacher.java b/src/main/java/com/example/demo/model/Teacher.java new file mode 100644 index 0000000..68a0372 --- /dev/null +++ b/src/main/java/com/example/demo/model/Teacher.java @@ -0,0 +1,6 @@ +package main.java.com.example.demo.model; + +public interface Teacher { + public void teach(Learner learner, double numberOfHours); + public void lecture(Iterable learners, double numberOfHours); +} From 524c158ddb6c7a220d5b01ac9acbc12312f32db4 Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Thu, 4 Sep 2025 16:05:34 -0400 Subject: [PATCH 06/15] peoplce class --- .../java/com/example/demo/model/People.java | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/main/java/com/example/demo/model/People.java diff --git a/src/main/java/com/example/demo/model/People.java b/src/main/java/com/example/demo/model/People.java new file mode 100644 index 0000000..e2db449 --- /dev/null +++ b/src/main/java/com/example/demo/model/People.java @@ -0,0 +1,52 @@ +package main.java.com.example.demo.model; + +import java.util.ArrayList; +import java.util.List; + +public abstract class People implements Iterable { + protected List personList; + + protected People(PersonType... people) { + this.personList = new ArrayList<>(); + for (PersonType p : people) { + this.personList.add(p); + } + } + + protected void add(PersonType person) { + personList.add(person); + } + + protected void remove(PersonType person) { + personList.remove(person); + } + + protected int size() { + return personList.size(); + } + + protected void clear() { + personList.clear(); + } + + protected void addAll(Iterable people) { + for (PersonType person : people) { + personList.add(person); + } + } + + protected PersonType findById(long id) { + PersonType temp = null; + for (PersonType person : personList) { + if (person.getId() == id) { + temp = person; + } + } + + return temp; + } + + protected List findAll() { + return personList; + } +} From 4517f1af33bad9586ff61b0b589b0ab028554057 Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Thu, 4 Sep 2025 16:08:15 -0400 Subject: [PATCH 07/15] students --- src/main/java/com/example/demo/model/Students.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/main/java/com/example/demo/model/Students.java diff --git a/src/main/java/com/example/demo/model/Students.java b/src/main/java/com/example/demo/model/Students.java new file mode 100644 index 0000000..271b734 --- /dev/null +++ b/src/main/java/com/example/demo/model/Students.java @@ -0,0 +1,7 @@ +package main.java.com.example.demo.model; + +public class Students extends People { + public Students(Student... students) { + super(students); + } +} From b26272d8806676c1aaf8de04c9c0ea826662c662 Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Thu, 4 Sep 2025 16:09:33 -0400 Subject: [PATCH 08/15] instructors --- src/main/java/com/example/demo/model/Instructors.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/main/java/com/example/demo/model/Instructors.java diff --git a/src/main/java/com/example/demo/model/Instructors.java b/src/main/java/com/example/demo/model/Instructors.java new file mode 100644 index 0000000..a2f5332 --- /dev/null +++ b/src/main/java/com/example/demo/model/Instructors.java @@ -0,0 +1,7 @@ +package main.java.com.example.demo.model; + +public class Instructors extends People { + public Instructors(Instructor... instructors) { + super(instructors); + } +} From a224bb30e17acc5da8f6d3df7dd8ae616978bedc Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Thu, 4 Sep 2025 16:20:45 -0400 Subject: [PATCH 09/15] classrooms --- .../com/example/demo/model/Classroom.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/main/java/com/example/demo/model/Classroom.java diff --git a/src/main/java/com/example/demo/model/Classroom.java b/src/main/java/com/example/demo/model/Classroom.java new file mode 100644 index 0000000..dc8af12 --- /dev/null +++ b/src/main/java/com/example/demo/model/Classroom.java @@ -0,0 +1,24 @@ +package main.java.com.example.demo.model; + +public class Classroom { + + private Students students; + private Instructors instructors; + + public Classroom(Students students, Instructors instructors){ + this.students = students; + this.instructors = instructors; + } + + public void hostLecture(Teacher teacher, double numberOfHours){ + teacher.lecture(students, numberOfHours); + } + + public Instructors getInstructors() { + return instructors; + } + + public Students getStudents() { + return students; + } +} From e8e908f48672cc29bda6a49eebc24017111e0354 Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Thu, 4 Sep 2025 21:22:15 -0400 Subject: [PATCH 10/15] studenrt config --- .../example/demo/config/StudentConfig.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/main/java/com/example/demo/config/StudentConfig.java diff --git a/src/main/java/com/example/demo/config/StudentConfig.java b/src/main/java/com/example/demo/config/StudentConfig.java new file mode 100644 index 0000000..a942f77 --- /dev/null +++ b/src/main/java/com/example/demo/config/StudentConfig.java @@ -0,0 +1,27 @@ +package main.java.com.example.demo.config; + +import main.java.com.example.demo.model.Student; +import main.java.com.example.demo.model.Students; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class StudentConfig { + + @Bean(name = "students") ///bean is called students + public Students currentStudents() { + return new Students( + new Student(1L, "Alice"), + new Student(2L, "Bob"), + new Student(3L, "Charlie") + ); + } + + @Bean + public Students previousStudents() {///beans default name is previousStudents + return new Students( + new Student(4L, "Dana"), + new Student(5L, "Eve") + ); + } +} From 11b164ca9c871ff9299007f75d42ee9f6dbb24aa Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Thu, 4 Sep 2025 21:25:42 -0400 Subject: [PATCH 11/15] class room config and instructors too --- .../example/demo/config/ClassroomConfig.java | 24 +++++++++++++ .../demo/config/InstructorsConfig.java | 36 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 src/main/java/com/example/demo/config/ClassroomConfig.java create mode 100644 src/main/java/com/example/demo/config/InstructorsConfig.java diff --git a/src/main/java/com/example/demo/config/ClassroomConfig.java b/src/main/java/com/example/demo/config/ClassroomConfig.java new file mode 100644 index 0000000..d811f05 --- /dev/null +++ b/src/main/java/com/example/demo/config/ClassroomConfig.java @@ -0,0 +1,24 @@ +package main.java.com.example.demo.config; + +import main.java.com.example.demo.model.Classroom; +import main.java.com.example.demo.model.Instructors; +import main.java.com.example.demo.model.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({"students", "instructors"}) + public Classroom currentCohort(Students students, Instructors instructors) { + return new Classroom(students, instructors); + } + + @Bean(name = "previousCohort") + @DependsOn({"previousStudents", "instructors"}) + public Classroom previousCohort(Students previousStudents, Instructors instructors) { + return new Classroom(previousStudents, instructors); + } +} diff --git a/src/main/java/com/example/demo/config/InstructorsConfig.java b/src/main/java/com/example/demo/config/InstructorsConfig.java new file mode 100644 index 0000000..eb14453 --- /dev/null +++ b/src/main/java/com/example/demo/config/InstructorsConfig.java @@ -0,0 +1,36 @@ +package main.java.com.example.demo.config; + +import main.java.com.example.demo.model.Instructor; +import main.java.com.example.demo.model.Instructors; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; + +@Configuration +public class InstructorsConfig { + + @Bean + public Instructors tcUsaInstructors() { + return new Instructors( + new Instructor(100L, "Prof. Smith"), + new Instructor(101L, "Prof. Johnson") + ); + } + + @Bean + public Instructors tcUkInstructors() { + return new Instructors( + new Instructor(200L, "Dr. Brown"), + new Instructor(201L, "Dr. Green") + ); + } + + @Bean(name = "instructors") + @Primary + public Instructors instructors() { + return new Instructors( + new Instructor(300L, "Lead Instructor A"), + new Instructor(301L, "Lead Instructor B") + ); + } +} From 0679192629e375be38b38f7ddb7f492d90a86727 Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Thu, 4 Sep 2025 21:54:34 -0400 Subject: [PATCH 12/15] test java --- pom.xml | 21 +++++----- .../java/com/example/demo/model/People.java | 18 ++++----- .../com/example/demo/TestStudentConfig.java | 39 +++++++++++++++++++ 3 files changed, 59 insertions(+), 19 deletions(-) create mode 100644 src/test/java/com/example/demo/TestStudentConfig.java diff --git a/pom.xml b/pom.xml index b0d8895..2af650c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,30 +1,31 @@ - 4.0.0 org.springframework.boot spring-boot-starter-parent 3.5.5 - + com.example demo 0.0.1-SNAPSHOT demo Demo project for Spring Boot - + - + - + - - - - + + + + 17 @@ -57,4 +58,4 @@ - + \ No newline at end of file diff --git a/src/main/java/com/example/demo/model/People.java b/src/main/java/com/example/demo/model/People.java index e2db449..ce833ca 100644 --- a/src/main/java/com/example/demo/model/People.java +++ b/src/main/java/com/example/demo/model/People.java @@ -4,38 +4,38 @@ import java.util.List; public abstract class People implements Iterable { - protected List personList; + public List personList; - protected People(PersonType... people) { + public People(PersonType... people) { this.personList = new ArrayList<>(); for (PersonType p : people) { this.personList.add(p); } } - protected void add(PersonType person) { + public void add(PersonType person) { personList.add(person); } - protected void remove(PersonType person) { + public void remove(PersonType person) { personList.remove(person); } - protected int size() { + public int size() { return personList.size(); } - protected void clear() { + public void clear() { personList.clear(); } - protected void addAll(Iterable people) { + public void addAll(Iterable people) { for (PersonType person : people) { personList.add(person); } } - protected PersonType findById(long id) { + public PersonType findById(long id) { PersonType temp = null; for (PersonType person : personList) { if (person.getId() == id) { @@ -46,7 +46,7 @@ protected PersonType findById(long id) { return temp; } - protected List findAll() { + public List findAll() { return personList; } } diff --git a/src/test/java/com/example/demo/TestStudentConfig.java b/src/test/java/com/example/demo/TestStudentConfig.java new file mode 100644 index 0000000..d388143 --- /dev/null +++ b/src/test/java/com/example/demo/TestStudentConfig.java @@ -0,0 +1,39 @@ +package test.java.com.example.demo; + +import main.java.com.example.demo.config.StudentConfig; +import main.java.com.example.demo.model.Student; +import main.java.com.example.demo.model.Students; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.beans.factory.annotation.Qualifier; + +import static org.junit.jupiter.api.Assertions.*; + +@SpringBootTest(classes = StudentConfig.class) +public class TestStudentConfig { + + @Autowired + @Qualifier("students") + private Students currentStudents; + + @Autowired + private Students previousStudents; + + @Test + void testCurrentStudentsContents() { + assertNotNull(currentStudents); + + assertEquals("Alice", currentStudents.findById(1L).getName()); + assertEquals("Bob", currentStudents.findById(2L).getName()); + assertEquals("Charlie", currentStudents.findById(3L).getName()); + } + + @Test + void testPreviousStudentsContents() { + assertNotNull(previousStudents); + + assertEquals("Dana", previousStudents.findById(4L).getName()); + assertEquals("Eve", previousStudents.findById(5L).getName()); + } +} From 2e2379190794a2d4463570e49e43ca8e1c6d1a2a Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Thu, 4 Sep 2025 22:01:19 -0400 Subject: [PATCH 13/15] adjusted --- src/main/java/com/example/demo/config/InstructorsConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/demo/config/InstructorsConfig.java b/src/main/java/com/example/demo/config/InstructorsConfig.java index eb14453..651dfa5 100644 --- a/src/main/java/com/example/demo/config/InstructorsConfig.java +++ b/src/main/java/com/example/demo/config/InstructorsConfig.java @@ -29,8 +29,8 @@ public Instructors tcUkInstructors() { @Primary public Instructors instructors() { return new Instructors( - new Instructor(300L, "Lead Instructor A"), - new Instructor(301L, "Lead Instructor B") + new Instructor(300L, "Kris"), + new Instructor(301L, "Paul") ); } } From b7702cac16767f588b1174b7572b40c645e46e14 Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Thu, 4 Sep 2025 22:35:34 -0400 Subject: [PATCH 14/15] fix all class packafges --- .vscode/settings.json | 3 + .../example/demo/config/ClassroomConfig.java | 15 +++-- .../demo/config/InstructorsConfig.java | 8 ++- .../example/demo/config/StudentConfig.java | 8 ++- .../com/example/demo/model/Classroom.java | 2 +- .../com/example/demo/model/Instructor.java | 21 ++++--- .../com/example/demo/model/Instructors.java | 10 +++- .../java/com/example/demo/model/Learner.java | 2 +- .../java/com/example/demo/model/People.java | 2 +- .../java/com/example/demo/model/Person.java | 2 +- .../java/com/example/demo/model/Student.java | 2 +- .../java/com/example/demo/model/Students.java | 12 +++- .../java/com/example/demo/model/Teacher.java | 2 +- .../com/example/demo/TestClassroomConfig.java | 53 ++++++++++++++++++ .../example/demo/TestInstructorConfig.java | 46 +++++++++++++++ .../com/example/demo/TestStudentConfig.java | 8 +-- target/classes/application.properties | 1 + .../com/example/demo/DemoApplication.class | Bin 0 -> 733 bytes .../example/demo/config/ClassroomConfig.class | Bin 0 -> 1341 bytes .../demo/config/InstructorsConfig.class | Bin 0 -> 1303 bytes .../example/demo/config/StudentConfig.class | Bin 0 -> 1064 bytes .../com/example/demo/model/Classroom.class | Bin 0 -> 1125 bytes .../com/example/demo/model/Instructor.class | Bin 0 -> 1512 bytes .../com/example/demo/model/Instructors.class | Bin 0 -> 868 bytes .../com/example/demo/model/Learner.class | Bin 0 -> 187 bytes .../com/example/demo/model/People.class | Bin 0 -> 2622 bytes .../com/example/demo/model/Person.class | Bin 0 -> 753 bytes .../com/example/demo/model/Student.class | Bin 0 -> 717 bytes .../com/example/demo/model/Students.class | Bin 0 -> 844 bytes .../com/example/demo/model/Teacher.class | Bin 0 -> 386 bytes .../example/demo/DemoApplicationTests.class | Bin 0 -> 531 bytes .../example/demo/TestClassroomConfig.class | Bin 0 -> 2232 bytes .../example/demo/TestInstructorConfig.class | Bin 0 -> 1823 bytes .../com/example/demo/TestStudentConfig.class | Bin 0 -> 1538 bytes 34 files changed, 165 insertions(+), 32 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 src/test/java/com/example/demo/TestClassroomConfig.java create mode 100644 src/test/java/com/example/demo/TestInstructorConfig.java create mode 100644 target/classes/application.properties create mode 100644 target/classes/com/example/demo/DemoApplication.class create mode 100644 target/classes/com/example/demo/config/ClassroomConfig.class create mode 100644 target/classes/com/example/demo/config/InstructorsConfig.class create mode 100644 target/classes/com/example/demo/config/StudentConfig.class create mode 100644 target/classes/com/example/demo/model/Classroom.class create mode 100644 target/classes/com/example/demo/model/Instructor.class create mode 100644 target/classes/com/example/demo/model/Instructors.class create mode 100644 target/classes/com/example/demo/model/Learner.class create mode 100644 target/classes/com/example/demo/model/People.class create mode 100644 target/classes/com/example/demo/model/Person.class create mode 100644 target/classes/com/example/demo/model/Student.class create mode 100644 target/classes/com/example/demo/model/Students.class create mode 100644 target/classes/com/example/demo/model/Teacher.class create mode 100644 target/test-classes/com/example/demo/DemoApplicationTests.class create mode 100644 target/test-classes/com/example/demo/TestClassroomConfig.class create mode 100644 target/test-classes/com/example/demo/TestInstructorConfig.class create mode 100644 target/test-classes/com/example/demo/TestStudentConfig.class diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..7b016a8 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.compile.nullAnalysis.mode": "automatic" +} \ No newline at end of file diff --git a/src/main/java/com/example/demo/config/ClassroomConfig.java b/src/main/java/com/example/demo/config/ClassroomConfig.java index d811f05..17017ff 100644 --- a/src/main/java/com/example/demo/config/ClassroomConfig.java +++ b/src/main/java/com/example/demo/config/ClassroomConfig.java @@ -1,24 +1,27 @@ -package main.java.com.example.demo.config; +package com.example.demo.config; -import main.java.com.example.demo.model.Classroom; -import main.java.com.example.demo.model.Instructors; -import main.java.com.example.demo.model.Students; + +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.DependsOn; +import com.example.demo.model.Classroom; +import com.example.demo.model.Instructors; +import com.example.demo.model.Students; + @Configuration public class ClassroomConfig { @Bean(name = "currentCohort") @DependsOn({"students", "instructors"}) - public Classroom currentCohort(Students students, Instructors instructors) { + public Classroom currentCohort(@Qualifier("students") Students students, Instructors instructors) { return new Classroom(students, instructors); } @Bean(name = "previousCohort") @DependsOn({"previousStudents", "instructors"}) - public Classroom previousCohort(Students previousStudents, Instructors instructors) { + public Classroom previousCohort(@Qualifier("previousStudents") Students previousStudents, Instructors instructors) { return new Classroom(previousStudents, instructors); } } diff --git a/src/main/java/com/example/demo/config/InstructorsConfig.java b/src/main/java/com/example/demo/config/InstructorsConfig.java index 651dfa5..c2f7c3c 100644 --- a/src/main/java/com/example/demo/config/InstructorsConfig.java +++ b/src/main/java/com/example/demo/config/InstructorsConfig.java @@ -1,11 +1,13 @@ -package main.java.com.example.demo.config; +package com.example.demo.config; + -import main.java.com.example.demo.model.Instructor; -import main.java.com.example.demo.model.Instructors; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; +import com.example.demo.model.Instructor; +import com.example.demo.model.Instructors; + @Configuration public class InstructorsConfig { diff --git a/src/main/java/com/example/demo/config/StudentConfig.java b/src/main/java/com/example/demo/config/StudentConfig.java index a942f77..3d1f69e 100644 --- a/src/main/java/com/example/demo/config/StudentConfig.java +++ b/src/main/java/com/example/demo/config/StudentConfig.java @@ -1,10 +1,12 @@ -package main.java.com.example.demo.config; +package com.example.demo.config; + -import main.java.com.example.demo.model.Student; -import main.java.com.example.demo.model.Students; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import com.example.demo.model.Student; +import com.example.demo.model.Students; + @Configuration public class StudentConfig { diff --git a/src/main/java/com/example/demo/model/Classroom.java b/src/main/java/com/example/demo/model/Classroom.java index dc8af12..8d267cb 100644 --- a/src/main/java/com/example/demo/model/Classroom.java +++ b/src/main/java/com/example/demo/model/Classroom.java @@ -1,4 +1,4 @@ -package main.java.com.example.demo.model; +package com.example.demo.model; public class Classroom { diff --git a/src/main/java/com/example/demo/model/Instructor.java b/src/main/java/com/example/demo/model/Instructor.java index 8874c0e..519847c 100644 --- a/src/main/java/com/example/demo/model/Instructor.java +++ b/src/main/java/com/example/demo/model/Instructor.java @@ -1,4 +1,4 @@ -package main.java.com.example.demo.model; +package com.example.demo.model; public class Instructor extends Person implements Teacher { @@ -12,11 +12,18 @@ public void teach(Learner learner, double numberOfHours) { } @Override - public void lecture(Iterable learners, double numberOfHours) { - double numberOfHoursPerPerson = numberOfHours / learners.length; - - for (Learner learner : learners) { - learner.learn(numberOfHoursPerPerson); - } +public void lecture(Iterable learners, double numberOfHours) { + // First pass: count learners + int count = 0; + for (Learner learner : learners) { + count++; + } + + double numberOfHoursPerPerson = numberOfHours / count; + + // Second pass: teach each learner + for (Learner learner : learners) { + learner.learn(numberOfHoursPerPerson); } } +} diff --git a/src/main/java/com/example/demo/model/Instructors.java b/src/main/java/com/example/demo/model/Instructors.java index a2f5332..319c104 100644 --- a/src/main/java/com/example/demo/model/Instructors.java +++ b/src/main/java/com/example/demo/model/Instructors.java @@ -1,7 +1,15 @@ -package main.java.com.example.demo.model; +package com.example.demo.model; + +import java.util.Iterator; public class Instructors extends People { public Instructors(Instructor... instructors) { super(instructors); } + + @Override + public Iterator iterator() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'iterator'"); + } } diff --git a/src/main/java/com/example/demo/model/Learner.java b/src/main/java/com/example/demo/model/Learner.java index 8d6ef7d..f74c864 100644 --- a/src/main/java/com/example/demo/model/Learner.java +++ b/src/main/java/com/example/demo/model/Learner.java @@ -1,4 +1,4 @@ -package main.java.com.example.demo.model; +package com.example.demo.model; public interface Learner { diff --git a/src/main/java/com/example/demo/model/People.java b/src/main/java/com/example/demo/model/People.java index ce833ca..ddd8c7b 100644 --- a/src/main/java/com/example/demo/model/People.java +++ b/src/main/java/com/example/demo/model/People.java @@ -1,4 +1,4 @@ -package main.java.com.example.demo.model; +package com.example.demo.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/example/demo/model/Person.java b/src/main/java/com/example/demo/model/Person.java index 8ca5375..09de9b8 100644 --- a/src/main/java/com/example/demo/model/Person.java +++ b/src/main/java/com/example/demo/model/Person.java @@ -1,4 +1,4 @@ -package main.java.com.example.demo.model; +package com.example.demo.model; public class Person { diff --git a/src/main/java/com/example/demo/model/Student.java b/src/main/java/com/example/demo/model/Student.java index 27892f8..6480352 100644 --- a/src/main/java/com/example/demo/model/Student.java +++ b/src/main/java/com/example/demo/model/Student.java @@ -1,4 +1,4 @@ -package main.java.com.example.demo.model; +package com.example.demo.model; public class Student extends Person implements Learner{ private double totalStudyTime; diff --git a/src/main/java/com/example/demo/model/Students.java b/src/main/java/com/example/demo/model/Students.java index 271b734..c6fe350 100644 --- a/src/main/java/com/example/demo/model/Students.java +++ b/src/main/java/com/example/demo/model/Students.java @@ -1,7 +1,15 @@ -package main.java.com.example.demo.model; +package com.example.demo.model; -public class Students extends People { +import java.util.Iterator; + +public class Students extends People { public Students(Student... students) { super(students); } + + @Override + public Iterator iterator() { + // TODO Auto-generated method stub + throw new UnsupportedOperationException("Unimplemented method 'iterator'"); + } } diff --git a/src/main/java/com/example/demo/model/Teacher.java b/src/main/java/com/example/demo/model/Teacher.java index 68a0372..f5cb90e 100644 --- a/src/main/java/com/example/demo/model/Teacher.java +++ b/src/main/java/com/example/demo/model/Teacher.java @@ -1,4 +1,4 @@ -package main.java.com.example.demo.model; +package com.example.demo.model; public interface Teacher { public void teach(Learner learner, double numberOfHours); diff --git a/src/test/java/com/example/demo/TestClassroomConfig.java b/src/test/java/com/example/demo/TestClassroomConfig.java new file mode 100644 index 0000000..9bee3a5 --- /dev/null +++ b/src/test/java/com/example/demo/TestClassroomConfig.java @@ -0,0 +1,53 @@ +package com.example.demo; + +import com.example.demo.config.ClassroomConfig; +import com.example.demo.config.InstructorsConfig; +import com.example.demo.config.StudentConfig; +import com.example.demo.model.Classroom; +import com.example.demo.model.Students; +import com.example.demo.model.Instructors; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.beans.factory.annotation.Qualifier; + +import static org.junit.jupiter.api.Assertions.*; + +@SpringBootTest(classes = {ClassroomConfig.class, StudentConfig.class, InstructorsConfig.class}) +public class TestClassroomConfig { + + @Autowired + @Qualifier("currentCohort") + private Classroom currentClassroom; + + @Autowired + @Qualifier("previousCohort") + private Classroom previousClassroom; + + @Test + void testCurrentClassroomContents() { + assertNotNull(currentClassroom); + Students students = currentClassroom.getStudents(); + Instructors instructors = currentClassroom.getInstructors(); + + assertEquals("Alice", students.findById(1L).getName()); + assertEquals("Bob", students.findById(2L).getName()); + assertEquals("Charlie", students.findById(3L).getName()); + + assertEquals("Kris", instructors.findById(300L).getName()); + assertEquals("Paul", instructors.findById(301L).getName()); + } + + @Test + void testPreviousClassroomContents() { + assertNotNull(previousClassroom); + Students students = previousClassroom.getStudents(); + Instructors instructors = previousClassroom.getInstructors(); + + assertEquals("Dana", students.findById(4L).getName()); + assertEquals("Eve", students.findById(5L).getName()); + + assertEquals("Kris", instructors.findById(300L).getName()); + assertEquals("Paul", instructors.findById(301L).getName()); + } +} diff --git a/src/test/java/com/example/demo/TestInstructorConfig.java b/src/test/java/com/example/demo/TestInstructorConfig.java new file mode 100644 index 0000000..61216ed --- /dev/null +++ b/src/test/java/com/example/demo/TestInstructorConfig.java @@ -0,0 +1,46 @@ +package com.example.demo; + +import com.example.demo.config.InstructorsConfig; +import com.example.demo.model.Instructors; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.beans.factory.annotation.Qualifier; + +import static org.junit.jupiter.api.Assertions.*; + +@SpringBootTest(classes = InstructorsConfig.class) +public class TestInstructorConfig { + + @Autowired + private Instructors instructors; // primary + + @Autowired + @Qualifier("tcUsaInstructors") + private Instructors usaInstructors; + + @Autowired + @Qualifier("tcUkInstructors") + private Instructors ukInstructors; + + @Test + void testPrimaryInstructorsContents() { + assertNotNull(instructors); + assertEquals("Kris", instructors.findById(300L).getName()); + assertEquals("Paul", instructors.findById(301L).getName()); + } + + @Test + void testUsaInstructorsContents() { + assertNotNull(usaInstructors); + assertEquals("Prof. Smith", usaInstructors.findById(100L).getName()); + assertEquals("Prof. Johnson", usaInstructors.findById(101L).getName()); + } + + @Test + void testUkInstructorsContents() { + assertNotNull(ukInstructors); + assertEquals("Dr. Brown", ukInstructors.findById(200L).getName()); + assertEquals("Dr. Green", ukInstructors.findById(201L).getName()); + } +} diff --git a/src/test/java/com/example/demo/TestStudentConfig.java b/src/test/java/com/example/demo/TestStudentConfig.java index d388143..e082317 100644 --- a/src/test/java/com/example/demo/TestStudentConfig.java +++ b/src/test/java/com/example/demo/TestStudentConfig.java @@ -1,8 +1,8 @@ -package test.java.com.example.demo; +package com.example.demo; -import main.java.com.example.demo.config.StudentConfig; -import main.java.com.example.demo.model.Student; -import main.java.com.example.demo.model.Students; +import com.example.demo.config.StudentConfig; +import com.example.demo.model.Student; +import com.example.demo.model.Students; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/target/classes/application.properties b/target/classes/application.properties new file mode 100644 index 0000000..2109a44 --- /dev/null +++ b/target/classes/application.properties @@ -0,0 +1 @@ +spring.application.name=demo diff --git a/target/classes/com/example/demo/DemoApplication.class b/target/classes/com/example/demo/DemoApplication.class new file mode 100644 index 0000000000000000000000000000000000000000..d9b3173c26575e43b3b58219a9dacae06a1e2539 GIT binary patch literal 733 zcmah{O-~y!5Pc2_2}@caP(E9!?J49?-?#*jAc)iQA%enzlXqhl(_K6AdRzV$ClH7J zfc_}Nc#D(>Me1Q^c4q81Z{GOt%kv)qd-zgEh2d*#GA{2$HcBNQ%FOU1G6$nks$$`k z(REZA7VpF_!Be3Veiq%y*fGrRDy`f;!%Ta7z)%%|_H(n)uF5MT+*b+i~d#wI); z`TUI)nfz_+PaYZLc)v_eOxMH;KG6)eAmFGyf!j+(o_D8p3a7!xMmu@$c+cn?l@!*G zIMIjFzU+q(Hlcx+ry!HgC(_-T;kod%owRf?=$pdE@>qEZSKck>hu48&Jil`KHYw$uz;ci*F!#=)nLL`lHp7ty9FwGxD|0BN`87 zIUwuHpab({oBs}w|3J|kK4O7D{NGaeHOjBkSECm| Qu7ZuyZeokPZ~GZ|1!QNuuK)l5 literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/config/ClassroomConfig.class b/target/classes/com/example/demo/config/ClassroomConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..34950ea7deb52bb3697bce50be755172ce595874 GIT binary patch literal 1341 zcmb_bTW?Z95dN0Z($X8YwTfB=tlD}zi4VpEHBpSI30k#=#Pn%7EU@*QU9!6e>%Y>c zCYtyI{87ePC`c_Neeh+@%$#p#zPaqL-`{@%c!HZ5q!@06Iu67kk2{eF8Y0#~s8v(8 zf=a}#HCo4&o}EFOA$P#LJczhz1-tbF5juvM$5Ki6lwoRXyT*{N=!VE*3UdpX#tg%9 zRVwi&iR;3A;Ppr_tW1bu(;E!i;X5?)tTGZQU47hqk!XF`_GVVh87y8#o5(8M1piF`;-V{aLRK z@1y@GF+upUR%dCiYSmim+B>6CzX~sfm?BeTWK7( e5`~|QTYdt!(s*t@vFDb;^`6}9P0r8v2Ji=BNmc3q literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/config/InstructorsConfig.class b/target/classes/com/example/demo/config/InstructorsConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..425ffcaba7cb2f923538ebfaae0d112acf562e68 GIT binary patch literal 1303 zcmb7CZBG+H5PlX~dK3^ikx_-NMKOUMhMcbhPaN`Kzb3pb5opiXYFk#l z*DAE8?ptlbl}03i7{kae|IED_S5@!b=C1H9L*Emrq$}B+-lhLB!F= zFkF&KysZbD!hGPHHNoJPw9ji5Ze--Qf-$=zLx%a%r3n>@j`cr=yo)Nsoow!Oi-0)Q zx}QX~srPkdWgsdtltkmXQrdDWwIUYzk~UQ@+&5BHw+#=(fi`=QGFBW~k9ShNWx*8* zd6gk^iuWnd1gZsd6CgP7-6d9?5!xVLZE9IvGaUMpTQr zO1oG%m|_@e7O(0Z6>61)i%e8L%`ltYxL79YNAn|%_qrr*Bm8oZW$1rl3RBBQAE&6!^WwdJJUBsJfT!=(tSh_5Hv#M?yt5HN6wCIiT#K@urr!zsmM>nH8K6eD?8yP)F z(iwdQ1~Je$8wunMk;iZa!<04B${M9RYV?WfqP)3dxa;vB7+dc>reh4_?!*x$%j>bG zd(*uYxkpHUrR*k}ix}A>)L|4U8ukp?C&+UhjZa0hj?$S9d(!?S|ET)M?`V1C5c-T{x7 literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/config/StudentConfig.class b/target/classes/com/example/demo/config/StudentConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..efa06bafbec3f9fb5e7813b34cce128f279bfb98 GIT binary patch literal 1064 zcma)4Yj4vq6g_T}HI%VODBU_9W7?}NjPMfsFhJS{`+zEtD5^B=3vTLl9*I+&r0i$G zr%Ful1Nc#h>%PV`36?0fk8|(2$LIRj@9#eWyui~OG7PJJ6nf%>hn+xpEfGeZAE`sx z_UcL65-Qp4qZ}-TnPcANUcgn`d)GV`e!?*ETq>EoWXP5)4F+pBYKc6uxH1VF6AaTe zsl?kfYzqB>Hv_@o)*_z=4X&lZ!%ZtWk}<=2?NVa4h}TcGCUrxRl)GH6T+9whPB1!2 zOnIgEsY+xh8Zwqtep{(1;fahCF>KT#-S*;+ma2WIc__X_`jc@Z5hsbq$D!Vi;EK2` zMKKIcJTNNG;ReIvg%h0Dki#6qoqq>8C^6XEf%M7CB5oQlZ!r|hZ)#^9s3%6}R;6K6 zGtHB6aF_b96E#OWSqCc&x!ohK14&c`tQo3xhL!Tcf6O9cYIsMBu8h)nWb=sGa&Vsv zc*PYTZP^YUQu)_ivLs)RQtgX9*>Cu{i}b*pfZ^F?y&hb@RQH>-g(Xmp{&BOkqANyY zj<82FquH+Z;CwS~AWx(D4P2!cm>dMqe2oyp6s9R^hSpPrX6bVez+znQ6Mm+Ale>9} z!v4e$6!){IH00g+9v15RmH`Fab{G559>67c*}xuFzf$TzLXlL0O69549FMkr|m?wr3y$e{S^;zZWuyO{E OC@Mp`j2))-6W|Y-itO6} literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/model/Classroom.class b/target/classes/com/example/demo/model/Classroom.class new file mode 100644 index 0000000000000000000000000000000000000000..aa9abde3c08227565d91ea6a0f8617b7acc40504 GIT binary patch literal 1125 zcmZ`%+iuf96r4@mq)FVQ4N%Ihq-g;sMfd{>ytG2C6k4QKk@~oCmd2GY$lf463nVH8 z4}1V0g_w1&s<143&mPa5**Rzb{QdPCz#DYSCPM|3`=1BT7H&pAfqeyY;dhSEwGyE@lZuN71-(J6gi(l4g_j`l?MJ?TD{$=O5#|zkfaQvvzJPT|e^nH*W}||-K+);+E1*XkD=3+$X`_r)fkw}d z)af`JsN_Np0>wYQ*poqDCcfEEla?O&^wiEf!Mv4pwEkY{Q9S%06B#P4OfPDqIMqG& zbevFOFW2dXlHN!q2S=TL4Uh1ojK>1oIh~(^ZEWMIKslI|-*S43QJ(Ms#)m0Mke&$e zPUJb69YJ6%%Gz@F@i-nE6XHmqex>wMw*{U%oxDm*ICDA3oDEW7H=i~GkyAaVvZvnp zW-j%4k6#&k*x?k5yyXQx9BLMEq+Bijsi4Yyjk`;(2G{8RfZg4{Ves+>8{aa*9e$f6 zfJBQVL#vZ^mzmathI`oLjs-Fqkwr$RfcuOqMjgCNpz0PLOjS==&Xl$HyWi1pe&V5p zg`_zfGNHzjls%WSDQ^6ck2ZD}QZ1(1e0hoRj9+8WB literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/model/Instructor.class b/target/classes/com/example/demo/model/Instructor.class new file mode 100644 index 0000000000000000000000000000000000000000..11e717969fe3ff87d52ef69724049dcdbc1457cb GIT binary patch literal 1512 zcma)6+fEZv6kVsCc1kH%0b8Wpg_Z*K1_%Xw5Dg{el0b;~HVh*jY-h-HYVh5}fA9x* z_Q~Lb@!9Y2$&V1%nNGPV4Q7&_J^Spl)?VxE>5t!EzX4dnGZg`WA>A%#jT5bWTr#o; zM%m7m?E|Bf&07`Msp_uns89rw4a&9*r(#>cUhn(wN^ON z-f7vAW*ug?UB|QzbLm|Hd2%}dNXL!h%@>so17b4>Z} zCl$A7Rs=>04O+MqlM@J-2LfV^Y?fB`5dY~#pnctNi}t~m=CH=4NP&M+{V6K6FY{KigDh~rImH67}A&!h?tU^ z<0P*?U2Cc8njADgpKHb>rd3SUQLgRAki`ReWyXms&{aq92558t$k1Ky{G%8i;|b*# zwaSK98cd~Mlil}|?sVN`2QNUks}`X}o(*0zlp|i7a&BB7zW2xV0i3%5^nc9biEnu*d;oP~VCoB^pBV-a z<8PEJ5ay$zh0!1nvJ9+9P6TP${$#tB%r;)%5W;VFKLZ7E?l`7fPg||P>DNuc$de-&yy7px__>Nd{sT+PNM IMgc7U0g*jPnE(I) literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/model/Instructors.class b/target/classes/com/example/demo/model/Instructors.class new file mode 100644 index 0000000000000000000000000000000000000000..3de2ca63687b0a71f6aa8202c252aec34dc2e1af GIT binary patch literal 868 zcma)4O-~y!5PjZ;Y*<1`(-Qhc2~a7aNZm_s3%T?|s+6{oQjicQv$2A!tiAGj5!e2t zo{(Cp-1$*e$4;tT8o?fR=GkxFJdb_z=jU$#hiHcg7dv+dswbx2@%8Y;?jXI zg;u_7tuK}MTxMs&eC21ZceAfkJ~`$_Iy_sf*mGGhyu95^kua>t`FW}6E=OQ!d=mCt zj|SZEOjvTrP?HonO^u<|-Rpnj7d$Slqv`(6jukiHR@46OMzq9J)>r>WDKES4Dy_jij{RJ!>=2idz literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/model/Learner.class b/target/classes/com/example/demo/model/Learner.class new file mode 100644 index 0000000000000000000000000000000000000000..c51414de4a19c566600800d3ad2a33d69831b727 GIT binary patch literal 187 zcmXX=OA5j;6r5MvMyrA+aIG720(T-VlnR3Tw0(X`(nxH@v$^m99!gBW&A`kspU?O8 z2C&3XARy@%e<($Yzc`DJ|Uj1=10P~ z=}f^cKW%L1?mn^O_F}8Oa>{VaLCOx^DtUd?Oc?#^7oj;N5PJR-Kz=Pj>UrO@gdl>5 IfyW5h56Z1A0RR91 literal 0 HcmV?d00001 diff --git a/target/classes/com/example/demo/model/People.class b/target/classes/com/example/demo/model/People.class new file mode 100644 index 0000000000000000000000000000000000000000..29d3d1e8812dc697c1803a4c30190d590bf66161 GIT binary patch literal 2622 zcmb_dT~`}b6x}zO$v_wiO%qC5C?B;Yfzl`~RS9Bg1qDNjLa7vWbx1~-ny(dxuHu_( z`4fEVn@_y>P?sNF=vvihAN>Ws_~MTc_q{`sX(-@>td+Sl=bU@a-skLl`Td`tp96Rc zpBe}V^ybRNl>OK$Rtk11Zx_p{VmWUYQj2z(76Y0<=R@m}l`2@Jjntj>hjz|25E6(q ztaGkiwbl!^K)7O8x5}lAv*mJMMulvxPgc+Ifin$g)77fA zBk_e1L1!xjx=a{oX+t;88HfvyXkBR^c~GljzKn~q6Q++e^M_5MCI6ws$*pNA|7`A0MqF4 zU=Gd6^tWB0eaW?QpD$PymCnE*N3&qNo8|nXRkeyX#X`n|iKDC3N7|9_rE*n zRciH-Er;}~iK}uT+LrSLb;TLaN%M6RuVG9;&lPN|DlM;@7?&ytadOjzg1}k-@MZ={DTNEd$fFv!f11&1>Q|-XVvQ z{g_85TFc;!5OUz9~N$xYJl)tqz zN5Ky!=94Fkj_PNSe{{0@lVQx@Lla9_=1?|lS7swLLJc^46@1ZLyGZdGvYeVwq}B-k zEz*C;cnENKsk~jy*|UzkmD;?^?5aG*0uLq|_sqlzOs0Iz@$SB~&r<7RQ*~{CcSw*w zoj;O63!kmLa{~zT{Yzd&CjFkJ9jEB|mER$*|@3>JzFQ4aBl2(3&(ZMqPEHuLPI*VMOzn^7T z1buvyf8!XyAi?!B<|1Apz)Q4tarL4ubM<^fv?V;>KCi!!0bw8sp`N@qhw0M=(}C&E zvuKUq6~*rXx67oa#6RNUm#~8hc3AmN6GTM8^Z=N3m?lOEPWZq{p9IH@^bOH>0AQ3R z!Rz2804X-G89zwW=PJa+sh@8en)|CTJcH;#yJD;kpvirBbD$6p*MQ^>LG|f{`!CF{nRP38W$< z9{K_OsH$hzQK16$Wp;Mw%$#$^{`LFzCxG|Z_TdP&CV3j^Zz?@YbTrjz9;NwIC()5E z=6UAB6|9`93l$|Qn?;A?Q#~mKPCOOJzQD~?ss-)g9p<*9+VCzdmxsAQyy*xVP7 zZg~>V1>NC)ZBg9HXI-A;(<4>TKuNO#Z>Gyn^hFVL=FfF`V9jmx9#`)ZUm@0e{f7`i z<2XMrCi-J+!Hyqc)>Wo-Qi^8muhy_LV4?XKQeSaL~PG^5z<= zSGHk|v2DvsjDc-yvTdF3+je{l8|d)H0hUH=W{7Hd$~sBD`~OQ)Sbb;wahdJwiZz}Wps+SGe)5mI#%PQFTDjOK z;b>RPthj~R51-$ba{=}axK7O*E8?SC$P2j#Y|?0hqs0-3U;Z+Qc?XO`Mjz4S2SnqI z=hvL$E5sL!1FUk6Sqscv5TKp%2j$jz1CoZ2Ff}F$4p{8O>O+FO{tJn!F}`W#C_O%&z&>po|!v;{{H+8;1Jyq0mJrGXR)~CS)PhG5t)uNorpA^ z*fJ5y79na3TMI~Ip=ldK{Xi;dhYT`a)i{LD3OkMxwM$J|JVt76Tb%YtENiIZZ$&?u^75`C$2hV@Uvp6g`H z4bOxnW27J{a;ptPr@uG)#xHnWTA9Wlt2%XAoyeKuwlw5;|DU9TC0+-^L5PP8J+Gf~ zHH(i_QRcZeRwQ3?XF+Q9{&FgEmo)I0Mth{B8*4^$6iJsHllN}#)^IOE2T$Dqo-u6p z=hnUS#2Tq){>r0?F3nVYknXlyw~ykrv%&Cok?Z-p_>V(j2aKM9`vQC?D|Lz?p&`Y9 zV*TZ-D>Q!i^}F0)chM8gBKVIJeoMS&nCUB^omGq+Qqaj(7b<(<;jJzYIm*jJ73yjw4SxKXsg`8Du z(m|jTA}??>F8?qnN%@BSRaWNr9kn;VjWsf z0te&rC;FOMRT)Z-#eB7BRFX}8lbxOX*X$xW^)}r&xj*Mpnx-qm;e*Wtr?Em;Kwyh^ l12SHugD&HOQIR3%(?cApj~!$fL=lGH^lqYAzxPFqJ^|zhW7Yrw literal 0 HcmV?d00001 diff --git a/target/test-classes/com/example/demo/DemoApplicationTests.class b/target/test-classes/com/example/demo/DemoApplicationTests.class new file mode 100644 index 0000000000000000000000000000000000000000..d0ac6136f102fc4afb200d7307f61b1d34c61d54 GIT binary patch literal 531 zcma)2yH3L}6g^H$3vHpLuvB7TLA)fqb>Sfu5K{yat-3p@DK3c}IS%xTB*F_phI}%YM8M>i~ zMKTsv`Fv5Vx_gx~?1ujmbIj0+jdpVGLL(+L*t;#XQ>h%QToLO)YvW4s)Y}S;o$^^h zI>~0rNy|m1xZjJI8bedqSY9bFuJ_mOM}BRFe#w((R_W=T6{&nO_JK#nIPQpwFBI`% zi8!Zv`2)5=*P(+00X@13<#mcUdFCqzFIavq+YPe54FWXDw!Q%5S1AM5s2iY7kwneun)fY5pLgla(X^)(IM*`%SX}d;+Sod?Ek< literal 0 HcmV?d00001 diff --git a/target/test-classes/com/example/demo/TestClassroomConfig.class b/target/test-classes/com/example/demo/TestClassroomConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..2e8d4fb6ab0b099b86f46bc8925e7e830c5efa54 GIT binary patch literal 2232 zcmb7FYg1EK6kUf`(s&i2SheL1<&D>>rP^paK(T`aghHv-wsLcG5)Qq&C%q5UpVgTT zb^Orrvmg4CI$b9(0wglRki*&Rz0X=}KX~`wn|}a2fJ&fEVBFP3TfTIPB~RKpS=9E9 z45MYw3By3^;2hxpba^oP7{;|8jXy#19qRvUruBS{3 zT>l~VBUO~UDpXldF8aQXoJeUu6u6twLBS47f$|Iaz$wZXI{4krO2-fFyyHeXcx5~F z0DCcx^a~Zp9MgVa=vM4_Dz9X~(9T20i>1KD8Y8{012XI>1@choIIP1LxKy`Qox1KT zUq#;tv`0{wQvdD0^J$q%Z<30mBEffz5=}&?KIMp4Sl;KF5T>g@TN> zqc~TAKQ=XeR)|U~)tu7ijVTM$m|;~Iz3PWi5Stz`I<`*G;FnHfj^$tUl*^jkz|90~ zfuR-@CNY=7Bcs(CnYUonAaVlh0wd@8rI5iw5}SN$(}}&>Tk{k; ztoOypxn03dQjLu;-YTL2A;)RJjML`naj(sj8JMRQEOaIDi~zrLe5a;QM-tDe1wvGc=K2&DjuQi$A8>XTH3(fbP){$)h*{&Jrmyx|)-iS-In_R@3aLtmIEO(Q} zV-)xH@zNy?-WfG{R*b4|wYTe@vn@RvbgOz}gz~hT2I4oD3U3MCx_L|TG~%T~T;P=g zHvi*A#&e1p!~ZLcv3Uxfoil%<=TH99hL8DaqJbXt@zbg};0iwB4Y*o<&^&CsuJJU9 z{zXR_T50AlTz`$v%yEQ~Oy!(h@131Z9bx`0ZXe;x*SOdFV73q6p0F&^vV6j_GS`Ri zkFfd{nImkNsK>NyHCm1_Pf!40fRYRn;Sh0-V3Mor9>%c7-S;adplLCjhAUXBoVwv) z8#`ok6;JUacBumJQ&XOAsyz2d>`8^^lPXW14uzV1&(Q;)xc^3s2`~L${ COhqRE literal 0 HcmV?d00001 diff --git a/target/test-classes/com/example/demo/TestInstructorConfig.class b/target/test-classes/com/example/demo/TestInstructorConfig.class new file mode 100644 index 0000000000000000000000000000000000000000..387b1b1fd168f761813ccbd01de26f3611021816 GIT binary patch literal 1823 zcmb7EUsD@599)?{Hs*lTb=r~=0trcMAgG~9nyHg^fP@6619iM&x{=I$a1K zt23Q6(}zwU+kU7{e>#J6V9zk|j3sL&tycS6`QQKk_!GcmyvicOaMRZvF5imIVIX-^ zb~N9Sk=+U-YhvGOv!TP5YG*ObaOpt25j+rKoByC)D7rhO9 zEw=hd8QCP-$v6_JgFc$;MJxie56ytYmSAVg5q$JeI*de1*FV*|xMbiXKC; zR8C!_VO=UK&YrJ5+{1kauY2*Qzfg8utp?mXMbLdUi4)(D6Lk>>r%sT_E3SNJ({@@q zSDQy3#xR-#*YTa%S%Vlc4?gD&<&uIjF zL7Ou@G1G)NqWy#zSY7-LSKec$aNYeVV&NTb{e|UsSb2}t!h4p7~LTGyX{2Is#$KGkfpexpVHh=lZX|fByr(Jv=HQC$JUTq14aRa1?3T z(?ctt=+y1ItfynwvT@%GN+<}d9I0a^BNY$ix7{NhI)UXdOADXi-(@|pLK|fJL{nREu%C1&%D*GyQHhC`9 z$pP8SoPBB%-DBGSdGxzXMW%0b!lT7w6=hnWoKC7Hkd;xQkB!aJ8E}E6yCyd7OM!f? zejre2v9JpAcssy3yhS!TCf0k|u&a|NiiHVOJ2q6&fl7?Gr_O>qG`wJYk*NjV32oi6 z8Ld}oW>XwlXOfLET}K&l$)jv!oKB<~nQ;djZ-86}C}OFCbzCZ8L*S~XcQL-1raBq7 zAi!l@5jdyDo;~aKvM3TbU+cWy{zmbS}X}`s3O^r4n{+x5!!YpIjNA^WxT_N+P3Y-aMP+Tln}j zIn8?Ln{+oofTc1ht-^g3tJ&E?8N0lreSDIwC{WqASrY08#tUq1K{7Xdn*?s3JxA6$ z>Cwp0OX!)C`{PO5rQc_w-b!KQ`S3(6wuGnnZ!nu>mO!h4O_q@N1n^6-(JIkerd8(d z3#_DglO~ItzVy3)ndi>g;kryqau?i-JHKJ&7e3@ry h!!_LGJe?xAHARp^n^8GD7?a}}{+hpUet-z^@E=_Cd6@tJ literal 0 HcmV?d00001 From 6a25c73a0d0c6a71fab8235286e5a3d094db332f Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Fri, 5 Sep 2025 09:36:29 -0400 Subject: [PATCH 15/15] test --- .../example/demo/config/StudentConfig.java | 2 +- .../java/com/example/demo/model/Alumni.java | 43 ++++++++++++++++++ .../java/com/example/demo/TestAlumni.java | 39 ++++++++++++++++ .../example/demo/config/StudentConfig.class | Bin 1064 -> 1072 bytes .../com/example/demo/model/Alumni.class | Bin 0 -> 1944 bytes .../com/example/demo/TestAlumni.class | Bin 0 -> 1699 bytes 6 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/example/demo/model/Alumni.java create mode 100644 src/test/java/com/example/demo/TestAlumni.java create mode 100644 target/classes/com/example/demo/model/Alumni.class create mode 100644 target/test-classes/com/example/demo/TestAlumni.class diff --git a/src/main/java/com/example/demo/config/StudentConfig.java b/src/main/java/com/example/demo/config/StudentConfig.java index 3d1f69e..02ca8da 100644 --- a/src/main/java/com/example/demo/config/StudentConfig.java +++ b/src/main/java/com/example/demo/config/StudentConfig.java @@ -19,7 +19,7 @@ public Students currentStudents() { ); } - @Bean + @Bean(name = "previousStudents") public Students previousStudents() {///beans default name is previousStudents return new Students( new Student(4L, "Dana"), diff --git a/src/main/java/com/example/demo/model/Alumni.java b/src/main/java/com/example/demo/model/Alumni.java new file mode 100644 index 0000000..d84c4a0 --- /dev/null +++ b/src/main/java/com/example/demo/model/Alumni.java @@ -0,0 +1,43 @@ +package com.example.demo.model; + +import org.springframework.stereotype.Component; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; + +import jakarta.annotation.PostConstruct; + +@Component +public class Alumni { + + private Students students; + private Instructors instructors; + + @Autowired + public Alumni(@Qualifier("previousStudents") Students previousStudents, Instructors instructors) { + this.students = previousStudents; + this.instructors = instructors; + } + + @PostConstruct + public void executeBootcamp() { + double totalHoursPerStudent = 1200.0; + double numberOfStudents = students.size(); + double numberOfInstructors = instructors.size(); + + // total teaching hours across all students + double totalTeachingHours = totalHoursPerStudent * numberOfStudents; + double hoursPerInstructor = totalTeachingHours / numberOfInstructors; + + for (Instructor instructor : instructors) { + instructor.lecture(students, hoursPerInstructor); + } + } + + public Students getStudents() { + return students; + } + + public Instructors getInstructors() { + return instructors; + } +} diff --git a/src/test/java/com/example/demo/TestAlumni.java b/src/test/java/com/example/demo/TestAlumni.java new file mode 100644 index 0000000..bb125a4 --- /dev/null +++ b/src/test/java/com/example/demo/TestAlumni.java @@ -0,0 +1,39 @@ +package com.example.demo; + +import com.example.demo.model.Alumni; +import com.example.demo.model.Student; +import com.example.demo.model.Students; +import com.example.demo.model.Instructors; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.junit.jupiter.api.Assertions.*; + +@SpringBootTest +public class TestAlumni { + + @Autowired + private Alumni alumni; + + @Test + void testBootcampHoursDistributed() { + Students students = alumni.getStudents(); + Instructors instructors = alumni.getInstructors(); + + double expectedTotalHours = 1200.0; + + // Check each student received 1200 hours + for (Student student : students) { + assertEquals(expectedTotalHours, student.getTotalStudyTime(), 0.01); + } + + // Optional: Check hours per instructor (derived dynamically) + int numberOfStudents = students.size(); + int numberOfInstructors = instructors.size(); + double expectedHoursPerInstructor = (expectedTotalHours * numberOfStudents) / numberOfInstructors; + + // You could loop over instructors if you track hours taught per instructor + // (only if your Instructor class stores this info) + } +} diff --git a/target/classes/com/example/demo/config/StudentConfig.class b/target/classes/com/example/demo/config/StudentConfig.class index efa06bafbec3f9fb5e7813b34cce128f279bfb98..1c14bfcae57eda5856412533ea9f7336858976ad 100644 GIT binary patch delta 27 hcmZ3%v4La5Qf7WW21W)!AQp;dU@T_Pn7oF$1^`n&1-JkJ delta 19 acmdnMv4Ug6Qf78G21W)!28PL7m}>ws*aW5k diff --git a/target/classes/com/example/demo/model/Alumni.class b/target/classes/com/example/demo/model/Alumni.class new file mode 100644 index 0000000000000000000000000000000000000000..baad739e7dd736e7888f3d5c1d2370f62749bdc0 GIT binary patch literal 1944 zcmbtVT~`}b6x}x;3`vF$ftFB9jXbg`DcUBU$hl9{ZTJCynd z`tGBDz*k+%;?f6KpZhcX3%*yBePX$(Ix+S!>=oZk4SlAI5`zrFZTT?r3 z=t5Lp4xF$axZc5jAZzNW9~?WoN_wHQFAeu+j%+13OOf`Ux`Emw z)yaRtZb_4_Rq%iCA4jt4?z<`=e)>dKBgK=b2kON2qwu_Nfz&dOD~lwCZDcSaken&( zWFT&fabLp$xgA_>fFIb;`LIIY;Q2mXd{!I3{momBk$H*_g+IfK}y~MFDHe z&on5-fH5VWRB5HKV_4m{Imet3>rjRpF#)#X8`98}b#>K`f^bU(O|b}w6&{)w3t)4< zEurCaS4W3fYmD(k$;u%IBF3Wgu!-3Y709}+xfPh|CYyE!rPH^qW#xEX)|;Bk9Vp!< zG{r7yQg);F*Cc(Dk|!sYi1zV(DST0T7lw)KLR18pnUzTuAF7R zR`)&r^p$X(vz4T56Z~@2VvB>uXNqq!lyeF>u6nq#`RwD>pWvdO*FcCtuHWMIHS-P5 zK=Bt06>q=5rQ)3z82yQ^1jcwDA`lp!Vt9tDehlLZJ=Yp(cpF!_A^>B|X2vo^5*VkQ zNyIx@GzH$l2;JwbCg?K^{v@uhMDK{>05>4c`I+_)Bb#> z;k~_J|9~rF_OEaRUSe(`H%2 zy)0cTT(_MA{xge>%=N-JBZ1XseNuAIar`Q2dguhMm$N+IwJL$HYTS-+90u&jJPewa zuUu0$t%%6X5CkR+B%men9;S6nvEDmbGjI_z0>cN&FZw}E**;rbT2A*i+2Xo$C=(W# zGjIu)1x6U1x7lP6^2h{N`zPo+m(lM2@S5rXl32p~IYv3wA5Eu+`OBNHD zWUWXwfp68#eA}NHMjF?2tne~=cMV*}hrCH!9aCYcPKGYsWptPVm)_k?607*wz$f@r z;5<1fQEv6H(-$SGFw#p-+xY(Fn+HFqzDwc@+|+SHU_Ml0?+s=>Pq~p=4XlGoFl6M} z`X-QdlBzA|a=COl1a{lN9c&2b&!o2#VW2d>4q40^xQ9(b^Q@Px4)RHCA*bS|_R<($+NaO+{M?mf3B&lDfwi1|S%#LPm zcfai-M)USoAVk)BSR;G+~i`yFec|CYdyZ{P6f-L=H^6Xe#k^hDy-(S-KO zxv7V(#n}+B!t%fbu}re1DWot%sm|ha+6~N8g$sC$MU*+hVf#-b)O+pr2eFF>ct}WN zw0S%tloU1@QDFWw!ER%RtZfnIE}ro3F@0b1Ph&>GYz0CuGVc^(Z!rf=htRR4V=K;$ SH27Y{P~v_JU!9Uv2L1&S^|i(T literal 0 HcmV?d00001