Merge pull request #64 from holixon/fix/63_concurrency

fix(#63) fixed concurrent modification exception

Author: CodeDrivenMitch

frontend/pom.xml

@@ -5,10 +5,10 @@
     <parent>
         <groupId>com.insidion</groupId>
         <artifactId>axon-open-admin-parent</artifactId>
-        <version>0.3.1</version>
+        <version>0.3.2-SNAPSHOT</version>
     </parent>
     <artifactId>axon-open-admin-frontend</artifactId>
-    <version>0.3.1</version>
+    <version>0.3.2-SNAPSHOT</version>
     <name>Frontend</name>
 
     <properties>

pom.xml

@@ -7,7 +7,7 @@
 
     <groupId>com.insidion</groupId>
     <artifactId>axon-open-admin-parent</artifactId>
-    <version>0.3.1</version>
+    <version>0.3.2-SNAPSHOT</version>
 
     <name>Axon Open Admin parent POM</name>
     <description>This Spring Boot starter project contains an administration interface for Axon Framework, including managing its tracking tokens.</description>

starter/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.insidion</groupId>
         <artifactId>axon-open-admin-parent</artifactId>
-        <version>0.3.1</version>
+        <version>0.3.2-SNAPSHOT</version>
     </parent>
     <artifactId>axon-open-admin-starter</artifactId>
 
-    <version>0.3.1</version>
+    <version>0.3.2-SNAPSHOT</version>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

starter/src/main/java/com/insidion/axon/openadmin/insights/InsightRegistrationService.kt

@@ -2,10 +2,11 @@ package com.insidion.axon.openadmin.insights
 
 import org.springframework.stereotype.Service
 import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicInteger
 
 @Service
 class InsightRegistrationService {
-    private val originMessages: MutableMap<MessageKey, Int> = ConcurrentHashMap()
+    private val originMessages: MutableMap<MessageKey, AtomicInteger> = ConcurrentHashMap()
     private val handlers: MutableMap<Handler, HandlerStats> = ConcurrentHashMap()
 
     fun getOverview() = InsightOverview(
@@ -14,23 +15,22 @@ class InsightRegistrationService {
     )
 
     fun reportOriginMessage(handler: MessageKey) {
-        val current = originMessages.computeIfAbsent(handler) { 0 }
-        originMessages[handler] = current + 1
+        originMessages.computeIfAbsent(handler) { AtomicInteger(0) }.incrementAndGet()
     }
 
     fun reportHandlerSuccess(handler: Handler) {
-        handlers.computeIfAbsent(handler) { HandlerStats() }.successCounter += 1
+        handlers.computeIfAbsent(handler) { HandlerStats() }.successCounter.incrementAndGet()
     }
 
     fun reportHandlerMessagesPublished(handler: Handler, messages: List<MessageKey>) {
         val map = handlers.computeIfAbsent(handler) { HandlerStats() }.publishedMessages
         messages.forEach { m ->
             map.computeIfAbsent(m) { PublishedMessageStats(m) }
-                .count += 1
+                .count.incrementAndGet()
         }
     }
 
     fun reportHandlerRollback(handler: Handler) {
-        handlers.computeIfAbsent(handler) { HandlerStats() }.failureCounter += 1
+        handlers.computeIfAbsent(handler) { HandlerStats() }.failureCounter.incrementAndGet()
     }
 }

starter/src/main/java/com/insidion/axon/openadmin/insights/models.kt

@@ -5,6 +5,8 @@ import org.axonframework.deadline.DeadlineMessage
 import org.axonframework.eventhandling.EventMessage
 import org.axonframework.messaging.Message
 import org.axonframework.queryhandling.QueryMessage
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicInteger
 
 data class InsightOverview(
     val handlers: List<HandlerOverview>,
@@ -18,7 +20,7 @@ data class HandlerOverview(
 
 data class OriginMessageOverview(
     val message: MessageKey,
-    val count: Int,
+    val count: AtomicInteger = AtomicInteger(0),
 )
 
 data class Handler(
@@ -46,12 +48,12 @@ data class MessageKey(
 }
 
 data class HandlerStats(
-    var successCounter: Int = 0,
-    var failureCounter: Int = 0,
-    val publishedMessages: MutableMap<MessageKey, PublishedMessageStats> = HashMap()
+    var successCounter: AtomicInteger = AtomicInteger(0),
+    var failureCounter: AtomicInteger = AtomicInteger(0),
+    val publishedMessages: MutableMap<MessageKey, PublishedMessageStats> = ConcurrentHashMap()
 )
 
 data class PublishedMessageStats(
     val message: MessageKey,
-    var count: Int = 0
+    var count: AtomicInteger = AtomicInteger(0)
 )