Review fixes (#520)

* Fix module names. * Fix (and simplify) wrapTasks method. --------- Signed-off-by: Sjoerd Talsma <sjoerdtalsma@users.noreply.github.com>
talsma-ict · Nov 15, 2024 · d8f77d5 · d8f77d5
1 parent 71277c9
commit d8f77d5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/...re/src/main/java/nl/talsmasoftware/context/core/delegation/DelegatingExecutorService.java b/...re/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
@@ -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
@@ -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
@@ -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>