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 c58d402 - Disabled the sonarcloud analysis until I get my hands on
some infra-guys (Were unresponsive for almost a day now)
add 5d17d47 [DF1] Added Initial Setup.
add f93faa0 DLC-207
add f7771cc Merge branch 'develop' of https://github.com/apache/plc4x
into implement-df1-protocol
add 3ac2921 DLC-207
add 17dc04f Merge branch 'develop' of https://github.com/apache/plc4x
into implement-df1-protocol
add f5a514e Merge branch 'develop' of https://github.com/apache/plc4x
into implement-df1-protocol
add c31582d DLC-207
add 2524123 DLC-207 first mspec definition
add 3c570d2 Merge branch 'develop' of https://github.com/apache/plc4x
into implement-df1-protocol
add 39a4274 Merge branch 'develop' of https://github.com/apache/plc4x
into implement-df1-protocol
add cbd00f4 Merge branch 'develop' of
https://gitbox.apache.org/repos/asf/plc4x into implement-df1-protocol
add 17d61a3 - Some major tweaking of how the mspec handles discriminator
types - Added arguments to the serialize methods, the same way they were added
to the parse methods - made the mspec parser allow array index expressions
add a3dc7f3 Merge branch 'implement-df1-protocol' of
https://github.com/vemmert/plc4x into implement-df1-protocol
add 89ee201 Merge branch 'develop' of https://github.com/apache/plc4x
into implement-df1-protocol
add 0e884ea DLC-207 first mspec definition
add 40dbc1b - Tweaked the mspec for the DF1 protocol - Started
implementing a PLC4X driver based on the generated code
add ca49f5f Fixed minor build issues.
add 3326555 Added TestClass EndtoEnt. Added dependency to HelloPlc4X.
add 376101d - Simplified the mspec for the DF1 protocol - Added a
"terminated" type of arrayField - Made the ReadBuffer endianness aware - Made
the testsuite endianness aware
add f7ee259 Matching pattern tests for serial/DF1 added
add ef3edea Plc4XDf1Protocol
add c495592 pom modified for asciidoc
add 1e73e20 Merge branch 'feature/implement-df1-driver' of
github.com:vemmert/plc4x into feature/implement-df1-driver
add 817085a - Updated the current Netty driver prototype to work with the
latest code generation updates.
add c8b5e5d - Added some additional field types: - "checksum" (throws
error during parsing, if the checksum is invalid) - "padding" (allows adding
additional padding bytes if a condition evaluates to true) - Started
implementing field types: - "manual" (Like a simple field, but we have full
control over the parsing and serialization) - "manualArray" (Like a array
field, but we have full control over the parsing and serialization) - Renamed
some of the field types: - "field [...]
new 33f3a3f Merge remote-tracking branch
'github/feature/implement-df1-driver' into develop
new c22e0b2 - Reactivated the sonarcloud analysis
The 2 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:
Jenkinsfile | 4 +-
.../language/java/JavaLanguageTemplateHelper.java | 58 ++++-
.../main/resources/templates/java/io-template.ftlh | 110 ++++++++--
.../resources/templates/java/pojo-template.ftlh | 30 +++
.../plugins/codegenerator/language/mspec/MSpec.g4 | 86 ++++----
.../mspec/model/fields/DefaultArrayField.java | 5 -
...ltConstField.java => DefaultChecksumField.java} | 14 +-
...rrayField.java => DefaultManualArrayField.java} | 27 ++-
...tImplicitField.java => DefaultManualField.java} | 16 +-
...OptionalField.java => DefaultPaddingField.java} | 20 +-
.../mspec/parser/MessageFormatListener.java | 143 ++++++++----
plc4j/examples/hello-world-plc4x/pom.xml | 7 +
.../java/base/connection/SerialChannelFactory.java | 5 +-
plc4j/protocols/driver-bases/tcp/pom.xml | 4 +
plc4j/protocols/pom.xml | 2 +-
.../org/apache/plc4x/java/utils/ReadBuffer.java | 39 +++-
.../org/apache/plc4x/java/utils/WriteBuffer.java | 27 ++-
.../protocol/test/ProtocolTestsuiteRunner.java | 14 +-
.../protocol/test/model/ProtocolTestsuite.java | 8 +-
.../src/main/resources/schemas/testsuite.xsd | 1 +
pom.xml | 2 +-
.../logback-test.xml => protocols/df1/pom.xml | 35 +--
.../org/apache/plc4x/protocol/df1/Df1Protocol.java | 46 ++++
...e.plc4x.plugins.codegenerator.protocol.Protocol | 2 +-
.../df1/src/main/resources/protocols/df1/df1.mspec | 53 +++++
.../resources/protocols/knxnetip/knxnetip.mspec | 206 ++++++++---------
protocols/pom.xml | 1 +
.../org/apache/plc4x/protocol/s7/S7Protocol.java | 2 +-
.../protocols/s7/{protocol.mspec => s7.mspec} | 123 +++++------
sandbox/pom.xml | 1 +
.../test-java-df1-driver/README.adoc | 19 +-
sandbox/test-java-df1-driver/pom.xml | 183 ++++++++++++++++
.../org/apache/plc4x/java/df1/DF1PlcDriver.java | 44 +---
.../java/org/apache/plc4x/java/df1/Df1Field.java | 36 +--
.../java/df1/connection/BaseDf1Connection.java | 18 +-
.../java/df1/connection/SerialDf1Connection.java | 63 +++++-
.../org/apache/plc4x/java/df1/fields/DataType.java | 19 +-
.../plc4x/java/df1/protocol/Df1Protocol.java | 149 +++++++++++++
.../plc4x/java/df1/protocol/Plc4XDf1Protocol.java | 63 ++++++
.../org/apache/plc4x/java/df1/util/DF1Utils.java | 122 +++++++++++
.../plc4x/java/df1/util/Df1FieldHandler.java | 18 +-
.../services/org.apache.plc4x.java.spi.PlcDriver | 2 +-
.../apache/plc4x/java/df1/DF1PlcDriverTest.java | 37 ++--
.../plc4x/protocol/df1/BenchmarkGeneratedDf1.java | 81 +++++++
.../plc4x/protocol/df1/BenchmarkManualDf1.java | 244 +++++++++++++++++++++
.../org/apache/plc4x/protocol/df1/Df1Test.java} | 8 +-
.../apache/plc4x/protocol/df1/EndToEndTest.java | 55 +++++
.../org/apache/plc4x/protocol/df1}/IOTest.java | 36 ++-
.../src/test/resources/testsuite/Df1Testsuite.xml | 81 +++++++
.../main/resources/protocols/df1}/protocol.mspec | 123 +++++------
50 files changed, 1961 insertions(+), 531 deletions(-)
copy
build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/{DefaultConstField.java
=> DefaultChecksumField.java} (76%)
copy
build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/{DefaultArrayField.java
=> DefaultManualArrayField.java} (66%)
copy
build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/{DefaultImplicitField.java
=> DefaultManualField.java} (72%)
copy
build-utils/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/model/fields/{DefaultOptionalField.java
=> DefaultPaddingField.java} (70%)
copy plc4j/utils/scraper/src/test/resources/logback-test.xml =>
protocols/df1/pom.xml (52%)
create mode 100644
protocols/df1/src/main/java/org/apache/plc4x/protocol/df1/Df1Protocol.java
copy
plc4j/integrations/apache-camel/src/test/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
=>
protocols/df1/src/main/resources/META-INF/services/org.apache.plc4x.plugins.codegenerator.protocol.Protocol
(95%)
create mode 100644 protocols/df1/src/main/resources/protocols/df1/df1.mspec
copy protocols/s7/src/main/resources/protocols/s7/{protocol.mspec => s7.mspec}
(58%)
copy src/site/asciidoc/protocols/ethernet-ip/index.adoc =>
sandbox/test-java-df1-driver/README.adoc (59%)
create mode 100644 sandbox/test-java-df1-driver/pom.xml
copy
plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/ModbusPlcDriver.java
=>
sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/DF1PlcDriver.java
(58%)
copy
plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockField.java
=>
sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/Df1Field.java
(57%)
copy
plc4j/api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcUnsupportedProtocolException.java
=>
sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/connection/BaseDf1Connection.java
(62%)
copy
plc4j/drivers/modbus/src/main/java/org/apache/plc4x/java/modbus/connection/BaseModbusPlcConnection.java
=>
sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/connection/SerialDf1Connection.java
(58%)
copy
plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestType.java
=>
sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/fields/DataType.java
(77%)
create mode 100644
sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/protocol/Df1Protocol.java
create mode 100644
sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/protocol/Plc4XDf1Protocol.java
create mode 100644
sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/util/DF1Utils.java
copy
plc4j/drivers/simulated/src/main/java/org/apache/plc4x/java/simulated/connection/TestFieldItem.java
=>
sandbox/test-java-df1-driver/src/main/java/org/apache/plc4x/java/df1/util/Df1FieldHandler.java
(59%)
copy {plc4j/integrations/apache-camel/src/test =>
sandbox/test-java-df1-driver/src/main}/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver
(95%)
copy
plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockField.java
=>
sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/java/df1/DF1PlcDriverTest.java
(56%)
create mode 100644
sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/BenchmarkGeneratedDf1.java
create mode 100644
sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/BenchmarkManualDf1.java
copy
sandbox/{test-java-knxnetip-driver/src/test/java/org/apache/plc4x/java/knxnetip/KNXNetIpTest.java
=>
test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/Df1Test.java}
(82%)
create mode 100644
sandbox/test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1/EndToEndTest.java
copy
sandbox/{test-java-knxnetip-driver/src/test/java/org/apache/plc4x/java/knxnetip
=>
test-java-df1-driver/src/test/java/org/apache/plc4x/protocol/df1}/IOTest.java
(78%)
create mode 100644
sandbox/test-java-df1-driver/src/test/resources/testsuite/Df1Testsuite.xml
rename {protocols/s7/src/main/resources/protocols/s7 =>
sandbox/test-java-s7-driver/src/main/resources/protocols/df1}/protocol.mspec
(58%)
