Merge pull request #390 from gradle/erichaagdev/format-serialization-factor-in-java

Serialization factor is formatted in Java

Author: erichaagdev

components/fetch-build-scan-data-cmdline-tool/src/main/java/com/gradle/enterprise/cli/BuildScanDataFields.java

@@ -4,6 +4,7 @@
 import com.gradle.enterprise.model.TaskExecutionSummary;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.function.Function;
@@ -34,7 +35,7 @@ public enum BuildScanDataFields {
     EXECUTED_NOT_CACHEABLE("Executed not cacheable", d -> totalTasks(d, "executed_not_cacheable")),
     EXECUTED_NOT_CACHEABLE_DURATION("Executed not cacheable duration", d -> totalDuration(d, "executed_not_cacheable")),
     BUILD_TIME("Build time", d -> formatDuration(d.getBuildTime())),
-    SERIALIZATION_FACTOR("Serialization factor", d -> toStringSafely(d.getSerializationFactor())),
+    SERIALIZATION_FACTOR("Serialization factor", d -> formatSerializationFactor(d.getSerializationFactor())),
     ;
 
     private static final String NO_VALUE = "";
@@ -55,10 +56,6 @@ private static String toStringSafely(Object object) {
         return object == null ? NO_VALUE : object.toString();
     }
 
-    private static String toStringSafely(BigDecimal value) {
-        return value == null ? NO_VALUE : value.toPlainString();
-    }
-
     private static String totalTasks(BuildScanData data, String avoidanceOutcome) {
         return summaryTotal(data, avoidanceOutcome, t -> String.valueOf(t.totalTasks()));
     }
@@ -81,4 +78,8 @@ private static String summaryTotal(BuildScanData data, String avoidanceOutcome,
     private static String formatDuration(Duration duration) {
         return duration == null ? NO_VALUE : format(duration);
     }
+
+    private static String formatSerializationFactor(BigDecimal serializationFactor) {
+        return serializationFactor == null ? NO_VALUE : serializationFactor.setScale(2, RoundingMode.HALF_UP).doubleValue() + "x";
+    }
 }

components/scripts/lib/summary.sh

@@ -278,9 +278,7 @@ print_executed_non_cacheable_tasks() {
 print_serialization_factor() {
   local value
   if [[ -n "${serialization_factors[0]}" && -n "${serialization_factors[1]}" ]]; then
-    printf -v value "%sx first build, %sx second build" \
-      "$(to_two_decimal_places "${serialization_factors[0]}")" \
-      "$(to_two_decimal_places "${serialization_factors[1]}")"
+    printf -v value "%s first build, %s second build" "${serialization_factors[0]}" "${serialization_factors[1]}"
   fi
   summary_row "Serialization factor:" "${value}"
 }
@@ -374,9 +372,3 @@ create_receipt_file() {
   echo "Generated by $(print_version)"
   } > "${RECEIPT_FILE}"
 }
-
-# Rounds the argument to two decimal places
-# See: https://unix.stackexchange.com/a/167059
-to_two_decimal_places() {
-  LC_ALL=C printf "%.2f" "$1"
-}