From 460d1ee131bd500bf56667c24521e78029783fec Mon Sep 17 00:00:00 2001
From: Hannes Braun <hannesbraun@mail.de>
Date: Wed, 13 Oct 2021 16:07:37 +0200
Subject: [PATCH] StatusController: use properties instead of getters

---
 .../controller/CachetAPIController.kt         |  6 +--
 .../controller/StatusController.kt            | 39 ++++++-------------
 2 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/src/main/kotlin/org/mosad/thecitadelofricks/controller/CachetAPIController.kt b/src/main/kotlin/org/mosad/thecitadelofricks/controller/CachetAPIController.kt
index a424572..534e3eb 100644
--- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/CachetAPIController.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/controller/CachetAPIController.kt
@@ -22,7 +22,7 @@
 
 package org.mosad.thecitadelofricks.controller
 
-import org.mosad.thecitadelofricks.controller.StatusController.Companion.getTotalRequests
+import org.mosad.thecitadelofricks.controller.StatusController.Companion.totalRequests
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.io.BufferedReader
@@ -42,8 +42,8 @@ class CachetAPIController {
          fun postTotalRequests() {
              try {
                  val url = URL("${StartupController.cachetBaseURL}/api/v1/metrics/1/points")
-                 val jsonInputString = "{\"value\": ${getTotalRequests() -oldTotalRequests}, \"timestamp\": \"${(System.currentTimeMillis() / 1000)}\"}"
-                 oldTotalRequests = getTotalRequests()
+                 val jsonInputString = "{\"value\": ${totalRequests -oldTotalRequests}, \"timestamp\": \"${(System.currentTimeMillis() / 1000)}\"}"
+                 oldTotalRequests = totalRequests
 
                  val con = url.openConnection() as HttpURLConnection
                  con.requestMethod = "POST"
diff --git a/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt b/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt
index b12420a..09f6da7 100644
--- a/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt
+++ b/src/main/kotlin/org/mosad/thecitadelofricks/controller/StatusController.kt
@@ -39,10 +39,14 @@ class StatusController {
     companion object {
         private val logger: Logger = LoggerFactory.getLogger(StatusController::class.java)
 
-        private var totalRequests = 0
-        private var mensaMenuRequests = 0
-        private var courseListRequests = 0
-        private var timetableRequests = HashMap<String, Int>()
+        var totalRequests = 0
+            private set
+        var mensaMenuRequests = 0
+            private set
+        var courseListRequests = 0
+            private set
+        var timetableRequests = HashMap<String, Int>()
+            private set
 
         /**
          * if a mensamenu/courseList/timetable is requested update the specific and total request count
@@ -62,25 +66,6 @@ class StatusController {
             totalRequests++
         }
 
-        /**
-         * getters and setters
-         */
-        fun getTotalRequests(): Int {
-            return totalRequests
-        }
-
-        fun getMensaMenuRequests(): Int {
-            return mensaMenuRequests
-        }
-
-        fun getCourseListRequests(): Int {
-            return courseListRequests
-        }
-
-        fun getTimetableRequests(): HashMap<String, Int> {
-            return timetableRequests
-        }
-
         fun getStatus(): Status {
             val currentTime = System.currentTimeMillis() / 1000
             val minutes = (currentTime - startTime) % 3600 / 60
@@ -112,10 +97,10 @@ class StatusController {
                 "$days days, $hours:$minutes",
                 apiVersion,
                 softwareVersion,
-                getTotalRequests(),
-                getMensaMenuRequests(),
-                getCourseListRequests(),
-                getTimetableRequests(),
+                totalRequests,
+                mensaMenuRequests,
+                courseListRequests,
+                timetableRequests,
                 CacheController.timetableList.size,
                 Date(CacheController.courseList.meta.updateTime * 1000),
                 Date(CacheController.mensaMenu.meta.updateTime * 1000),