This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 7a219c41589c758be8a6b21c5880cd9acbe37cd3 Author: Christofer Dutz <[email protected]> AuthorDate: Sun Dec 3 14:10:22 2023 +0100 chore: Made it possible to override the default for "resolve-mac-address" and updated the raw-socket transport to use the new transport configs. --- .../config/ProfinetRawSocketTransportConfiguration.java | 15 ++------------- .../rawsocket/DefaultRawSocketTransportConfiguration.java | 5 ++++- .../java/transport/rawsocket/RawSocketTransport.java | 6 +++++- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/config/ProfinetRawSocketTransportConfiguration.java b/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/config/ProfinetRawSocketTransportConfiguration.java index 99f08f1820..ce3b57b2b5 100644 --- a/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/config/ProfinetRawSocketTransportConfiguration.java +++ b/plc4j/drivers/profinet-ng/src/main/java/org/apache/plc4x/java/profinet/config/ProfinetRawSocketTransportConfiguration.java @@ -19,24 +19,13 @@ package org.apache.plc4x.java.profinet.config; -import org.apache.plc4x.java.spi.configuration.annotations.ConfigurationParameter; -import org.apache.plc4x.java.spi.configuration.annotations.defaults.BooleanDefaultValue; import org.apache.plc4x.java.transport.rawsocket.DefaultRawSocketTransportConfiguration; import org.apache.plc4x.java.utils.pcap.netty.handlers.PacketHandler; public class ProfinetRawSocketTransportConfiguration extends DefaultRawSocketTransportConfiguration { - @ConfigurationParameter("resolve-mac-address") - @BooleanDefaultValue(true) - private boolean resolveMacAddress; - - @Override - public boolean isResolveMacAccess() { - return resolveMacAddress; - } - - public void setResolveMacAddress(boolean resolveMacAddress) { - this.resolveMacAddress = resolveMacAddress; + public ProfinetRawSocketTransportConfiguration() { + setResolveMacAddress(true); } @Override diff --git a/plc4j/transports/raw-socket/src/main/java/org/apache/plc4x/java/transport/rawsocket/DefaultRawSocketTransportConfiguration.java b/plc4j/transports/raw-socket/src/main/java/org/apache/plc4x/java/transport/rawsocket/DefaultRawSocketTransportConfiguration.java index 64c376fe8f..5d8c742b44 100644 --- a/plc4j/transports/raw-socket/src/main/java/org/apache/plc4x/java/transport/rawsocket/DefaultRawSocketTransportConfiguration.java +++ b/plc4j/transports/raw-socket/src/main/java/org/apache/plc4x/java/transport/rawsocket/DefaultRawSocketTransportConfiguration.java @@ -26,9 +26,12 @@ import org.apache.plc4x.java.transport.pcap.DefaultPcapTransportConfiguration; public abstract class DefaultRawSocketTransportConfiguration extends DefaultPcapTransportConfiguration implements RawSocketTransportConfiguration { @ConfigurationParameter("resolve-mac-address") - @BooleanDefaultValue(false) private boolean resolveMacAddress; + public DefaultRawSocketTransportConfiguration() { + resolveMacAddress = false; + } + @Override public boolean isResolveMacAccess() { return resolveMacAddress; diff --git a/plc4j/transports/raw-socket/src/main/java/org/apache/plc4x/java/transport/rawsocket/RawSocketTransport.java b/plc4j/transports/raw-socket/src/main/java/org/apache/plc4x/java/transport/rawsocket/RawSocketTransport.java index 241d030ec5..3bf4e32b8b 100644 --- a/plc4j/transports/raw-socket/src/main/java/org/apache/plc4x/java/transport/rawsocket/RawSocketTransport.java +++ b/plc4j/transports/raw-socket/src/main/java/org/apache/plc4x/java/transport/rawsocket/RawSocketTransport.java @@ -97,7 +97,11 @@ public class RawSocketTransport implements Transport, HasConfiguration<RawSocket // Create the fully qualified remote socket address which we should connect to. SocketAddress address = new InetSocketAddress((ip == null) ? hostname : ip, port); - return new RawSocketChannelFactory(address); + RawSocketChannelFactory rawSocketChannelFactory = new RawSocketChannelFactory(address); + if(configuration != null) { + rawSocketChannelFactory.setConfiguration(configuration); + } + return rawSocketChannelFactory; } @Override
