From 641eb82a805112ffea6438491b25ef7976eb4c3f Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 11 Jun 2023 06:41:53 +0000 Subject: [PATCH 01/20] chore (maintain) gradle version upgrade --- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59821 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 257 ++++++++++++++--------- 3 files changed, 154 insertions(+), 105 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..41d9927a4d4fb3f96a785543079b8df6723c946b 100644 GIT binary patch delta 20926 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 i_W%EDg1>@4`_NK(#)z|gdCiK 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf5..aa991fce 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c..1b6c7873 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" From 983fbfb996dd238c26c754d921cf29acd7cc7c77 Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 11 Jun 2023 06:42:04 +0000 Subject: [PATCH 02/20] =?UTF-8?q?chore=20(maintain)=20devcontainer=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devcontainer/devcontainer.json | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .devcontainer/devcontainer.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000..7e42a8b9 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,27 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/java +{ + "name": "Java", + // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile + "image": "mcr.microsoft.com/devcontainers/java:0-17", + + "features": { + "ghcr.io/devcontainers/features/java:1": { + "version": "none", + "installMaven": "false", + "installGradle": "true" + } + } + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "java -version", + + // Configure tool-specific properties. + // "customizations": {}, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} From 85ddd12338aabe423e47ade8c66fcc643b1f34ad Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 11 Jun 2023 14:07:12 +0000 Subject: [PATCH 03/20] =?UTF-8?q?refactor=20(lambda)=20=EB=9E=8C=EB=8B=A4?= =?UTF-8?q?=20=EC=8B=A4=EC=8A=B5=201=20-=20=EC=9D=B5=EB=AA=85=20=ED=81=B4?= =?UTF-8?q?=EB=9E=98=EC=8A=A4=EB=A5=BC=20=EB=9E=8C=EB=8B=A4=EB=A1=9C=20?= =?UTF-8?q?=EC=A0=84=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/nextstep/fp/CarTest.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/test/java/nextstep/fp/CarTest.java b/src/test/java/nextstep/fp/CarTest.java index 1ab1106f..ecab481a 100644 --- a/src/test/java/nextstep/fp/CarTest.java +++ b/src/test/java/nextstep/fp/CarTest.java @@ -8,24 +8,14 @@ public class CarTest { @Test public void 이동() { Car car = new Car("pobi", 0); - Car actual = car.move(new MoveStrategy() { - @Override - public boolean isMovable() { - return true; - } - }); + Car actual = car.move(() -> true); assertThat(actual).isEqualTo(new Car("pobi", 1)); } @Test public void 정지() { Car car = new Car("pobi", 0); - Car actual = car.move(new MoveStrategy() { - @Override - public boolean isMovable() { - return false; - } - }); + Car actual = car.move(() -> false); assertThat(actual).isEqualTo(new Car("pobi", 0)); } } From 2091f96497aabec4d9ea1e3e8b2e0c1257e977c3 Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 11 Jun 2023 14:07:29 +0000 Subject: [PATCH 04/20] =?UTF-8?q?refactor=20(lambda)=20=EB=9E=8C=EB=8B=A4?= =?UTF-8?q?=20=EC=8B=A4=EC=8A=B5=202=20-=20=EB=9E=8C=EB=8B=A4=EB=A5=BC=20?= =?UTF-8?q?=ED=99=9C=EC=9A=A9=ED=95=B4=20=EC=A4=91=EB=B3=B5=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nextstep/fp/Conditional.java | 5 +++++ src/main/java/nextstep/fp/Lambda.java | 21 +++++---------------- src/test/java/nextstep/fp/LambdaTest.java | 2 +- 3 files changed, 11 insertions(+), 17 deletions(-) create mode 100644 src/main/java/nextstep/fp/Conditional.java diff --git a/src/main/java/nextstep/fp/Conditional.java b/src/main/java/nextstep/fp/Conditional.java new file mode 100644 index 00000000..49e095c1 --- /dev/null +++ b/src/main/java/nextstep/fp/Conditional.java @@ -0,0 +1,5 @@ +package nextstep.fp; + +public interface Conditional { + boolean test (Integer number); +} diff --git a/src/main/java/nextstep/fp/Lambda.java b/src/main/java/nextstep/fp/Lambda.java index bd68fe1c..70b3260b 100644 --- a/src/main/java/nextstep/fp/Lambda.java +++ b/src/main/java/nextstep/fp/Lambda.java @@ -26,31 +26,20 @@ public void run() { }).start(); } - public static int sumAll(List numbers) { + public static int sumAll(List numbers, Conditional conditon) { int total = 0; for (int number : numbers) { - total += number; + if (conditon.test(number)) + total += number; } return total; } public static int sumAllEven(List numbers) { - int total = 0; - for (int number : numbers) { - if (number % 2 == 0) { - total += number; - } - } - return total; + return sumAll(numbers, number -> number % 2 == 0); } public static int sumAllOverThree(List numbers) { - int total = 0; - for (int number : numbers) { - if (number > 3) { - total += number; - } - } - return total; + return sumAll(numbers, number -> number > 3); } } diff --git a/src/test/java/nextstep/fp/LambdaTest.java b/src/test/java/nextstep/fp/LambdaTest.java index f240ac65..b2c99380 100644 --- a/src/test/java/nextstep/fp/LambdaTest.java +++ b/src/test/java/nextstep/fp/LambdaTest.java @@ -33,7 +33,7 @@ public void runThread() throws Exception { @Test public void sumAll() throws Exception { - int sum = Lambda.sumAll(numbers); + int sum = Lambda.sumAll(numbers, (number) -> true); assertThat(sum).isEqualTo(21); } From f919bd133e095c21c0e6f0d49033b6c5a5b0e5f1 Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Mon, 12 Jun 2023 13:35:46 +0000 Subject: [PATCH 05/20] =?UTF-8?q?refactor=20(stream)=20map,=20reduce,=20fi?= =?UTF-8?q?lter=20=EC=8B=A4=EC=8A=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nextstep/fp/StreamStudy.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/nextstep/fp/StreamStudy.java b/src/main/java/nextstep/fp/StreamStudy.java index b446983a..697520a8 100644 --- a/src/main/java/nextstep/fp/StreamStudy.java +++ b/src/main/java/nextstep/fp/StreamStudy.java @@ -15,10 +15,7 @@ public static long countWords() throws IOException { .get("src/main/resources/fp/war-and-peace.txt")), StandardCharsets.UTF_8); List words = Arrays.asList(contents.split("[\\P{L}]+")); - long count = 0; - for (String w : words) { - if (w.length() > 12) count++; - } + long count = words.stream().filter(w -> w.length() > 12).count(); return count; } @@ -28,6 +25,12 @@ public static void printLongestWordTop100() throws IOException { List words = Arrays.asList(contents.split("[\\P{L}]+")); // TODO 이 부분에 구현한다. + words.stream() + .filter(w -> w.length() > 12) + .distinct() + .sorted() + .limit(100) + .forEach(w -> System.out.println(w.toLowerCase())); } public static List doubleNumbers(List numbers) { @@ -39,6 +42,6 @@ public static long sumAll(List numbers) { } public static long sumOverThreeAndDouble(List numbers) { - return 0; + return numbers.stream().filter(n -> n > 3).map(n -> n * 2).reduce(0, Integer::sum); } } \ No newline at end of file From b372b39bb20c86832d3fea030afdfb6e33cc7a38 Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Tue, 13 Jun 2023 13:03:21 +0000 Subject: [PATCH 06/20] =?UTF-8?q?refactor=20(Optional)=20=EC=9A=94?= =?UTF-8?q?=EA=B5=AC=EC=82=AC=ED=95=AD=201=20-=20Optional=EC=9D=84=20?= =?UTF-8?q?=ED=99=9C=EC=9A=A9=ED=95=B4=20=EC=A1=B0=EA=B1=B4=EC=97=90=20?= =?UTF-8?q?=EB=94=B0=EB=A5=B8=20=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nextstep/optional/User.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/nextstep/optional/User.java b/src/main/java/nextstep/optional/User.java index 9614c2f4..f877348b 100644 --- a/src/main/java/nextstep/optional/User.java +++ b/src/main/java/nextstep/optional/User.java @@ -1,5 +1,7 @@ package nextstep.optional; +import java.util.Optional; + public class User { private String name; private Integer age; @@ -26,14 +28,20 @@ public static boolean ageIsInRange1(User user) { if (user != null && user.getAge() != null && (user.getAge() >= 30 - && user.getAge() <= 45)) { + && user.getAge() <= 45)) { isInRange = true; } return isInRange; } public static boolean ageIsInRange2(User user) { - return false; + Optional optionalUser = Optional.ofNullable(user); + if (!optionalUser.isPresent()) + return false; + + return optionalUser.map(u -> u.getAge()) + .filter(age -> age >= 30 && age <= 45) + .isPresent(); } @Override From 1a9a9f61ae7ed69132276888cb989bcc56ae5121 Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Tue, 13 Jun 2023 13:24:50 +0000 Subject: [PATCH 07/20] =?UTF-8?q?refactor=20(Optional)=20=EC=9A=94?= =?UTF-8?q?=EA=B5=AC=EC=82=AC=ED=95=AD=202=20-=20Optional=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EA=B0=92=EC=9D=84=20=EB=B0=98=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nextstep/optional/Users.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/nextstep/optional/Users.java b/src/main/java/nextstep/optional/Users.java index 6293040d..8a285b68 100644 --- a/src/main/java/nextstep/optional/Users.java +++ b/src/main/java/nextstep/optional/Users.java @@ -13,11 +13,9 @@ public class Users { new User("honux", 45)); User getUser(String name) { - for (User user : users) { - if (user.matchName(name)) { - return user; - } - } - return DEFAULT_USER; + return users.stream() + .filter(u -> u.matchName(name)) + .findFirst() + .orElseGet(() -> DEFAULT_USER); } } From dd138e51a7d333a6fa10e1e8e1cbfda728255f9b Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Tue, 13 Jun 2023 13:38:00 +0000 Subject: [PATCH 08/20] =?UTF-8?q?refactor=20(Optional)=20=EC=9A=94?= =?UTF-8?q?=EA=B5=AC=EC=82=AC=ED=95=AD=203=20-=20Optional=EC=97=90?= =?UTF-8?q?=EC=84=9C=20exception=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/nextstep/optional/Expression.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/nextstep/optional/Expression.java b/src/main/java/nextstep/optional/Expression.java index 1c98cd6a..d455d981 100644 --- a/src/main/java/nextstep/optional/Expression.java +++ b/src/main/java/nextstep/optional/Expression.java @@ -1,5 +1,7 @@ package nextstep.optional; +import java.util.stream.Stream; + enum Expression { PLUS("+"), MINUS("-"), TIMES("*"), DIVIDE("/"); @@ -14,12 +16,12 @@ private static boolean matchExpression(Expression e, String expression) { } static Expression of(String expression) { - for (Expression v : values()) { - if (matchExpression(v, expression)) { - return v; - } - } + return Stream.of(values()) + .filter(v -> matchExpression(v, expression)) + .findFirst() + .orElseThrow( + () -> new IllegalArgumentException( + String.format("%s는 사칙연산에 해당하지 않는 표현식입니다.", expression))); - throw new IllegalArgumentException(String.format("%s는 사칙연산에 해당하지 않는 표현식입니다.", expression)); } } From fc85776b6855d970d3858f349074b8c85627002a Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 9 Jul 2023 10:18:49 +0000 Subject: [PATCH 09/20] =?UTF-8?q?feat=20(blackjack)=20Card=20&=20Cards=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/blackjack/domain/card/Card.java | 42 ++++++++ .../java/blackjack/domain/card/Cards.java | 95 +++++++++++++++++++ .../blackjack/domain/card/Denomination.java | 59 ++++++++++++ src/main/java/blackjack/domain/card/Suit.java | 15 +++ 4 files changed, 211 insertions(+) create mode 100644 src/main/java/blackjack/domain/card/Card.java create mode 100644 src/main/java/blackjack/domain/card/Cards.java create mode 100644 src/main/java/blackjack/domain/card/Denomination.java create mode 100644 src/main/java/blackjack/domain/card/Suit.java diff --git a/src/main/java/blackjack/domain/card/Card.java b/src/main/java/blackjack/domain/card/Card.java new file mode 100644 index 00000000..189b1da3 --- /dev/null +++ b/src/main/java/blackjack/domain/card/Card.java @@ -0,0 +1,42 @@ +package blackjack.domain.card; + +import java.util.Objects; + +public class Card { + private final Denomination denomination; + private final Suit suit; + private final static String NULL_EXCEPTION_MESSAGE = "Denomination 또는 Suit로 null이 존재합니다."; + + public Card(Denomination denomination, Suit suit) { + Objects.requireNonNull(denomination, NULL_EXCEPTION_MESSAGE); + Objects.requireNonNull(suit, NULL_EXCEPTION_MESSAGE); + + this.denomination = denomination; + this.suit = suit; + } + + public Denomination getDenomitation() { + return denomination; + } + + public Suit getSuit() { + return suit; + } + + @Override + public String toString() { + return denomination.getName() + suit.getName(); + } + + @Override + public boolean equals(Object o) { + if (o == this) + return true; + if (o == null || getClass() != o.getClass()) + return false; + Card other = (Card) o; + + return this.getDenomitation() == other.getDenomitation() + && this.getSuit() == other.getSuit(); + } +} diff --git a/src/main/java/blackjack/domain/card/Cards.java b/src/main/java/blackjack/domain/card/Cards.java new file mode 100644 index 00000000..0962dffe --- /dev/null +++ b/src/main/java/blackjack/domain/card/Cards.java @@ -0,0 +1,95 @@ +package blackjack.domain.card; + +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; +import java.util.Random; +import java.util.stream.Collectors; + +public class Cards { + + private final List cards; + private final static String NULL_CARD_EXCEPTION_MESSAGE = "card의 값은 null이 될 수 없습니다"; + private final static String DUPLICATED_CARD_EXCEPTION_MESSAGE = "이미 같은 card가 존재합니다"; + private final static String DELEMITER = ", "; + private final static Integer BLACKJACK_SCORE = 21; + private final static Random RANDOM = new Random(); + + public Cards() { + this.cards = new LinkedList<>(); + } + + public Cards(Card... cards) { + this(); + for (Card card : cards) { + this.cards.add(card); + } + } + + public void add(Card card) { + Objects.requireNonNull(card, NULL_CARD_EXCEPTION_MESSAGE); + if (cards.contains(card)) + throw new IllegalArgumentException(DUPLICATED_CARD_EXCEPTION_MESSAGE); + cards.add(card); + } + + public Integer size() { + return cards.size(); + } + + public Card get(int index) { + return cards.get(index); + } + + public boolean isBlackjack() { + return score() == BLACKJACK_SCORE; + } + + public boolean isBust() { + return score() > BLACKJACK_SCORE; + } + + public Integer score() { + int initialScore = cards.stream() + .mapToInt(card -> card.getDenomitation().getScore()) + .sum(); + + if (initialScore <= BLACKJACK_SCORE) + return initialScore; + + return cards.stream() + .mapToInt(card -> card.getDenomitation().getScore(initialScore)) + .sum(); + } + + public Card pop() { + Integer randomIndex = RANDOM.nextInt(cards.size()); + Card card = cards.get(randomIndex); + cards.remove(card); + return card; + } + + @Override + public String toString() { + return cards.stream() + .map(Card::toString) + .collect(Collectors.joining(DELEMITER)); + } + + @Override + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + + Cards other = (Cards) o; + + return Objects.equals(cards, other.cards); + } + + @Override + public int hashCode() { + return Objects.hashCode(cards); + } +} diff --git a/src/main/java/blackjack/domain/card/Denomination.java b/src/main/java/blackjack/domain/card/Denomination.java new file mode 100644 index 00000000..4c11d7da --- /dev/null +++ b/src/main/java/blackjack/domain/card/Denomination.java @@ -0,0 +1,59 @@ +package blackjack.domain.card; + +import java.util.function.Predicate; +import java.util.function.Supplier; + +public enum Denomination { + ACE(11, "A"), + TWO(2, "2"), + THREE(3, "3"), + FOUR(4, "4"), + FIVE(5, "5"), + SIX(6, "6"), + SEVEN(7, "7"), + EIGHT(8, "8"), + NINE(9, "9"), + TEN(10, "10"), + JACK(10, "J"), + QUEEN(10, "Q"), + KING(10, "K"); + + private final int score; + private final String name; + private final static Integer BIG_ACE_SCORE = 11; + private final static Integer BALCKJACK_SCORE = 21; + private final static Predicate scoreBurstPredicate = score -> score + BIG_ACE_SCORE > BALCKJACK_SCORE; + private final static Supplier smallAceScoreSupplier = () -> 1; + private final static String SCORE_EXCEPTION_MESSAGE = "score는 0보다 작을 수 없습니다."; + + Denomination(final int score, final String name) { + this.score = score; + this.name = name; + } + + public boolean isAce() { + return this == ACE; + } + + public Integer getScore() { + return score; + } + + public Integer getScore(int userScore) { + if (userScore < 0) + throw new IllegalArgumentException(SCORE_EXCEPTION_MESSAGE); + if (isAce()) + return getAceScore(userScore); + return score; + } + + public String getName() { + return name; + } + + private Integer getAceScore(int userScore) { + if (scoreBurstPredicate.test(userScore)) + return smallAceScoreSupplier.get(); + return BIG_ACE_SCORE; + } +} diff --git a/src/main/java/blackjack/domain/card/Suit.java b/src/main/java/blackjack/domain/card/Suit.java new file mode 100644 index 00000000..94eecf47 --- /dev/null +++ b/src/main/java/blackjack/domain/card/Suit.java @@ -0,0 +1,15 @@ +package blackjack.domain.card; + +public enum Suit { + CLUBS("클로버"), DIAMONDS("다이아몬드"), HEARTS("하트"), SPADES("스페이드"); + + private final String name; + + Suit (String name) { + this.name = name; + } + + public String getName() { + return name; + } +} From 88164d353fa9813199ce10edc96b2d6c335888f1 Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 9 Jul 2023 10:19:09 +0000 Subject: [PATCH 10/20] test (blackjack) Card & Cards --- .../java/blackjack/domain/card/CardTest.java | 44 ++++++++ .../java/blackjack/domain/card/CardsTest.java | 105 ++++++++++++++++++ .../domain/card/DenominationTest.java | 25 +++++ 3 files changed, 174 insertions(+) create mode 100644 src/test/java/blackjack/domain/card/CardTest.java create mode 100644 src/test/java/blackjack/domain/card/CardsTest.java create mode 100644 src/test/java/blackjack/domain/card/DenominationTest.java diff --git a/src/test/java/blackjack/domain/card/CardTest.java b/src/test/java/blackjack/domain/card/CardTest.java new file mode 100644 index 00000000..8879627c --- /dev/null +++ b/src/test/java/blackjack/domain/card/CardTest.java @@ -0,0 +1,44 @@ +package blackjack.domain.card; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatNullPointerException; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import blackjack.domain.Fixture; + +public class CardTest { + Card card; + + @BeforeEach + void setup() { + card = new Card(Denomination.ACE, Suit.CLUBS); + } + + @Test + void null_argument_test() { + assertThatNullPointerException().isThrownBy(() -> { + new Card(null, null); + }); + + assertThatNullPointerException().isThrownBy(() -> { + new Card(null, Suit.CLUBS); + }); + + assertThatNullPointerException().isThrownBy(() -> { + new Card(Denomination.ACE, null); + }); + } + + @Test + void toString_test() { + assertThat(card.toString().equals("A클로버")); + } + + @Test + void equals_test() { + assertThat(card.equals(new Card(Denomination.ACE, Suit.CLUBS))).isTrue(); + assertThat(card.equals(Fixture.ACE_SPADE)).isFalse(); + } +} diff --git a/src/test/java/blackjack/domain/card/CardsTest.java b/src/test/java/blackjack/domain/card/CardsTest.java new file mode 100644 index 00000000..c51e8aef --- /dev/null +++ b/src/test/java/blackjack/domain/card/CardsTest.java @@ -0,0 +1,105 @@ +package blackjack.domain.card; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatNullPointerException; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; + +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import blackjack.domain.Fixture; + +public class CardsTest { + Cards cards; + + @BeforeEach + void setup() { + cards = new Cards(); + } + + @AfterEach + void teardown() { + cards = null; + } + + @Test + void add_null_test() { + assertThatNullPointerException().isThrownBy(() -> { + cards.add(null); + }); + } + + @Test + void add_duplicated_card_test() { + cards.add(Fixture.ACE_SPADE); + assertThatIllegalArgumentException().isThrownBy(() -> { + cards.add(Fixture.ACE_SPADE); + }); + } + + @Test + void sum_test_under_bust_with_ace() { + cards.add(Fixture.ACE_SPADE); + cards.add(Fixture.KING_SPADE); + + assertThat(cards.score()).isEqualTo(21); + } + + @Test + void sum_test_over_bust_with_ace() { + cards.add(Fixture.ACE_SPADE); + cards.add(Fixture.KING_SPADE); + cards.add(Fixture.KING_HEART); + + assertThat(cards.score()).isEqualTo(21); + } + + @Test + void isBust_test() { + cards.add(Fixture.KING_SPADE); + cards.add(Fixture.KING_HEART); + + assertThat(cards.isBust()).isFalse(); + + cards.add(new Card(Denomination.TWO, Suit.HEARTS)); + assertThat(cards.isBust()).isTrue(); + } + + @Test + void pop_test() { + Card card = Fixture.KING_SPADE; + cards.add(card); + + assertThat(cards.pop().equals(card)).isTrue(); + assertThat(cards.size()).isEqualTo(0); + } + + @Test + void equals_test() { + Card card1 = Fixture.KING_SPADE; + Card card2 = Fixture.KING_HEART; + cards.add(card1); + cards.add(card2); + + Cards other = new Cards(); + other.add(card1); + other.add(card2); + + assertThat(cards.equals(other)).isTrue(); + + cards.add(Fixture.TWO_SPADE); + + assertThat(cards.equals(other)).isFalse(); + } + + @Test + void toString_test() { + Card card1 = Fixture.KING_SPADE; + Card card2 = Fixture.KING_HEART; + cards.add(card1); + cards.add(card2); + + assertThat(cards.toString().equals("K스페이드, K하트")).isTrue(); + } +} diff --git a/src/test/java/blackjack/domain/card/DenominationTest.java b/src/test/java/blackjack/domain/card/DenominationTest.java new file mode 100644 index 00000000..c128270b --- /dev/null +++ b/src/test/java/blackjack/domain/card/DenominationTest.java @@ -0,0 +1,25 @@ +package blackjack.domain.card; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; + +import org.junit.jupiter.api.Test; + +public class DenominationTest { + @Test + void getScore_test() { + assertThat(Denomination.ACE.getScore(10)) + .isEqualTo(11); + assertThat(Denomination.ACE.getScore(11)) + .isEqualTo(1); + assertThat(Denomination.KING.getScore(11)) + .isEqualTo(10); + } + + @Test + void getScore_illegalArgumenttExceptionTest() { + assertThatIllegalArgumentException().isThrownBy(() -> { + Denomination.SEVEN.getScore(-1); + }); + } +} From bb6e68599964ff73b8882125ac846828145173e9 Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 9 Jul 2023 10:19:32 +0000 Subject: [PATCH 11/20] feat (blackjack) deck --- src/main/java/blackjack/domain/card/Deck.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/main/java/blackjack/domain/card/Deck.java diff --git a/src/main/java/blackjack/domain/card/Deck.java b/src/main/java/blackjack/domain/card/Deck.java new file mode 100644 index 00000000..ff08d469 --- /dev/null +++ b/src/main/java/blackjack/domain/card/Deck.java @@ -0,0 +1,28 @@ +package blackjack.domain.card; + +public class Deck { + private final static Cards DECK = new Cards(); + private static Deck instance = null; + + private Deck() { + for (Denomination denomination : Denomination.values()) { + for (Suit suit : Suit.values()) { + DECK.add(new Card(denomination, suit)); + } + } + } + + public static Deck getInstance() { + if (instance == null) + instance = new Deck(); + return instance; + } + + public Card draw() { + return DECK.pop(); + } + + public Integer size() { + return DECK.size(); + } +} From 80f2cb763db2a5f7310d623ea922271e5f40c8e7 Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 9 Jul 2023 10:19:45 +0000 Subject: [PATCH 12/20] test (blackjack) deck --- .../java/blackjack/domain/card/DeckTest.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/test/java/blackjack/domain/card/DeckTest.java diff --git a/src/test/java/blackjack/domain/card/DeckTest.java b/src/test/java/blackjack/domain/card/DeckTest.java new file mode 100644 index 00000000..641d64b3 --- /dev/null +++ b/src/test/java/blackjack/domain/card/DeckTest.java @@ -0,0 +1,24 @@ +package blackjack.domain.card; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.Test; + +public class DeckTest { + + @Test + void getInstance_test() { + Deck deck = Deck.getInstance(); + assertThat(deck).isInstanceOf(Deck.class); + } + + @Test + void draw_test() { + Deck deck = Deck.getInstance(); + Card card = deck.draw(); + int totalDeckSize = 52; + + assertThat(card).isInstanceOf(Card.class); + assertThat(deck.size()).isEqualTo(totalDeckSize - 1); + } +} From 5640aa28d3ad7a06c5d5db07c12d433f1ae52404 Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 9 Jul 2023 10:21:12 +0000 Subject: [PATCH 13/20] =?UTF-8?q?feat=20(blackjack)=20State=20Pattern?= =?UTF-8?q?=EC=9D=84=20=EC=9C=84=ED=95=9C=20state=20classes=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/blackjack/domain/state/Started.java | 21 ++++++++++ .../java/blackjack/domain/state/State.java | 18 +++++++++ .../blackjack/domain/state/StateFactory.java | 16 ++++++++ .../domain/state/finished/Blackjack.java | 18 +++++++++ .../blackjack/domain/state/finished/Bust.java | 18 +++++++++ .../domain/state/finished/Finished.java | 39 +++++++++++++++++++ .../blackjack/domain/state/finished/Stay.java | 20 ++++++++++ .../blackjack/domain/state/running/Hit.java | 29 ++++++++++++++ .../domain/state/running/Running.java | 23 +++++++++++ 9 files changed, 202 insertions(+) create mode 100644 src/main/java/blackjack/domain/state/Started.java create mode 100644 src/main/java/blackjack/domain/state/State.java create mode 100644 src/main/java/blackjack/domain/state/StateFactory.java create mode 100644 src/main/java/blackjack/domain/state/finished/Blackjack.java create mode 100644 src/main/java/blackjack/domain/state/finished/Bust.java create mode 100644 src/main/java/blackjack/domain/state/finished/Finished.java create mode 100644 src/main/java/blackjack/domain/state/finished/Stay.java create mode 100644 src/main/java/blackjack/domain/state/running/Hit.java create mode 100644 src/main/java/blackjack/domain/state/running/Running.java diff --git a/src/main/java/blackjack/domain/state/Started.java b/src/main/java/blackjack/domain/state/Started.java new file mode 100644 index 00000000..7e7ececc --- /dev/null +++ b/src/main/java/blackjack/domain/state/Started.java @@ -0,0 +1,21 @@ +package blackjack.domain.state; + +import blackjack.domain.card.Cards; + +public abstract class Started implements State { + + protected final Cards cards; + + public Started(final Cards cards) { + this.cards = cards; + } + + public Started() { + this.cards = new Cards(); + } + + @Override + public Cards cards() { + return cards; + } +} diff --git a/src/main/java/blackjack/domain/state/State.java b/src/main/java/blackjack/domain/state/State.java new file mode 100644 index 00000000..057541a0 --- /dev/null +++ b/src/main/java/blackjack/domain/state/State.java @@ -0,0 +1,18 @@ +package blackjack.domain.state; + +import blackjack.domain.card.Card; +import blackjack.domain.card.Cards; +import blackjack.domain.user.Betting; +import blackjack.domain.user.Dealer; + +public interface State { + State draw(Card card); + + State stay(); + + boolean isFinishied(); + + Cards cards(); + + double profit(Dealer dealer, Betting betting); +} diff --git a/src/main/java/blackjack/domain/state/StateFactory.java b/src/main/java/blackjack/domain/state/StateFactory.java new file mode 100644 index 00000000..60121613 --- /dev/null +++ b/src/main/java/blackjack/domain/state/StateFactory.java @@ -0,0 +1,16 @@ +package blackjack.domain.state; + +import blackjack.domain.card.Card; +import blackjack.domain.card.Cards; +import blackjack.domain.state.finished.Blackjack; +import blackjack.domain.state.running.Hit; + +public class StateFactory { + public static State firstDraw(Card card1, Card card2) { + Cards cards = new Cards(card1, card2); + + if (cards.isBlackjack()) + return new Blackjack(cards); + return new Hit(cards); + } +} diff --git a/src/main/java/blackjack/domain/state/finished/Blackjack.java b/src/main/java/blackjack/domain/state/finished/Blackjack.java new file mode 100644 index 00000000..b2db365f --- /dev/null +++ b/src/main/java/blackjack/domain/state/finished/Blackjack.java @@ -0,0 +1,18 @@ +package blackjack.domain.state.finished; + +import blackjack.domain.card.Cards; +import blackjack.domain.user.Dealer; + +// 블랙잭(Blackjack): 처음 두 장의 카드 합이 21인 경우, 베팅 금액의 1.5배 +public class Blackjack extends Finished { + public Blackjack(final Cards cards) { + super(cards); + } + + @Override + public double earningRate(Dealer dealer) { + if (cards().isBlackjack() && dealer.isBlackjack()) + return 0; + return 1.5; + } +} diff --git a/src/main/java/blackjack/domain/state/finished/Bust.java b/src/main/java/blackjack/domain/state/finished/Bust.java new file mode 100644 index 00000000..0346fd1c --- /dev/null +++ b/src/main/java/blackjack/domain/state/finished/Bust.java @@ -0,0 +1,18 @@ +package blackjack.domain.state.finished; + +import blackjack.domain.card.Cards; +import blackjack.domain.user.Dealer; + +// 버스트(Bust): 카드 총합이 21을 넘는 경우. 배당금을 잃는다. +public class Bust extends Finished { + + public Bust(Cards cards) { + super(cards); + } + + @Override + public double earningRate(Dealer dealer) { + return 0; + } + +} diff --git a/src/main/java/blackjack/domain/state/finished/Finished.java b/src/main/java/blackjack/domain/state/finished/Finished.java new file mode 100644 index 00000000..a9c65fd6 --- /dev/null +++ b/src/main/java/blackjack/domain/state/finished/Finished.java @@ -0,0 +1,39 @@ +package blackjack.domain.state.finished; + +import blackjack.domain.card.Card; +import blackjack.domain.card.Cards; +import blackjack.domain.state.Started; +import blackjack.domain.state.State; +import blackjack.domain.user.Betting; +import blackjack.domain.user.Dealer; + +// 끝난 상태를 표현하기 위한 클래스 +// profit()을 얻을 수 있지만 draw(), stay()는 사용이 불가능 하도록 예외처리 +public abstract class Finished extends Started { + public Finished(final Cards cards) { + super(cards); + } + + @Override + public boolean isFinishied() { + return true; + } + + @Override + public double profit(Dealer dealer, Betting betting) { + return betting.value() * earningRate(dealer); + } + + public abstract double earningRate(Dealer dealer); + + @Override + public State draw(final Card card) { + throw new UnsupportedOperationException(); + } + + @Override + public State stay() { + throw new UnsupportedOperationException(); + } + +} diff --git a/src/main/java/blackjack/domain/state/finished/Stay.java b/src/main/java/blackjack/domain/state/finished/Stay.java new file mode 100644 index 00000000..68153460 --- /dev/null +++ b/src/main/java/blackjack/domain/state/finished/Stay.java @@ -0,0 +1,20 @@ +package blackjack.domain.state.finished; + +import blackjack.domain.card.Cards; +import blackjack.domain.user.Dealer; + +// 스테이(Stay): 카드를 더 뽑지 않고 차례를 마치는 것 +public class Stay extends Finished { + public Stay(Cards cards) { + super(cards); + } + + @Override + public double earningRate(Dealer dealer) { + if (dealer.isBust() || cards().score() > dealer.score()) + return 1; + if (!dealer.isBust() && cards().score() == dealer.score()) + return 0; + return -1; + } +} diff --git a/src/main/java/blackjack/domain/state/running/Hit.java b/src/main/java/blackjack/domain/state/running/Hit.java new file mode 100644 index 00000000..88b12c0b --- /dev/null +++ b/src/main/java/blackjack/domain/state/running/Hit.java @@ -0,0 +1,29 @@ +package blackjack.domain.state.running; + +import blackjack.domain.card.Card; +import blackjack.domain.card.Cards; +import blackjack.domain.state.State; +import blackjack.domain.state.finished.Bust; +import blackjack.domain.state.finished.Stay; + +// 힛(Hit): 처음 2장의 상태에서 카드를 더 뽑는 것 +public class Hit extends Running { + + public Hit(final Cards cards) { + super(cards); + } + + // TODO: dealer의 경우는 어떻게 할 것인가... 따로?? 고민 필요 + @Override + public State draw(final Card card) { + cards.add(card); + if (cards.isBust()) + return new Bust(cards); + return new Hit(cards); + } + + @Override + public State stay() { + return new Stay(cards); + } +} diff --git a/src/main/java/blackjack/domain/state/running/Running.java b/src/main/java/blackjack/domain/state/running/Running.java new file mode 100644 index 00000000..b43d1425 --- /dev/null +++ b/src/main/java/blackjack/domain/state/running/Running.java @@ -0,0 +1,23 @@ +package blackjack.domain.state.running; + +import blackjack.domain.card.Cards; +import blackjack.domain.state.Started; +import blackjack.domain.user.Betting; +import blackjack.domain.user.Dealer; + +public abstract class Running extends Started { + + public Running(final Cards cards) { + super(cards); + } + + @Override + public boolean isFinishied() { + return false; + } + + @Override + public double profit(Dealer dealer, Betting betting) { + throw new UnsupportedOperationException(); + } +} From 639533db097814b09e33e69e2baa1c29fde7edd2 Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 9 Jul 2023 10:21:31 +0000 Subject: [PATCH 14/20] test (blackjack) State --- .../java/blackjack/domain/state/HitTest.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/test/java/blackjack/domain/state/HitTest.java diff --git a/src/test/java/blackjack/domain/state/HitTest.java b/src/test/java/blackjack/domain/state/HitTest.java new file mode 100644 index 00000000..95ba25bd --- /dev/null +++ b/src/test/java/blackjack/domain/state/HitTest.java @@ -0,0 +1,27 @@ +package blackjack.domain.state; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.Test; + +import blackjack.domain.Fixture; +import blackjack.domain.card.Cards; +import blackjack.domain.state.finished.Bust; +import blackjack.domain.state.running.Hit; + +public class HitTest { + + @Test + void hit_test() { + Hit hit = new Hit(new Cards(Fixture.ACE_SPADE, Fixture.TWO_SPADE)); + State state = hit.draw(Fixture.KING_HEART); + assertThat(state).isInstanceOf(Hit.class); + } + + @Test + void bust_test() { + Hit hit = new Hit(new Cards(Fixture.KING_HEART, Fixture.KING_SPADE, Fixture.ACE_SPADE)); + State state = hit.draw(Fixture.TWO_SPADE); + assertThat(state).isInstanceOf(Bust.class); + } +} From 1ef49ee22e8dafb1f483601a3d0aa16783c89c68 Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 9 Jul 2023 10:21:57 +0000 Subject: [PATCH 15/20] =?UTF-8?q?feat=20(blackjack)=20User(Player=20&=20De?= =?UTF-8?q?aler)=20class=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../blackjack/domain/user/AbstractUser.java | 55 +++++++++++++++++++ .../java/blackjack/domain/user/Betting.java | 26 +++++++++ .../java/blackjack/domain/user/Dealer.java | 34 ++++++++++++ src/main/java/blackjack/domain/user/Name.java | 27 +++++++++ .../java/blackjack/domain/user/Names.java | 39 +++++++++++++ .../java/blackjack/domain/user/Player.java | 21 +++++++ .../java/blackjack/domain/user/Players.java | 50 +++++++++++++++++ src/main/java/blackjack/domain/user/User.java | 13 +++++ 8 files changed, 265 insertions(+) create mode 100644 src/main/java/blackjack/domain/user/AbstractUser.java create mode 100644 src/main/java/blackjack/domain/user/Betting.java create mode 100644 src/main/java/blackjack/domain/user/Dealer.java create mode 100644 src/main/java/blackjack/domain/user/Name.java create mode 100644 src/main/java/blackjack/domain/user/Names.java create mode 100644 src/main/java/blackjack/domain/user/Player.java create mode 100644 src/main/java/blackjack/domain/user/Players.java create mode 100644 src/main/java/blackjack/domain/user/User.java diff --git a/src/main/java/blackjack/domain/user/AbstractUser.java b/src/main/java/blackjack/domain/user/AbstractUser.java new file mode 100644 index 00000000..52bf5cb6 --- /dev/null +++ b/src/main/java/blackjack/domain/user/AbstractUser.java @@ -0,0 +1,55 @@ +package blackjack.domain.user; + +import blackjack.domain.card.Cards; +import blackjack.domain.state.State; + +public abstract class AbstractUser implements User { + private final Name name; + private final Betting betting; + protected State state; + + public AbstractUser(Name name, Betting betting, State state) { + this.name = name; + this.betting = betting; + this.state = state; + } + + public Name getName() { + return name; + } + + public Betting getBetting() { + return betting; + } + + protected void changeState(State state) { + this.state = state; + } + + public void stay() { + changeState(state.stay()); + } + + public boolean isFinishied() { + return state.isFinishied(); + } + + public boolean isBlackjack() { + return getCards().isBlackjack(); + } + + protected Cards getCards() { + return state.cards(); + } + + public Integer score() { + return getCards().score(); + } + + @Override + public String toString() { + String cardsInString = getCards().toString(); + + return getName().value() + " 카드: " + cardsInString; + } +} diff --git a/src/main/java/blackjack/domain/user/Betting.java b/src/main/java/blackjack/domain/user/Betting.java new file mode 100644 index 00000000..523ef963 --- /dev/null +++ b/src/main/java/blackjack/domain/user/Betting.java @@ -0,0 +1,26 @@ +package blackjack.domain.user; + +public class Betting { + + private final Double betting; + private final static String ARGUMENT_EXCEPTION_STRING = "베팅 금액은 0보다 큰 정수여야 합니다."; + private final static int MIN_BETTING = 0; + + public Betting(double betting) { + validate(betting); + this.betting = betting; + } + + public static Betting of(String betting) { + return new Betting(Double.parseDouble(betting)); + } + + private void validate(double betting) { + if (betting < MIN_BETTING) + throw new IllegalArgumentException(ARGUMENT_EXCEPTION_STRING); + } + + public Double value() { + return betting; + } +} diff --git a/src/main/java/blackjack/domain/user/Dealer.java b/src/main/java/blackjack/domain/user/Dealer.java new file mode 100644 index 00000000..2e7144f7 --- /dev/null +++ b/src/main/java/blackjack/domain/user/Dealer.java @@ -0,0 +1,34 @@ +package blackjack.domain.user; + +import blackjack.domain.card.Card; +import blackjack.domain.state.State; + +public class Dealer extends AbstractUser { + + public static final Integer STANDARD = 16; + + public Dealer(State state) { + super(new Name("딜러"), null, state); + } + + @Override + public void draw(Card card) { + if (canDraw()) { + changeState(state.draw(card)); + return; + } + stay(); + } + + public String initStatus() { + return getName().value() + ": " + getCards().get(0).toString(); + } + + public boolean isBust() { + return getCards().isBust(); + } + + public boolean canDraw() { + return score() <= STANDARD; + } +} diff --git a/src/main/java/blackjack/domain/user/Name.java b/src/main/java/blackjack/domain/user/Name.java new file mode 100644 index 00000000..b8e84064 --- /dev/null +++ b/src/main/java/blackjack/domain/user/Name.java @@ -0,0 +1,27 @@ +package blackjack.domain.user; + +import java.util.Objects; + +public class Name { + + private final String name; + private final static String NULL_NAME_EXCEPTION_MESSAGE = "이름은 null이될 수 없습니다"; + + public Name(String name) { + validate(name); + this.name = name; + } + + public void validate(String name) { + Objects.requireNonNull(name, NULL_NAME_EXCEPTION_MESSAGE); + } + + public String value() { + return name; + } + + @Override + public String toString() { + return name; + } +} diff --git a/src/main/java/blackjack/domain/user/Names.java b/src/main/java/blackjack/domain/user/Names.java new file mode 100644 index 00000000..3a8680cd --- /dev/null +++ b/src/main/java/blackjack/domain/user/Names.java @@ -0,0 +1,39 @@ +package blackjack.domain.user; + +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; + +public class Names implements Iterable { + private final List names; + + private static final String SPLIT_DELIMITER = ","; + + public Names(List names) { + this.names = names; + } + + public static Names of(List names) { + return new Names(names); + } + + public static Names of(String names) { + String trimmedNames = names.trim(); + return of(Arrays.stream(trimmedNames.split(SPLIT_DELIMITER)) + .map(String::trim) + .map(Name::new) + .collect(Collectors.toList())); + } + + public List getNames() { + return Collections.unmodifiableList(names); + } + + @Override + public Iterator iterator() { + return names.iterator(); + } + +} diff --git a/src/main/java/blackjack/domain/user/Player.java b/src/main/java/blackjack/domain/user/Player.java new file mode 100644 index 00000000..361fa367 --- /dev/null +++ b/src/main/java/blackjack/domain/user/Player.java @@ -0,0 +1,21 @@ +package blackjack.domain.user; + +import blackjack.domain.card.Card; +import blackjack.domain.state.State; + +public class Player extends AbstractUser { + + public Player(Name name, Betting betting, State state) { + super(name, betting, state); + } + + public double profit(Dealer dealer) { + return state.profit(dealer, getBetting()); + } + + @Override + public void draw(Card card) { + changeState(state.draw(card)); + } + +} diff --git a/src/main/java/blackjack/domain/user/Players.java b/src/main/java/blackjack/domain/user/Players.java new file mode 100644 index 00000000..466745a2 --- /dev/null +++ b/src/main/java/blackjack/domain/user/Players.java @@ -0,0 +1,50 @@ +package blackjack.domain.user; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +public class Players implements Iterable { + private final List players; + + public Players() { + players = new ArrayList<>(); + } + + public void add(Player player) { + players.add(player); + } + + public Player get(int index) { + return players.get(index); + } + + @Override + public Iterator iterator() { + return players.iterator(); + } + + @Override + public boolean equals(Object o) { + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; + Players other = (Players) o; + return Objects.equals(players, other.players); + } + + @Override + public int hashCode() { + return Objects.hash(players); + } + + @Override + public String toString() { + return players.stream() + .map(Player::toString) + .collect(Collectors.joining("\n")); + } +} diff --git a/src/main/java/blackjack/domain/user/User.java b/src/main/java/blackjack/domain/user/User.java new file mode 100644 index 00000000..5df4f0a2 --- /dev/null +++ b/src/main/java/blackjack/domain/user/User.java @@ -0,0 +1,13 @@ +package blackjack.domain.user; + +import blackjack.domain.card.Card; + +public interface User { + Name getName(); + Betting getBetting(); + void draw(Card card); + void stay(); + boolean isFinishied(); + boolean isBlackjack(); + Integer score(); +} From c0732127f031a6332121b154b898886ed450eaef Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 9 Jul 2023 10:22:47 +0000 Subject: [PATCH 16/20] test (blackjack) User --- src/test/java/blackjack/domain/Fixture.java | 14 ++++ .../blackjack/domain/user/DealerTest.java | 20 +++++ .../blackjack/domain/user/PlayerTest.java | 81 +++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 src/test/java/blackjack/domain/Fixture.java create mode 100644 src/test/java/blackjack/domain/user/DealerTest.java create mode 100644 src/test/java/blackjack/domain/user/PlayerTest.java diff --git a/src/test/java/blackjack/domain/Fixture.java b/src/test/java/blackjack/domain/Fixture.java new file mode 100644 index 00000000..851647e0 --- /dev/null +++ b/src/test/java/blackjack/domain/Fixture.java @@ -0,0 +1,14 @@ +package blackjack.domain; + +import blackjack.domain.card.Card; +import blackjack.domain.card.Denomination; +import blackjack.domain.card.Suit; + +public class Fixture { + public static final Card ACE_SPADE = new Card(Denomination.ACE, Suit.SPADES); + public static final Card TWO_SPADE = new Card(Denomination.TWO, Suit.SPADES); + public static final Card KING_SPADE = new Card(Denomination.KING, Suit.SPADES); + public static final Card EIGHT_SPADE = new Card(Denomination.EIGHT, Suit.SPADES); + public static final Card NINE_SPADE = new Card(Denomination.NINE, Suit.SPADES); + public static final Card KING_HEART = new Card(Denomination.KING, Suit.HEARTS); +} diff --git a/src/test/java/blackjack/domain/user/DealerTest.java b/src/test/java/blackjack/domain/user/DealerTest.java new file mode 100644 index 00000000..529e3c31 --- /dev/null +++ b/src/test/java/blackjack/domain/user/DealerTest.java @@ -0,0 +1,20 @@ +package blackjack.domain.user; + +import static org.assertj.core.api.Assertions.assertThat; + +import blackjack.domain.Fixture; +import blackjack.domain.state.State; +import blackjack.domain.state.StateFactory; + +import org.junit.jupiter.api.Test; + +public class DealerTest { + @Test + void firstPhase() { + State firstState = StateFactory.firstDraw(Fixture.KING_HEART, Fixture.KING_SPADE); + + Dealer dealer = new Dealer(firstState); + + assertThat(dealer.initStatus().equals("딜러: K하트")).isTrue(); + } +} diff --git a/src/test/java/blackjack/domain/user/PlayerTest.java b/src/test/java/blackjack/domain/user/PlayerTest.java new file mode 100644 index 00000000..05ab6a9d --- /dev/null +++ b/src/test/java/blackjack/domain/user/PlayerTest.java @@ -0,0 +1,81 @@ +package blackjack.domain.user; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import blackjack.domain.Fixture; +import blackjack.domain.state.State; +import blackjack.domain.state.StateFactory; + +public class PlayerTest { + Player player; + Player blackjackPlayer; + Dealer dealer; + Dealer blackjackDealer; + + @BeforeEach + void setup() { + Name name = new Name("hyeonwoo"); + Betting betting = new Betting(100); + + State firstState = StateFactory.firstDraw(Fixture.EIGHT_SPADE, Fixture.KING_SPADE); + player = new Player(name, betting, firstState); + player.draw(Fixture.TWO_SPADE); + + + State blackjack = StateFactory.firstDraw(Fixture.ACE_SPADE, Fixture.KING_SPADE); + blackjackPlayer = new Player(name, betting, blackjack); + + State dealerState = StateFactory.firstDraw(Fixture.TWO_SPADE, Fixture.KING_SPADE); + dealer = new Dealer(dealerState); + dealer.draw(Fixture.ACE_SPADE); + + State blackjackDealerState = StateFactory.firstDraw(Fixture.ACE_SPADE, Fixture.KING_SPADE); + blackjackDealer = new Dealer(blackjackDealerState); + } + + @Test + void draw_isFinished_true() { + assertThat(player.isFinishied()).isFalse(); + } + + @Test + void bust() { + player.draw(Fixture.KING_HEART); + + assertThat(player.isFinishied()).isTrue(); + assertThat(player.profit(dealer)).isEqualTo(0.0); + } + + @Test + void user_toString() { + assertThat(player.toString().equals("hyeonwoo 카드: 8스페이드, K스페이드, 2스페이드")).isTrue(); + } + + @Test + void profit_player_score_bigger_than_dealer_score() { + player.stay(); + + assertThat(player.profit(dealer)).isEqualTo(100.0); + } + + @Test + void profit_should_be_0_when_both_blackjack_case() { + player.stay(); + assertThat(blackjackPlayer.profit(blackjackDealer)).isEqualTo(0.0); + } + + @Test + void profit_should_be_negative100_when_only_dealer_is_blackjack() { + player.stay(); + assertThat(player.profit(blackjackDealer)).isEqualTo(-100.0); + } + + @Test + void profit_should_be_0_when_bust_player_low_dealer_score() { + player.draw(Fixture.KING_HEART); + assertThat(player.profit(dealer)).isEqualTo(0.0); + } +} From 1dea8ecf3fe998b8251d00fa7398d388c715f2c7 Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 9 Jul 2023 10:23:06 +0000 Subject: [PATCH 17/20] =?UTF-8?q?feat=20(blackjack)=20Input=20&=20Output?= =?UTF-8?q?=20view=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/blackjack/view/InputView.java | 27 ++++++++++++ src/main/java/blackjack/view/OutputView.java | 44 ++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 src/main/java/blackjack/view/InputView.java create mode 100644 src/main/java/blackjack/view/OutputView.java diff --git a/src/main/java/blackjack/view/InputView.java b/src/main/java/blackjack/view/InputView.java new file mode 100644 index 00000000..b0a0b3f2 --- /dev/null +++ b/src/main/java/blackjack/view/InputView.java @@ -0,0 +1,27 @@ +package blackjack.view; + +import java.util.Scanner; + +import blackjack.domain.user.Name; +import blackjack.domain.user.Player; + +public class InputView { + private static final Scanner SCANNER = new Scanner(System.in); + + private InputView() {} + + public static String inputPlayerNames() { + System.out.println("게임에 참여할 사람의 이름을 입력하세요.(쉼표 기준으로 분리)"); + return SCANNER.nextLine(); + } + + public static String inputPlayerBettingMoney(Name name) { + System.out.println("\n" + name + "의 베팅 금액은?"); + return SCANNER.nextLine(); + } + + public static String inputPlayerIntention(Player player) { + System.out.println(player.getName() + "는 한장의 카드를 더 받겠습니까? (예는 y, 아니오는 n)"); + return SCANNER.nextLine(); + } +} diff --git a/src/main/java/blackjack/view/OutputView.java b/src/main/java/blackjack/view/OutputView.java new file mode 100644 index 00000000..e2111f83 --- /dev/null +++ b/src/main/java/blackjack/view/OutputView.java @@ -0,0 +1,44 @@ +package blackjack.view; + +import blackjack.domain.user.Dealer; +import blackjack.domain.user.Player; +import blackjack.domain.user.Players; + +public class OutputView { + public static void printInitStatus(Players players, Dealer dealer) { + printNewLine(); + System.out.println(dealer.initStatus()); + System.out.println(players); + printNewLine(); + } + + public static void printPlayerStatus(Player player) { + System.out.println(player); + } + + public static void printDealerDrew(Dealer dealer) { + if (dealer.canDraw()) { + printNewLine(); + System.out.println("딜러는 " + Dealer.STANDARD + "이하라 한장의 카드를 더 받았습니다."); + printNewLine(); + } + } + + public static void printResult(Players players, Dealer dealer) { + printNewLine(); + System.out.println(dealer + " - 결과: " + dealer.score()); + players.forEach(player -> { + System.out.println(player + " - 결과: " + player.score()); + }); + printNewLine(); + + System.out.println("## 최종 수익"); + players.forEach(player -> { + System.out.println(player.getName() + ": " + player.profit(dealer)); + }); + } + + private static void printNewLine() { + System.out.println(); + } +} From 20bf076c86eba11de9de982a5040dd53235946a0 Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 9 Jul 2023 10:23:27 +0000 Subject: [PATCH 18/20] =?UTF-8?q?feat=20(blackjack)=20Controller=20&=20Mai?= =?UTF-8?q?n=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/blackjack/Main.java | 9 +++ .../java/blackjack/controller/Controller.java | 78 +++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 src/main/java/blackjack/Main.java create mode 100644 src/main/java/blackjack/controller/Controller.java diff --git a/src/main/java/blackjack/Main.java b/src/main/java/blackjack/Main.java new file mode 100644 index 00000000..279668ac --- /dev/null +++ b/src/main/java/blackjack/Main.java @@ -0,0 +1,9 @@ +package blackjack; + +import blackjack.controller.Controller; + +public class Main { + public static void main(String[] args) { + Controller.run(); + } +} diff --git a/src/main/java/blackjack/controller/Controller.java b/src/main/java/blackjack/controller/Controller.java new file mode 100644 index 00000000..2e76c3e4 --- /dev/null +++ b/src/main/java/blackjack/controller/Controller.java @@ -0,0 +1,78 @@ +package blackjack.controller; + +import blackjack.domain.card.Card; +import blackjack.domain.card.Deck; +import blackjack.domain.state.State; +import blackjack.domain.state.StateFactory; +import blackjack.domain.user.Betting; +import blackjack.domain.user.Dealer; +import blackjack.domain.user.Names; +import blackjack.domain.user.Player; +import blackjack.domain.user.Players; +import blackjack.view.InputView; +import blackjack.view.OutputView; + +public class Controller { + private final static Deck deck = Deck.getInstance(); + + private Controller() { + } + + public static void run() { + Players players = enrollPlayers(); + Dealer dealer = enrollDealer(); + + OutputView.printInitStatus(players, dealer); + + playerDrawPhase(players); + dealerDrawPhase(dealer); + + OutputView.printResult(players, dealer); + } + + private static Players enrollPlayers() { + Names names = Names.of(InputView.inputPlayerNames()); + Players players = new Players(); + + names.forEach((name) -> { + Betting betting = Betting.of(InputView.inputPlayerBettingMoney(name)); + + Card card1 = deck.draw(); + Card card2 = deck.draw(); + State firstState = StateFactory.firstDraw(card1, card2); + + players.add(new Player(name, betting, firstState)); + }); + return players; + } + + private static Dealer enrollDealer() { + Card card1 = deck.draw(); + Card card2 = deck.draw(); + State firstState = StateFactory.firstDraw(card1, card2); + + return new Dealer(firstState); + } + + private static void playerDrawPhase(Players players) { + players.forEach((player) -> { + while (!player.isFinishied() && wantDraw(player)) { + player.draw(deck.draw()); + OutputView.printPlayerStatus(player); + } + }); + } + + private static void dealerDrawPhase(Dealer dealer) { + OutputView.printDealerDrew(dealer); + dealer.draw(deck.draw()); + } + + private static boolean wantDraw(Player player) { + String intention = InputView.inputPlayerIntention(player); + boolean drawStops = intention.equals("n"); + if (drawStops) + player.stay(); + return intention.equals("y"); + } +} From 0baf4031ca5143dff6d2abf60eae9787ff087638 Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 9 Jul 2023 13:25:30 +0000 Subject: [PATCH 19/20] =?UTF-8?q?chore=20(blackjack)=20Hit=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=EC=9D=98=20todo=20=EC=A3=BC=EC=84=9D=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/blackjack/domain/state/running/Hit.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/blackjack/domain/state/running/Hit.java b/src/main/java/blackjack/domain/state/running/Hit.java index 88b12c0b..6cb3f4bd 100644 --- a/src/main/java/blackjack/domain/state/running/Hit.java +++ b/src/main/java/blackjack/domain/state/running/Hit.java @@ -13,7 +13,6 @@ public Hit(final Cards cards) { super(cards); } - // TODO: dealer의 경우는 어떻게 할 것인가... 따로?? 고민 필요 @Override public State draw(final Card card) { cards.add(card); From acb201492d8e1e272dcc692aa507f8001d5f349e Mon Sep 17 00:00:00 2001 From: Jung Hyun Woo <1995hyunwoo@naver.com> Date: Sun, 9 Jul 2023 13:25:43 +0000 Subject: [PATCH 20/20] =?UTF-8?q?chore=20(blackjack)=20readme=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/README.md b/README.md index 8fe71120..9f26c919 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,133 @@ +## 이전에 지키지 못한 설계 원칙 +* 하나하나 지시하지 말고 요청해라. + * 예를들어, 판사가 증인에게 1) 목격했던 장면을 떠올리고, 2) 떠오르는 시간을 순서대로 구성하고, 3) 말로 간결하게 표현해라 라고 요청하지 않는다. 그냥 "증언하라" 라고 요청한다. + * 마찬가지로 객체의 설계단계에서도 책임이 있는 객체에 요청만 하도록 설계한다. +* 역할과 책임을 확실히 분리하기 + * 이전 코드에서 InputView가 단순 input을 받고 보여주는 역할을 넘어 게임의 로직까지 관리함 + + +## 구현 +* Strategy pattern 사용 +* String, int 등의 자료형 사용 x. 다 포장하기 +* 딜러의 수익금 규칙은 명확하지 않으니 spec out +* 객체의 다형성을 이용해 조건문 줄이기 (아래 UML 사용) + + + [이미지 출처](https://newwisdom.tistory.com/27) +* 주요 객체들은 첫 구현 시 equals method & hashCode method를 override 해줄 것 + +## 주요 객체 + * User + * Player + * Dealer + * card 관련 + * enums + * Denomination + * Suit + * Card + * Cards + * Deck + * State + * Running + * Hit + * Finished + * Bust + * Stay + * Blackjack + * Controller + +## 게임 규칙(from [toney parky](https://github.com/woowacourse/java-blackjack/tree/toneyparky)) +- [x] 플레이어의 이름을 입력 받는다. + - [x] 문자열 처리 + - [x] 참여인원 제한 + - [x] 플레이어 생성 +- [x] 플레이어마다 베팅 금액을 입력 받는다. + - [x] 문자열 처리 + - [x] 입력 범위 처리 +- [x] 게임 시작시 카드 2장을 딜러와 플레이어에게 나누어 주어야 한다. + - [x] Deck에서 2장을 pop해서 준다. (2장 pop하는 메서드도 가능) + - [x] Deck을 만들어야 한다. +- [x] 딜러는 1장, 플레이어는 2장의 카드를 공개한다. +- [x] 처음에 블랙잭일시 플레이어와 딜러의 패에 따라 경기 처리 +- [x] 플레이어가 카드를 더 받을수 있는지 검사 해야한다. + - [x] ACE는 1 또는 11로 계산할 수 있다. + - [x] K,Q,J는 10으로 계산한다. +- [x] 플레이어가 카드를 더 받고 싶어하는지 검사 해야한다. +- [x] 받을수 있고, 받고자 한다면 카드를 나누어준다. +- [x] 플레이어가 카드를 받으면 카드의 상태를 출력한다. +- [x] 플레이어 페이즈가 끝나면 딜러가 카드를 받는다. + - [x] 딜러가 16이하의 점수를 갖고 있으면 넘을때 까지 카드를 받는다. +- [x] 카드 결과를 출력한다. +- [x] 블랙잭 게임 결과에 따른 베팅 금액을 출력한다. + - [x] 딜러가 블랙잭이면 블랙잭을 가진 사람 이외의 플레이어는 전부 패배하여 베팅 금액을 돌려 받지 못한다. (둘다 블랙잭이면 돌려 받음.) + - [x] 둘다 버스트면 딜러가 이긴다. + - [x] 처음 2장으로 21이 만들어지면 블랙잭이다. + - [x] 버스트면 0점으로 간주한다. + - [x] 플레이어가 블랙잭으로 승리시 배팅 금액의 1.5배를 받는다. + - [x] 플레이어가 승리시 베팅 금액만큼을 받는다. + - [x] 플레이어가 패배시 베팅 금액만큼을 잃는다. + +## 기능 요구 사항 +블랙잭 게임을 변형한 프로그램을 구현한다. 블랙잭 게임은 딜러와 플레이어 중 카드의 합이 21 또는 21에 가장 가까운 숫자를 가지는 쪽이 이기는 게임이다. + +- 플레이어는 게임을 시작할 때 배팅 금액을 정해야 한다. +- 카드의 숫자 계산은 카드 숫자를 기본으로 하며, 예외로 Ace는 1 또는 11로 계산할 수 있으며, King, Queen, Jack은 각각 10으로 계산한다. +- 게임을 시작하면 플레이어는 두 장의 카드를 지급 받으며, 두 장의 카드 숫자를 합쳐 21을 초과하지 않으면서 21에 가깝게 만들면 이긴다. + - 21을 넘지 않을 경우 원한다면 얼마든지 카드를 계속 뽑을 수 있다. 단, 카드를 추가로 뽑아 21을 초과할 경우 배팅 금액을 모두 잃게 된다. +- 처음 두 장의 카드 합이 21일 경우 블랙잭이 되면 베팅 금액의 1.5 배를 딜러에게 받는다. + - 딜러와 플레이어가 모두 동시에 블랙잭인 경우 플레이어는 베팅한 금액을 돌려받는다. +- 딜러는 처음에 받은 2장의 합계가 16이하이면 반드시 1장의 카드를 추가로 받아야 하고, 17점 이상이면 추가로 받을 수 없다. + - 딜러가 21을 초과하면 그 시점까지 남아 있던 플레이어들은 가지고 있는 패에 상관 없이 승리해 베팅 금액을 받는다. + +- BlackJack이 아닐 경우, 플레이어는 Hit(카드를 받는다), Stay(그만 받는다) 중 하나를 선택할 수 있다. + +- Stay를 선택할 경우 그 판에서는 더이상 카드를 받을 수 없으므로, 게임이 종료된다. + +- Hit를 선택할 시, 카드를 한 장 더 받게되고 +이 때, 카드의 합이 21이 초과했을 경우 Bust로 딜러의 카드 합 및 결과와 관계없이 패배한다. + +- 21이하인 경우는, 본인 판단하에 Stay를 선택해 게임을 종료하여 +딜러의 카드 합과 플레이어의 카드 합 중 높은 쪽이 승리하게 되는 게임이다. + +## 실행결과 +``` +게임에 참여할 사람의 이름을 입력하세요.(쉼표 기준으로 분리) +pobi,jason + +pobi의 배팅 금액은? +10000 + +jason의 배팅 금액은? +20000 + +딜러와 pobi, jason에게 2장의 나누었습니다. +딜러: 3다이아몬드 +pobi카드: 2하트, 8스페이드 +jason카드: 7클로버, K스페이드 + +pobi는 한장의 카드를 더 받겠습니까?(예는 y, 아니오는 n) +y +pobi카드: 2하트, 8스페이드, A클로버 +pobi는 한장의 카드를 더 받겠습니까?(예는 y, 아니오는 n) +n +jason은 한장의 카드를 더 받겠습니까?(예는 y, 아니오는 n) +n +jason카드: 7클로버, K스페이드 + +딜러는 16이하라 한장의 카드를 더 받았습니다. + +딜러 카드: 3다이아몬드, 9클로버, 8다이아몬드 - 결과: 20 +pobi카드: 2하트, 8스페이드, A클로버 - 결과: 21 +jason카드: 7클로버, K스페이드 - 결과: 17 + +## 최종 수익 +딜러: 10000 +pobi: 10000 +jason: -20000 + +``` + + ## [NEXTSTEP 플레이그라운드의 미션 진행 과정](https://github.com/next-step/nextstep-docs/blob/master/playground/README.md) ---