Update BeanMapperPerformanceLogger

- Added BeanMapperPerformanceLogger#runTimed(Supplier, String, Object...), to allow for just-in-time formatting of log messages.
42BV · Apr 3, 2024 · 725c26a · 725c26a
1 parent 1d9335e
commit 725c26a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/src/main/java/io/beanmapper/core/collections/AbstractCollectionHandler.java b/src/main/java/io/beanmapper/core/collections/AbstractCollectionHandler.java
@@ -10,7 +10,7 @@
 
 public abstract class AbstractCollectionHandler<C> implements CollectionHandler<C> {
 
-    private static final String LOGGING_STRING = "AbstractCollectionHandler#mapItem(BeanMapper, Class, Object) -> BeanMapper#map(Object)";
+    private static final String LOGGING_STRING = "%s#mapItem(BeanMapper, Class, Object) -> BeanMapper#map(Object)";
 
     private final Class<C> type;
     private final DefaultBeanInitializer beanInitializer = new DefaultBeanInitializer();
@@ -35,13 +35,12 @@ public Object mapItem(
             BeanMapper beanMapper,
             Class<?> collectionElementClass,
             Object source) {
-        return BeanMapperPerformanceLogger.runTimed(LOGGING_STRING,
-                () -> beanMapper.wrap()
+        return BeanMapperPerformanceLogger.runTimed(() -> beanMapper.wrap()
                 .setTargetClass(collectionElementClass)
                 .setCollectionClass(null)
                 .setConverterChoosable(true)
                 .build()
-                .map(source));
+                .map(source), LOGGING_STRING, getClass().getSimpleName());
     }
 
     @Override

diff --git a/src/main/java/io/beanmapper/core/converter/collections/CollectionConverter.java b/src/main/java/io/beanmapper/core/converter/collections/CollectionConverter.java
@@ -8,7 +8,7 @@
 
 public class CollectionConverter implements BeanConverter {
 
-    private static final String LOGGING_STRING = "CollectionConverter#convert(BeanMapper, Object, Class, BeanPropertyMatch) -> BeanMapper#map(Object)";
+    private static final String LOGGING_STRING = "%s#convert(BeanMapper, Object, Class, BeanPropertyMatch) -> BeanMapper#map(Object)";
 
     private final CollectionHandler<?> collectionHandler;
 
@@ -27,8 +27,7 @@ public <R, U> U convert(
             return targetClass.cast(source);
         }
 
-        return BeanMapperPerformanceLogger.runTimed(LOGGING_STRING,
-                () -> beanMapper.wrap()
+        return BeanMapperPerformanceLogger.runTimed(() -> beanMapper.wrap()
                 .setCollectionClass(collectionHandler.getType())
                 .setCollectionUsage(beanPropertyMatch.getCollectionInstructions().getBeanCollectionUsage())
                 .setPreferredCollectionClass(beanPropertyMatch.getCollectionInstructions().getPreferredCollectionClass().getAnnotationClass())
@@ -37,7 +36,7 @@ public <R, U> U convert(
                 .setTarget(beanPropertyMatch.getTargetObject())
                 .setUseNullValue()
                 .build()
-                .map(source));
+                .map(source), LOGGING_STRING, getClass().getSimpleName());
     }
 
     @Override

diff --git a/src/main/java/io/beanmapper/strategy/MapToDynamicClassStrategy.java b/src/main/java/io/beanmapper/strategy/MapToDynamicClassStrategy.java
@@ -9,7 +9,7 @@
 
 public class MapToDynamicClassStrategy extends AbstractMapStrategy {
 
-    private static final String LOGGING_STRING = "Recursively calling BeanMapper#map(Object)";
+    private static final String LOGGING_STRING = "Recursively calling BeanMapper#map(Object), to map source of type %s, to type %s.";
 
     public MapToDynamicClassStrategy(BeanMapper beanMapper, Configuration configuration) {
         super(beanMapper, configuration);
@@ -51,23 +51,21 @@ public <S, T> T downsizeSource(S source, List<String> downsizeSourceFields) {
         Class<?> targetClass = getConfiguration().getTargetClass();
         Object target = getConfiguration().getTarget();
 
-        Object dynSource = BeanMapperPerformanceLogger.runTimed(LOGGING_STRING,
-                () -> getBeanMapper()
+        Object dynSource = BeanMapperPerformanceLogger.runTimed(() -> getBeanMapper()
                         .wrap()
                         .downsizeSource(null)
                         .setTarget(target)
                         .setTargetClass(dynamicClass)
                         .build()
-                        .map(source));
+                        .map(source), LOGGING_STRING, source.getClass().getSimpleName(), targetClass != null ? targetClass.getSimpleName() : null);
 
-        return BeanMapperPerformanceLogger.runTimed(LOGGING_STRING,
-                () -> getBeanMapper()
+        return BeanMapperPerformanceLogger.runTimed(() -> getBeanMapper()
                         .wrap()
                         .downsizeSource(null)
                         .setTarget(target)
                         .setTargetClass(targetClass)
                         .build()
-                        .map(dynSource));
+                        .map(dynSource), LOGGING_STRING, dynSource.getClass().getSimpleName(), targetClass != null ? targetClass.getSimpleName() : null);
     }
 
     public <S, T> T downsizeTarget(S source, List<String> downsizeTargetFields) {
@@ -76,12 +74,12 @@ public <S, T> T downsizeTarget(S source, List<String> downsizeTargetFields) {
                 downsizeTargetFields,
                 getConfiguration().getStrictMappingProperties());
         Class<?> collectionClass = getBeanMapper().getConfiguration().getCollectionClass();
-        return BeanMapperPerformanceLogger.runTimed(LOGGING_STRING, () -> getBeanMapper()
+        return BeanMapperPerformanceLogger.runTimed(() -> getBeanMapper()
                 .wrap()
                 .downsizeTarget(null)
                 .setCollectionClass(collectionClass)
                 .setTargetClass(dynamicClass)
                 .build()
-                .map(source));
+                .map(source), LOGGING_STRING, source.getClass().getSimpleName(), dynamicClass.getSimpleName());
     }
 }
diff --git a/src/main/java/io/beanmapper/utils/BeanMapperPerformanceLogger.java b/src/main/java/io/beanmapper/utils/BeanMapperPerformanceLogger.java
@@ -25,6 +25,14 @@ public static <T> T runTimed(String taskName, Supplier<T> task) {
         return result;
     }
 
+    public static <T> T runTimed(Supplier<T> task, String unformattedTaskName, Object... messageArguments) {
+        if (log.isDebugEnabled()) {
+            String taskName = unformattedTaskName.formatted(messageArguments);
+            return runTimed(taskName, task);
+        }
+        return task.get();
+    }
+
     private static class Stopwatch {
 
         private final Instant started;