From d8f77d5057e9993c4f23aecb610bb756ed39de51 Mon Sep 17 00:00:00 2001
From: Sjoerd Talsma <sjoerdtalsma@users.noreply.github.com>
Date: Fri, 15 Nov 2024 11:39:11 +0100
Subject: [PATCH] Review fixes (#520)

* Fix module names.
* Fix (and simplify) wrapTasks method.

---------

Signed-off-by: Sjoerd Talsma <sjoerdtalsma@users.noreply.github.com>
---
 .../core/delegation/DelegatingExecutorService.java  | 13 ++++---------
 timers/context-timer-micrometer/pom.xml             |  2 +-
 timers/context-timer-opentelemetry/pom.xml          |  2 +-
 timers/context-timer-opentracing/pom.xml            |  2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/context-propagation-core/src/main/java/nl/talsmasoftware/context/core/delegation/DelegatingExecutorService.java b/context-propagation-core/src/main/java/nl/talsmasoftware/context/core/delegation/DelegatingExecutorService.java
index f684dfcf..211a8c5a 100644
--- a/context-propagation-core/src/main/java/nl/talsmasoftware/context/core/delegation/DelegatingExecutorService.java
+++ b/context-propagation-core/src/main/java/nl/talsmasoftware/context/core/delegation/DelegatingExecutorService.java
@@ -18,7 +18,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Objects;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -74,18 +73,14 @@ protected <T> Future<T> wrap(Future<T> source) {
      * @see #wrap(Callable)
      */
     protected <T> Collection<? extends Callable<T>> wrapTasks(Collection<? extends Callable<T>> tasks) {
-        Collection<? extends Callable<T>> wrappedTasks = tasks;
         if (tasks != null && !tasks.isEmpty()) {
-            boolean modification = false;
-            final List<Callable<T>> copy = new ArrayList<Callable<T>>(tasks.size());
+            final List<Callable<T>> wrappedTasks = new ArrayList<>(tasks.size());
             for (Callable<T> task : tasks) {
-                final Callable<T> wrapped = wrap(task);
-                modification |= (task == wrapped || Objects.equals(task, wrapped));
-                copy.add(wrapped);
+                wrappedTasks.add(wrap(task));
             }
-            if (modification) wrappedTasks = copy;
+            tasks = wrappedTasks;
         }
-        return wrappedTasks;
+        return tasks;
     }
 
     /**
diff --git a/timers/context-timer-micrometer/pom.xml b/timers/context-timer-micrometer/pom.xml
index 3b7874fb..88277756 100644
--- a/timers/context-timer-micrometer/pom.xml
+++ b/timers/context-timer-micrometer/pom.xml
@@ -35,7 +35,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <project.moduleName>${project.groupId}.metrics</project.moduleName>
+        <project.moduleName>${project.groupId}.micrometer</project.moduleName>
         <root.basedir>${project.parent.basedir}</root.basedir>
 
         <micrometer.version>1.14.0</micrometer.version>
diff --git a/timers/context-timer-opentelemetry/pom.xml b/timers/context-timer-opentelemetry/pom.xml
index 622deaa1..c4b17775 100644
--- a/timers/context-timer-opentelemetry/pom.xml
+++ b/timers/context-timer-opentelemetry/pom.xml
@@ -35,7 +35,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <project.moduleName>${project.groupId}.metrics</project.moduleName>
+        <project.moduleName>${project.groupId}.opentelemetry</project.moduleName>
         <root.basedir>${project.parent.basedir}</root.basedir>
     </properties>
 
diff --git a/timers/context-timer-opentracing/pom.xml b/timers/context-timer-opentracing/pom.xml
index 2b401270..88109165 100644
--- a/timers/context-timer-opentracing/pom.xml
+++ b/timers/context-timer-opentracing/pom.xml
@@ -35,7 +35,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <project.moduleName>${project.groupId}.metrics</project.moduleName>
+        <project.moduleName>${project.groupId}.opentracing</project.moduleName>
         <root.basedir>${project.parent.basedir}</root.basedir>
     </properties>