You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2023/10/29 18:00:08 UTC

(plc4x) branch feature/transport-configuration-rework updated: feat(plc4j): Added the general support for configuring transports via connection-string parameters.

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch feature/transport-configuration-rework
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/feature/transport-configuration-rework by this push:
     new 5a03628bc1 feat(plc4j): Added the general support for configuring transports via connection-string parameters.
5a03628bc1 is described below

commit 5a03628bc18e43aa4388d97067fbcd298df792de
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Sun Oct 29 18:59:59 2023 +0100

    feat(plc4j): Added the general support for configuring transports via connection-string parameters.
---
 .../apache/plc4x/java/s7/readwrite/S7HGeneratedDriverBase.java | 10 +++++++++-
 .../apache/plc4x/java/spi/connection/GeneratedDriverBase.java  | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/S7HGeneratedDriverBase.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/S7HGeneratedDriverBase.java
index f771453c64..82411127c8 100644
--- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/S7HGeneratedDriverBase.java
+++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/S7HGeneratedDriverBase.java
@@ -30,6 +30,8 @@ import org.apache.plc4x.java.spi.connection.GeneratedDriverBase;
 import org.apache.plc4x.java.spi.connection.PlcTagHandler;
 import org.apache.plc4x.java.spi.connection.ProtocolStackConfigurer;
 import org.apache.plc4x.java.spi.transport.Transport;
+import org.apache.plc4x.java.spi.transport.TransportConfiguration;
+import org.apache.plc4x.java.spi.transport.TransportConfigurationProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -100,7 +102,13 @@ public class S7HGeneratedDriverBase extends GeneratedDriverBase<TPKTPacket> {
         }
 
         // Inject the configuration into the transport.
-        configure(configuration, transport);
+        if(configuration instanceof TransportConfigurationProvider) {
+            TransportConfigurationProvider transportConfigurationProvider =
+                (TransportConfigurationProvider) configuration;
+            TransportConfiguration transportConfiguration =
+                transportConfigurationProvider.getTransportConfiguration(transportCode);
+            configure(transportConfiguration, transport);
+        }
 
         // Create an instance of the communication channel which the driver should use.
         ChannelFactory channelFactory = transport.createChannelFactory(transportConfig);
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
index 47dcd1461d..954bdef3ce 100644
--- 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
@@ -28,6 +28,8 @@ import org.apache.plc4x.java.spi.configuration.ConfigurationFactory;
 import org.apache.plc4x.java.spi.generation.Message;
 import org.apache.plc4x.java.spi.optimizer.BaseOptimizer;
 import org.apache.plc4x.java.spi.transport.Transport;
+import org.apache.plc4x.java.spi.transport.TransportConfiguration;
+import org.apache.plc4x.java.spi.transport.TransportConfigurationProvider;
 
 import java.util.ServiceLoader;
 import java.util.regex.Matcher;
@@ -151,7 +153,13 @@ public abstract class GeneratedDriverBase<BASE_PACKET extends Message> implement
         }
 
         // Inject the configuration into the transport.
-        configure(configuration, transport);
+        if(configuration instanceof TransportConfigurationProvider) {
+            TransportConfigurationProvider transportConfigurationProvider =
+                (TransportConfigurationProvider) configuration;
+            TransportConfiguration transportConfiguration =
+                transportConfigurationProvider.getTransportConfiguration(transportCode);
+            configure(transportConfiguration, transport);
+        }
 
         // Create an instance of the communication channel which the driver should use.
         ChannelFactory channelFactory = transport.createChannelFactory(transportConfig);