From 45dc6078dce686730e55dcc951d158d274737354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ko=C5=BEusznik?= <jan@kozusznik.cz>
Date: Mon, 18 Jun 2018 23:15:52 +0200
Subject: [PATCH] fix: numberformatexcpetion
---
.../core/ResultFileTask.java | 9 ++++----
.../core/TaskComputation.java | 2 +-
.../java/cz/it4i/fiji/haas/TestFormat.java | 21 +++++++++++++++++++
3 files changed, 27 insertions(+), 5 deletions(-)
create mode 100644 haas-spim-benchmark/src/test/java/cz/it4i/fiji/haas/TestFormat.java
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/ResultFileTask.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/ResultFileTask.java
index 4f0bed33..8c27191f 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/ResultFileTask.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/ResultFileTask.java
@@ -8,14 +8,15 @@ import java.util.Collection;
import java.util.DoubleSummaryStatistics;
import java.util.LinkedList;
import java.util.List;
+import java.util.Locale;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.google.common.collect.Streams;
public class ResultFileTask {
- private String name;
- private List<ResultFileJob> jobs;
+ private final String name;
+ private final List<ResultFileJob> jobs;
private DoubleSummaryStatistics memoryUsageStats;
private DoubleSummaryStatistics startTimeStats;
private DoubleSummaryStatistics wallTimeStats;
@@ -38,8 +39,8 @@ public class ResultFileTask {
// Calculate start and wall time values
DateTimeFormatter formatter = new DateTimeFormatterBuilder()
- .appendOptional(DateTimeFormatter.ofPattern("EEE MMM dd kk:mm:ss z yyyy"))
- .appendOptional(DateTimeFormatter.ofPattern("EEE MMM dd kk:mm:ss yyyy")).toFormatter();
+ .appendOptional(DateTimeFormatter.ofPattern("EEE MMM d kk:mm:ss z yyyy"))
+ .appendOptional(DateTimeFormatter.ofPattern("EEE MMM d kk:mm:ss yyyy")).toFormatter(Locale.ENGLISH);
Collection<Double> startTimeValues = retrieveValues(Constants.STATISTICS_RESOURCES_START_TIME)
.map(s -> s != null && !s.equals("null")
? (double) LocalDateTime.parse(s, formatter).toEpochSecond(ZoneOffset.UTC)
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java
index c1a9b3ec..f781fcad 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/core/TaskComputation.java
@@ -16,7 +16,7 @@ import com.google.common.collect.Streams;
import cz.it4i.fiji.haas_java_client.JobState;
import cz.it4i.fiji.haas_java_client.SynchronizableFileType;
-//FIXME: TaskComputation 'done' should be Finished not Queued
+
public class TaskComputation {
public static class Log {
diff --git a/haas-spim-benchmark/src/test/java/cz/it4i/fiji/haas/TestFormat.java b/haas-spim-benchmark/src/test/java/cz/it4i/fiji/haas/TestFormat.java
new file mode 100644
index 00000000..0d7a7d74
--- /dev/null
+++ b/haas-spim-benchmark/src/test/java/cz/it4i/fiji/haas/TestFormat.java
@@ -0,0 +1,21 @@
+package cz.it4i.fiji.haas;
+
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.util.Locale;
+
+public class TestFormat {
+ public static void main(String[] args) {
+ System.out.println(Locale.getDefault());
+ DateTimeFormatter formatter = new DateTimeFormatterBuilder()
+ .appendOptional(DateTimeFormatter.ofPattern("EEE MMM dd kk:mm:ss z yyyy"))
+ .appendOptional(DateTimeFormatter.ofPattern("EEE MMM dd kk:mm:ss yyyy")).toFormatter();
+
+ String value = "Thu Jun 14 09:08:43 2018";
+ System.out.println(LocalDateTime.parse(value, formatter).toEpochSecond(ZoneOffset.UTC));
+
+ }
+
+}
--
GitLab