documentation part 2 #14

Zukkari · Feb 25, 2018 · 25dde8a · 25dde8a
1 parent 12ae831
commit 25dde8a
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/src/main/kotlin/cs/ut/engine/LogManager.kt b/src/main/kotlin/cs/ut/engine/LogManager.kt
@@ -52,7 +52,7 @@ object LogManager {
         detailedDir = DirectoryConfiguration.dirPath(Dir.DETAIL_DIR)
         log.debug("Detailed log directory -> $detailedDir")
 
-        allowedExtensions = ConfigurationReader.findNode("fileUpload/extensions")!!.itemListValues()
+        allowedExtensions = ConfigurationReader.findNode("fileUpload/extensions").itemListValues()
     }
 
     /**

diff --git a/src/main/kotlin/cs/ut/jobs/SimulationJob.kt b/src/main/kotlin/cs/ut/jobs/SimulationJob.kt
@@ -29,7 +29,7 @@ class SimulationJob(
 ) : Job(id) {
 
     private var process: Process? = null
-    private val configNode = ConfigurationReader.findNode("userPreferences")!!
+    private val configNode = ConfigurationReader.findNode("userPreferences")
 
     override fun preProcess() {
         log.debug("Generating training parameters for job $this")

diff --git a/src/main/kotlin/cs/ut/jobs/UserRightsJob.kt b/src/main/kotlin/cs/ut/jobs/UserRightsJob.kt
@@ -32,7 +32,7 @@ class UserRightsJob(private val f: File) : Job() {
 
 
     companion object {
-        private val configNode = ConfigurationReader.findNode("userPreferences")!!
+        private val configNode = ConfigurationReader.findNode("userPreferences")
 
         val log = Logger.getLogger(UserRightsJob::class.java)!!
 

diff --git a/src/main/kotlin/cs/ut/ui/controllers/AdminViewController.kt b/src/main/kotlin/cs/ut/ui/controllers/AdminViewController.kt
@@ -43,7 +43,7 @@ class AdminViewController : SelectorComposer<Component>(), UIComponent {
     @Wire
     private lateinit var logData: Textbox
 
-    private val configNode = ConfigurationReader.findNode("userPreferences/adminFunctionality")!!
+    private val configNode = ConfigurationReader.findNode("userPreferences/adminFunctionality")
 
     private val logFile: File = File(DirectoryConfiguration.dirPath(Dir.LOG_FILE))
 

diff --git a/src/main/kotlin/cs/ut/ui/controllers/HeaderController.kt b/src/main/kotlin/cs/ut/ui/controllers/HeaderController.kt
@@ -15,7 +15,7 @@ import org.zkoss.zkmax.zul.Navitem
 
 class HeaderController : SelectorComposer<Component>(), Redirectable {
 
-    private val configNode = ConfigurationReader.findNode("header")!!
+    private val configNode = ConfigurationReader.findNode("header")
 
     @Wire
     private lateinit var navbar: Navbar

diff --git a/src/main/kotlin/cs/ut/ui/controllers/Redirectable.kt b/src/main/kotlin/cs/ut/ui/controllers/Redirectable.kt
@@ -67,6 +67,6 @@ interface Redirectable {
     }
 
     companion object {
-        private val pages: List<Value> = ConfigurationReader.findNode("pages")!!.itemList()
+        private val pages: List<Value> = ConfigurationReader.findNode("pages").itemList()
     }
 }
diff --git a/src/main/kotlin/cs/ut/ui/controllers/UploadLogController.kt b/src/main/kotlin/cs/ut/ui/controllers/UploadLogController.kt
@@ -37,7 +37,7 @@ class UploadLogController : SelectorComposer<Component>(), Redirectable, UICompo
 
     private lateinit var media: Media
 
-    private val allowedExtensions = ConfigurationReader.findNode("fileUpload/extensions")!!.itemListValues()
+    private val allowedExtensions = ConfigurationReader.findNode("fileUpload/extensions").itemListValues()
 
     /**
      * Method that analyzes uploaded file. Checks that the file has required extension.

diff --git a/src/main/kotlin/cs/ut/ui/controllers/modal/ParameterModalController.kt b/src/main/kotlin/cs/ut/ui/controllers/modal/ParameterModalController.kt
@@ -70,7 +70,7 @@ class ParameterModalController : GenericAutowireComposer<Component>(), Redirecta
     override fun doAfterCompose(comp: Component?) {
         super.doAfterCompose(comp)
 
-        cols = ConfigurationReader.findNode("csv/userCols")!!.itemListValues()
+        cols = ConfigurationReader.findNode("csv/userCols").itemListValues()
         log.debug("Read columns from master config: $cols")
 
         this.file = arg[FILE] as File

diff --git a/src/main/kotlin/cs/ut/util/CsvReader.kt b/src/main/kotlin/cs/ut/util/CsvReader.kt
@@ -29,16 +29,16 @@ class CsvReader(private val f: File) {
     init {
         log.debug("Initializing csv reader...")
 
-        val configNode = ConfigurationReader.findNode("csv")!!
+        val configNode = ConfigurationReader.findNode("csv")
         splitter = configNode.valueWithIdentifier("splitter").value.toRegex()
         confThreshold = configNode.valueWithIdentifier("threshold").intValue()
         sampleSize = configNode.valueWithIdentifier("sampleSize").intValue()
 
-        emptyValues = ConfigurationReader.findNode("csv/empty")!!.itemListValues()
-        activityId = ConfigurationReader.findNode("csv/activityId")!!.itemListValues()
-        caseId = ConfigurationReader.findNode("csv/caseId")!!.itemListValues()
-        dateFormats = ConfigurationReader.findNode("csv/timestamp")!!.itemListValues().map { it.toRegex() }
-        resourceId = ConfigurationReader.findNode("csv/resource")!!.itemListValues()
+        emptyValues = ConfigurationReader.findNode("csv/empty").itemListValues()
+        activityId = ConfigurationReader.findNode("csv/activityId").itemListValues()
+        caseId = ConfigurationReader.findNode("csv/caseId").itemListValues()
+        dateFormats = ConfigurationReader.findNode("csv/timestamp").itemListValues().map { it.toRegex() }
+        resourceId = ConfigurationReader.findNode("csv/resource").itemListValues()
 
         log.debug("Finished initializing csv reader...")
     }