From a42b44c9a6680929cb1f260571526ac101ccdba8 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Wed, 21 Sep 2022 06:56:26 +0200 Subject: Revert "Revert "Short circuit boolean expressions"" --- .../expressions/ArithmeticExpression.java | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'indexinglanguage') diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java index fa82c4d88ee..e4bc2dae965 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ArithmeticExpression.java @@ -166,19 +166,13 @@ public final class ArithmeticExpression extends CompositeExpression { } BigDecimal lhsVal = asBigDecimal((NumericFieldValue)lhs); BigDecimal rhsVal = asBigDecimal((NumericFieldValue)rhs); - switch (op) { - case ADD: - return createFieldValue(lhs, rhs, lhsVal.add(rhsVal)); - case SUB: - return createFieldValue(lhs, rhs, lhsVal.subtract(rhsVal)); - case MUL: - return createFieldValue(lhs, rhs, lhsVal.multiply(rhsVal)); - case DIV: - return createFieldValue(lhs, rhs, lhsVal.divide(rhsVal, MathContext.DECIMAL64)); - case MOD: - return createFieldValue(lhs, rhs, lhsVal.remainder(rhsVal)); - } - throw new IllegalStateException("Unsupported operation: " + op); + return switch (op) { + case ADD -> createFieldValue(lhs, rhs, lhsVal.add(rhsVal)); + case SUB -> createFieldValue(lhs, rhs, lhsVal.subtract(rhsVal)); + case MUL -> createFieldValue(lhs, rhs, lhsVal.multiply(rhsVal)); + case DIV -> createFieldValue(lhs, rhs, lhsVal.divide(rhsVal, MathContext.DECIMAL64)); + case MOD -> createFieldValue(lhs, rhs, lhsVal.remainder(rhsVal)); + }; } private FieldValue createFieldValue(FieldValue lhs, FieldValue rhs, BigDecimal val) { -- cgit v1.2.3