src/main/java/io/kokuwa/keycloak/metrics/event/MetricsEventListener.java

@@ -1,4 +1,4 @@
-package io.kokuwa.keycloak.metrics;
+package io.kokuwa.keycloak.metrics.event;
 
 import java.util.Optional;
 

src/main/java/io/kokuwa/keycloak/metrics/event/MetricsEventListenerFactory.java

@@ -1,4 +1,4 @@
-package io.kokuwa.keycloak.metrics;
+package io.kokuwa.keycloak.metrics.event;
 
 import javax.enterprise.inject.spi.CDI;
 

src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory

@@ -1 +1 @@
-io.kokuwa.keycloak.metrics.MetricsEventListenerFactory
+io.kokuwa.keycloak.metrics.event.MetricsEventListenerFactory

src/test/java/io/kokuwa/keycloak/metrics/KeycloakIT.java

@@ -14,7 +14,7 @@ import org.keycloak.events.EventType;
 
 import io.kokuwa.keycloak.metrics.junit.KeycloakClient;
 import io.kokuwa.keycloak.metrics.junit.KeycloakExtension;
-import io.kokuwa.keycloak.metrics.prometheus.Prometheus;
+import io.kokuwa.keycloak.metrics.junit.Prometheus;
 
 /**
  * Integration tests with Keycloak.

src/test/java/io/kokuwa/keycloak/metrics/event/MetricsEventListenerTest.java

@@ -1,4 +1,4 @@
-package io.kokuwa.keycloak.metrics;
+package io.kokuwa.keycloak.metrics.event;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
@@ -378,8 +378,8 @@ public class MetricsEventListenerTest {
 		}
 	}
 
-	private MetricsEventListener listener(boolean replaceIds) {
+	private MetricsEventListener listener(boolean replace) {
-		return new MetricsEventListener(registry, replaceIds, session);
+		return new MetricsEventListener(registry, replace, session);
 	}
 
 	private void assertCounter(String metric, Map<String, String> tags) {

src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java

@@ -19,9 +19,6 @@ import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.MountableFile;
 
-import io.kokuwa.keycloak.metrics.prometheus.Prometheus;
-import io.kokuwa.keycloak.metrics.prometheus.PrometheusClient;
-
 /**
  * JUnit extension to start keycloak.
  *

src/test/java/io/kokuwa/keycloak/metrics/junit/Prometheus.java

@@ -1,4 +1,4 @@
-package io.kokuwa.keycloak.metrics.prometheus;
+package io.kokuwa.keycloak.metrics.junit;
 
 import java.util.HashSet;
 import java.util.Map;

src/test/java/io/kokuwa/keycloak/metrics/junit/PrometheusClient.java

@@ -1,4 +1,4 @@
-package io.kokuwa.keycloak.metrics.prometheus;
+package io.kokuwa.keycloak.metrics.junit;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;

src/test/java/io/kokuwa/keycloak/metrics/junit/PrometheusMetric.java

@@ -1,4 +1,4 @@
-package io.kokuwa.keycloak.metrics.prometheus;
+package io.kokuwa.keycloak.metrics.junit;
 
 import java.util.Map;