Skip to content

Commit 35ecea6

Browse files
committed
chore: 불필요한 import문 제거 및 디렉토리 재정렬
1 parent a8e61d1 commit 35ecea6

File tree

9 files changed

+9
-19
lines changed

9 files changed

+9
-19
lines changed

calculator/src/main/java/com/wonu606/Main.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import com.wonu606.app.App;
44
import com.wonu606.calculator.CalculatorApp;
5+
import com.wonu606.io.ConsoleInput;
56
import com.wonu606.io.ConsolePrinter;
67
import com.wonu606.io.Input;
78
import com.wonu606.io.Print;
8-
import com.wonu606.io.ConsoleInput;
9-
import java.io.IOException;
109

1110
public class Main {
1211

calculator/src/main/java/com/wonu606/app/App.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.wonu606.io.Input;
44
import com.wonu606.io.Print;
5-
import java.io.IOException;
65

76
public interface App {
87

calculator/src/main/java/com/wonu606/calculator/CalculatorApp.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
import com.wonu606.calculator.storage.Persistence;
55
import com.wonu606.calculator.storage.ResultStore;
66
import com.wonu606.calculator.strategy.CalculatorStrategy;
7+
import com.wonu606.calculator.util.CalculatorMessage;
78
import com.wonu606.io.Input;
89
import com.wonu606.io.Print;
9-
import com.wonu606.calculator.util.CalculatorMessage;
1010
import java.util.HashMap;
1111
import java.util.Map;
12-
import java.util.Optional;
1312

1413
public class CalculatorApp implements App {
1514

calculator/src/main/java/com/wonu606/calculator/model/Operator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.wonu606.calculator.util.CalculatorMessage;
44

55
public enum Operator {
6-
ADD("+", 2){
6+
ADD("+", 2) {
77
@Override
88
public double apply(double a, double b) {
99
return a + b;
@@ -39,8 +39,6 @@ public double apply(double a, double b) {
3939
this.precedence = precedence;
4040
}
4141

42-
public abstract double apply(double a, double b);
43-
4442
public static Operator get(String symbol) {
4543
for (Operator operator : values()) {
4644
if (operator.symbol.equals(symbol)) {
@@ -49,4 +47,6 @@ public static Operator get(String symbol) {
4947
}
5048
return null;
5149
}
50+
51+
public abstract double apply(double a, double b);
5252
}

calculator/src/main/java/com/wonu606/io/ConsoleInput.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.wonu606.io;
22

3-
import java.io.IOException;
43
import java.util.Scanner;
54

65
public class ConsoleInput implements Input {

calculator/src/test/java/com/wonu606/calculator/PostCalculatorTest.java renamed to calculator/src/test/java/com/wonu606/calculator/calculator/PostCalculatorTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
package com.wonu606.calculator;
1+
package com.wonu606.calculator.calculator;
22

33
import static org.assertj.core.api.Assertions.assertThat;
44

5-
import com.wonu606.calculator.calculator.Calculator;
6-
import com.wonu606.calculator.calculator.PostfixCalculator;
75
import java.util.Arrays;
86
import java.util.List;
97
import org.junit.jupiter.api.DisplayName;

calculator/src/test/java/com/wonu606/storage/ResultStoreTest.java renamed to calculator/src/test/java/com/wonu606/calculator/storage/ResultStoreTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
package com.wonu606.storage;
1+
package com.wonu606.calculator.storage;
22

33
import static org.assertj.core.api.Assertions.assertThat;
44
import static org.assertj.core.api.Assertions.assertThatThrownBy;
55

66
import com.wonu606.calculator.model.CalculationResult;
7-
import com.wonu606.calculator.storage.Persistence;
8-
import com.wonu606.calculator.storage.ResultStore;
97
import com.wonu606.calculator.util.CalculatorMessage;
108
import java.util.ArrayList;
119
import java.util.List;
1210
import org.junit.jupiter.api.DisplayName;
1311
import org.junit.jupiter.api.Test;
1412

1513
public class ResultStoreTest {
14+
1615
@Test
1716
@DisplayName("저장")
1817
void testSave() {

calculator/src/test/java/com/wonu606/validator/InfixValidatorTest.java renamed to calculator/src/test/java/com/wonu606/calculator/validator/InfixValidatorTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
package com.wonu606.validator;
1+
package com.wonu606.calculator.validator;
22

33
import static org.assertj.core.api.Assertions.assertThat;
44

5-
import com.wonu606.calculator.validator.InfixValidator;
6-
import com.wonu606.calculator.validator.Validator;
75
import org.junit.jupiter.api.Test;
86

97
public class InfixValidatorTest {

calculator/src/test/java/com/wonu606/io/ConsoleInputTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import static org.assertj.core.api.Assertions.assertThat;
44

55
import java.io.ByteArrayInputStream;
6-
import java.io.IOException;
76
import java.io.InputStream;
87
import org.junit.jupiter.api.DisplayName;
98
import org.junit.jupiter.api.Test;

0 commit comments

Comments
 (0)