This is an automated email from the ASF dual-hosted git repository.
tmitsch pushed a change to branch feature/improve-scraper-tim
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
discard 2b50c6e Merge remote-tracking branch 'origin/develop' into
scraper_refactoring_and_improvement
omit 3b3c754 adjusted logging to lower level
omit bf2c96b Merge pull request #64 from
apache/feature/jmx-for-scraper-integration
omit 8d836e2 changes due to api change of scraper
omit 777a595 Merge branch 'scraper_refactoring_and_improvement' into
feature/jmx-for-scraper-integration
omit 6ba3f5c PLC4X-109 implemented comparison to previous value for
numeric values, extracted trigger into a separate class, updated java-docs,
divers improvements
omit 98d8386 Implemented a Test for the Trigger Scraper.
omit 0ff0ba2 Implemeted JMX for the triggered scraper.
add 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 [...]
add 33f3a3f Merge remote-tracking branch
'github/feature/implement-df1-driver' into develop
add c22e0b2 - Reactivated the sonarcloud analysis
add 4e913f8 - Tried to get the syntax right
add 19c0977 - Renamed the ArrayField and ManualArrayFields "lengthType"
and "lengthExpression" to "loopType" and "loopExpression" because the
ManualArrayField needed a "lengthExpression" - Implemented the code-generation
for "manual" and "manualArray" types
add b0397cb - Changed the driver to initialize the buffer with the
correct size.
add 356e194 Merge branches 'develop' and 'feature/implement-df1-driver'
of https://gitbox.apache.org/repos/asf/plc4x into develop
add b9b53bb - Continued working on the Jenkinsfile
add 4558c99 - Re-enabled the ADS driver and temporarily commented out the
broken code parts.
add 85fc878 - Continued working on the Jenkinsfile
add f8cd9ff - Commented out the test to get the build running again
add 8153bf8 - Commented out the test to get the build running again
add 753cb45 - Removed the entire test, as ignoring didn't seem to hlep
add 1d82eb6 - Continued working on the Jenkinsfile
add 7a58b81 - Continued working on the Jenkinsfile
add fe7b11d - Continued working on the Jenkinsfile
add 9faaa28 - Continued working on the Jenkinsfile
add 4602f9e - Re-enabled the full build after enabling the sonarcloud
analysis
add 02b0ddc Added .vscode to .gitignore
add d647679 Removed settings file from .vscode (should not be in the repo)
new 7b94a60 Implemeted JMX for the triggered scraper.
new 6c60ac3 Implemented a Test for the Trigger Scraper.
new 5e66833 PLC4X-109 implemented comparison to previous value for
numeric values, extracted trigger into a separate class, updated java-docs,
divers improvements
new 2db314a changes due to api change of scraper
new f4ace2c adjusted logging to lower level
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (2b50c6e)
\
N -- N -- N refs/heads/feature/improve-scraper-tim (f4ace2c)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 5 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:
.gitignore | 1 +
.vscode/settings.json | 8 -
Jenkinsfile | 5 +-
.../language/java/JavaLanguageTemplateHelper.java | 72 +++++-
.../main/resources/templates/java/io-template.ftlh | 214 ++++++++++++++----
.../resources/templates/java/pojo-template.ftlh | 30 ++-
.../plugins/codegenerator/language/mspec/MSpec.g4 | 86 ++++----
.../mspec/model/fields/DefaultArrayField.java | 23 +-
...ltConstField.java => DefaultChecksumField.java} | 14 +-
...rrayField.java => DefaultManualArrayField.java} | 37 +++-
...tImplicitField.java => DefaultManualField.java} | 16 +-
...OptionalField.java => DefaultPaddingField.java} | 20 +-
.../mspec/parser/MessageFormatListener.java | 150 +++++++++----
plc4j/examples/hello-world-plc4x/pom.xml | 7 +
.../ads/protocol/util/LittleEndianDecoder.java | 16 +-
.../protocol/util/LittleEndianDecoderSpec.groovy | 2 +-
.../protocol/util/EncoderDecoderRoundTripTest.java | 100 ---------
.../java/base/connection/SerialChannelFactory.java | 5 +-
plc4j/protocols/driver-bases/tcp/pom.xml | 4 +
.../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 +-
.../resources/logback.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 +-
.../pom.xml | 129 ++++++++---
.../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 | 148 +++++++++++++
.../plc4x/java/df1/protocol/Plc4XDf1Protocol.java | 63 ++++++
.../org/apache/plc4x/java/df1/util/DF1Utils.java | 161 ++++++++++++++
.../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 | 101 +++++++++
.../main/resources/protocols/df1}/protocol.mspec | 123 +++++------
54 files changed, 2058 insertions(+), 717 deletions(-)
delete mode 100644 .vscode/settings.json
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} (59%)
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%)
delete mode 100644
plc4j/protocols/ads/src/test/java/org/apache/plc4x/java/ads/protocol/util/EncoderDecoderRoundTripTest.java
copy plc4j/utils/scraper/src/test/resources/logback.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%)
copy sandbox/{test-java-knxnetip-driver => test-java-df1-driver}/pom.xml (50%)
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%)
