From 6cccc5eeaa9421111aad2c9b1e2482920b743710 Mon Sep 17 00:00:00 2001
From: lorenz <stu203404@mail.uni-kiel.de>
Date: Fri, 19 Nov 2021 12:10:03 +0100
Subject: [PATCH] Enhanced beam-commons for uc3
---
.../main/java/theodolite/commons/beam/ConfigurationKeys.java | 2 ++
.../java/theodolite/commons/beam/kafka}/EventTimePolicy.java | 2 +-
.../application/{Uc3ApplicationBeam.java => Uc3BeamFlink.java} | 1 +
.../src/main/java/application/HourOfDayKey.java | 0
.../src/main/java/application/HourOfDayKeyFactory.java | 0
.../src/main/java/application/HourOfDayKeySerde.java | 0
.../src/main/java/application/HourOfDaykeyCoder.java | 0
.../src/main/java/application/MapTimeFormat.java | 0
.../src/main/java/application/StatsAggregation.java | 0
.../src/main/java/application/StatsKeyFactory.java | 0
10 files changed, 4 insertions(+), 1 deletion(-)
rename theodolite-benchmarks/{uc3-beam-flink/src/main/java/application => beam-commons/src/main/java/theodolite/commons/beam/kafka}/EventTimePolicy.java (96%)
rename theodolite-benchmarks/uc3-beam-flink/src/main/java/application/{Uc3ApplicationBeam.java => Uc3BeamFlink.java} (99%)
rename theodolite-benchmarks/{uc3-beam-flink => uc3-beam}/src/main/java/application/HourOfDayKey.java (100%)
rename theodolite-benchmarks/{uc3-beam-flink => uc3-beam}/src/main/java/application/HourOfDayKeyFactory.java (100%)
rename theodolite-benchmarks/{uc3-beam-flink => uc3-beam}/src/main/java/application/HourOfDayKeySerde.java (100%)
rename theodolite-benchmarks/{uc3-beam-flink => uc3-beam}/src/main/java/application/HourOfDaykeyCoder.java (100%)
rename theodolite-benchmarks/{uc3-beam-flink => uc3-beam}/src/main/java/application/MapTimeFormat.java (100%)
rename theodolite-benchmarks/{uc3-beam-flink => uc3-beam}/src/main/java/application/StatsAggregation.java (100%)
rename theodolite-benchmarks/{uc3-beam-flink => uc3-beam}/src/main/java/application/StatsKeyFactory.java (100%)
diff --git a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/ConfigurationKeys.java b/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/ConfigurationKeys.java
index d1c01e1c2..1f7aca45c 100644
--- a/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/ConfigurationKeys.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/ConfigurationKeys.java
@@ -46,6 +46,8 @@ public final class ConfigurationKeys {
public static final String TRIGGER_INTERVAL = "trigger.interval";
+
+
private ConfigurationKeys() {
}
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/EventTimePolicy.java b/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/EventTimePolicy.java
similarity index 96%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/EventTimePolicy.java
rename to theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/EventTimePolicy.java
index 627c13da9..42b317928 100644
--- a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/EventTimePolicy.java
+++ b/theodolite-benchmarks/beam-commons/src/main/java/theodolite/commons/beam/kafka/EventTimePolicy.java
@@ -1,4 +1,4 @@
-package application;
+package theodolite.commons.beam.kafka;
import java.util.Optional;
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/Uc3ApplicationBeam.java b/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/Uc3BeamFlink.java
similarity index 99%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/Uc3ApplicationBeam.java
rename to theodolite-benchmarks/uc3-beam-flink/src/main/java/application/Uc3BeamFlink.java
index 7a8a09657..62b388935 100644
--- a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/Uc3ApplicationBeam.java
+++ b/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/Uc3BeamFlink.java
@@ -76,6 +76,7 @@ public final class Uc3ApplicationBeam {
System.getenv(AGGREGATION_ADVANCE_DAYS) == null
? "1" : System.getenv(AGGREGATION_ADVANCE_DAYS));
final Duration advance = Duration.standardDays(aggregationAdvance);
+
final int triggerInterval = Integer.parseInt(
System.getenv(TRIGGER_INTERVAL) == null
? "15" : System.getenv(TRIGGER_INTERVAL));
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDayKey.java b/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKey.java
similarity index 100%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDayKey.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKey.java
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDayKeyFactory.java b/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKeyFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDayKeyFactory.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKeyFactory.java
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDayKeySerde.java b/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKeySerde.java
similarity index 100%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDayKeySerde.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDayKeySerde.java
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDaykeyCoder.java b/theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDaykeyCoder.java
similarity index 100%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/HourOfDaykeyCoder.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/application/HourOfDaykeyCoder.java
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/MapTimeFormat.java b/theodolite-benchmarks/uc3-beam/src/main/java/application/MapTimeFormat.java
similarity index 100%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/MapTimeFormat.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/application/MapTimeFormat.java
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/StatsAggregation.java b/theodolite-benchmarks/uc3-beam/src/main/java/application/StatsAggregation.java
similarity index 100%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/StatsAggregation.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/application/StatsAggregation.java
diff --git a/theodolite-benchmarks/uc3-beam-flink/src/main/java/application/StatsKeyFactory.java b/theodolite-benchmarks/uc3-beam/src/main/java/application/StatsKeyFactory.java
similarity index 100%
rename from theodolite-benchmarks/uc3-beam-flink/src/main/java/application/StatsKeyFactory.java
rename to theodolite-benchmarks/uc3-beam/src/main/java/application/StatsKeyFactory.java
--
GitLab