Skip to content

Commit 7232afa

Browse files
author
Nicolai Parlog
committed
Print observation with finish locale
This allows the jlink branch to demonstrate that not all locales are available in java.base.
1 parent a976b18 commit 7232afa

File tree

4 files changed

+22
-14
lines changed

4 files changed

+22
-14
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,39 @@
11
package monitor.persistence;
22

33
import monitor.statistics.Statistics;
4+
import monitor.statistics.Statistics.LivenessQuota;
45

6+
import java.text.NumberFormat;
57
import java.util.Comparator;
8+
import java.util.Locale;
69
import java.util.Map.Entry;
710
import java.util.Optional;
811

912
public class StatisticsRepository {
1013

14+
private final NumberFormat format = NumberFormat.getInstance(new Locale("fi", "FI"));
15+
1116
public Optional<Statistics> load() {
1217
return Optional.empty();
1318
}
1419

1520
public void store(Statistics statistics) {
16-
System.out.printf("Total liveness: %s (from %d data points)%n",
17-
statistics.totalLivenessQuota().livenessQuota(),
18-
statistics.totalLivenessQuota().dataPointCount());
21+
System.out.println("Total liveness: " + formatLiveness(statistics.totalLivenessQuota()));
1922
statistics.livenessQuotaByService()
2023
.sorted(Comparator.comparing(Entry::getKey))
21-
.forEach(serviceLiveness ->
22-
System.out.printf(" * %s liveness: %s (from %d data points)%n",
23-
serviceLiveness.getKey(),
24-
serviceLiveness.getValue().livenessQuota(),
25-
serviceLiveness.getValue().dataPointCount()));
24+
.map(serviceLiveness -> formatServiceLiveness(serviceLiveness.getKey(), serviceLiveness.getValue()))
25+
.forEach(System.out::println);
2626
System.out.println();
2727
}
2828

29+
private String formatLiveness(LivenessQuota quota) {
30+
return String.format("%s (from %s data points)",
31+
format.format(quota.livenessQuota()),
32+
format.format(quota.dataPointCount()));
33+
}
34+
35+
private String formatServiceLiveness(String serviceName, LivenessQuota quota) {
36+
return String.format(" * %s liveness: %s", serviceName, formatLiveness(quota));
37+
}
38+
2939
}

monitor.statistics/src/main/java/monitor/statistics/Statistician.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
import monitor.observer.DiagnosticDataPoint;
44

5-
import java.util.stream.Stream;
6-
75
public class Statistician {
86

97
public Statistics emptyStatistics() {
10-
return Statistics.create();
8+
return Statistics.empty();
119
}
1210

1311
public Statistics compute(Statistics currentStats, Iterable<DiagnosticDataPoint> dataPoints) {

monitor.statistics/src/main/java/monitor/statistics/Statistics.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class Statistics {
2121
this.livenessQuotaByService = requireNonNull(livenessQuotaByService);
2222
}
2323

24-
static Statistics create() {
24+
static Statistics empty() {
2525
return new Statistics(LivenessQuota.zero(), new HashMap<>());
2626
}
2727

monitor/src/main/java/monitor/Monitor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ public Monitor(
3131
}
3232

3333
public void updateStatistics() {
34-
List<DiagnosticDataPoint> newDataPoints = serviceObservers.stream()
34+
List<DiagnosticDataPoint> newData = serviceObservers.stream()
3535
.map(ServiceObserver::gatherDataFromService)
3636
.collect(toList());
37-
Statistics newStatistics = statistician.compute(currentStatistics, newDataPoints);
37+
Statistics newStatistics = statistician.compute(currentStatistics, newData);
3838
currentStatistics = newStatistics;
3939
repository.store(newStatistics);
4040
}

0 commit comments

Comments
 (0)