diff --git a/src/main/java/resources/CalculatorResource.java b/src/main/java/resources/CalculatorResource.java index 8d30f8daa9d944fd6a8d1ffc391143d4838dadc8..024ae41860ec8cc3c2bdd110a0b7a6fc11bee044 100644 --- a/src/main/java/resources/CalculatorResource.java +++ b/src/main/java/resources/CalculatorResource.java @@ -39,6 +39,8 @@ public class CalculatorResource { */ if(expressionTrimmed.matches("[0-9]+[+][0-9]+")) result = sum(expressionTrimmed); else if(expressionTrimmed.matches("[0-9]+[-][0-9]+")) result = subtraction(expressionTrimmed); + else if(expressionTrimmed.matches("[0-9]+[/][0-9]+")) result = division(expressionTrimmed); + else if(expressionTrimmed.matches("[0-9]+[*][0-9]+")) result = multiplication(expressionTrimmed); return result; } @@ -70,4 +72,23 @@ public class CalculatorResource { return number1 - number2; } + + + public int division(String expression){ + String[] split = expression.split("[/]"); + + int number1 = Integer.parseInt(split[0]); + int number2 = Integer.parseInt(split[1]); + + return number1 / number2; + } + + public int multiplication(String expression){ + String[] split = expression.split("[*]"); + + int number1 = Integer.parseInt(split[0]); + int number2 = Integer.parseInt(split[1]); + + return number1 * number2; + } }