fix: nested defaults should now be unwrapped

apache · Feb 14, 2024 · ccd8bd2 · ccd8bd2
1 parent fd53a59
commit ccd8bd2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/plc4j/drivers/all/src/site/generated/firmata.adoc b/plc4j/drivers/all/src/site/generated/firmata.adoc
@@ -58,7 +58,7 @@ Typical values are:
 - 1
 - 2
 (The theoretical 1.5 stop-bits setting is not supported)
-|`serial.parity` |STRUCT |NO_PARITY| |Number of bits used to calculate data parity.
+|`serial.parity` |STRING |NO_PARITY| |Number of bits used to calculate data parity.
 This is used to detect errors in transmission.
 Allowed values are:
 - NO_PARITY

diff --git a/plc4j/drivers/all/src/site/generated/modbus-ascii.adoc b/plc4j/drivers/all/src/site/generated/modbus-ascii.adoc
@@ -65,7 +65,7 @@ Typical values are:
 - 1
 - 2
 (The theoretical 1.5 stop-bits setting is not supported)
-|`serial.parity` |STRUCT |NO_PARITY| |Number of bits used to calculate data parity.
+|`serial.parity` |STRING |NO_PARITY| |Number of bits used to calculate data parity.
 This is used to detect errors in transmission.
 Allowed values are:
 - NO_PARITY

diff --git a/plc4j/drivers/all/src/site/generated/modbus-rtu.adoc b/plc4j/drivers/all/src/site/generated/modbus-rtu.adoc
@@ -65,7 +65,7 @@ Typical values are:
 - 1
 - 2
 (The theoretical 1.5 stop-bits setting is not supported)
-|`serial.parity` |STRUCT |NO_PARITY| |Number of bits used to calculate data parity.
+|`serial.parity` |STRING |NO_PARITY| |Number of bits used to calculate data parity.
 This is used to detect errors in transmission.
 Allowed values are:
 - NO_PARITY

diff --git a/plc4j/drivers/all/src/site/generated/opcua.adoc b/plc4j/drivers/all/src/site/generated/opcua.adoc
@@ -65,7 +65,10 @@ Possible values are between others `jks`, `pkcs11`, `dks`, `jceks`.
 |`session-timeout` |LONG |120000| |Expiry time for opened secure session, value in milliseconds. Defaults to 2 minutes.
 |`negotiation-timeout` |LONG |60000| |Timeout for all negotiation steps prior acceptance of application level operations - this timeout applies to open secure channel, create session and close calls. Defaults to 60 seconds.
 |`request-timeout` |LONG |30000| |Timeout for read/write/subscribe calls. Value in milliseconds.
-|`encoding` |STRUCT | | |TCP encoding options
+|`encoding.receive-buffer-size` |INT |65535| |Maximum size of received TCP transport message chunk value in bytes.
+|`encoding.send-buffer-size` |INT |65535| |Maximum size of sent transport message chunk.
+|`encoding.max-message-size` |INT |2097152| |Maximum size of complete message.
+|`encoding.max-chunk-count` |INT |64| |Maximum number of chunks for both sent and received messages.
 5+|Transport config options:
 5+| - `tcp`
 |`tcp.keep-alive` |BOOLEAN |false| |Should keep-alive packets be sent?

diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/connection/GeneratedDriverBase.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/connection/GeneratedDriverBase.java
@@ -136,7 +136,7 @@ private List<DefaultOption> optionsForField(Field field) {
                                 option.getType(),
                                 option.getDescription(),
                                 option.isRequired(),
-                                option.getDefaultValue()
+                                option.getDefaultValue().orElse(null)
                             ))
                             .collect(Collectors.toList());
                     }