This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from 2da3281 - Adjusted the connector to latest feedback from Confluent
new 05157ad - Added a new Udp driver base
new d9e805c - Added filtering capabilities by ip, port and protocol id to
the pcap channel
new 54e8980 - Fixed a bug in handling of ternary terms
new 9c203b8 - Fixed some bugs in the code generation helper for non uint
types (Were mostly all missing a "(")
new 7525f2c - Changed the templates for the IO classes to no longer
implement the MessageIO or MessageInput interfaces - The parse and serialize
methods now take all arguments as real arguments and no longer as var args
object array - No instances of IO modules are needed as now the parse and
serialize methods are static (Needed to avoid stack overflows if types embed
themselves) - Number of minor improvements
new b10bb73 - Made the discriminator values in typeSwitch elements
optional (resulting in a "default" case)
new dc22f3a - Changed the templates for the IO classes to no longer
implement the MessageIO or MessageInput interfaces - The parse and serialize
methods now take all arguments as real arguments and no longer as var args
object array - No instances of IO modules are needed as now the parse and
serialize methods are static (Needed to avoid stack overflows if types embed
themselves) - Number of minor improvements
new 2eb67c0 - Improved and fine-tuned the
GeneratedDriverByteToMessageCodec to allow checking if enough data is available
and to remove the rest of faulty packages after failing to decode. - Added a
protocolHandler property to the RawSocketChannelFactory - Added filter
capabilities to the PcapSocket stuff - Added a speed-factor to slow down or
speed up the pcap replay
new 5c8bc05 - Adjusted the existing dirvers to latest changes
new 333c0f9 - Updated the version of commons-configuration to 2.6 -
Updated the version of commons-text to 1.8 - Updated the version of jna to 5.3.1
new 86d833b - Continued working on the BACnet driver
The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../language/java/JavaLanguageTemplateHelper.java | 36 +-
.../main/resources/templates/java/io-template.ftlh | 60 ++--
.../plugins/codegenerator/language/mspec/MSpec.g4 | 4 +-
.../mspec/expression/ExpressionStringListener.java | 2 +-
.../mspec/parser/MessageFormatListener.java | 13 +-
plc4j/protocols/driver-bases/base/pom.xml | 4 +
.../base/GeneratedDriverByteToMessageCodec.java | 19 +-
.../java/base/connection/PcapChannelFactory.java | 11 +-
plc4j/protocols/driver-bases/pom.xml | 1 +
.../base/connection/RawSocketChannelFactory.java | 11 +-
plc4j/protocols/driver-bases/{tcp => udp}/pom.xml | 6 +-
.../base/connection/UdpSocketChannelFactory.java} | 15 +-
.../org/apache/plc4x/java/utils/MessageInput.java | 2 +-
.../org/apache/plc4x/java/utils/MessageOutput.java | 2 +-
.../utils/pcapsockets/netty/PcapSocketAddress.java | 27 +-
.../utils/pcapsockets/netty/PcapSocketChannel.java | 29 +-
.../pcapsockets/netty/PcapSocketChannelConfig.java | 20 +-
.../protocol/test/ProtocolTestsuiteRunner.java | 33 +-
.../utils/rawsockets/netty/RawSocketAddress.java | 1 -
.../rawsockets}/netty/UdpIpPacketHandler.java | 4 +-
pom.xml | 6 +-
.../resources/protocols/bacnetip/bacnetip.mspec | 397 ++++++++++++++++++---
.../plc4x/java/abeth/protocol/AbEthProtocol.java | 27 +-
sandbox/test-java-bacnetip-driver/pom.xml | 13 +-
.../java/bacnetip/PassiveBacNetIpDriver.java} | 35 +-
.../bacnetip/connection/BacNetIpFieldHandler.java} | 10 +-
.../connection/PassiveBacNetIpPlcConnection.java} | 53 +--
.../plc4x/java/bacnetip/model/BacNetIpField.java} | 29 +-
.../java/bacnetip/protocol/BacNetIpProtocol.java | 62 ++++
.../java/bacnetip/protocol/HelloWorldProtocol.java | 61 ++++
.../services/org.apache.plc4x.java.spi.PlcDriver | 2 +-
.../plc4x/java/bacnetip/ManualBacNetDecoder.java | 22 +-
.../java/bacnetip/PassiveBacNetIpDriverManual.java | 39 ++
.../plc4x/java/df1/protocol/Df1Protocol.java | 2 +-
.../plc4x/javapassive/s7/PassiveS7PlcDriver.java | 5 +-
.../s7/connection/PassiveS7PlcConnection.java | 3 +-
36 files changed, 835 insertions(+), 231 deletions(-)
copy plc4j/protocols/driver-bases/{tcp => udp}/pom.xml (92%)
copy
plc4j/protocols/driver-bases/{tcp/src/main/java/org/apache/plc4x/java/base/connection/TcpSocketChannelFactory.java
=>
udp/src/main/java/org/apache/plc4x/java/base/connection/UdpSocketChannelFactory.java}
(89%)
copy
plc4j/utils/{pcap-sockets/src/main/java/org/apache/plc4x/java/utils/pcapsockets
=>
raw-sockets/src/main/java/org/apache/plc4x/java/utils/rawsockets}/netty/UdpIpPacketHandler.java
(92%)
copy
sandbox/{test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/AbEthDriver.java
=>
test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriver.java}
(60%)
copy
sandbox/{test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthFieldHandler.java
=>
test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/connection/BacNetIpFieldHandler.java}
(80%)
copy
sandbox/{test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthPlcConnection.java
=>
test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/connection/PassiveBacNetIpPlcConnection.java}
(67%)
copy
sandbox/{test-java-ab-eth-driver/src/main/java/org/apache/plc4x/java/abeth/connection/AbEthFieldHandler.java
=>
test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/model/BacNetIpField.java}
(52%)
create mode 100644
sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/protocol/BacNetIpProtocol.java
create mode 100644
sandbox/test-java-bacnetip-driver/src/main/java/org/apache/plc4x/java/bacnetip/protocol/HelloWorldProtocol.java
copy {plc4j/api/src/test =>
sandbox/test-java-bacnetip-driver/src/main}/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
(93%)
copy
plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/model/DummyField.java
=>
sandbox/test-java-bacnetip-driver/src/test/java/org/apache/plc4x/java/bacnetip/ManualBacNetDecoder.java
(55%)
create mode 100644
sandbox/test-java-bacnetip-driver/src/test/java/org/apache/plc4x/java/bacnetip/PassiveBacNetIpDriverManual.java
