From ef0ec8f794d7f03ebef72a00a1e9e17a653b894b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Mon, 31 Jan 2022 15:15:31 +0100
Subject: [PATCH] Improve comments and logging
---
.../serialization/AggregatedActivePowerRecordCoder.java | 5 ++---
.../AggregatedActivePowerRecordDeserializer.java | 9 ++++-----
.../AggregatedActivePowerRecordSerializer.java | 6 +++---
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordCoder.java b/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordCoder.java
index d2b484f5a..28f3d70b4 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordCoder.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordCoder.java
@@ -11,8 +11,7 @@ import org.apache.beam.sdk.coders.CoderException;
import titan.ccp.model.records.AggregatedActivePowerRecord;
/**
- * Wrapper Class that encapsulates a AggregatedActivePowerRecord Serde in a
- * org.apache.beam.sdk.coders.Coder.
+ * {@link Coder} for an {@link AggregatedActivePowerRecord}.
*/
@SuppressWarnings("serial")
public class AggregatedActivePowerRecordCoder extends Coder<AggregatedActivePowerRecord>
@@ -51,7 +50,7 @@ public class AggregatedActivePowerRecordCoder extends Coder<AggregatedActivePowe
@Override
public void verifyDeterministic() throws NonDeterministicException {
if (!DETERMINISTIC) {
- throw new NonDeterministicException(this, "This class should be deterministic!");
+ throw new NonDeterministicException(this, "This class should be deterministic.");
}
}
}
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordDeserializer.java b/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordDeserializer.java
index 6e2f2765f..876260f96 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordDeserializer.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordDeserializer.java
@@ -9,7 +9,7 @@ import org.slf4j.LoggerFactory;
import titan.ccp.model.records.AggregatedActivePowerRecord;
/**
- * Wrapper Class that encapsulates a IMonitoringRecordSerde.serializer in a Deserializer
+ * {@link Deserializer} for an {@link AggregatedActivePowerRecord}.
*/
public class AggregatedActivePowerRecordDeserializer
implements Deserializer<AggregatedActivePowerRecord> {
@@ -22,13 +22,12 @@ public class AggregatedActivePowerRecordDeserializer
@Override
public AggregatedActivePowerRecord deserialize(final String topic, final byte[] data) {
- AggregatedActivePowerRecord value = null;
try {
- value = this.avroEnCoder.decode(new ByteArrayInputStream(data));
+ return this.avroEnCoder.decode(new ByteArrayInputStream(data));
} catch (final IOException e) {
- LOGGER.error("Could not deserialize AggregatedActivePowerRecord", e);
+ LOGGER.error("Could not deserialize AggregatedActivePowerRecord.", e);
+ return null;
}
- return value;
}
}
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordSerializer.java b/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordSerializer.java
index 77b79d546..1c80f2817 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordSerializer.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordSerializer.java
@@ -9,7 +9,7 @@ import org.slf4j.LoggerFactory;
import titan.ccp.model.records.AggregatedActivePowerRecord;
/**
- * Wrapper Class that encapsulates a IMonitoringRecordSerde.serializer in a Serializer
+ * {@link Serializer} for an {@link AggregatedActivePowerRecord}.
*/
public class AggregatedActivePowerRecordSerializer
implements Serializer<AggregatedActivePowerRecord> {
@@ -26,14 +26,14 @@ public class AggregatedActivePowerRecordSerializer
try {
this.avroEnCoder.encode(data, out);
} catch (final IOException e) {
- LOGGER.error("Could not serialize AggregatedActivePowerRecord", e);
+ LOGGER.error("Could not serialize AggregatedActivePowerRecord.", e);
}
final byte[] result = out.toByteArray();
try {
out.close();
} catch (final IOException e) {
LOGGER.error(
- "Could not close output stream after serialization of AggregatedActivePowerRecord", e);
+ "Could not close output stream after serialization of AggregatedActivePowerRecord.", e);
}
return result;
}
--
GitLab