Merge pull request #91 from Fraunhofer-AISEC/fix-routes-overview

Show routes from dynamically loaded XMLs in UI

Author: milux

ids-route-manager/src/main/kotlin/de/fhg/aisec/ids/rm/RouteManagerService.kt

@@ -170,11 +170,9 @@ class RouteManagerService : RouteManager {
     private val camelContexts: List<CamelContext>
         get() {
             return try {
-                val contexts = ctx.getBeansOfType(CamelContext::class.java).values.toMutableList()
-
-                contexts.sortWith(Comparator.comparing { it.name })
-
-                return contexts
+                val appContexts = ctx.getBeansOfType(CamelContext::class.java).values.toList()
+                val watcherContexts = XmlDeployWatcher.getBeansOfType(CamelContext::class.java)
+                return listOf(appContexts, watcherContexts).flatten().sortedBy { it.name }
             } catch (e: Exception) {
                 LOG.warn("Cannot retrieve the list of Camel contexts.", e)
                 emptyList()

ids-route-manager/src/main/kotlin/de/fhg/aisec/ids/rm/XmlDeployWatcher.kt

@@ -21,6 +21,7 @@ package de.fhg.aisec.ids.rm
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import org.springframework.beans.BeansException
 import org.springframework.boot.context.event.ApplicationReadyEvent
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContextAware
@@ -44,8 +45,6 @@ class XmlDeployWatcher : ApplicationContextAware {
         this.applicationContext = applicationContext
     }
 
-    private val xmlContexts = mutableMapOf<String, CompletableFuture<AbstractXmlApplicationContext>>()
-
     private fun startXmlApplicationContext(xmlPath: String) {
         LOG.info("XML file {} detected, creating XmlApplicationContext...", xmlPath)
         val xmlContextFuture: CompletableFuture<AbstractXmlApplicationContext> = CompletableFuture.supplyAsync {
@@ -150,6 +149,20 @@ class XmlDeployWatcher : ApplicationContextAware {
     }
 
     companion object {
-        val LOG: Logger = LoggerFactory.getLogger(XmlDeployWatcher::class.java)
+        private val LOG: Logger = LoggerFactory.getLogger(XmlDeployWatcher::class.java)
+        private val xmlContexts = mutableMapOf<String, CompletableFuture<AbstractXmlApplicationContext>>()
+
+        @Throws(BeansException::class)
+        fun <T> getBeansOfType(type: Class<T>?): List<T> {
+            return xmlContexts.values
+                .mapNotNull {
+                    if (it.isDone) {
+                        it.get()
+                    } else {
+                        null
+                    }
+                }
+                .flatMap { it.getBeansOfType(type).values }
+        }
     }
 }