From 423f54d6b92ca28fcf0aa6de15957ca5ca940378 Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <oliver.drotbohm@broadcom.com>
Date: Wed, 26 Feb 2025 19:17:39 +0100
Subject: [PATCH] GH-1097 - Upgrade to ArchUnit 1.4.

---
 pom.xml                                       |  2 +-
 .../support/ModuleEventListener.java          |  6 ++---
 .../support/ModuleEventListenerUnitTests.java | 24 +++++++++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 spring-modulith-observability/src/test/java/org/springframework/modulith/observability/support/ModuleEventListenerUnitTests.java

diff --git a/pom.xml b/pom.xml
index 082b5813..d31785a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
 
 	<properties>
 
-		<archunit.version>1.3.0</archunit.version>
+		<archunit.version>1.4.0</archunit.version>
 		<artifactory-maven-plugin.version>3.6.2</artifactory-maven-plugin.version>
 		<flapdoodle-mongodb.version>4.16.1</flapdoodle-mongodb.version>
 		<jgit.version>7.0.0.202409031743-r</jgit.version>
diff --git a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/support/ModuleEventListener.java b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/support/ModuleEventListener.java
index c7852370..519a78f7 100644
--- a/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/support/ModuleEventListener.java
+++ b/spring-modulith-observability/src/main/java/org/springframework/modulith/observability/support/ModuleEventListener.java
@@ -74,8 +74,8 @@ public class ModuleEventListener implements ApplicationListener<ApplicationEvent
 			return;
 		}
 
-		var object = payloadEvent.getPayload();
-		var payloadType = object.getClass();
+		var payload = payloadEvent.getPayload();
+		var payloadType = payload.getClass();
 
 		if (!runtime.isApplicationClass(payloadType)) {
 			return;
@@ -98,7 +98,7 @@ public class ModuleEventListener implements ApplicationListener<ApplicationEvent
 					.tags(ModulithMetrics.LowKeys.MODULE_NAME.name().toLowerCase(), moduleByType.getDisplayName()) //
 					.register(registry).increment();
 
-			factory.createCounterBuilder(event).register(registry).increment();
+			factory.createCounterBuilder(payload).register(registry).increment();
 		}
 
 		var observation = observationRegistry.get().getCurrentObservation();
diff --git a/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/support/ModuleEventListenerUnitTests.java b/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/support/ModuleEventListenerUnitTests.java
new file mode 100644
index 00000000..4eae9ac6
--- /dev/null
+++ b/spring-modulith-observability/src/test/java/org/springframework/modulith/observability/support/ModuleEventListenerUnitTests.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.modulith.observability.support;
+
+/**
+ *
+ * @author Oliver Drotbohm
+ */
+public class ModuleEventListenerUnitTests {
+
+}