Feature/transport configuration rework #1179
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…lly support overwriting (WIP)
…plc4x-maven-plugin config.
…figurationFactory
… connection-string parameters.
…taching them from the protocol configuration.
sruehl
approved these changes
Oct 30, 2023
...ivers/ab-eth/src/main/java/org/apache/plc4x/java/abeth/configuration/AbEthConfiguration.java
Show resolved
Hide resolved
plc4j/drivers/ads/src/main/java/org/apache/plc4x/java/ads/configuration/AdsConfiguration.java
Show resolved
Hide resolved
...us/src/main/java/org/apache/plc4x/java/cbus/configuration/CBusTcpTransportConfiguration.java
Outdated
Show resolved
Hide resolved
| @@ -111,7 +112,7 @@ public Plc4xProtocolBase<BASE_PACKET_CLASS> configurePipeline(Configuration conf | |||
| if (driverContextClass != null) { | |||
| protocol.setDriverContext(configure(configuration, createInstance(driverContextClass))); | |||
| } | |||
| Plc4xNettyWrapper<BASE_PACKET_CLASS> context = new Plc4xNettyWrapper<>(configuration.getTimeoutManager(), pipeline, passive, protocol, | |||
| Plc4xNettyWrapper<BASE_PACKET_CLASS> context = new Plc4xNettyWrapper<>(new NettyHashTimerTimeoutManager(), pipeline, passive, protocol, | |||
There was a problem hiding this comment.
same as above: why is this change?
There was a problem hiding this comment.
This was simply me cleaning up something that I thought didn't belong into the configuration.
| @@ -28,4 +28,8 @@ public interface Transport { | |||
|
|
|||
| ChannelFactory createChannelFactory(String transportConfig); | |||
|
|
|||
| default Class<? extends TransportConfiguration> getTransportConfigType() { | |||
| return null; | |||
There was a problem hiding this comment.
we could also consider the use of optional, depending on how it is use (not a issue with null)
|
|
||
| public interface TransportConfigurationTypeProvider { | ||
|
|
||
| Class<? extends TransportConfiguration> getTransportConfigurationType(String transportCode); |
plc4j/spi/src/test/java/org/apache/plc4x/java/spi/configuration/ConfigurationFactoryTest.java
Show resolved
Hide resolved
...ap-shared/src/main/java/org/apache/plc4x/java/transport/pcap/PcapTransportConfiguration.java
Show resolved
Hide resolved
|
LGTM |
…configuration-rework # Conflicts: # plc4j/drivers/modbus/pom.xml
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reworked the configuration of transports so a transports configuration options are referenced by a prefix, that matches the transport code.
So for example in S7 I can customize the timeout like this: