From 3d3ce9f7f8cfec5b3d7172c9268f161519bf0f3b Mon Sep 17 00:00:00 2001
From: Reiner Jung <reiner.jung@email.uni-kiel.de>
Date: Fri, 2 Sep 2022 14:23:14 +0200
Subject: [PATCH] Changed date format output to day-month hour:minute.
---
.../moobench/tools/results/TeetimeConfiguration.java | 1 +
.../moobench/tools/results/{ => data}/OrderedSet.java | 2 +-
.../tools/results/stages/GenerateHtmlTableStage.java | 2 +-
.../tools/results/{ => stages}/JsonChartSink.java | 11 +++++++++--
4 files changed, 12 insertions(+), 4 deletions(-)
rename tools/compile-results/src/main/java/moobench/tools/results/{ => data}/OrderedSet.java (97%)
rename tools/compile-results/src/main/java/moobench/tools/results/{ => stages}/JsonChartSink.java (75%)
diff --git a/tools/compile-results/src/main/java/moobench/tools/results/TeetimeConfiguration.java b/tools/compile-results/src/main/java/moobench/tools/results/TeetimeConfiguration.java
index 5296ea7..363ce32 100644
--- a/tools/compile-results/src/main/java/moobench/tools/results/TeetimeConfiguration.java
+++ b/tools/compile-results/src/main/java/moobench/tools/results/TeetimeConfiguration.java
@@ -28,6 +28,7 @@ import moobench.tools.results.stages.ComputeTableStage;
import moobench.tools.results.stages.ElementProducer;
import moobench.tools.results.stages.FileSink;
import moobench.tools.results.stages.GenerateHtmlTableStage;
+import moobench.tools.results.stages.JsonChartSink;
import moobench.tools.results.stages.LogAppenderStage;
import moobench.tools.results.stages.TailChartStage;
import moobench.tools.results.stages.YamlLogSink;
diff --git a/tools/compile-results/src/main/java/moobench/tools/results/OrderedSet.java b/tools/compile-results/src/main/java/moobench/tools/results/data/OrderedSet.java
similarity index 97%
rename from tools/compile-results/src/main/java/moobench/tools/results/OrderedSet.java
rename to tools/compile-results/src/main/java/moobench/tools/results/data/OrderedSet.java
index 72a5a6c..3ccb19f 100644
--- a/tools/compile-results/src/main/java/moobench/tools/results/OrderedSet.java
+++ b/tools/compile-results/src/main/java/moobench/tools/results/data/OrderedSet.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
***************************************************************************/
-package moobench.tools.results;
+package moobench.tools.results.data;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/tools/compile-results/src/main/java/moobench/tools/results/stages/GenerateHtmlTableStage.java b/tools/compile-results/src/main/java/moobench/tools/results/stages/GenerateHtmlTableStage.java
index 47fa81a..573043d 100644
--- a/tools/compile-results/src/main/java/moobench/tools/results/stages/GenerateHtmlTableStage.java
+++ b/tools/compile-results/src/main/java/moobench/tools/results/stages/GenerateHtmlTableStage.java
@@ -3,8 +3,8 @@ package moobench.tools.results.stages;
import java.nio.file.Path;
import java.util.Set;
-import moobench.tools.results.OrderedSet;
import moobench.tools.results.data.Measurements;
+import moobench.tools.results.data.OrderedSet;
import moobench.tools.results.data.OutputFile;
import moobench.tools.results.data.TableInformation;
import teetime.stage.basic.AbstractTransformation;
diff --git a/tools/compile-results/src/main/java/moobench/tools/results/JsonChartSink.java b/tools/compile-results/src/main/java/moobench/tools/results/stages/JsonChartSink.java
similarity index 75%
rename from tools/compile-results/src/main/java/moobench/tools/results/JsonChartSink.java
rename to tools/compile-results/src/main/java/moobench/tools/results/stages/JsonChartSink.java
index 8cda0f4..6a9fd5e 100644
--- a/tools/compile-results/src/main/java/moobench/tools/results/JsonChartSink.java
+++ b/tools/compile-results/src/main/java/moobench/tools/results/stages/JsonChartSink.java
@@ -1,7 +1,8 @@
-package moobench.tools.results;
+package moobench.tools.results.stages;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.util.Calendar;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -34,7 +35,13 @@ public class JsonChartSink extends AbstractConsumerStage<Chart> {
final Double number = value.getValues().get(i);
objectNode.put(name, number);
}
- objectNode.put("time", value.getTimestamp());
+
+ final Calendar calendar = Calendar.getInstance();
+ calendar.setTimeInMillis(value.getTimestamp() * 1000);
+
+ objectNode.put("time", String.format("%d-%d %d:%d",
+ calendar.get(Calendar.DAY_OF_MONTH), calendar.get(Calendar.MONTH),
+ calendar.get(Calendar.HOUR_OF_DAY), calendar.get(Calendar.MINUTE)));
arrayNode.add(objectNode);
}
--
GitLab