From 4ffdac4dfd55e1e76f123aec6d6e55542cc4d139 Mon Sep 17 00:00:00 2001
From: Henrik Burmann <henriabu@stud.ntnu.no>
Date: Tue, 9 Mar 2021 11:10:48 +0100
Subject: [PATCH] Some doc added to check pipelines
---
src/main/java/dao/Database.java | 2 +-
src/main/java/resources/CalculatorResource.java | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/dao/Database.java b/src/main/java/dao/Database.java
index 232a69f..e550802 100644
--- a/src/main/java/dao/Database.java
+++ b/src/main/java/dao/Database.java
@@ -18,7 +18,7 @@ public class Database {
private static boolean isTest = isJUnitTest();
- private static final String IP_TO_VM = "129.241.96.191";
+ private static final String IP_TO_VM = "129.241.97.157";
private static String DB_URL = "jdbc:mysql://" + ((DB_CHOICE != null) ?
(DB_CHOICE + ":3306/") :
diff --git a/src/main/java/resources/CalculatorResource.java b/src/main/java/resources/CalculatorResource.java
index 93ce4d3..b2ad6c1 100644
--- a/src/main/java/resources/CalculatorResource.java
+++ b/src/main/java/resources/CalculatorResource.java
@@ -1,7 +1,6 @@
package resources;
-
import javax.ws.rs.Consumes;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
@@ -13,7 +12,6 @@ import javax.ws.rs.core.MediaType;
*/
@Path("/calculator")
public class CalculatorResource {
-
/**
* Method handling HTTP POST requests. The calculated answer to the expression will be sent to the client as
* plain/text.
@@ -48,7 +46,7 @@ public int calculate(String expression) {
return result;
}
-
+//Multiplication
public int multiplication(String equation) {
String[] split = equation.split("[*]");
int sum = Integer.parseInt(split[0]);
--
GitLab