style:코드 정리

Author: whrjsgml0000

src/main/java/calculator/controller/CalculatorController.java

@@ -6,18 +6,19 @@
 public class CalculatorController {
     private final CalculatorService calculatorService;
 
-    public CalculatorController(CalculatorService calculatorService){
+    public CalculatorController(CalculatorService calculatorService) {
         this.calculatorService = calculatorService;
     }
 
-    public void input(){
+    public void input() {
         System.out.println("덧셈할 문자열을 입력해 주세요.");
         String s = Console.readLine();
         output(s);
     }
-    private void output(String s){
+
+    private void output(String s) {
         int sum = calculatorService.sum(s);
-        System.out.println("결과 : "+sum);
+        System.out.println("결과 : " + sum);
     }
 
 }

src/main/java/calculator/service/CalculatorService.java

@@ -4,16 +4,20 @@ public class CalculatorService {
     private String s;
     private String plusSeparator;
 
-    /** Run all logic step by step. */
-    public int sum(String s){
+    /**
+     * Run all logic step by step.
+     */
+    public int sum(String s) {
         this.s = s;
         boolean hasPlusSeparator = checkPlusSeparator();
         String[] separatedString = separate(hasPlusSeparator);
         hasNaN(separatedString);
         return sumSeparatedStringArr(separatedString);
     }
+
     /**
      * Check existence of another separator.
+     *
      * @return if exist another separator, return true. Or return false.
      */
     private boolean checkPlusSeparator() {
@@ -24,43 +28,51 @@ private boolean checkPlusSeparator() {
         }
         return false;
     }
+
     /**
      * Separate input string. if escape string(\) added separator, need action.
+     *
      * @param hasPlusSeparator if another separator exist, set true. Or false.
      * @return separated string.
      */
-    private String[] separate(boolean hasPlusSeparator){
-        if(!hasPlusSeparator){
+    private String[] separate(boolean hasPlusSeparator) {
+        if (!hasPlusSeparator) {
             return s.split("[:,]");
-        }else{
-            if(plusSeparator.equals("\\"))
-                return s.split("[:,"+plusSeparator.repeat(2)+"]");
-            return s.split("[:,"+plusSeparator+"]");
+        } else {
+            if (plusSeparator.equals("\\")) {
+                return s.split("[:," + plusSeparator.repeat(2) + "]");
+            }
+            return s.split("[:," + plusSeparator + "]");
         }
     }
+
     /**
-     * Check input string array contains not a number. if it contains NaN,
-     * throw IllegalArgumentException.
+     * Check input string array contains not a number. if it contains NaN, throw IllegalArgumentException.
+     *
      * @param separatedStringArr String separated by separator.
      */
-    private void hasNaN(String[] separatedStringArr){
-        for(String s:separatedStringArr){
-            for(char c:s.toCharArray()){
-                if(c < 48 || c > 57)
+    private void hasNaN(String[] separatedStringArr) {
+        for (String s : separatedStringArr) {
+            for (char c : s.toCharArray()) {
+                if (c < 48 || c > 57) {
                     throw new IllegalArgumentException();
+                }
             }
         }
     }
+
     /**
      * Sum all of them
+     *
      * @param separatedStringArr clean integer string array.
      * @return Sum
      */
-    private int sumSeparatedStringArr(String[] separatedStringArr){
+    private int sumSeparatedStringArr(String[] separatedStringArr) {
         int sum = 0;
-        for(String separatedString:separatedStringArr){
-            if(!separatedString.isEmpty())
+        for (String separatedString : separatedStringArr) {
+            if (!separatedString.isEmpty()) {
                 sum += Integer.parseInt(separatedString);
+            }
         }
         return sum;
     }

src/test/java/calculator/ApplicationTest.java

@@ -1,12 +1,12 @@
 package calculator;
 
-import camp.nextstep.edu.missionutils.test.NsTest;
-import org.junit.jupiter.api.Test;
-
 import static camp.nextstep.edu.missionutils.test.Assertions.assertSimpleTest;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
+import camp.nextstep.edu.missionutils.test.NsTest;
+import org.junit.jupiter.api.Test;
+
 class ApplicationTest extends NsTest {
     @Test
     void 커스텀_구분자_사용() {
@@ -19,8 +19,8 @@ class ApplicationTest extends NsTest {
     @Test
     void 예외_테스트() {
         assertSimpleTest(() ->
-            assertThatThrownBy(() -> runException("-1,2,3"))
-                .isInstanceOf(IllegalArgumentException.class)
+                assertThatThrownBy(() -> runException("-1,2,3"))
+                        .isInstanceOf(IllegalArgumentException.class)
         );
     }
 
@@ -30,47 +30,47 @@ public void runMain() {
     }
 
     @Test
-    public void 숫자_구분자_사용(){
-        assertSimpleTest(()->{
+    public void 숫자_구분자_사용() {
+        assertSimpleTest(() -> {
             run("//1\\n2:213");
             assertThat(output()).contains("결과 : 7");
         });
     }
 
     @Test
-    public void 탈출_문자_사용(){
+    public void 탈출_문자_사용() {
         assertSimpleTest(() -> {
             assertThatThrownBy(() -> runException("1\\2:3"))
                     .isInstanceOf(IllegalArgumentException.class);
         });
     }
 
     @Test
-    public void 탈출_문자_구분자_사용(){
+    public void 탈출_문자_구분자_사용() {
         assertSimpleTest(() -> {
             run("//\\\\n1\\2:3,4");
             assertThat(output()).contains("결과 : 10");
         });
     }
 
     @Test
-    public void 마침표_구분자_사용(){
-        assertSimpleTest(()->{
+    public void 마침표_구분자_사용() {
+        assertSimpleTest(() -> {
             run("//.\\n1.2.4:3");
             assertThat(output()).contains("결과 : 10");
         });
     }
 
     @Test
-    public void 따옴표_구분자_사용(){
-        assertSimpleTest(()->{
+    public void 따옴표_구분자_사용() {
+        assertSimpleTest(() -> {
             run("//\"\\n1\"2\"4:3");
             assertThat(output()).contains("결과 : 10");
         });
     }
 
     @Test
-    public void 구분자_사이에_문자열_없음(){
+    public void 구분자_사이에_문자열_없음() {
         assertSimpleTest(() -> {
             run("1,:2");
             assertThat(output()).contains("결과 : 3");