integrated eventing

coolsamson7 · Nov 13, 2024 · 096d3db · 096d3db
1 parent 9cc1442
commit 096d3db
Show file tree

Hide file tree

Showing 15 changed files with 171 additions and 81 deletions.
diff --git a/administration/server/pom.xml b/administration/server/pom.xml
@@ -26,6 +26,12 @@
 
         <!-- internal -->
 
+        <dependency>
+            <groupId>com.serious</groupId>
+            <artifactId>service-events-artemis</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.serious</groupId>
             <artifactId>service-administration-core</artifactId>

diff --git a/...rver/src/main/java/com/serious/service/administration/ServiceAdministrationApplication.kt b/...rver/src/main/java/com/serious/service/administration/ServiceAdministrationApplication.kt
@@ -16,6 +16,9 @@ import com.serious.service.ComponentAdministration
 import com.serious.service.ServiceConfiguration
 import com.serious.service.ServiceManager
 import lombok.extern.slf4j.Slf4j
+import org.sirius.common.tracer.TraceLevel
+import org.sirius.common.tracer.Tracer
+import org.sirius.common.tracer.trace.ConsoleTrace
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
@@ -250,6 +253,12 @@ class ServiceAdministrationApplication {
         fun main(args: Array<String>) {
             System.setProperty("java.net.preferIPv4Stack" , "true");
 
+            val tracer = Tracer(ConsoleTrace(), "%d{yyyy-MM-dd HH:mm:ss,SSS} %l{-6s} [%p{-10s}] %m")
+
+            tracer
+                .setTraceLevel("org.sirius", TraceLevel.FULL)
+                .setTraceLevel("com.serious", TraceLevel.FULL)
+
             SpringApplication.run(ServiceAdministrationApplication::class.java, *args)
         }
     }

diff --git a/administration/server/src/main/resources/application.yml b/administration/server/src/main/resources/application.yml
@@ -4,6 +4,8 @@ logging:
     file: "[%d{yyyy-MM-dd HH:mm:ss.SSS}] %-5level [%t] [%logger - %line]: %m%n"
   level:
     root: INFO
+    org:
+      hibernate: INFO
   file:
     name: "log/hello.log"
 server:

diff --git a/administration/server/src/main/resources/broker.xml b/administration/server/src/main/resources/broker.xml
@@ -0,0 +1,11 @@
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:activemq" xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
+    <core xmlns="urn:activemq:core">
+        <persistence-enabled>false</persistence-enabled>
+
+        <security-enabled>false</security-enabled>
+
+        <acceptors>
+            <acceptor name="in-vm">vm://0</acceptor>
+        </acceptors>
+    </core>
+</configuration>
diff --git a/core/pom.xml b/core/pom.xml
@@ -13,6 +13,16 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <!-- local -->
+
+        <dependency>
+            <groupId>com.serious</groupId>
+            <artifactId>service-common</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- spring -->
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>

diff --git a/events/artemis/src/main/kotlin/org/sirius/events/artemis/ArtemisEventing.kt b/events/artemis/src/main/kotlin/org/sirius/events/artemis/ArtemisEventing.kt
@@ -7,5 +7,5 @@ package org.sirius.events.artemis
 
 import org.sirius.events.Eventing
 
-abstract class ArtemisEventing() : Eventing {
+abstract class ArtemisEventing() : Eventing() {
 }
diff --git a/events/artemis/src/main/kotlin/org/sirius/events/artemis/EmbeddedArtemisEventing.kt b/events/artemis/src/main/kotlin/org/sirius/events/artemis/EmbeddedArtemisEventing.kt
@@ -12,6 +12,7 @@ import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ
 import org.sirius.common.tracer.TraceLevel
 import org.sirius.common.tracer.Tracer
 import org.sirius.events.EventDescriptor
+import org.sirius.events.EventError
 import org.sirius.events.EventListenerDescriptor
 import org.sirius.events.EventManager
 import org.springframework.stereotype.Component
@@ -29,31 +30,30 @@ class EmbeddedArtemisEventing : ArtemisEventing() {
     init {
         this.embedded.start()
         val serverLocator = ActiveMQClient.createServerLocator("vm://0")
-        val sessionFactory = serverLocator.createSessionFactory()
-        session = sessionFactory.createSession()
+
+        session = serverLocator.createSessionFactory().createSession()
     }
 
     // private
 
     protected fun createMessage(eventManager: EventManager, event: Any) : ClientMessage {
-        val json = eventManager.objectMapper.writeValueAsString(event)
-
         val message = session.createMessage(true)
 
-        message.writeBodyBufferString(json)
+        message.writeBodyBufferString(asJSON(event))
 
         return message
     }
 
-    private fun createEvent(eventManager: EventManager, message : ClientMessage, eventClass: Class<*>) : Any {
-        val body = message.bodyBuffer.readString()
-
-        return eventManager.objectMapper.readValue(body, eventClass)
+    private fun createEvent(message : ClientMessage, eventDescriptor: EventDescriptor) : Any {
+        return asEvent(message.bodyBuffer.readString(), eventDescriptor)
     }
 
-
     private fun producer4(clazz: Class<*>) : ClientProducer {
-        return this.producer[clazz]!!
+        val producer = this.producer[clazz]
+        if ( producer !== null)
+            return producer
+        else
+            throw EventError("unknown producer for class ${clazz.name}")
     }
 
     // implement
@@ -69,7 +69,7 @@ class EmbeddedArtemisEventing : ArtemisEventing() {
         val eventClass =  eventListenerDescriptor.event.clazz
 
         val address = eventName
-        val queueName = eventName
+        val queueName = eventListenerDescriptor.name
 
         // create a queue per listener
 
@@ -90,14 +90,11 @@ class EmbeddedArtemisEventing : ArtemisEventing() {
             if ( Tracer.ENABLED)
                 Tracer.trace("org.sirius.events", TraceLevel.HIGH, "handle event %s from address %s", eventClass.name, message.address)
 
-            eventManager.dispatch(createEvent(eventManager, message, eventClass), eventClass)
+            eventManager.dispatch(createEvent(message, eventListenerDescriptor.event), eventClass)
         }
     }
 
     override fun send(eventManager: EventManager, event: Any) {
-        if ( Tracer.ENABLED)
-            Tracer.trace("org.sirius.events", TraceLevel.HIGH, "send event %s", event.javaClass.name)
-
         producer4(event.javaClass).send(createMessage(eventManager, event))
     }
 

diff --git a/events/artemis/src/test/kotlin/org/sirius/events/artemis/EventTests.kt b/events/artemis/src/test/kotlin/org/sirius/events/artemis/EventTests.kt
@@ -33,7 +33,7 @@ class TestConfiguration {
     }
 }
 
-@Event
+@Event(broadcast = true)
 data class HelloEvent(
     val hello : String = ""
 )
@@ -49,6 +49,13 @@ class HelloEventListener : AbstractEventListener<HelloEvent>() {
         EventTests.future.complete(event.hello)
     }
 }
+/*
+@EventListener(event = HelloEvent::class)
+class OtherHelloEventListener : AbstractEventListener<HelloEvent>() {
+    override fun on(event: HelloEvent) {
+        EventTests.future1.complete(event.hello)
+    }
+}*/
 
 @SpringBootTest(classes = [TestConfiguration::class, EventConfiguration::class])
 internal class EventTests {
@@ -61,21 +68,21 @@ internal class EventTests {
 
     @Test
     fun test() {
-        Tracer.trace("org.sirius", TraceLevel.FULL, "test" )
-
         eventManager.send(HelloEvent("world"))
 
         val value = future.get()
+        //val value1 = future1.get()
 
         assertEquals("world", value)
     }
 
     companion object {
         val future = CompletableFuture<String>()
+        val future1 = CompletableFuture<String>()
 
         @JvmStatic
         @BeforeAll
-        fun setupTracer(): Unit {
+        fun setupTracer() {
             val tracer = Tracer(ConsoleTrace(), "%d{yyyy-MM-dd HH:mm:ss,SSS} %l{-6s} [%p{-10s}] %m")
 
             tracer.setTraceLevel("org.sirius", TraceLevel.FULL)

diff --git a/events/core/src/main/kotlin/org/sirius/events/EventListener.kt b/events/core/src/main/kotlin/org/sirius/events/EventListener.kt
@@ -12,6 +12,6 @@ import kotlin.reflect.KClass
 @Target(AnnotationTarget.CLASS)
 @Component
 annotation class EventListener(
-    //val name: String = "",
+    val name: String = "",
     val event: KClass<out Any>
 )
diff --git a/events/core/src/main/kotlin/org/sirius/events/EventListenerDescriptor.kt b/events/core/src/main/kotlin/org/sirius/events/EventListenerDescriptor.kt
@@ -9,6 +9,7 @@ import kotlin.reflect.KClass
 
 data class EventListenerDescriptor(
     val beanDefinition : BeanDefinition,
+    val name: String,
     val event: EventDescriptor,
     var instance : AbstractEventListener<Any>? = null
 )
diff --git a/events/core/src/main/kotlin/org/sirius/events/EventManager.kt b/events/core/src/main/kotlin/org/sirius/events/EventManager.kt
@@ -57,7 +57,7 @@ class EventManager() : ApplicationContextAware {
     lateinit var rootPackage: String
 
     @Autowired
-    lateinit var objectMapper : ObjectMapper
+    private lateinit var objectMapper : ObjectMapper
 
     lateinit var listenerFactory : ListenerFactory
 
@@ -70,8 +70,10 @@ class EventManager() : ApplicationContextAware {
     // public
 
     fun send(event: Any) {
+        val eventDescriptor = this.findEventDescriptor(event.javaClass)
+
         if ( Tracer.ENABLED)
-            Tracer.trace("org.sirius.events", TraceLevel.HIGH, "send event %s", event.javaClass.name)
+            Tracer.trace("org.sirius.events", TraceLevel.HIGH, "%s event %s", eventDescriptor.name, if (eventDescriptor.broadcast) "broadcast" else "send")
 
         eventing.send(this, event)
     }
@@ -113,14 +115,18 @@ class EventManager() : ApplicationContextAware {
                 .metadata
                 .getAnnotationAttributes(EventListener::class.java.getCanonicalName())!!
 
+            var name = annotations["name"] as String
+            if ( name.isBlank())
+                name = bean.beanClassName!!
+
             val eventClass = annotations["event"] as Class<out Any>
 
             val eventDescriptor = findEventDescriptor(eventClass)
 
             if ( Tracer.ENABLED)
                 Tracer.trace("org.sirius.events", TraceLevel.HIGH, "register event listener %s for event %s", bean.beanClassName!!, eventDescriptor.name)
 
-            val descriptor = EventListenerDescriptor(bean, eventDescriptor)
+            val descriptor = EventListenerDescriptor(bean, name, eventDescriptor)
 
             eventListener[eventClass] = descriptor
 
@@ -136,7 +142,7 @@ class EventManager() : ApplicationContextAware {
             throw EventError("no registered event for class ${eventClass.name}")
     }
 
-    public fun dispatch(event: Any, eventClass: Class<out Any>) {
+    fun dispatch(event: Any, eventClass: Class<out Any>) {
         eventListener(eventClass).on(event)
     }
 

diff --git a/events/core/src/main/kotlin/org/sirius/events/Eventing.kt b/events/core/src/main/kotlin/org/sirius/events/Eventing.kt
@@ -5,18 +5,46 @@ package org.sirius.events
  * All rights reserved
  */
 
-interface Eventing {
+import com.fasterxml.jackson.databind.ObjectMapper
+import org.springframework.beans.factory.annotation.Autowired
+
+abstract class Eventing {
+    // instance data
+
+    @Autowired
+    private lateinit var objectMapper : ObjectMapper
+
+    // protected
+
+    protected fun asEvent(json: String, eventDescriptor: EventDescriptor) : Any {
+        try {
+            return objectMapper.readValue(json, eventDescriptor.clazz)
+        }
+        catch(exception: Throwable) {
+            throw EventError(exception.message!!)
+        }
+    }
+
+    protected fun asJSON(event: Any) : String {
+        try {
+            return objectMapper.writeValueAsString(event)
+        }
+        catch(exception: Throwable) {
+            throw EventError(exception.message!!)
+        }
+    }
+
     // public
 
-    fun registerEvent(eventManager: EventManager, eventDescriptor: EventDescriptor)
+    abstract fun registerEvent(eventManager: EventManager, eventDescriptor: EventDescriptor)
 
-    fun registerEventListener(eventManager: EventManager, eventListenerDescriptor: EventListenerDescriptor)
+    abstract fun registerEventListener(eventManager: EventManager, eventListenerDescriptor: EventListenerDescriptor)
 
-    fun send(eventManager: EventManager, event: Any)
+    abstract fun send(eventManager: EventManager, event: Any)
 
     // lifecycle
 
-    fun startup()
+    open fun startup() {}
 
-    fun shutdown()
+    open fun shutdown() {}
 }
diff --git a/portal/core/pom.xml b/portal/core/pom.xml
@@ -26,6 +26,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.serious</groupId>
+            <artifactId>service-events-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <!-- dependencies -->
 
         <dependency>

diff --git a/portal/core/src/main/java/com/serious/portal/DeploymentManager.kt b/portal/core/src/main/java/com/serious/portal/DeploymentManager.kt
@@ -15,11 +15,18 @@ import com.serious.portal.version.Version
 import com.serious.portal.version.VersionRange
 import jakarta.persistence.EntityManager
 import jakarta.persistence.PersistenceContext
+import org.sirius.events.AbstractEventListener
+import org.sirius.events.Event
+import org.sirius.events.EventListener
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Component
 import java.util.*
 import kotlin.collections.HashMap
 
+@Event(broadcast = true)
+data class ClearCacheEvent(val name : String = "") // TODO: wohin
+
+
 // types
 
 data class FilterContext(
@@ -30,8 +37,9 @@ typealias ManifestFilter = (context: FilterContext, manifest: Manifest) -> Boole
 
 typealias FeatureFilter = (context: FilterContext, feature: Feature) -> Boolean
 
+@EventListener(event = ClearCacheEvent::class)
 @Component
-class DeploymentManager() {
+class DeploymentManager() : AbstractEventListener<ClearCacheEvent>() {
     // instance data
 
     private val manifestFilters = mutableListOf<ManifestFilter>()
@@ -308,4 +316,10 @@ class DeploymentManager() {
 
         return deployment
     }
+
+    // implement AbstractEventListener
+
+    override fun on(event: ClearCacheEvent) {
+        // TODO
+    }
 }