Skip to content
Open
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f45f23d
[init]: 전체 프로젝트 구성 및 인터페이스 추상화
YebinLeee Jun 9, 2023
2c65733
[feat]: Input, Output 구성
YebinLeee Jun 9, 2023
18682d2
[feat]: InfixToPostfixConverter 기능 구현
YebinLeee Jun 9, 2023
e60186f
[feat]: Calculator 입출력 동작 구현과 Repository 저장 및 입력 validation 기능
YebinLeee Jun 9, 2023
839015a
[add]: Constant 상수 추가
YebinLeee Jun 9, 2023
431c84b
[feat]: 후위 표기 수식 계산 기능 구현
YebinLeee Jun 9, 2023
e8068a4
[test]: 적합하지 않은 수식 표현 테스트 코드 작성
YebinLeee Jun 9, 2023
a0fe526
[add]: switch-case 분기문 continue 추가로 오류 해결 및 리팰토링
YebinLeee Jun 10, 2023
5bfc293
[feat]: 계산 결과 출력
YebinLeee Jun 10, 2023
a9cee87
[fix]: menu Input 올바른 값 아닌 경우
YebinLeee Jun 10, 2023
ee811b9
[refactor]: LinkedHashMap 에서 전체 계산 결과 조회시 List<String> 으로 변환
YebinLeee Jun 10, 2023
55d942e
[add]: 프로그램 종료 가능한 메뉴 추가하기
YebinLeee Jun 11, 2023
7464a01
[refactor]: 계산 결과 모델 변경 (CalculationResult 클래스 추가 - expression, resul…
YebinLeee Jun 11, 2023
e168cbd
[refactor]: Validator 분리, ExpresionConverter과 Calculator 추상화
YebinLeee Jun 11, 2023
2593643
[refactor]: Validator 분리, ExpresionConverter과 Calculator 추상화
YebinLeee Jun 11, 2023
a0e17ed
[refactor]: Constants 상수들 객체 내로 이동, Menu validator 이동
YebinLeee Jun 13, 2023
6738c30
[refactor] CaclulationResult - ConcurrentHashMap으로 변경, Object에서 Integ…
YebinLeee Jun 13, 2023
1127cae
[refactor]: Operation 클래스 객체 생성 시 singleton으로 변경
YebinLeee Jun 13, 2023
b2b7566
[add]: AtomicInteger을 통해 멀티 스레드 환경에서의 Map의 id값 동등성 보장 및 관리
YebinLeee Jun 13, 2023
a8193d1
[test]: CalculationRepository에 clearStore() 메서드 추가 및 테스트 코드 작성
YebinLeee Jun 13, 2023
4cefceb
[test]: 사칙 연산 수행 테스트, 수식 표현 convert 테스트
YebinLeee Jun 13, 2023
cd2152a
[test]: 올바른 수식 표현 검증 테스트, 수식 연산 에러 테스트, 메뉴 입력 검증 테스트
YebinLeee Jun 13, 2023
2e6da4b
[test]: Console 메뉴 및 계산 결과 및 계산 이력 출력 검증 테스트
YebinLeee Jun 13, 2023
a6c79e2
[refactor]: 상수 constants 모두 private 지정자로 변경
YebinLeee Jun 14, 2023
45eeb50
[test]: Menu, CalculationResult 오버라이딩 toString 메서드 검증 테스트
YebinLeee Jun 14, 2023
35d54d4
[test]: Calculator Console, Postfix Calculator 테스트 추가
YebinLeee Jun 14, 2023
c459ac6
[refactor]: 전체 프로젝트 구조 변경
YebinLeee Jun 14, 2023
b706154
[add]: 반환 타입 List로 수정, delimiter 추가, 계산기 통합 테스트 추가
YebinLeee Jun 14, 2023
fe6e3b5
[fix]: readme에 추가한 내용들 삭제
YebinLeee Jun 14, 2023
9cfa1d6
[docs]: 요구사항 및 구현 내용 추가
YebinLeee Aug 11, 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
28 changes: 28 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*

.idea
.gradle
build
19 changes: 11 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# java_calculator
자바 계산기 구현 미션 Repository입니다.

## 이곳은 공개 Repo입니다.
### 이곳은 공개 Repo입니다.
1. 여러분의 포트폴리오로 사용하셔도 됩니다.
2. 때문에 이 repo를 fork한 뒤
3. 여러분의 개인 Repo에 작업하며
4. 이 Repo에 PR을 보내어 멘토의 코드 리뷰와 피드백을 받으세요.

## Branch 명명 규칙
1. 여러분 repo는 알아서 해주시고 😀(본인 레포니 main으로 하셔두 되져)
2. prgrms-be-devcourse/spring-board 레포로 PR시 branch는 gituser_id을 적어주세요 :)
- base repo : `여기repo` base : `username` ← head repo : `여러분repo` compare : `main`또는 `github_id`
- 이 규칙은 멘토+팀원들과 정하여 진행해주세요 :)
### Branch 명명 규칙 + 팀의 PR규칙 정하기
1. 여러분 repo는 알아서 해주시고 😀(본인 레포니 main으로 하셔두 되져)
2. prgrms-be-devcourse/spring-board 레포로 PR시 branch는 gituser_id을 적어주세요 :)
- base repo : `여기repo` base : `username` ← head repo : `여러분repo` compare : `main`또는 `github_id`
3. 실제 진행할 PR규칙은 멘토+팀원들과 정하여 진행해주세요 :)
- ← head repo : `여러분repo` compare : `main`로 할지
- 또는 ← head repo : `여러분repo` compare : `github_id`로 할지
- 참고 : [Github 위치 및 피드백 기준 가이드](https://www.notion.so/backend-devcourse/Github-e1a0908a6bbf4aeaa5a62981499bb215)

### 과제를 통해 기대하는 역량
Expand All @@ -21,15 +23,16 @@
- 스스로 OOP를 생각하고 코드로 옮길 수 있는 능력해보자

### 요구사항

- 콘솔로 구현입니다.(스윙으로 구현하시는 분들 계실까봐)
- 객체지향적인 코드로 계산기 구현하기
- [ ] 더하기
- [ ] 빼기
- [ ] 곱하기
- [ ] 나누기
- [ ] 우선순위(사칙연산)
- [ ] 테스트 코드 구현하기
- [ ] 계산 이력을 맵으로 데이터 저장기능 만들기(인메모리 DB)
- [ ] 계산 이력을 맵으로 데이터 저장기능 만들기
- 애플리케이션이 동작하는 동안 데이터베이스 외에 데이터를 저장할 수 있는 방법을 고안해보세요.
- (선택) 정규식 사용

### 실행결과(콘솔)
Expand Down
33 changes: 33 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
plugins {
id 'java'
}

group 'org.example'
version '1.0-SNAPSHOT'
sourceCompatibility = '17'


repositories {
mavenCentral()
}
configurations {
compileOnly {
extendsFrom annotationProcessor
}
}


dependencies {

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'

implementation 'org.assertj:assertj-core:3.24.2'

implementation group: 'org.projectlombok', name: 'lombok', version: '1.18.28'

}

tasks.test {
useJUnitPlatform()
}
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" "$@"
Loading