Merge branch 'main' into dsl-update

finos · Sep 17, 2024 · ac9e7ef · ac9e7ef
2 parents f6eeb29 + ed9379f
commit ac9e7ef
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/main/java/com/regnosys/rosetta/common/translation/MappingProcessorStep.java b/src/main/java/com/regnosys/rosetta/common/translation/MappingProcessorStep.java
@@ -83,8 +83,13 @@ public <T extends RosettaModelObject> PostProcessorReport runProcessStep(Class<?
 			RosettaPath path = RosettaPath.valueOf(topClass.getSimpleName());
 			for (MappingDelegate mapper : mappingDelegates) {
 				LOGGER.debug("Running mapper {} for model path {}", mapper.getClass().getSimpleName(), mapper.getModelPath());
+				long t0 = System.currentTimeMillis();
 				MappingBuilderProcessor processor = new MappingBuilderProcessor(mapper);
 				processor.processRosetta(path, topClass, builder, null);
+				long t = System.currentTimeMillis() - t0;
+				if (t > 200) {
+					LOGGER.debug("Took {} ms to run mapper {} for model path {}", t, mapper.getClass().getSimpleName(), mapper.getModelPath());	
+				}
 				builder.process(path, processor);
 			}
 			// Mapper thread waits for invoked tasks to complete before continuing (subject to timeout before)

diff --git a/src/main/java/com/regnosys/rosetta/common/util/ClassPathUtils.java b/src/main/java/com/regnosys/rosetta/common/util/ClassPathUtils.java
@@ -49,13 +49,12 @@ public class ClassPathUtils {
      * @param classLoader          Classloader to search in.
      * @return
      */
-
     public static List<Path> findPathsFromClassPath(Collection<String> classPathDirectories, String includeRegex, Optional<String> excludeRegex, ClassLoader classLoader) {
         List<Path> modelPaths = classPathDirectories.stream().flatMap(path -> loadFromClasspath(path, classLoader))
                 .collect(Collectors.toList());
         List<Path> expandedModelPaths = expandPaths(modelPaths, includeRegex, excludeRegex);
-        LOGGER.debug("Using paths:" + expandedModelPaths);
-        expandedModelPaths.forEach(x -> LOGGER.debug("   " + x));
+        LOGGER.trace("Using paths: {}", expandedModelPaths);
+        expandedModelPaths.forEach(x -> LOGGER.trace("   {}", x));
         return expandedModelPaths;
     }
 

diff --git a/src/main/java/com/regnosys/rosetta/common/validation/ValidationReport.java b/src/main/java/com/regnosys/rosetta/common/validation/ValidationReport.java
@@ -67,9 +67,9 @@ public List<ValidationResult<?>> results() {
 	public void logReport() {
 		for (ValidationResult<?> validationResult : validationResults) {
 			if (!validationResult.isSuccess()) {
-				LOGGER.error(validationResult.toString());
-			} else {
 				LOGGER.debug(validationResult.toString());
+			} else {
+				LOGGER.trace(validationResult.toString());
 			}
 		}
 	}