Skip to content

Commit 6042114

Browse files
art920kalisar
andauthored
feat: refactor rule-maker (#47)
# Description What is the overall goal of your PR? Which problem does it solve? Please also include relevant motivation and context. List any dependencies that are required for this change. Fixes #(issue number) # Migrations required yes: please describe the migration no: please delete the whole paragraph # Verification Please describe the test cases you used to verify your code. Did you check the change in your environment? # Checklist - [ ] My code follows the style guidelines of the project - [ ] I have performed a self-review of my own code - [ ] I have made corresponding changes to the documentation --------- Co-authored-by: kalisar <[email protected]>
1 parent 3475c00 commit 6042114

20 files changed

+2268
-971
lines changed

src/main/java/com/hlag/rulemaker/ClampExpression.java

Lines changed: 0 additions & 52 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.hlag.rulemaker;
22

3-
import static com.hlag.rulemaker.ExtendedNumericComparisonExpression.LTE_LT;
4-
import static com.hlag.rulemaker.ExtendedNumericComparisonExpression.LTE_LTE;
5-
import static com.hlag.rulemaker.ExtendedNumericComparisonExpression.LT_LT;
6-
import static com.hlag.rulemaker.ExtendedNumericComparisonExpression.LT_LTE;
3+
import static com.hlag.rulemaker.expression.CustomNumericComparisonExpression.LTE_LT;
4+
import static com.hlag.rulemaker.expression.CustomNumericComparisonExpression.LTE_LTE;
5+
import static com.hlag.rulemaker.expression.CustomNumericComparisonExpression.LT_LT;
6+
import static com.hlag.rulemaker.expression.CustomNumericComparisonExpression.LT_LTE;
77
import static io.github.jamsesso.jsonlogic.evaluator.expressions.NumericComparisonExpression.GT;
88
import static io.github.jamsesso.jsonlogic.evaluator.expressions.NumericComparisonExpression.GTE;
99
import static io.github.jamsesso.jsonlogic.evaluator.expressions.NumericComparisonExpression.LT;
@@ -15,7 +15,7 @@
1515

1616
@Getter
1717
@AllArgsConstructor
18-
public enum RuleMakerComparisonOperators {
18+
public enum ComparisonOperators {
1919

2020
LOWER(LT.key()),
2121
LOWER_OR_EQUAL(LTE.key()),
@@ -26,11 +26,11 @@ public enum RuleMakerComparisonOperators {
2626
LOWER_OR_EQUAL_LOWER(LTE_LT.key()),
2727
LOWER_LOWER_OR_EQUAL(LT_LTE.key());
2828

29-
private final String ruleMakerOperator;
29+
private final String operator;
3030

31-
public static RuleMakerComparisonOperators fromRuleWrightOperator(String ruleWrightOperator) {
32-
return Arrays.stream(RuleMakerComparisonOperators.values())
33-
.filter(operatorMapper -> operatorMapper.getRuleMakerOperator().equals(ruleWrightOperator))
34-
.findFirst().orElseThrow();
31+
public static ComparisonOperators fromOperator(String operator) {
32+
return Arrays.stream(ComparisonOperators.values())
33+
.filter(operatorMapper -> operatorMapper.getOperator().equals(operator))
34+
.findFirst().orElseThrow();
3535
}
3636
}

src/main/java/com/hlag/rulemaker/ExtendedNumericComparisonExpression.java

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)