From 6ab85d69e130e768d896480c47c24e74204ce7b2 Mon Sep 17 00:00:00 2001
From: Sebastian Bugge <vkbugge@hotmail.com>
Date: Mon, 7 Mar 2022 13:19:48 +0100
Subject: [PATCH 1/3] Added positive multiplication and integer division
---
.../java/resources/CalculatorResource.java | 30 +++++++++++++++++++
src/test/java/CalculatorResourceTest.java | 22 ++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/src/main/java/resources/CalculatorResource.java b/src/main/java/resources/CalculatorResource.java
index 8d30f8d..083e8c6 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 = multiplication(expressionTrimmed);
+ else if(expressionTrimmed.matches("[0-9]+[/][0-9]+")) result = division(expressionTrimmed);
return result;
}
@@ -70,4 +72,32 @@ public class CalculatorResource {
return number1 - number2;
}
+
+ /**
+ * Method used to calculate a subtraction expression.
+ * @param expression the expression to be calculated as a String
+ * @return the answer as an int
+ */
+ public int multiplication(String expression){
+ String[] split = expression.split("[*]");
+
+ int number1 = Integer.parseInt(split[0]);
+ int number2 = Integer.parseInt(split[1]);
+
+ return number1 * number2;
+ }
+
+ /**
+ * Method used to calculate a subtraction expression.
+ * @param expression the expression to be calculated as a String
+ * @return the answer as an int
+ */
+ public int division(String expression){
+ String[] split = expression.split("[/]");
+
+ int number1 = Integer.parseInt(split[0]);
+ int number2 = Integer.parseInt(split[1]);
+
+ return number1 / number2;
+ }
}
diff --git a/src/test/java/CalculatorResourceTest.java b/src/test/java/CalculatorResourceTest.java
index a04ee8b..411ec2f 100644
--- a/src/test/java/CalculatorResourceTest.java
+++ b/src/test/java/CalculatorResourceTest.java
@@ -37,4 +37,26 @@ public class CalculatorResourceTest{
expression = "20-2";
assertEquals(200, calculatorResource.subtraction(expression));
}
+
+ @Test
+ public void testMultiplication(){
+ CalculatorResource calculatorResource = new CalculatorResource();
+
+ String expression = "10*100";
+ assertEquals(1000, calculatorResource.multiplication(expression));
+
+ expression = "9*3";
+ assertEquals(27, calculatorResource.multiplication(expression));
+ }
+
+ @Test
+ public void testDivision(){
+ CalculatorResource calculatorResource = new CalculatorResource();
+
+ String expression = "100/10";
+ assertEquals(10, calculatorResource.division(expression));
+
+ expression = "9/3";
+ assertEquals(3, calculatorResource.division(expression));
+ }
}
--
GitLab
From cf1b15f857d4f7ae3cfe329b32dfd538e477df35 Mon Sep 17 00:00:00 2001
From: Sebastian Bugge <vkbugge@hotmail.com>
Date: Mon, 7 Mar 2022 13:42:02 +0100
Subject: [PATCH 2/3] removed bad code lul
---
src/main/java/resources/UserResource.java | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/src/main/java/resources/UserResource.java b/src/main/java/resources/UserResource.java
index 721ada9..e406fae 100644
--- a/src/main/java/resources/UserResource.java
+++ b/src/main/java/resources/UserResource.java
@@ -24,23 +24,6 @@ public class UserResource {
public List<User> getUsers(){
UserDAO userDAO = new UserDAO();
- new Thread(){
- public void run(){
- Date date = new Date();
- int number = 0;
- boolean run = true;
-
- while (run) {
- number++;
- if (number == Integer.MAX_VALUE) {
- Date newDate = new Date();
- if(newDate.getTime()-date.getTime() > 25000) run = false;
- number = 0;
- }
- }
- }
- }.start();
-
return userDAO.getUsers();
}
--
GitLab
From c5e3938ca7806b8a816b403d501fb752446a7622 Mon Sep 17 00:00:00 2001
From: Mathias Bjerkan <mbjerkan@LAPTOP-CSTI9OH4.localdomain>
Date: Mon, 7 Mar 2022 14:02:34 +0100
Subject: [PATCH 3/3] Fikset logg
---
glances.conf | 2 +-
src/main/webapp/app.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/glances.conf b/glances.conf
index 433fb5a..cd73ac8 100644
--- a/glances.conf
+++ b/glances.conf
@@ -355,7 +355,7 @@ prefix=localhost
[influxdb2]
# NOTE: localhost will NOT work here!
-host=INSERT_IP_TO_VM_HERE
+host=129.241.99.33
port=8086
protocol=http
org=ntnu
diff --git a/src/main/webapp/app.html b/src/main/webapp/app.html
index 9077a76..5fbe190 100644
--- a/src/main/webapp/app.html
+++ b/src/main/webapp/app.html
@@ -18,7 +18,7 @@
<div class="menu">
<ul>
<li><a href="http://129.241.99.33:61208/">Ressursovervåking</a></li>
- <li><a href="#">Logg</a></li>
+ <li><a href="http://129.241.99.33:3000/d/ESYAe0tnk">Logg</a></li>
<li><a href="./settings.html">Innstillinger</a></li>
<li><a href="/">Logg ut</a></li>
</ul>
--
GitLab