Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,13 @@ public boolean isEndOfStream(Row nextElement) {
@Override
public Row deserialize(ConsumerRecord<byte[], byte[]> consumerRecord) {
Descriptors.Descriptor descriptor = getProtoParser();
byte[] value = consumerRecord.value();
if (value == null) {
LOGGER.warn("Record value / byteArray is NULL! " + protoClassName);
return createDefaultInvalidRow(DynamicMessage.getDefaultInstance(descriptor));
}
try {
DynamicMessage proto = DynamicMessage.parseFrom(descriptor, consumerRecord.value());
DynamicMessage proto = DynamicMessage.parseFrom(descriptor, value);
return addTimestampFieldToRow(proto);
} catch (DescriptorNotFoundException e) {
throw new DescriptorNotFoundException(e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import com.gotocompany.dagger.common.configuration.Configuration;
import com.gotocompany.dagger.common.core.StencilClientOrchestrator;
import com.gotocompany.dagger.common.exceptions.DescriptorNotFoundException;
import com.gotocompany.dagger.common.exceptions.serde.DaggerDeserializationException;
import com.gotocompany.dagger.common.serde.typehandler.RowFactory;
import com.gotocompany.dagger.consumer.*;
import org.apache.flink.api.common.typeinfo.TypeInformation;
Expand Down Expand Up @@ -246,10 +245,10 @@ public void shouldIgnoreStructWhileDeserialising() {
}

@Test
public void shouldThrowExceptionIfNotAbleToDeserialise() {
public void shouldMarkRecordInvalidIfThePayloadIsNull() {
ProtoDeserializer protoDeserializer = new ProtoDeserializer(TestNestedRepeatedMessage.class.getTypeName(), 6, "rowtime", stencilClientOrchestrator);
assertThrows(DaggerDeserializationException.class,
() -> protoDeserializer.deserialize(new ConsumerRecord<>("test-topic", 0, 0, null, null)));
Row row = protoDeserializer.deserialize(new ConsumerRecord<>("test-topic", 0, 0, null, null));
assertFalse((boolean) row.getField(row.getArity() - 2));
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions dagger-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ dependencies {
exclude group: "io.grpc"
}
dependenciesJar 'org.apache.flink:flink-connector-kafka_2.11:' + flinkVersion
dependenciesJar 'com.google.protobuf:protobuf-java:3.23.2'
dependenciesJar 'com.google.protobuf:protobuf-java-util:3.1.0'
dependenciesJar 'com.google.protobuf:protobuf-java:3.25.3'
dependenciesJar 'com.google.protobuf:protobuf-java-util:3.25.3'
dependenciesJar 'org.influxdb:influxdb-java:2.8'
dependenciesJar 'org.elasticsearch.client:elasticsearch-rest-client:6.6.1'
dependenciesJar 'com.google.cloud.bigtable:bigtable-hbase-2.x:2.10.0'
Expand Down