App selector

Author: pun-ky

framework/src/main/kotlin/com/neva/javarel/framework/api/rest/Controller.kt

@@ -2,6 +2,7 @@ package com.neva.javarel.framework.api.rest
 
 import com.neva.javarel.communication.rest.api.UrlGenerator
 import com.neva.javarel.foundation.api.injection.Osgi
+import com.neva.javarel.framework.api.structure.App
 import com.neva.javarel.presentation.asset.api.Asset
 import com.neva.javarel.presentation.view.api.View
 import com.neva.javarel.resource.api.ResourceResolver
@@ -15,6 +16,9 @@ abstract class Controller {
     @Inject
     protected lateinit var guard: Guard
 
+    @Osgi
+    protected lateinit var app: App
+
     @Osgi
     protected lateinit var dbAdmin: DatabaseAdmin
 
@@ -37,7 +41,8 @@ abstract class Controller {
 
     protected val context: Map<String, Any> by lazy {
         mapOf(
-                "guard" to guard
+                "guard" to guard,
+                "app" to app
         )
     }
 

framework/src/main/kotlin/com/neva/javarel/framework/api/structure/App.kt

@@ -2,6 +2,6 @@ package com.neva.javarel.framework.api.structure
 
 interface App {
 
-    val modules: Set<Module>
+    val modules: List<Module>
 
 }

framework/src/main/kotlin/com/neva/javarel/framework/impl/structure/MultiModuleApp.kt

@@ -1,6 +1,5 @@
 package com.neva.javarel.framework.impl.structure
 
-import com.google.common.collect.Sets
 import com.neva.javarel.framework.api.structure.App
 import com.neva.javarel.framework.api.structure.Module
 import org.apache.felix.scr.annotations.*
@@ -16,10 +15,10 @@ class MultiModuleApp : App {
             policy = ReferencePolicy.DYNAMIC,
             policyOption = ReferencePolicyOption.GREEDY
     )
-    private val allModules = Sets.newConcurrentHashSet<Module>(TreeSet<Module>({ m1, m2 -> m1.priority.compareTo(m2.priority) }))
+    private val allModules = Collections.synchronizedSortedSet(TreeSet<Module>({ m1, m2 -> m1.priority.compareTo(m2.priority) }))
 
-    override val modules: Set<Module>
-        get() = allModules.toSet()
+    override val modules: List<Module>
+        get() = allModules.toList()
 
     protected fun bindModule(module: Module) {
         allModules.add(module)

presentation/view/pebble/src/main/kotlin/com/neva/javarel/presentation/view/pebble/functions/ServiceFunction.kt

@@ -5,10 +5,26 @@ import com.neva.javarel.presentation.view.api.ViewException
 
 class ServiceFunction(val osgiUtils: OsgiUtils) : BaseFunction() {
 
+    companion object {
+        const val CLASS_ARG = "class"
+    }
+
+    override fun getArgumentNames(): MutableList<String> {
+        return mutableListOf(CLASS_ARG)
+    }
+
     override fun execute(args: Map<String, Any>): Any {
-        val serviceClass = firstArgument(args) as String
+        val serviceClass = args.get(CLASS_ARG) as String?
+        if (serviceClass.isNullOrBlank()) {
+            throw ViewException("OSGi service class cannot be empty.")
+        }
+
+        val service = osgiUtils.serviceOf<Any>(serviceClass!!)
+        if (service == null) {
+            throw ViewException("OSGi service '$serviceClass' cannot be found.")
+        }
 
-        return osgiUtils.serviceOf(serviceClass) ?: throw ViewException("OSGi service '$serviceClass' cannot be found.")
+        return service
     }
 
 }