From ac5ae44cd410788698ad5ef8519e8b4cbd45c237 Mon Sep 17 00:00:00 2001
From: nathan <nathan@dorkbox.com>
Date: Tue, 11 Aug 2020 16:16:08 +0200
Subject: [PATCH] code polish

---
 src/dorkbox/network/store/SettingsStore.kt | 62 ++++++++--------------
 1 file changed, 21 insertions(+), 41 deletions(-)

diff --git a/src/dorkbox/network/store/SettingsStore.kt b/src/dorkbox/network/store/SettingsStore.kt
index 918dbcea..c9778afc 100644
--- a/src/dorkbox/network/store/SettingsStore.kt
+++ b/src/dorkbox/network/store/SettingsStore.kt
@@ -104,7 +104,7 @@ abstract class SettingsStore : AutoCloseable {
 
         // starts with will allow for anonymous inner classes.
         if (callerClass !== callingClass) {
-            val message = "Security violation by: " + (callerClass ?: "???")
+            val message = "Security violation by: $callerClass"
             val logger = LoggerFactory.getLogger(SettingsStore::class.java)
             logger.error(message)
             throw SecurityException(message)
@@ -128,14 +128,10 @@ abstract class SettingsStore : AutoCloseable {
                     .findFirst()
         }.get()
 
-        var ok = false
         // starts with will allow for anonymous inner classes.
-        if (callerClass != null) {
-            ok = callerClass === callingClass1 || callerClass === callingClass2
-        }
-
+        val ok = callerClass === callingClass1 || callerClass === callingClass2
         if (!ok) {
-            val message = "Security violation by: " + (callerClass ?: "???")
+            val message = "Security violation by: $callerClass"
             val logger = LoggerFactory.getLogger(SettingsStore::class.java)
             logger.error(message)
             throw SecurityException(message)
@@ -159,14 +155,10 @@ abstract class SettingsStore : AutoCloseable {
                     .findFirst()
         }.get()
 
-        var ok = false
         // starts with will allow for anonymous inner classes.
-        if (callerClass != null) {
-            ok = callerClass === callingClass1 || callerClass === callingClass2 || callerClass === callingClass3
-        }
-
+       val ok = callerClass === callingClass1 || callerClass === callingClass2 || callerClass === callingClass3
         if (!ok) {
-            val message = "Security violation by: " + (callerClass ?: "???")
+            val message = "Security violation by: $callerClass"
             val logger = LoggerFactory.getLogger(SettingsStore::class.java)
             logger.error(message)
             throw SecurityException(message)
@@ -189,17 +181,15 @@ abstract class SettingsStore : AutoCloseable {
 
         var ok = false
         // starts with will allow for anonymous inner classes.
-        if (callerClass != null) {
-            for (clazz in callingClasses) {
-                if (callerClass === clazz) {
-                    ok = true
-                    break
-                }
+        for (clazz in callingClasses) {
+            if (callerClass === clazz) {
+                ok = true
+                break
             }
         }
 
         if (!ok) {
-            val message = "Security violation by: " + (callerClass ?: "???")
+            val message = "Security violation by: $callerClass"
             val logger = LoggerFactory.getLogger(SettingsStore::class.java)
             logger.error(message)
             throw SecurityException(message)
@@ -225,8 +215,8 @@ abstract class SettingsStore : AutoCloseable {
         }.get()
 
         // starts with will allow for anonymous inner classes.
-        if (callerClass == null || callerClass !== callingClass) {
-            val message = "Security violation by: " + (callerClass ?: "???")
+        if (callerClass !== callingClass) {
+            val message = "Security violation by: $callerClass"
             val logger = LoggerFactory.getLogger(SettingsStore::class.java)
             logger.error(message)
             return false
@@ -252,14 +242,10 @@ abstract class SettingsStore : AutoCloseable {
                     .findFirst()
         }.get()
 
-        var ok = false
         // starts with will allow for anonymous inner classes.
-        if (callerClass != null) {
-            ok = callerClass === callingClass1 || callerClass === callingClass2
-        }
-
+        var ok = callerClass === callingClass1 || callerClass === callingClass2
         if (!ok) {
-            val message = "Security violation by: " + (callerClass ?: "???")
+            val message = "Security violation by: $callerClass"
             val logger = LoggerFactory.getLogger(SettingsStore::class.java)
             logger.error(message)
             return false
@@ -286,14 +272,10 @@ abstract class SettingsStore : AutoCloseable {
                     .findFirst()
         }.get()
 
-        var ok = false
         // starts with will allow for anonymous inner classes.
-        if (callerClass != null) {
-            ok = callerClass === callingClass1 || callerClass === callingClass2 || callerClass === callingClass3
-        }
-
+        val ok = callerClass === callingClass1 || callerClass === callingClass2 || callerClass === callingClass3
         if (!ok) {
-            val message = "Security violation by: " + (callerClass ?: "???")
+            val message = "Security violation by: $callerClass"
             val logger = LoggerFactory.getLogger(SettingsStore::class.java)
             logger.error(message)
             return false
@@ -319,17 +301,15 @@ abstract class SettingsStore : AutoCloseable {
 
         var ok = false
         // starts with will allow for anonymous inner classes.
-        if (callerClass != null) {
-            for (clazz in callingClasses) {
-                if (callerClass === clazz) {
-                    ok = true
-                    break
-                }
+        for (clazz in callingClasses) {
+            if (callerClass === clazz) {
+                ok = true
+                break
             }
         }
 
         if (!ok) {
-            val message = "Security violation by: " + (callerClass ?: "???")
+            val message = "Security violation by: $callerClass"
             val logger = LoggerFactory.getLogger(SettingsStore::class.java)
             logger.error(message)
             return false