fix(plc4j/codegen): make writers for complex and enum null safe

apache · May 13, 2022 · 6b6a8fd · 6b6a8fd
1 parent fd1d2db
commit 6b6a8fd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/io/DataWriterComplexDefault.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/io/DataWriterComplexDefault.java
@@ -20,9 +20,14 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.plc4x.java.spi.generation.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DataWriterComplexDefault<T extends Message> implements DataWriterComplex<T> {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(DataWriterComplexDefault.class);
+
+
     protected final WriteBuffer writeBuffer;
 
     public DataWriterComplexDefault(WriteBuffer writeBuffer) {
@@ -55,7 +60,11 @@ public void write(String logicalName, T value, WithWriterArgs... writerArgs) thr
         if (hasLogicalName) {
             writeBuffer.pushContext(logicalName);
         }
-        value.serialize(writeBuffer);
+        if (value != null) {
+            value.serialize(writeBuffer);
+        } else {
+            LOGGER.warn("Trying to serialize null value for {}", logicalName);
+        }
         if (hasLogicalName) {
             writeBuffer.popContext(logicalName);
         }

diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/io/DataWriterEnumDefault.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/codegen/io/DataWriterEnumDefault.java
@@ -23,11 +23,15 @@
 import org.apache.plc4x.java.spi.generation.SerializationException;
 import org.apache.plc4x.java.spi.generation.WithReaderWriterArgs;
 import org.apache.plc4x.java.spi.generation.WithWriterArgs;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.function.Function;
 
 public class DataWriterEnumDefault<T, I> implements DataWriterEnum<T> {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(DataWriterEnumDefault.class);
+
     private final Function<T, I> enumSerializer;
     private final Function<T, String> enumNamer;
     private final DataWriter<I> dataWriter;
@@ -54,6 +58,10 @@ public void write(String logicalName, T value, WithWriterArgs... writerArgs) thr
     }
 
     public void write(String logicalName, T value, Function<T, I> enumSerializer, Function<T, String> enumNamer, DataWriter<I> rawWriter, WithWriterArgs... writerArgs) throws SerializationException {
+        if (value == null) {
+            LOGGER.warn("Trying to serialize null value for {}", logicalName);
+            return;
+        }
         final I rawValue = enumSerializer.apply(value);
         rawWriter.write(logicalName, rawValue, ArrayUtils.addAll(writerArgs, WithReaderWriterArgs.WithAdditionalStringRepresentation(enumNamer.apply(value))));
     }