fixes and adjustments after merge to adapt to the newest version

campudus · Nov 13, 2024 · 9706066 · 9706066
1 parent 2ef86c5
commit 9706066
Show file tree

Hide file tree

Showing 5 changed files with 188 additions and 233 deletions.
diff --git a/src/main/scala/com/campudus/tableaux/Starter.scala b/src/main/scala/com/campudus/tableaux/Starter.scala
@@ -5,7 +5,7 @@ import com.campudus.tableaux.database.DatabaseConnection
 import com.campudus.tableaux.helper.{FileUtils, VertxAccess}
 import com.campudus.tableaux.router._
 import com.campudus.tableaux.verticles.JsonSchemaValidator.{JsonSchemaValidatorClient, JsonSchemaValidatorVerticle}
-import com.campudus.tableaux.verticles.Messaging.MessagingVerticle
+import com.campudus.tableaux.verticles.MessagingVerticle.MessagingVerticle
 
 import io.vertx.lang.scala.ScalaVerticle
 import io.vertx.scala.SQLConnection
@@ -141,17 +141,8 @@ class Starter extends ScalaVerticle with LazyLogging {
   }
 
   private def deployMessagingVerticle(tableauxConfig: TableauxConfig): Future[String] = {
-
-    val config =
-      Json.obj(
-        "rolePermissions" -> tableauxConfig.rolePermissions,
-        "authConfig" -> tableauxConfig.authConfig,
-        "databaseConfig" -> tableauxConfig.databaseConfig
-      )
-    val options = DeploymentOptions()
-      .setConfig(config)
-
-    val deployFuture = vertx.deployVerticleFuture(ScalaVerticle.nameForVerticle[MessagingVerticle], options)
+    val options = DeploymentOptions().setConfig(Json.emptyObj()) // No options so far
+    val deployFuture = vertx.deployVerticleFuture(new MessagingVerticle(tableauxConfig), options)
 
     deployFuture.onComplete({
       case Success(id) =>
@@ -161,7 +152,6 @@ class Starter extends ScalaVerticle with LazyLogging {
     })
 
     deployFuture
-
   }
 
   private def deployCacheVerticle(cacheConfig: JsonObject, tableauxConfig: TableauxConfig): Future[String] = {

diff --git a/src/main/scala/com/campudus/tableaux/controller/TableauxController.scala b/src/main/scala/com/campudus/tableaux/controller/TableauxController.scala
@@ -13,9 +13,7 @@ import com.campudus.tableaux.database.model.TableauxModel._
 import com.campudus.tableaux.router.auth.permission._
 import com.campudus.tableaux.verticles.MessagingVerticle.MessagingVerticleClient
 
-import io.vertx.scala.ext.web.RoutingContext
 import org.vertx.scala.core.json.Json
-import org.vertx.scala.core.json.JsonArray
 
 import scala.concurrent.Future
 import scala.util.Try