Skip to content
Open
Show file tree
Hide file tree
Changes from 50 commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
f0424ce
chore : 프로젝트 세팅
hongxeob Jun 7, 2023
76d8a18
chore : 프로젝트 세팅 (테스트 파일 설정)
hongxeob Jun 7, 2023
89fe199
chore : AssertJ 라이브러리 추가
hongxeob Jun 12, 2023
0996a5f
feat : Operators 클래스 구현 (연산자)
hongxeob Jun 12, 2023
ecf45dc
feat : Priority 클래스 구현 (우선 순위)
hongxeob Jun 12, 2023
f99c009
feat : PostfixConverter 클래스 구현(후위 표기식 변환기)
hongxeob Jun 12, 2023
e673165
feat : StringUtil 유틸 클래스 구현 (문자열 파싱,체킹 관련 클래스)
hongxeob Jun 12, 2023
6a65c0d
test : PostfixConverter 테스트 코드 작성
hongxeob Jun 12, 2023
34abe3a
feat : CalculationRepository 클래스/인터페이스 및 CalculationResult 객체 구현 (계산 …
hongxeob Jun 12, 2023
1bbf816
test : CalculationRepository 테스트 코드 작성
hongxeob Jun 12, 2023
dc3d04a
feat : Input,Output 인터페이스 / Console 클래스 구현 (입출력 기능)
hongxeob Jun 12, 2023
d397714
feat : Calculator 클래스 구현 (계산 기능)
hongxeob Jun 12, 2023
218160e
chore : 매개 변수화된 테스트를 위해 JUnit Jupiter Params 5.8.1 종속성 추가
hongxeob Jun 12, 2023
3f6a6dd
test : Calculator 테스트 코드 작성
hongxeob Jun 12, 2023
f8bcb0b
feat : ErrorMsg 클래스 구현 (에러 메시지 관리)
hongxeob Jun 12, 2023
e2c5d08
fix : putOperand()메서드 예외 유형 변경
hongxeob Jun 12, 2023
e11a959
feat: CalculatorRunner 클래스 구현 (계산기 구동)
hongxeob Jun 12, 2023
e7276a6
refactor : CalculatorRunner 클래스 이름 변경
hongxeob Jun 12, 2023
d8688d7
refactor : CalculatorTest 오타 수정
hongxeob Jun 12, 2023
c4189ed
feat : Main 클래스 구현
hongxeob Jun 12, 2023
5e9d621
fix : getOperator() 예외 유형 변경
hongxeob Jun 12, 2023
e8db59a
fix : getPriority() 예외 유형 변경
hongxeob Jun 12, 2023
0caa0d2
chore : 커스텀 예외 패키지 및 클래스 삭제
hongxeob Jun 12, 2023
63acaf6
refactor : 미사용 import 제거
hongxeob Jun 12, 2023
0cbd01a
refactor : pintError() 메서드명 변경
hongxeob Jun 12, 2023
88239e6
feat : 프로그램 종료 기능 구현
hongxeob Jun 12, 2023
eef98d0
style : 에러 메세지 정리 및 통일
hongxeob Jun 13, 2023
6379fd4
style : 에러 메세지 정리 및 통일
hongxeob Jun 13, 2023
d8400a7
refactor : CalculatorManager 인자 변경
hongxeob Jun 13, 2023
5a2f9f2
refactor : isOperatorCheck 메서드 인자명, 메서드명 명시적으로 변경
hongxeob Jun 13, 2023
cadabfb
chore : 패키지 구조 재설정
hongxeob Jun 13, 2023
8f9583d
refactor : PostfixConverter의 일부 메서드를 PostfixConverterHelper 객체로 분리
hongxeob Jun 13, 2023
048651e
style : PostfixConverter클래스의 주석 제거
hongxeob Jun 13, 2023
34d6872
refactor : 우선 순위를 가리는 비교 구문을 Priority 클래스에 위임, operator 인자 -> operato…
hongxeob Jun 13, 2023
1d7a426
style : 각각 요소를 뜻하는 numOrOperator를 token으로 이름 변경
hongxeob Jun 13, 2023
39eb058
refactor : try catch문 제거 후 정규식 사용, 인자명 명확하게 변경
hongxeob Jun 13, 2023
a983041
style : 우선 순위 범위를 여유있게 변경
hongxeob Jun 13, 2023
4177baf
refactor : Writer(Output), Reader(Input) 구현체 생성 후, Console 클래스에 추상체인 …
hongxeob Jun 13, 2023
9aa9710
refactor : 명시적인 calculateTop 메서드 생성
hongxeob Jun 13, 2023
1a85706
refactor : 명시적인 isNewOperatorPriorityLower 메서드 생성
hongxeob Jun 13, 2023
a133dfe
refactor : Writer(Output), Reader(Input) 구현체 생성
hongxeob Jun 13, 2023
9feb646
refactor : while(true) -> power를 넣어줌으로써 무한루프 방지
hongxeob Jun 14, 2023
ddf3617
refactor : println() 추가, 에러 메세지 수정
hongxeob Jun 14, 2023
a471903
refactor : output.print() 메서드 활용
hongxeob Jun 14, 2023
f7036b3
refactor : final을 붙여 각 메시지를 상수로 선언
hongxeob Jun 14, 2023
871e9e2
feat : Validator 구현
hongxeob Jun 14, 2023
6321921
refactor : Converter 인터페이스를 생성해 PostfixConverter 캡슐화
hongxeob Jun 14, 2023
8824513
refactor : PostfixConverter 테스트 코드 수정
hongxeob Jun 14, 2023
84d699d
refactor : AbstractConverter 인터페이스를 생성해 Calculator 캡슐화
hongxeob Jun 14, 2023
a39c737
refactor : AbstractCalculator 의존성 주입 수정
hongxeob Jun 14, 2023
07890c2
refactor : 생성자를 private으로 선언하여 클래스의 인스턴스화 방지
hongxeob Jun 15, 2023
1eb0f8c
refactor : 명확한 변수명으로 변경
hongxeob Jun 15, 2023
bfe3841
style : 에러 메세지 수정
hongxeob Jun 15, 2023
60b3fdb
refactor : 불필요한 private 메서드 간소화
hongxeob Jun 15, 2023
ae953b9
refactor : 리턴 타입, 파라미터 object 형태로 교체
hongxeob Jun 15, 2023
b9c4588
chore : 패키지 분류 변경
hongxeob Jun 15, 2023
f21b475
refactor : 파라미터 object 형태로 교체
hongxeob Jun 15, 2023
e5d1c83
refactor : CalculatorManager의 역할 분담 (SRP)
hongxeob Jun 15, 2023
b1c06c7
refactor : 오탈자 수정 및 변수명 직관적으로 변경
hongxeob Jun 15, 2023
d9d1de5
style : 코드 순서 변경
hongxeob Jun 15, 2023
fa16185
style : 개행 추가
hongxeob Jun 15, 2023
ae85279
refactor : 추상체와 구현체를 좀 더 명확한 네이밍으로 변경
hongxeob Jun 15, 2023
ce23bdb
refactor : 필드에 final 추가
hongxeob Jun 15, 2023
e4d7984
refactor : 유틸 클래스가 인스턴스화 되지 못하게 수정, null 체크 추가
hongxeob Jun 15, 2023
c67121b
refactor : 해당 메서드가 한번만 사용되므로 추출하지 않고 사용
hongxeob Jun 15, 2023
d923d2b
test : 클래스 삭제
hongxeob Jun 16, 2023
191cad9
refactor : 파라미터 명 통일
hongxeob Jun 16, 2023
52032d1
refactor : null체크 검사 추가
hongxeob Jun 16, 2023
186e74f
test : Calculator 클래스 테스트
hongxeob Jun 16, 2023
067aad3
test : Validator 테스트
hongxeob Jun 16, 2023
b860458
test : StringUtil 테스트
hongxeob Jun 16, 2023
4895bf1
test : 중복 코드 통일
hongxeob Jun 16, 2023
598b1c7
test : null 체크 테스트 추가
hongxeob Jun 16, 2023
3f33692
test : Priority 테스트 추가
hongxeob Jun 16, 2023
5de6ce2
test : Converter 테스트 수정
hongxeob Jun 16, 2023
208dc6b
test : 개행 수정
hongxeob Jun 16, 2023
84c2a12
refactor : 주석 삭제
hongxeob Jun 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
HELP.md
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/


### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
.DS_Store
.gradle
out/
!**/src/main/**/out/
!**/src/test/**/out/

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/

### VS Code ###
.vscode/
23 changes: 23 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
plugins {
id 'java'
}

group 'com.programmers'
version '1.0-SNAPSHOT'

repositories {
mavenCentral()
}

dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.1'

testImplementation 'org.assertj:assertj-core:3.22.0'

}

test {
useJUnitPlatform()
}
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
234 changes: 234 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
@@ -0,0 +1,234 @@
#!/bin/sh

#
# 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.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

##############################################################################
#
# 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
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

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
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

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 ;; #(
MSYS* | MINGW* ) msys=true ;; #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD=$JAVA_HOME/jre/sh/java
else
JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
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
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
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

# 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" || "$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
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
# 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
fi

# 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.
#

eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'

exec "$JAVACMD" "$@"
89 changes: 89 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
Loading