From 654ff9ae142a28f9b9683cab6e148dedb8ed16ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Fri, 25 Feb 2022 14:01:31 +0100
Subject: [PATCH] Minor code refactorings
---
.../theodolite/benchmarks/uc3/beam/HourOfDayKey.java | 5 -----
.../{HourOfDaykeyCoder.java => HourOfDayKeyCoder.java} | 4 ++--
.../theodolite/benchmarks/uc3/beam/MapTimeFormat.java | 8 ++++----
.../theodolite/benchmarks/uc3/beam/PipelineFactory.java | 6 +++---
4 files changed, 9 insertions(+), 14 deletions(-)
rename theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/{HourOfDaykeyCoder.java => HourOfDayKeyCoder.java} (92%)
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKey.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKey.java
index 9a18ae488..bde85327c 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKey.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKey.java
@@ -1,13 +1,8 @@
package rocks.theodolite.benchmarks.uc3.beam;
-import org.apache.beam.sdk.coders.AvroCoder;
-import org.apache.beam.sdk.coders.DefaultCoder;
-
-
/**
* Composed key of an hour of the day and a sensor id.
*/
-@DefaultCoder(AvroCoder.class)
public class HourOfDayKey {
private final int hourOfDay;
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDaykeyCoder.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKeyCoder.java
similarity index 92%
rename from theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDaykeyCoder.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKeyCoder.java
index dd84010d1..4189761c0 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDaykeyCoder.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/HourOfDayKeyCoder.java
@@ -12,9 +12,9 @@ import org.apache.beam.sdk.coders.CoderException;
import org.apache.kafka.common.serialization.Serde;
/**
- * Wrapper Class that encapsulates a HourOfDayKeySerde in a org.apache.beam.sdk.coders.Coder.
+ * Wrapper Class that encapsulates a {@link HourOfDayKeySerde} in a {@link Coder}.
*/
-public class HourOfDaykeyCoder extends Coder<HourOfDayKey> implements Serializable {
+public class HourOfDayKeyCoder extends Coder<HourOfDayKey> implements Serializable {
public static final long serialVersionUID = 4444444;
private static final boolean DETERMINISTIC = true;
private static final int VALUE_SIZE = 4;
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/MapTimeFormat.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/MapTimeFormat.java
index d129a67b1..3c0d7acdb 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/MapTimeFormat.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/MapTimeFormat.java
@@ -8,7 +8,7 @@ import org.apache.beam.sdk.values.KV;
import titan.ccp.model.records.ActivePowerRecord;
/**
- * Changes the time format to us europe/paris time.
+ * Changes the time format to us Europe/Paris time.
*/
public class MapTimeFormat
extends SimpleFunction<KV<String, ActivePowerRecord>, KV<HourOfDayKey, ActivePowerRecord>> {
@@ -17,11 +17,11 @@ public class MapTimeFormat
private final ZoneId zone = ZoneId.of("Europe/Paris");
@Override
- public KV<HourOfDayKey, ActivePowerRecord> apply(
- final KV<String, ActivePowerRecord> kv) {
+ public KV<HourOfDayKey, ActivePowerRecord> apply(final KV<String, ActivePowerRecord> kv) {
final Instant instant = Instant.ofEpochMilli(kv.getValue().getTimestamp());
final LocalDateTime dateTime = LocalDateTime.ofInstant(instant, this.zone);
- return KV.of(this.keyFactory.createKey(kv.getValue().getIdentifier(), dateTime),
+ return KV.of(
+ this.keyFactory.createKey(kv.getValue().getIdentifier(), dateTime),
kv.getValue());
}
}
diff --git a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/PipelineFactory.java b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/PipelineFactory.java
index 0d1f8fdbb..de960d3d8 100644
--- a/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/PipelineFactory.java
+++ b/theodolite-benchmarks/uc3-beam/src/main/java/rocks/theodolite/benchmarks/uc3/beam/PipelineFactory.java
@@ -78,8 +78,8 @@ public class PipelineFactory extends AbstractPipelineFactory {
.accumulatingFiredPanes())
// Aggregate per window for every key
- .apply(Combine.<HourOfDayKey, ActivePowerRecord, Stats>perKey(new StatsAggregation()))
- .setCoder(KvCoder.of(new HourOfDaykeyCoder(), SerializableCoder.of(Stats.class)))
+ .apply(Combine.perKey(new StatsAggregation()))
+ .setCoder(KvCoder.of(new HourOfDayKeyCoder(), SerializableCoder.of(Stats.class)))
// Map into correct output format
.apply(MapElements.via(hourOfDayWithStats))
@@ -94,7 +94,7 @@ public class PipelineFactory extends AbstractPipelineFactory {
AvroCoder.of(ActivePowerRecord.SCHEMA$));
registry.registerCoderForClass(
HourOfDayKey.class,
- new HourOfDaykeyCoder());
+ new HourOfDayKeyCoder());
registry.registerCoderForClass(
StatsAggregation.class,
SerializableCoder.of(StatsAggregation.class));
--
GitLab