From 041a223a5d32812b4e6d4193ec29b925faf987ff Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 22 Jan 2023 01:26:57 +0100 Subject: [PATCH] Update --- .../data/generator/plugin/DataModel.java | 20 +++++++++++-------- .../plugin/classgen/GenUpgraderBaseX.java | 1 - 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/DataModel.java b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/DataModel.java index d7501bd..89d5b57 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/DataModel.java +++ b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/DataModel.java @@ -27,9 +27,13 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class DataModel { + private static final Logger logger = LoggerFactory.getLogger(DataModel.class); + private static final List NATIVE_TYPES = List.of("String", "boolean", "short", @@ -552,23 +556,23 @@ public class DataModel { LongAdder unchangedTot = new LongAdder(); LongAdder changedTot = new LongAdder(); computedTypes.forEach((version, types) -> { - System.out.println("Version: " + version); - System.out.println("\tTypes: " + types.size()); - System.out.println("\tVersioned types: " + types.values().stream().filter(t -> (t instanceof VersionedComputedType)).count()); + logger.debug("Version: {}", version); + logger.debug("\tTypes: {}", types.size()); + logger.debug("\tVersioned types: {}", types.values().stream().filter(t -> (t instanceof VersionedComputedType)).count()); var unchanged = types.values().stream().filter(t -> (t instanceof VersionedComputedType versionedComputedType && versionedComputedType.getVersion().getVersion() != version)).count(); var changed = types.values().stream().filter(t -> (t instanceof VersionedComputedType versionedComputedType && versionedComputedType.getVersion().getVersion() == version)).count(); unchangedTot.add(unchanged); changedTot.add(changed); - System.out.println("\t\tUnchanged: " + unchanged + " (" + (unchanged * 100 / Math.max(changed + unchanged, 1)) + "%)"); - System.out.println("\t\tChanged: " + changed + " (" + (changed * 100 / Math.max(changed + unchanged, 1)) + "%)"); + logger.debug("\t\tUnchanged: {} ({}%)", unchanged, (unchanged * 100 / Math.max(changed + unchanged, 1))); + logger.debug("\t\tChanged: {} ({}%)", changed, (changed * 100 / Math.max(changed + unchanged, 1))); }); - System.out.println("Result:"); + logger.debug("Result:"); var unchanged = unchangedTot.sum(); var changed = changedTot.sum(); - System.out.println("\tAvoided type versions: " + unchanged + " (" + (unchanged * 100 / (changed + unchanged)) + "%)"); - System.out.println("\tType versions: " + changed + " (" + (changed * 100 / (changed + unchanged)) + "%)"); + logger.debug("\tAvoided type versions: {} ({}%)", unchanged, (unchanged * 100 / (changed + unchanged))); + logger.debug("\tType versions: {} ({}%)", changed, (changed * 100 / (changed + unchanged))); this.currentVersion = computedVersions.get(versionsCount - 1); this.superTypes = superTypesData; this.customTypes = customTypesData; diff --git a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenUpgraderBaseX.java b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenUpgraderBaseX.java index 266cd4f..2354b4c 100644 --- a/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenUpgraderBaseX.java +++ b/data-generator-plugin/src/main/java/it/cavallium/data/generator/plugin/classgen/GenUpgraderBaseX.java @@ -195,7 +195,6 @@ public class GenUpgraderBaseX extends ClassGenerator { throw new UnsupportedOperationException("Unsupported transformation type: " + transformation); } } - System.out.println(); consumer.accept(new ResultField(fieldName, fieldType, codeBlock)); }).sorted(Comparator.comparingInt(f -> expectedResultFields.indexOf(f.name()))); }