From 213192f65350821fd82d210c9ee311520eb0699f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Fri, 25 Nov 2022 19:15:16 +0100
Subject: [PATCH] Fix code style
---
.../hazelcastjet/MapTimeKeyConfiguration.java | 4 ++
.../uc3/hazelcastjet/Uc3PipelineTest.java | 50 ++++++++-----------
2 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/MapTimeKeyConfiguration.java b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/MapTimeKeyConfiguration.java
index 75bf67321..9199dd7c1 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/MapTimeKeyConfiguration.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/main/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/MapTimeKeyConfiguration.java
@@ -10,6 +10,10 @@ public class MapTimeKeyConfiguration {
private final StatsKeyFactory<HourOfDayKey> keyFactory;
private final ZoneId zone;
+ /**
+ * Create a {@link MapTimeKeyConfiguration} for the supplied {@link StatsKeyFactory} and
+ * {@link ZoneId}.
+ */
public MapTimeKeyConfiguration(
final StatsKeyFactory<HourOfDayKey> keyFactory,
final ZoneId zone) {
diff --git a/theodolite-benchmarks/uc3-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3PipelineTest.java b/theodolite-benchmarks/uc3-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3PipelineTest.java
index e4487a3d1..aa74ae146 100644
--- a/theodolite-benchmarks/uc3-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3PipelineTest.java
+++ b/theodolite-benchmarks/uc3-hazelcastjet/src/test/java/rocks/theodolite/benchmarks/uc3/hazelcastjet/Uc3PipelineTest.java
@@ -13,9 +13,6 @@ import com.hazelcast.jet.pipeline.test.Assertions;
import com.hazelcast.jet.pipeline.test.TestSources;
import com.hazelcast.jet.test.SerialTest;
import java.time.Duration;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
@@ -37,6 +34,16 @@ public class Uc3PipelineTest extends JetTestSupport {
private static final Logger LOGGER = LoggerFactory.getLogger(Uc3PipelineTest.class);
+ // Setup Configuration
+ private static final int TEST_ITEMS_PER_SECOND = 1;
+ private static final String TEST_SENSOR_NAME = "TEST-SENSOR";
+ private static final Double TEST_VALUE_IN_W = 10.0;
+ private static final Duration TEST_WINDOW_SLIDE = Duration.ofSeconds(1);
+ private static final Duration TEST_WINDOW_SIZE = Duration.ofSeconds(50);
+ private static final Duration TEST_EMIT_PERIOD = Duration.ofSeconds(0); // Do not emit early results
+ // Used to check hourOfDay
+ private static final long MOCK_TIMESTAMP = 1632741651;
+
// Test Machinery
private JetInstance testInstance = null;
@@ -51,17 +58,6 @@ public class Uc3PipelineTest extends JetTestSupport {
@Before
public void buildUc3Pipeline() {
- // Setup Configuration
- final int testItemsPerSecond = 1;
- final String testSensorName = "TEST-SENSOR";
- final Double testValueInW = 10.0;
- final Duration testHopSize = Duration.ofSeconds(1);
- final Duration testWindowSize = Duration.ofSeconds(50);
- final Duration testEmitPeriod = Duration.ofSeconds(0); // Do not emit early results
- // Used to check hourOfDay
- final long mockTimestamp = 1632741651;
-
-
// Create mock jet instance with configuration
final String testClusterName = randomName();
final JetConfig testJetConfig = new JetConfig();
@@ -70,18 +66,20 @@ public class Uc3PipelineTest extends JetTestSupport {
// Create a test source
final StreamSource<Entry<String, ActivePowerRecord>> testSource =
- TestSources.itemStream(testItemsPerSecond, (timestamp, item) -> {
+ TestSources.itemStream(TEST_ITEMS_PER_SECOND, (timestamp, item) -> {
final ActivePowerRecord testRecord =
- new ActivePowerRecord(testSensorName, mockTimestamp, testValueInW);
+ new ActivePowerRecord(TEST_SENSOR_NAME, MOCK_TIMESTAMP, TEST_VALUE_IN_W);
final Entry<String, ActivePowerRecord> testEntry =
- Map.entry(testSensorName, testRecord);
+ Map.entry(TEST_SENSOR_NAME, testRecord);
return testEntry;
});
// Create pipeline to test
final Properties properties = new Properties();
final Uc3PipelineFactory factory = new Uc3PipelineFactory(
- properties, "", properties, "", testWindowSize, testHopSize, testEmitPeriod);
+ properties, "", properties, "", TEST_WINDOW_SIZE,
+ TEST_WINDOW_SLIDE,
+ TEST_EMIT_PERIOD);
this.uc3Topology = factory.extendUc3Topology(testSource);
@@ -96,10 +94,8 @@ public class Uc3PipelineTest extends JetTestSupport {
// Assertion Configuration
final int timeout = 10;
- final String testSensorName = "TEST-SENSOR";
- final double testValueInW = 10.0;
- // Used to check hourOfDay
- final long mockTimestamp = 1632741651;
+ // final String testSensorName = "TEST-SENSOR";
+ // final double testValueInW = 10.0;
// Assertion
this.uc3Topology.apply(Assertions.assertCollectedEventually(timeout,
@@ -113,15 +109,9 @@ public class Uc3PipelineTest extends JetTestSupport {
if (collection != null) {
LOGGER.info("CHECK 2 || Collection Size: " + collection.size());
for (final Entry<String, String> entry : collection) {
-
- // Build hour of day
- final int expectedHour = LocalDateTime
- .ofInstant(Instant.ofEpochMilli(mockTimestamp), ZoneId.of("Europe/Paris"))
- .getHour();
-
// Compare expected output with generated output
- final String expectedKey = testSensorName;
- final String expectedValue = Double.toString(testValueInW);
+ final String expectedKey = TEST_SENSOR_NAME;
+ final String expectedValue = Double.toString(TEST_VALUE_IN_W);
// DEBUG
LOGGER.info(
--
GitLab