Skip to content

Commit 51e3fd1

Browse files
sidhant92sidhant92
committed
refactor
1 parent 53d1955 commit 51e3fd1

17 files changed

Lines changed: 36 additions & 47 deletions

‎src/main/java/com/github/sidhant92/boolparser/application/ArithmeticExpressionEvaluator.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
package com.github.sidhant92.boolparser.application;
22

3-
import java.util.ArrayList;
4-
import java.util.Collection;
53
import java.util.List;
64
import java.util.Map;
75
import java.util.stream.Collectors;
86
import com.github.sidhant92.boolparser.constant.ContainerDataType;
97
import com.github.sidhant92.boolparser.constant.DataType;
108
import com.github.sidhant92.boolparser.constant.Operator;
119
import com.github.sidhant92.boolparser.domain.EvaluatedNode;
12-
import com.github.sidhant92.boolparser.domain.UnaryNode;
10+
import com.github.sidhant92.boolparser.domain.arithmetic.UnaryNode;
1311
import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode;
14-
import com.github.sidhant92.boolparser.domain.Node;
12+
import com.github.sidhant92.boolparser.domain.logical.Node;
1513
import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticFunctionNode;
1614
import com.github.sidhant92.boolparser.exception.UnsupportedToken;
1715
import com.github.sidhant92.boolparser.function.FunctionEvaluatorService;

‎src/main/java/com/github/sidhant92/boolparser/application/BooleanExpressionEvaluator.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
package com.github.sidhant92.boolparser.application;
22

3-
import java.util.ArrayList;
4-
import java.util.Collection;
53
import java.util.List;
64
import java.util.Map;
75
import java.util.stream.Collectors;
86
import com.github.sidhant92.boolparser.constant.ContainerDataType;
97
import com.github.sidhant92.boolparser.constant.DataType;
108
import com.github.sidhant92.boolparser.constant.Operator;
11-
import com.github.sidhant92.boolparser.domain.ArrayNode;
12-
import com.github.sidhant92.boolparser.domain.BooleanNode;
9+
import com.github.sidhant92.boolparser.domain.logical.ArrayNode;
10+
import com.github.sidhant92.boolparser.domain.logical.BooleanNode;
1311
import com.github.sidhant92.boolparser.domain.EvaluatedNode;
14-
import com.github.sidhant92.boolparser.domain.InNode;
15-
import com.github.sidhant92.boolparser.domain.NumericRangeNode;
16-
import com.github.sidhant92.boolparser.domain.ComparisonNode;
17-
import com.github.sidhant92.boolparser.domain.Node;
18-
import com.github.sidhant92.boolparser.domain.UnaryNode;
12+
import com.github.sidhant92.boolparser.domain.logical.InNode;
13+
import com.github.sidhant92.boolparser.domain.logical.NumericRangeNode;
14+
import com.github.sidhant92.boolparser.domain.logical.ComparisonNode;
15+
import com.github.sidhant92.boolparser.domain.logical.Node;
16+
import com.github.sidhant92.boolparser.domain.arithmetic.UnaryNode;
1917
import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticBaseNode;
20-
import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticNode;
2118
import com.github.sidhant92.boolparser.exception.DataNotFoundException;
2219
import com.github.sidhant92.boolparser.exception.HeterogeneousArrayException;
2320
import com.github.sidhant92.boolparser.exception.InvalidUnaryOperand;

‎src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticBaseNode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.github.sidhant92.boolparser.domain.arithmetic;
22

3-
import com.github.sidhant92.boolparser.domain.Node;
3+
import com.github.sidhant92.boolparser.domain.logical.Node;
44

55
/**
66
* @author sidhant.aggarwal

‎src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticFunctionNode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import java.util.List;
44
import com.github.sidhant92.boolparser.constant.FunctionType;
55
import com.github.sidhant92.boolparser.constant.NodeType;
6-
import com.github.sidhant92.boolparser.domain.Node;
6+
import com.github.sidhant92.boolparser.domain.logical.Node;
77
import lombok.AllArgsConstructor;
88
import lombok.Builder;
99
import lombok.Getter;

‎src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/ArithmeticNode.java‎

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

33
import com.github.sidhant92.boolparser.constant.NodeType;
44
import com.github.sidhant92.boolparser.constant.Operator;
5-
import com.github.sidhant92.boolparser.domain.Node;
5+
import com.github.sidhant92.boolparser.domain.logical.Node;
66
import lombok.AllArgsConstructor;
77
import lombok.Builder;
88
import lombok.Getter;

src/main/java/com/github/sidhant92/boolparser/domain/UnaryNode.java renamed to src/main/java/com/github/sidhant92/boolparser/domain/arithmetic/UnaryNode.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package com.github.sidhant92.boolparser.domain;
1+
package com.github.sidhant92.boolparser.domain.arithmetic;
22

33
import com.github.sidhant92.boolparser.constant.DataType;
44
import com.github.sidhant92.boolparser.constant.NodeType;
5-
import com.github.sidhant92.boolparser.domain.arithmetic.ArithmeticBaseNode;
65
import lombok.AllArgsConstructor;
76
import lombok.Builder;
87
import lombok.Getter;

src/main/java/com/github/sidhant92/boolparser/domain/ArrayNode.java renamed to src/main/java/com/github/sidhant92/boolparser/domain/logical/ArrayNode.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
package com.github.sidhant92.boolparser.domain;
1+
package com.github.sidhant92.boolparser.domain.logical;
22

33
import java.util.List;
4-
import org.apache.commons.lang3.tuple.Pair;
5-
import com.github.sidhant92.boolparser.constant.DataType;
64
import com.github.sidhant92.boolparser.constant.NodeType;
75
import com.github.sidhant92.boolparser.constant.Operator;
86
import lombok.AllArgsConstructor;

src/main/java/com/github/sidhant92/boolparser/domain/BooleanNode.java renamed to src/main/java/com/github/sidhant92/boolparser/domain/logical/BooleanNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.sidhant92.boolparser.domain;
1+
package com.github.sidhant92.boolparser.domain.logical;
22

33
import com.github.sidhant92.boolparser.constant.NodeType;
44
import com.github.sidhant92.boolparser.constant.LogicalOperationType;

src/main/java/com/github/sidhant92/boolparser/domain/ComparisonNode.java renamed to src/main/java/com/github/sidhant92/boolparser/domain/logical/ComparisonNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.sidhant92.boolparser.domain;
1+
package com.github.sidhant92.boolparser.domain.logical;
22

33
import com.github.sidhant92.boolparser.constant.DataType;
44
import com.github.sidhant92.boolparser.constant.NodeType;

src/main/java/com/github/sidhant92/boolparser/domain/InNode.java renamed to src/main/java/com/github/sidhant92/boolparser/domain/logical/InNode.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
package com.github.sidhant92.boolparser.domain;
1+
package com.github.sidhant92.boolparser.domain.logical;
22

33
import java.util.List;
4-
import org.apache.commons.lang3.tuple.Pair;
5-
import com.github.sidhant92.boolparser.constant.DataType;
64
import com.github.sidhant92.boolparser.constant.NodeType;
75
import lombok.AllArgsConstructor;
86
import lombok.Builder;

0 commit comments

Comments
 (0)