From efa32adbab99fd9b6e6b6afd75c5a9fb5bcb4d90 Mon Sep 17 00:00:00 2001
From: Johannes Beck <mail@johannes-beck.name>
Date: Sat, 15 Jun 2024 18:07:09 +0200
Subject: [PATCH] Update to surefire 3.3.0

---
 pom.xml                                             |  5 +++--
 src/main/java/x1/stomp/model/JaxbSupport.java       | 12 +++++-------
 src/main/java/x1/stomp/util/MeteredInterceptor.java |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1d8cf95..cb268a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -437,6 +437,7 @@
                         </goals>
                         <configuration>
                             <outputDirectory>${basedir}/target/generated-sources/java-templates</outputDirectory>
+                            <overwrite>true</overwrite>
                             <resources>
                                 <resource>
                                     <directory>src/main/java-templates</directory>
@@ -547,7 +548,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.5</version>
+                <version>3.3.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -606,7 +607,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>3.2.5</version>
+                <version>3.3.0</version>
                 <reportSets>
                     <reportSet>
                         <reports>
diff --git a/src/main/java/x1/stomp/model/JaxbSupport.java b/src/main/java/x1/stomp/model/JaxbSupport.java
index 0829738..5ab5eda 100644
--- a/src/main/java/x1/stomp/model/JaxbSupport.java
+++ b/src/main/java/x1/stomp/model/JaxbSupport.java
@@ -4,7 +4,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Map.Entry;
 
 import javax.xml.namespace.QName;
 
@@ -96,8 +95,8 @@ public static class JaxbAdapter extends XmlAdapter<JaxbLink, Link> {
 
     @Override
     public Link unmarshal(final JaxbLink v) {
-        Link.Builder lb = Link.fromUri(v.getUri());
-        for (Entry<QName, Object> e : v.getParams().entrySet()) {
+        var lb = Link.fromUri(v.getUri());
+        for (var e : v.getParams().entrySet()) {
             lb.param(e.getKey().getLocalPart(), e.getValue().toString());
         }
         return lb.build();
@@ -105,10 +104,9 @@ public Link unmarshal(final JaxbLink v) {
 
     @Override
     public JaxbLink marshal(final Link v) {
-        JaxbLink jl = new JaxbLink(v.getUri());
-        for (Entry<String, String> e : v.getParams().entrySet()) {
-            final String name = e.getKey();
-            jl.getParams().put(new QName("", name), e.getValue());
+        var jl = new JaxbLink(v.getUri());
+        for (var e : v.getParams().entrySet()) {
+            jl.getParams().put(new QName("", e.getKey()), e.getValue());
         }
         return jl;
     }
diff --git a/src/main/java/x1/stomp/util/MeteredInterceptor.java b/src/main/java/x1/stomp/util/MeteredInterceptor.java
index 8fa4663..ff9ad35 100644
--- a/src/main/java/x1/stomp/util/MeteredInterceptor.java
+++ b/src/main/java/x1/stomp/util/MeteredInterceptor.java
@@ -28,8 +28,8 @@ public class MeteredInterceptor {
 
   @AroundInvoke
   public Object meter(InvocationContext ctx) throws Exception {
-    Class<?> type = ctx.getMethod().getDeclaringClass();
-    String method = ctx.getMethod().getName();
+    var type = ctx.getMethod().getDeclaringClass();
+    var method = ctx.getMethod().getName();
 
     var timed = timed(ctx);
     var counted = counted(ctx);