diff --git a/pom.xml b/pom.xml index f8c1474..b466fbe 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ fraudo - 0.0.16 + 0.0.17 Fraudo Language for describing antifraud patterns diff --git a/src/main/antlr4/com.rbkmoney.fraudo/FraudoP2P.g4 b/src/main/antlr4/com.rbkmoney.fraudo/FraudoP2P.g4 index 895bf74..39a6399 100644 --- a/src/main/antlr4/com.rbkmoney.fraudo/FraudoP2P.g4 +++ b/src/main/antlr4/com.rbkmoney.fraudo/FraudoP2P.g4 @@ -52,7 +52,6 @@ integerExpression floatExpression : sum | amount - | INTEGER | DECIMAL ; diff --git a/src/main/antlr4/com.rbkmoney.fraudo/FraudoPayment.g4 b/src/main/antlr4/com.rbkmoney.fraudo/FraudoPayment.g4 index 02990e0..4095a8c 100644 --- a/src/main/antlr4/com.rbkmoney.fraudo/FraudoPayment.g4 +++ b/src/main/antlr4/com.rbkmoney.fraudo/FraudoPayment.g4 @@ -60,7 +60,6 @@ floatExpression | sum_chargeback | sum_refund | amount - | INTEGER | DECIMAL ; diff --git a/src/main/java/com/rbkmoney/fraudo/p2p/visitor/impl/FirstFindP2PVisitorImpl.java b/src/main/java/com/rbkmoney/fraudo/p2p/visitor/impl/FirstFindP2PVisitorImpl.java index 286d609..bd4d96e 100644 --- a/src/main/java/com/rbkmoney/fraudo/p2p/visitor/impl/FirstFindP2PVisitorImpl.java +++ b/src/main/java/com/rbkmoney/fraudo/p2p/visitor/impl/FirstFindP2PVisitorImpl.java @@ -180,9 +180,7 @@ public class FirstFindP2PVisitorImpl extends FraudoP2PBa @Override public Double visitFloatExpression(FloatExpressionContext ctx) { - if (ctx.INTEGER() != null) { - return Double.valueOf(TextUtil.safeGetText(ctx.INTEGER())); - } else if (ctx.DECIMAL() != null) { + if (ctx.DECIMAL() != null) { return Double.valueOf(TextUtil.safeGetText(ctx.DECIMAL())); } return (Double) visitChildren(ctx); diff --git a/src/main/java/com/rbkmoney/fraudo/payment/visitor/impl/FirstFindVisitorImpl.java b/src/main/java/com/rbkmoney/fraudo/payment/visitor/impl/FirstFindVisitorImpl.java index 01f1435..c86f3f9 100644 --- a/src/main/java/com/rbkmoney/fraudo/payment/visitor/impl/FirstFindVisitorImpl.java +++ b/src/main/java/com/rbkmoney/fraudo/payment/visitor/impl/FirstFindVisitorImpl.java @@ -184,9 +184,7 @@ public class FirstFindVisitorImpl extends FraudoPaymentB @Override public Double visitFloatExpression(FloatExpressionContext ctx) { - if (ctx.INTEGER() != null) { - return Double.valueOf(TextUtil.safeGetText(ctx.INTEGER())); - } else if (ctx.DECIMAL() != null) { + if (ctx.DECIMAL() != null) { return Double.valueOf(TextUtil.safeGetText(ctx.DECIMAL())); } return (Double) visitChildren(ctx);