Merge pull request #184 from cturkalj/keycloak-23

Compatiblity with Keycloak 23

Author: pb82

gradle.properties

@@ -1,2 +1,2 @@
-keycloakVersion=22.0.0
+keycloakVersion=23.0.3
 prometheusVersion=0.16.0

pom.xml

@@ -11,8 +11,9 @@
 
     <properties>
         <java.version>17</java.version>
-        <keycloak.version>22.0.0</keycloak.version>
+        <keycloak.version>23.0.3</keycloak.version>
         <prometheus.version>0.16.0</prometheus.version>
+        <quarkus-resteasy.version>3.2.9.Final</quarkus-resteasy.version>
         <version.compiler.maven.plugin>3.5.1</version.compiler.maven.plugin>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
@@ -52,6 +53,12 @@
             <version>${keycloak.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
+            <version>${quarkus-resteasy.version}</version>
+            <scope>provided</scope>
+        </dependency>        
         <dependency><!-- required by 'system-stubs-junit4' -->
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>

src/main/java/org/jboss/aerogear/keycloak/metrics/MetricsFilterProvider.java

@@ -5,6 +5,8 @@
 import jakarta.ws.rs.container.ContainerResponseContext;
 import jakarta.ws.rs.container.ContainerResponseFilter;
 import jakarta.ws.rs.ext.Provider;
+import org.jboss.resteasy.reactive.server.ServerRequestFilter;
+import org.jboss.resteasy.reactive.server.ServerResponseFilter;
 
 /**
  * This provider registers the MetricsFilter within environments that use Resteasy 4.x and above, e.g. Keycloak.X.
@@ -13,11 +15,13 @@
 public class MetricsFilterProvider implements ContainerRequestFilter, ContainerResponseFilter {
 
     @Override
+    @ServerRequestFilter(preMatching = true)
     public void filter(ContainerRequestContext requestContext) {
         MetricsFilter.instance().filter(requestContext);
     }
 
     @Override
+    @ServerResponseFilter
     public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext) {
         MetricsFilter.instance().filter(requestContext, responseContext);
     }