You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2023/06/05 19:46:26 UTC
[plc4x] branch chore/profinet-phase-3 updated (64ef2075c9 -> e674fcc27b)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch chore/profinet-phase-3
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from 64ef2075c9 chore(plc4j/profinet): Created a new version of the Profinet driver that uses a much simpler approach.
add 4389991a8b chore(plc4go): code sync
add 09147a8d95 refactor(plc4go/spi): move transaction manager to own package
add c4bf3ebd62 refactor(plc4go/spi): move WorkerPool to own package
add b330c7ce33 feat(plc4go/spi): Introduce new WithCustomLogger option
add 0025f9fd73 fix(plc4go/cbus): remove some remaining global logs
add 474d17901b test(plc4go/cbus): cleanup resources
add f9ffb0b0ef build(deps): bump jackson.version from 2.15.1 to 2.15.2 (#966)
add 31a55c9772 build(deps): bump github.com/stretchr/testify in /plc4go (#969)
add a4f5155aed build(deps): bump influxdb-client-java from 6.8.0 to 6.9.0 (#967)
add 7c14c99a10 feat(plc4go/spi): use more local loggers
add 103f21a7cb build(deps): bump github.com/spf13/viper in /plc4go (#968)
add 2341bd6548 test(plc4go/spi): code sync
add 577d61e312 test(plc4go/spi): code sync
add 3193782fb9 feat(plc4go): add new WithCustomLogger option
add aa260692f3 test(plc4go): avoid global logging in connection cache
add 1cd64fd235 test(plc4go): remove global logging from api
add 95571e9494 refactor(plc4go): switch from global loggers to local loggers
add 04d235d1a8 refactor(plc4go): switch from global loggers to local loggers
add f8ddf688c3 chore(plc4go): code sync
add e33b114a19 build(deps): bump equalsverifier from 3.14.1 to 3.14.2 (#970)
add da9275ecb4 build(deps): bump asciidoctorj from 2.5.8 to 2.5.9 (#974)
add c577543d4b build(deps): bump extra-enforcer-rules from 1.6.2 to 1.7.0 (#975)
add 93f6c6cc96 build(deps): bump golang.org/x/tools from 0.9.1 to 0.9.3 in /plc4go (#976)
add d952bc0c15 build(deps): bump checker-qual from 3.34.0 to 3.35.0 (#977)
add 80a0d8ef1b test(plc4go/cbus): fix concurrency issue in test.
add 39e450524c test(plc4go/driver): move to configured logger
add 0a16fb34a1 chore(build): upload go test results to action
add c369e4842b chore(build): fix golang test report path
add 50f8709386 chore(build): remove test reporter again...
add d9c1a5f3da chore(build): try glob pattern with path detection
add 973bd8affb chore(build): add surefire/failsafe reports to actions
add fd85e77676 test(plc4go): fix Jenkins not being able to parse log outputs.
add b031b118de chore(plc4go): add small note on Jenkins fix [skip ci]
add 59e34eebfc test(plc4go): detect more CI runtimes
add d9584bcde7 fix(plc4go/spi): properly shutdown worker spawner and killer on shutdown
add e9c9050eaa chore(build): fix surefire/failsafe paths
add dc05255f56 chore(build): unify surefire/failsafe into one glob
add b869ebaad4 chore(build): include matrix in test report name
add 42d750e2c4 chore(build): java tests can only be reported on windows
add 30ae32d658 test(plc4go/cbus): properly shutdown discovery at test end
add 1abf354916 test(plc4go/cbus): fix Jenkins not being able to parse log outputs.
add 2ff14f33c0 fix(plc4go): pass loggers where missing
add 25480b1d22 fix(plc4go): transaction should now be properly handled
add b9c89ebea3 fix(plc4go/spi): harden request transaction manager implementation
add 704fe93b97 chore(build): store the first failure report
add e873ba0e7f chore(build): first failure reporter should not fail
add 60f560662d test(plc4go/cbus): small optimization regarding required errors
add 7d745dae3c fix(plc4go/spi): make shutdown of WorkerPool more reliable
add dd568f9ef4 fix(plc4go): fixed some quality issues
add 6c17d1f839 chore(plc4go): update mocks [skip ci]
add efbb79c58b feat(plc4j) Better handling of timeouts in plc4j (#821).
add 7cdfcd4fda build(deps): bump byte-buddy from 1.14.4 to 1.14.5 (#978)
add 853c4eff78 build(deps): bump asciidoctorj from 2.5.9 to 2.5.10 (#979)
add bd1329579a feat(plc4j/opcua): Add support of PlcDINT for BigInteger in PlcValueHandler (#962)
add c29ea5b7e0 feat(knx): update vendor
add 39448aaf5c refactor(plc4go/eip): cleanup connection code
add 85dcb43198 fix(plc4go/eip): fix possible contention by using 1 buffered chan
add 096cb0ddf8 fix(plc4go/eip): fix possible double match in switch
add c9019a90a9 test(plc4go/spi): add more output to DriverTestRunner
add 442960c2fe fix(plc4go/epi): matches should work on exact basis
add aa9aef5006 test(plc4go/spi): add more output to ParserSerializerRunner
add 15cf776ad6 chore(plc4go): use fork of go-junit-report til PR is merged
add 117d669ce4 test(plc4go/spi): output produced bytes for plc response in DriverTestRunner
new 7636caa55c Merge remote-tracking branch 'origin/develop' into chore/profinet-phase-3
new e674fcc27b chore(plc4j/profinet): Created a new version of the Profinet driver that uses a much simpler approach.
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:
.github/workflows/go-platform.yml | 17 +
.github/workflows/java-platform.yml | 9 +
plc4go/examples/ads/discovery/Discovery.go | 2 +-
.../hello_world_plc4go_bacnet_discovery.go | 2 +-
.../discovery/hello_world_plc4go_knx_discovery.go | 2 +-
plc4go/go.mod | 12 +-
plc4go/go.sum | 35 +-
plc4go/internal/ads/Connection.go | 43 +-
plc4go/internal/ads/Discoverer.go | 29 +-
plc4go/internal/ads/DiscoveryMessageCodec.go | 25 +-
plc4go/internal/ads/Driver.go | 36 +-
plc4go/internal/ads/Interactions.go | 13 +-
plc4go/internal/ads/MessageCodec.go | 45 +-
plc4go/internal/ads/Reader.go | 25 +-
plc4go/internal/ads/Subscriber.go | 22 +-
plc4go/internal/ads/ValueHandler.go | 14 +-
plc4go/internal/ads/Writer.go | 17 +-
plc4go/internal/ads/model/AdsSubscriptionHandle.go | 11 +-
plc4go/internal/ads/model/Configuration.go | 16 +-
plc4go/internal/ads/model/SubscriptionEvent.go | 12 +-
.../bacnetip/BACnetVirtualLinkLayerService.go | 8 +-
plc4go/internal/bacnetip/Connection.go | 51 +-
plc4go/internal/bacnetip/Driver.go | 7 +-
plc4go/internal/bacnetip/IOCBModule.go | 14 +-
plc4go/internal/bacnetip/MessageCodec.go | 12 +-
plc4go/internal/bacnetip/PDU.go | 4 +-
plc4go/internal/bacnetip/Reader.go | 12 +-
plc4go/internal/bacnetip/Subscriber.go | 19 +-
.../internal/bacnetip/UDPCommunicationsModule.go | 6 +-
plc4go/internal/cbus/Browser.go | 2 +-
plc4go/internal/cbus/Browser_test.go | 54 +-
plc4go/internal/cbus/Connection.go | 11 +-
plc4go/internal/cbus/Connection_test.go | 544 +++++++-----
plc4go/internal/cbus/Discoverer.go | 16 +-
plc4go/internal/cbus/Discoverer_test.go | 116 ++-
plc4go/internal/cbus/Driver_test.go | 16 +-
plc4go/internal/cbus/MessageCodec_test.go | 265 ++++--
plc4go/internal/cbus/Reader.go | 9 +-
plc4go/internal/cbus/Reader_test.go | 917 ++++++++++-----------
plc4go/internal/cbus/Subscriber.go | 7 +-
plc4go/internal/cbus/Subscriber_test.go | 34 +-
plc4go/internal/cbus/SubscriptionEvent.go | 7 +-
plc4go/internal/cbus/ValueHandler.go | 7 +-
plc4go/internal/cbus/Writer.go | 4 +-
.../internal/cbus/mock_RequestTransaction_test.go | 41 +
plc4go/internal/cbus/noGlobalLog_test.go | 4 +-
plc4go/internal/eip/Configuration.go | 12 +-
plc4go/internal/eip/Connection.go | 373 +++++----
plc4go/internal/eip/EipDriver.go | 39 +-
plc4go/internal/eip/MessageCodec.go | 33 +-
plc4go/internal/eip/Reader.go | 35 +-
plc4go/internal/eip/ValueHandler.go | 11 +-
plc4go/internal/eip/Writer.go | 58 +-
plc4go/internal/knxnetip/Browser.go | 30 +-
plc4go/internal/knxnetip/Connection.go | 42 +-
.../knxnetip/ConnectionDriverSpecificOperations.go | 17 +-
plc4go/internal/knxnetip/ConnectionHelper.go | 13 +-
plc4go/internal/knxnetip/Discoverer.go | 31 +-
plc4go/internal/knxnetip/Driver.go | 20 +-
plc4go/internal/knxnetip/MessageCodec.go | 76 +-
plc4go/internal/knxnetip/Reader.go | 14 +-
plc4go/internal/knxnetip/Subscriber.go | 16 +-
plc4go/internal/knxnetip/SubscriptionEvent.go | 24 +-
plc4go/internal/modbus/Connection.go | 36 +-
plc4go/internal/modbus/MessageCodec.go | 20 +-
plc4go/internal/modbus/ModbusAsciiDriver.go | 41 +-
plc4go/internal/modbus/ModbusRtuDriver.go | 41 +-
plc4go/internal/modbus/ModbusTcpDriver.go | 41 +-
plc4go/internal/modbus/Reader.go | 34 +-
plc4go/internal/modbus/Tag.go | 9 +-
plc4go/internal/modbus/TagHandler.go | 7 +-
plc4go/internal/modbus/ValueHandler.go | 11 +-
plc4go/internal/modbus/Writer.go | 12 +-
plc4go/internal/s7/Configuration.go | 24 +-
plc4go/internal/s7/Connection.go | 57 +-
plc4go/internal/s7/Driver.go | 39 +-
plc4go/internal/s7/MessageCodec.go | 27 +-
plc4go/internal/s7/Reader.go | 32 +-
plc4go/internal/s7/ValueHandler.go | 11 +-
plc4go/internal/s7/Writer.go | 28 +-
plc4go/internal/simulated/Connection.go | 24 +-
plc4go/internal/simulated/Device.go | 24 +-
plc4go/internal/simulated/Device_test.go | 28 +-
plc4go/internal/simulated/Driver.go | 13 +-
plc4go/internal/simulated/Driver_test.go | 13 +-
plc4go/internal/simulated/Reader.go | 14 +-
plc4go/internal/simulated/Reader_test.go | 4 +-
plc4go/internal/simulated/Subscriber.go | 6 +-
plc4go/internal/simulated/Writer.go | 14 +-
plc4go/internal/simulated/Writer_test.go | 4 +-
plc4go/pkg/api/cache/PlcConnectionCache.go | 49 +-
plc4go/pkg/api/cache/PlcConnectionCache_test.go | 44 +-
plc4go/pkg/api/cache/common.go | 22 +-
plc4go/pkg/api/cache/connectionContainer.go | 132 +--
plc4go/pkg/api/cache/connectionContainer_test.go | 127 ++-
.../pkg/api/cache/mock_tracedPlcConnection_test.go | 14 +-
.../cbus => pkg/api/cache}/noGlobalLog_test.go | 6 +-
plc4go/pkg/api/cache/plcConnectionLease.go | 14 +-
plc4go/pkg/api/cache/tracedPlcConnection.go | 4 +-
plc4go/pkg/api/config/config.go | 15 +
.../api/config}/mock_WithOption_test.go | 2 +-
plc4go/pkg/api/driverManager.go | 57 +-
plc4go/pkg/api/driverManager_test.go | 29 +-
plc4go/pkg/api/drivers/drivers.go | 38 +-
plc4go/pkg/api/logging/init.go | 30 +-
plc4go/pkg/api/transports/transports.go | 14 +-
plc4go/pom.xml | 3 +-
plc4go/spi/default/DefaultBrowser.go | 14 +-
plc4go/spi/default/DefaultCodec.go | 31 +-
plc4go/spi/default/DefaultConnection.go | 20 +-
plc4go/spi/default/DefaultConnection_test.go | 11 +-
.../spi/default/mock_CustomMessageHandler_test.go | 98 +++
.../mock_DefaultPlcConnectionCloseResult_test.go | 14 +-
.../interceptors/SingleItemRequestInterceptor.go | 51 +-
plc4go/spi/model/DefaultPlcBrowseRequest_test.go | 4 +-
plc4go/spi/model/DefaultPlcSubscriptionEvent.go | 16 +-
.../model/DefaultPlcSubscriptionRequest_test.go | 2 +-
plc4go/spi/model/DefaultPlcSubscriptionResponse.go | 15 +-
.../spi/model/DefaultPlcUnsubscriptionRequest.go | 6 +-
.../converter/OptionConverter.go} | 27 +-
plc4go/spi/pool/WorkerPool.go | 300 ++++---
plc4go/spi/pool/WorkerPool_test.go | 198 ++++-
plc4go/spi/testutils/DriverTestRunner.go | 28 +-
plc4go/spi/testutils/ManualTestRunner.go | 6 +-
plc4go/spi/testutils/ParserSerializerTestRunner.go | 2 +
plc4go/spi/testutils/TestUtils.go | 46 +-
plc4go/spi/{ => tracer}/Tracer.go | 20 +-
plc4go/spi/{ => tracer}/Tracer_test.go | 2 +-
.../spi/{ => tracer}/mock_TracerProvider_test.go | 2 +-
.../spi/transactions/RequestTransactionManager.go | 75 +-
.../transactions/RequestTransactionManager_test.go | 263 +++++-
.../{pool => transactions}/mock_Executor_test.go | 21 +-
.../mock_RequestTransactionManagerOption_test.go | 85 --
.../transactions/mock_RequestTransaction_test.go | 41 +
plc4go/spi/transactions/mock_requirements.go | 5 +
plc4go/spi/transports/TransportInstance.go | 90 --
plc4go/spi/transports/pcap/Transport.go | 5 +-
plc4go/spi/transports/pcap/Transport_test.go | 17 +-
plc4go/spi/transports/serial/Transport.go | 5 +-
plc4go/spi/transports/serial/Transport_test.go | 13 +-
plc4go/spi/transports/tcp/Transport.go | 11 +-
plc4go/spi/transports/tcp/Transport_test.go | 27 +-
plc4go/spi/transports/test/Transport.go | 2 +-
.../DefaultBufferedTransportInstance.go} | 37 +-
.../DefaultBufferedTransportInstance_test.go} | 5 +-
.../spi/transports/utils/TransportLogger_test.go | 2 +-
...ltBufferedTransportInstanceRequirements_test.go | 2 +-
.../mock_DefaultBufferedTransportInstance_test.go | 2 +-
plc4go/spi/utils/IdGenerator.go | 7 +-
plc4go/spi/utils/IdGenerator_test.go | 18 +-
plc4go/spi/utils/Net.go | 40 +-
plc4go/spi/utils/mock_CompletionFuture_test.go | 132 ---
plc4go/spi/utils/mock_Runnable_test.go | 84 --
plc4go/spi/values/PlcValueHandler.go | 12 +-
plc4go/tests/drivers/tests/abeth_driver_test.go | 11 +-
.../drivers/tests/abeth_parser_serializer_test.go | 9 +-
plc4go/tests/drivers/tests/ads_driver_test.go | 15 +-
.../drivers/tests/ads_parser_serializer_test.go | 8 +-
.../drivers/tests/bacnet_parser_serializer_test.go | 9 +-
plc4go/tests/drivers/tests/df1_driver_test.go | 11 +-
.../drivers/tests/df1_parser_serializer_test.go | 10 +-
plc4go/tests/drivers/tests/eip_driver_test.go | 12 +-
.../drivers/tests/eip_parser_serializer_test.go | 16 +-
plc4go/tests/drivers/tests/firmata_driver_test.go | 10 +-
.../tests/firmata_parser_serializer_test.go | 9 +-
plc4go/tests/drivers/tests/knxnetip_driver_test.go | 15 +-
.../tests/knxnetip_parser_serializer_test.go | 9 +-
.../tests/drivers/tests/manual_ads_driver_test.go | 16 +-
.../drivers/tests/manual_bacnet_driver_test.go | 15 +-
plc4go/tests/drivers/tests/manual_bacnet_test.go | 7 +-
.../tests/drivers/tests/manual_cbus_driver_test.go | 49 +-
.../tests/drivers/tests/manual_s7_driver_test.go | 16 +-
plc4go/tests/drivers/tests/modbus_driver_test.go | 15 +-
.../drivers/tests/modbus_parser_serializer_test.go | 9 +-
plc4go/tests/drivers/tests/s7_driver_test.go | 9 +-
.../drivers/tests/s7_parser_serializer_test.go | 3 +-
plc4go/tests/initializetest/init.go | 54 --
plc4go/tools/plc4xgenerator/gen.go | 2 +-
.../java/opcua/protocol/OpcuaProtocolLogic.java | 2 +-
.../plc4x/java/opcua/OpcuaPlcDriverTest.java | 1 -
.../examples/hello-influx-data-collection/pom.xml | 2 +-
plc4j/integrations/apache-calcite/pom.xml | 2 +-
.../apache/plc4x/java/spi/Plc4xNettyWrapper.java | 152 ++--
.../org/apache/plc4x/java/spi/TimedOperation.java} | 16 +-
.../org/apache/plc4x/java/spi/TimeoutManager.java | 21 +-
.../java/spi/configuration/Configuration.java | 7 +
.../connection/CustomProtocolStackConfigurer.java | 2 +-
.../connection/SingleProtocolStackConfigurer.java | 2 +-
.../spi/internal/DefaultConversationContext.java | 106 +++
.../java/spi/internal/HandlerRegistration.java | 9 +-
.../spi/netty/NettyHashTimerTimeoutManager.java | 78 ++
.../plc4x/java/spi/values/PlcValueHandler.java | 3 +
.../plc4x/java/spi/Plc4xNettyWrapperTest.java | 2 +-
.../internal/DefaultSendRequestContextTest.java | 2 +-
.../knxnetip/readwrite/model/KnxManufacturer.cs | 40 +-
pom.xml | 10 +-
196 files changed, 4452 insertions(+), 2890 deletions(-)
copy plc4go/{internal/cbus => pkg/api/cache}/noGlobalLog_test.go (88%)
copy plc4go/{spi/options => pkg/api/config}/mock_WithOption_test.go (99%)
create mode 100644 plc4go/spi/default/mock_CustomMessageHandler_test.go
copy plc4go/spi/{utils/ReadBuffer_test.go => options/converter/OptionConverter.go} (67%)
rename plc4go/spi/{ => tracer}/Tracer.go (88%)
rename plc4go/spi/{ => tracer}/Tracer_test.go (99%)
rename plc4go/spi/{ => tracer}/mock_TracerProvider_test.go (99%)
copy plc4go/spi/{pool => transactions}/mock_Executor_test.go (90%)
delete mode 100644 plc4go/spi/transactions/mock_RequestTransactionManagerOption_test.go
copy plc4go/spi/transports/{TransportInstance.go => utils/DefaultBufferedTransportInstance.go} (78%)
rename plc4go/spi/transports/{TransportInstance_test.go => utils/DefaultBufferedTransportInstance_test.go} (99%)
rename plc4go/spi/transports/{ => utils}/mock_DefaultBufferedTransportInstanceRequirements_test.go (99%)
rename plc4go/spi/transports/{ => utils}/mock_DefaultBufferedTransportInstance_test.go (99%)
delete mode 100644 plc4go/spi/utils/mock_CompletionFuture_test.go
delete mode 100644 plc4go/spi/utils/mock_Runnable_test.go
delete mode 100644 plc4go/tests/initializetest/init.go
copy plc4j/{tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperTaskMBean.java => spi/src/main/java/org/apache/plc4x/java/spi/TimedOperation.java} (75%)
copy code-generation/protocol-base-mspec/src/main/java/org/apache/plc4x/plugins/codegenerator/language/mspec/LazyTypeDefinitionConsumer.java => plc4j/spi/src/main/java/org/apache/plc4x/java/spi/TimeoutManager.java (72%)
create mode 100644 plc4j/spi/src/main/java/org/apache/plc4x/java/spi/internal/DefaultConversationContext.java
create mode 100644 plc4j/spi/src/main/java/org/apache/plc4x/java/spi/netty/NettyHashTimerTimeoutManager.java
[plc4x] 01/02: Merge remote-tracking branch 'origin/develop' into chore/profinet-phase-3
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch chore/profinet-phase-3
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 7636caa55cf2c1e94a7926c3d56ad0b6e0efe013
Merge: 64ef2075c9 117d669ce4
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Mon Jun 5 21:37:02 2023 +0200
Merge remote-tracking branch 'origin/develop' into chore/profinet-phase-3
# Conflicts:
# plc4go/internal/bacnetip/Connection.go
# plc4go/internal/bacnetip/Driver.go
# plc4go/internal/bacnetip/Reader.go
# plc4go/internal/cbus/Browser_test.go
# plc4go/internal/cbus/Connection.go
# plc4go/internal/cbus/Connection_test.go
# plc4go/internal/cbus/Discoverer_test.go
# plc4go/internal/cbus/Driver_test.go
# plc4go/internal/cbus/Reader.go
# plc4go/internal/cbus/Reader_test.go
# plc4go/internal/cbus/noGlobalLog_test.go
# plc4go/internal/eip/Connection.go
# plc4go/internal/eip/EipDriver.go
# plc4go/internal/eip/Reader.go
# plc4go/internal/eip/Writer.go
# plc4go/internal/knxnetip/Discoverer.go
# plc4go/internal/s7/Connection.go
# plc4go/internal/s7/Driver.go
# plc4go/internal/s7/Reader.go
# plc4go/internal/s7/Writer.go
# plc4go/spi/default/DefaultConnection.go
# plc4go/spi/pool/WorkerPool.go
# plc4go/spi/pool/WorkerPool_test.go
# plc4go/spi/testutils/TestUtils.go
# plc4go/spi/transactions/RequestTransactionManager.go
# plc4go/spi/transactions/RequestTransactionManager_test.go
# plc4go/spi/transactions/mock_RequestTransactionManagerOption_test.go
# plc4go/spi/transactions/mock_requirements.go
# plc4go/spi/transports/serial/Transport.go
# plc4go/spi/transports/test/Transport.go
.github/workflows/go-platform.yml | 17 +
.github/workflows/java-platform.yml | 9 +
plc4go/examples/ads/discovery/Discovery.go | 2 +-
.../hello_world_plc4go_bacnet_discovery.go | 2 +-
.../discovery/hello_world_plc4go_knx_discovery.go | 2 +-
plc4go/go.mod | 12 +-
plc4go/go.sum | 35 +-
plc4go/internal/ads/Connection.go | 43 +-
plc4go/internal/ads/Discoverer.go | 29 +-
plc4go/internal/ads/DiscoveryMessageCodec.go | 25 +-
plc4go/internal/ads/Driver.go | 36 +-
plc4go/internal/ads/Interactions.go | 13 +-
plc4go/internal/ads/MessageCodec.go | 45 +-
plc4go/internal/ads/Reader.go | 25 +-
plc4go/internal/ads/Subscriber.go | 22 +-
plc4go/internal/ads/ValueHandler.go | 14 +-
plc4go/internal/ads/Writer.go | 17 +-
plc4go/internal/ads/model/AdsSubscriptionHandle.go | 11 +-
plc4go/internal/ads/model/Configuration.go | 16 +-
plc4go/internal/ads/model/SubscriptionEvent.go | 12 +-
.../bacnetip/BACnetVirtualLinkLayerService.go | 8 +-
plc4go/internal/bacnetip/Connection.go | 51 +-
plc4go/internal/bacnetip/Driver.go | 7 +-
plc4go/internal/bacnetip/IOCBModule.go | 14 +-
plc4go/internal/bacnetip/MessageCodec.go | 12 +-
plc4go/internal/bacnetip/PDU.go | 4 +-
plc4go/internal/bacnetip/Reader.go | 12 +-
plc4go/internal/bacnetip/Subscriber.go | 19 +-
.../internal/bacnetip/UDPCommunicationsModule.go | 6 +-
plc4go/internal/cbus/Browser.go | 2 +-
plc4go/internal/cbus/Browser_test.go | 54 +-
plc4go/internal/cbus/Connection.go | 11 +-
plc4go/internal/cbus/Connection_test.go | 544 +++++++-----
plc4go/internal/cbus/Discoverer.go | 16 +-
plc4go/internal/cbus/Discoverer_test.go | 116 ++-
plc4go/internal/cbus/Driver_test.go | 16 +-
plc4go/internal/cbus/MessageCodec_test.go | 265 ++++--
plc4go/internal/cbus/Reader.go | 9 +-
plc4go/internal/cbus/Reader_test.go | 917 ++++++++++-----------
plc4go/internal/cbus/Subscriber.go | 7 +-
plc4go/internal/cbus/Subscriber_test.go | 34 +-
plc4go/internal/cbus/SubscriptionEvent.go | 7 +-
plc4go/internal/cbus/ValueHandler.go | 7 +-
plc4go/internal/cbus/Writer.go | 4 +-
.../internal/cbus/mock_RequestTransaction_test.go | 41 +
plc4go/internal/cbus/noGlobalLog_test.go | 4 +-
plc4go/internal/eip/Configuration.go | 12 +-
plc4go/internal/eip/Connection.go | 373 +++++----
plc4go/internal/eip/EipDriver.go | 39 +-
plc4go/internal/eip/MessageCodec.go | 33 +-
plc4go/internal/eip/Reader.go | 35 +-
plc4go/internal/eip/ValueHandler.go | 11 +-
plc4go/internal/eip/Writer.go | 58 +-
plc4go/internal/knxnetip/Browser.go | 30 +-
plc4go/internal/knxnetip/Connection.go | 42 +-
.../knxnetip/ConnectionDriverSpecificOperations.go | 17 +-
plc4go/internal/knxnetip/ConnectionHelper.go | 13 +-
plc4go/internal/knxnetip/Discoverer.go | 31 +-
plc4go/internal/knxnetip/Driver.go | 20 +-
plc4go/internal/knxnetip/MessageCodec.go | 76 +-
plc4go/internal/knxnetip/Reader.go | 14 +-
plc4go/internal/knxnetip/Subscriber.go | 16 +-
plc4go/internal/knxnetip/SubscriptionEvent.go | 24 +-
plc4go/internal/modbus/Connection.go | 36 +-
plc4go/internal/modbus/MessageCodec.go | 20 +-
plc4go/internal/modbus/ModbusAsciiDriver.go | 41 +-
plc4go/internal/modbus/ModbusRtuDriver.go | 41 +-
plc4go/internal/modbus/ModbusTcpDriver.go | 41 +-
plc4go/internal/modbus/Reader.go | 34 +-
plc4go/internal/modbus/Tag.go | 9 +-
plc4go/internal/modbus/TagHandler.go | 7 +-
plc4go/internal/modbus/ValueHandler.go | 11 +-
plc4go/internal/modbus/Writer.go | 12 +-
plc4go/internal/s7/Configuration.go | 24 +-
plc4go/internal/s7/Connection.go | 57 +-
plc4go/internal/s7/Driver.go | 39 +-
plc4go/internal/s7/MessageCodec.go | 27 +-
plc4go/internal/s7/Reader.go | 32 +-
plc4go/internal/s7/ValueHandler.go | 11 +-
plc4go/internal/s7/Writer.go | 28 +-
plc4go/internal/simulated/Connection.go | 24 +-
plc4go/internal/simulated/Device.go | 24 +-
plc4go/internal/simulated/Device_test.go | 28 +-
plc4go/internal/simulated/Driver.go | 13 +-
plc4go/internal/simulated/Driver_test.go | 13 +-
plc4go/internal/simulated/Reader.go | 14 +-
plc4go/internal/simulated/Reader_test.go | 4 +-
plc4go/internal/simulated/Subscriber.go | 6 +-
plc4go/internal/simulated/Writer.go | 14 +-
plc4go/internal/simulated/Writer_test.go | 4 +-
plc4go/pkg/api/cache/PlcConnectionCache.go | 49 +-
plc4go/pkg/api/cache/PlcConnectionCache_test.go | 44 +-
plc4go/pkg/api/cache/common.go | 22 +-
plc4go/pkg/api/cache/connectionContainer.go | 132 +--
plc4go/pkg/api/cache/connectionContainer_test.go | 127 ++-
.../pkg/api/cache/mock_tracedPlcConnection_test.go | 14 +-
.../cbus => pkg/api/cache}/noGlobalLog_test.go | 6 +-
plc4go/pkg/api/cache/plcConnectionLease.go | 14 +-
plc4go/pkg/api/cache/tracedPlcConnection.go | 4 +-
plc4go/pkg/api/config/config.go | 15 +
plc4go/pkg/api/config/mock_WithOption_test.go | 93 +++
plc4go/pkg/api/driverManager.go | 57 +-
plc4go/pkg/api/driverManager_test.go | 29 +-
plc4go/pkg/api/drivers/drivers.go | 38 +-
plc4go/pkg/api/logging/init.go | 30 +-
plc4go/pkg/api/transports/transports.go | 14 +-
plc4go/pom.xml | 3 +-
plc4go/spi/default/DefaultBrowser.go | 14 +-
plc4go/spi/default/DefaultCodec.go | 31 +-
plc4go/spi/default/DefaultConnection.go | 20 +-
plc4go/spi/default/DefaultConnection_test.go | 11 +-
.../spi/default/mock_CustomMessageHandler_test.go | 98 +++
.../mock_DefaultPlcConnectionCloseResult_test.go | 14 +-
.../interceptors/SingleItemRequestInterceptor.go | 51 +-
plc4go/spi/model/DefaultPlcBrowseRequest_test.go | 4 +-
plc4go/spi/model/DefaultPlcSubscriptionEvent.go | 16 +-
.../model/DefaultPlcSubscriptionRequest_test.go | 2 +-
plc4go/spi/model/DefaultPlcSubscriptionResponse.go | 15 +-
.../spi/model/DefaultPlcUnsubscriptionRequest.go | 6 +-
.../options/converter/OptionConverter.go} | 18 +-
plc4go/spi/pool/WorkerPool.go | 300 ++++---
plc4go/spi/pool/WorkerPool_test.go | 198 ++++-
plc4go/spi/testutils/DriverTestRunner.go | 28 +-
plc4go/spi/testutils/ManualTestRunner.go | 6 +-
plc4go/spi/testutils/ParserSerializerTestRunner.go | 2 +
plc4go/spi/testutils/TestUtils.go | 46 +-
plc4go/spi/{ => tracer}/Tracer.go | 20 +-
plc4go/spi/{ => tracer}/Tracer_test.go | 2 +-
.../spi/{ => tracer}/mock_TracerProvider_test.go | 2 +-
.../spi/transactions/RequestTransactionManager.go | 75 +-
.../transactions/RequestTransactionManager_test.go | 263 +++++-
plc4go/spi/transactions/mock_Executor_test.go | 249 ++++++
.../mock_RequestTransactionManagerOption_test.go | 85 --
.../transactions/mock_RequestTransaction_test.go | 41 +
plc4go/spi/transactions/mock_requirements.go | 5 +
plc4go/spi/transports/TransportInstance.go | 90 --
plc4go/spi/transports/pcap/Transport.go | 5 +-
plc4go/spi/transports/pcap/Transport_test.go | 17 +-
plc4go/spi/transports/serial/Transport.go | 5 +-
plc4go/spi/transports/serial/Transport_test.go | 13 +-
plc4go/spi/transports/tcp/Transport.go | 11 +-
plc4go/spi/transports/tcp/Transport_test.go | 27 +-
plc4go/spi/transports/test/Transport.go | 2 +-
.../DefaultBufferedTransportInstance.go} | 37 +-
.../DefaultBufferedTransportInstance_test.go} | 5 +-
.../spi/transports/utils/TransportLogger_test.go | 2 +-
...ltBufferedTransportInstanceRequirements_test.go | 2 +-
.../mock_DefaultBufferedTransportInstance_test.go | 2 +-
plc4go/spi/utils/IdGenerator.go | 7 +-
plc4go/spi/utils/IdGenerator_test.go | 18 +-
plc4go/spi/utils/Net.go | 40 +-
plc4go/spi/utils/mock_CompletionFuture_test.go | 132 ---
plc4go/spi/utils/mock_Runnable_test.go | 84 --
plc4go/spi/values/PlcValueHandler.go | 12 +-
plc4go/tests/drivers/tests/abeth_driver_test.go | 11 +-
.../drivers/tests/abeth_parser_serializer_test.go | 9 +-
plc4go/tests/drivers/tests/ads_driver_test.go | 15 +-
.../drivers/tests/ads_parser_serializer_test.go | 8 +-
.../drivers/tests/bacnet_parser_serializer_test.go | 9 +-
plc4go/tests/drivers/tests/df1_driver_test.go | 11 +-
.../drivers/tests/df1_parser_serializer_test.go | 10 +-
plc4go/tests/drivers/tests/eip_driver_test.go | 12 +-
.../drivers/tests/eip_parser_serializer_test.go | 16 +-
plc4go/tests/drivers/tests/firmata_driver_test.go | 10 +-
.../tests/firmata_parser_serializer_test.go | 9 +-
plc4go/tests/drivers/tests/knxnetip_driver_test.go | 15 +-
.../tests/knxnetip_parser_serializer_test.go | 9 +-
.../tests/drivers/tests/manual_ads_driver_test.go | 16 +-
.../drivers/tests/manual_bacnet_driver_test.go | 15 +-
plc4go/tests/drivers/tests/manual_bacnet_test.go | 7 +-
.../tests/drivers/tests/manual_cbus_driver_test.go | 49 +-
.../tests/drivers/tests/manual_s7_driver_test.go | 16 +-
plc4go/tests/drivers/tests/modbus_driver_test.go | 15 +-
.../drivers/tests/modbus_parser_serializer_test.go | 9 +-
plc4go/tests/drivers/tests/s7_driver_test.go | 9 +-
.../drivers/tests/s7_parser_serializer_test.go | 3 +-
plc4go/tests/initializetest/init.go | 54 --
plc4go/tools/plc4xgenerator/gen.go | 2 +-
.../java/opcua/protocol/OpcuaProtocolLogic.java | 2 +-
.../plc4x/java/opcua/OpcuaPlcDriverTest.java | 1 -
.../examples/hello-influx-data-collection/pom.xml | 2 +-
plc4j/integrations/apache-calcite/pom.xml | 2 +-
.../apache/plc4x/java/spi/Plc4xNettyWrapper.java | 152 ++--
.../org/apache/plc4x/java/spi/TimedOperation.java | 18 +-
.../org/apache/plc4x/java/spi/TimeoutManager.java | 28 +-
.../java/spi/configuration/Configuration.java | 7 +
.../connection/CustomProtocolStackConfigurer.java | 2 +-
.../connection/SingleProtocolStackConfigurer.java | 2 +-
.../spi/internal/DefaultConversationContext.java | 106 +++
.../java/spi/internal/HandlerRegistration.java | 9 +-
.../spi/netty/NettyHashTimerTimeoutManager.java | 78 ++
.../plc4x/java/spi/values/PlcValueHandler.java | 3 +
.../plc4x/java/spi/Plc4xNettyWrapperTest.java | 2 +-
.../internal/DefaultSendRequestContextTest.java | 2 +-
pom.xml | 10 +-
195 files changed, 4751 insertions(+), 2870 deletions(-)
[plc4x] 02/02: chore(plc4j/profinet): Created a new version of the Profinet driver that uses a much simpler approach.
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch chore/profinet-phase-3
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit e674fcc27b1c5bef65b2db4f2ec490de96316594
Author: Christofer Dutz <cd...@apache.org>
AuthorDate: Mon Jun 5 21:46:15 2023 +0200
chore(plc4j/profinet): Created a new version of the Profinet driver that uses a much simpler approach.
---
.../knxnetip/readwrite/model/KnxManufacturer.cs | 40 ++++++++++++++++++----
1 file changed, 34 insertions(+), 6 deletions(-)
diff --git a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
index 0476e160fd..dbae696f97 100644
--- a/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
+++ b/plc4net/drivers/knxnetip/src/drivers/knxnetip/readwrite/model/KnxManufacturer.cs
@@ -654,8 +654,12 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
M_LENGEN = 627,
M_SHENZHEN_EXC_LED_TECHNOLOGY_CO__LTD = 628,
M_VIBROXX_FZCO = 629,
- M_ABB___RESERVED = 630,
- M_BUSCH_JAEGER_ELEKTRO___RESERVED = 631,
+ M_SUZHOU_HONGYUN_INTELLIGENT_TECHNOLOGYCO___LTD = 630,
+ M_PASSIV_ENERGIE_GMBH = 631,
+ M_PAYNE_TECHNOLOGIES_LTD = 632,
+ M_GUANGDONG_YOZEWIT_INTELLIGENT_TECHNOLOGY_CO__LTD_ = 633,
+ M_ABB___RESERVED = 634,
+ M_BUSCH_JAEGER_ELEKTRO___RESERVED = 635,
}
public static class KnxManufacturerInfo
@@ -2438,10 +2442,22 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_WHD_WILHELM_HUBER_Plus_SOEHNE: { /* '63' */
return 101;
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '630' */
+ case KnxManufacturer.M_SUZHOU_HONGYUN_INTELLIGENT_TECHNOLOGYCO___LTD: { /* '630' */
+ return 687;
+ }
+ case KnxManufacturer.M_PASSIV_ENERGIE_GMBH: { /* '631' */
+ return 688;
+ }
+ case KnxManufacturer.M_PAYNE_TECHNOLOGIES_LTD: { /* '632' */
+ return 689;
+ }
+ case KnxManufacturer.M_GUANGDONG_YOZEWIT_INTELLIGENT_TECHNOLOGY_CO__LTD_: { /* '633' */
+ return 690;
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '634' */
return 43954;
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '631' */
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '635' */
return 43959;
}
case KnxManufacturer.M_BISCHOFF_ELEKTRONIK: { /* '64' */
@@ -4344,10 +4360,22 @@ namespace org.apache.plc4net.drivers.knxnetip.readwrite.model
case KnxManufacturer.M_WHD_WILHELM_HUBER_Plus_SOEHNE: { /* '63' */
return "WHD Wilhelm Huber + Söhne";
}
- case KnxManufacturer.M_ABB___RESERVED: { /* '630' */
+ case KnxManufacturer.M_SUZHOU_HONGYUN_INTELLIGENT_TECHNOLOGYCO___LTD: { /* '630' */
+ return "Suzhou Hongyun Intelligent TechnologyCo., Ltd";
+ }
+ case KnxManufacturer.M_PASSIV_ENERGIE_GMBH: { /* '631' */
+ return "Passiv Energie GmbH";
+ }
+ case KnxManufacturer.M_PAYNE_TECHNOLOGIES_LTD: { /* '632' */
+ return "Payne Technologies Ltd";
+ }
+ case KnxManufacturer.M_GUANGDONG_YOZEWIT_INTELLIGENT_TECHNOLOGY_CO__LTD_: { /* '633' */
+ return "Guangdong Yozewit Intelligent Technology Co.,Ltd.";
+ }
+ case KnxManufacturer.M_ABB___RESERVED: { /* '634' */
return "ABB - reserved";
}
- case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '631' */
+ case KnxManufacturer.M_BUSCH_JAEGER_ELEKTRO___RESERVED: { /* '635' */
return "Busch-Jaeger Elektro - reserved";
}
case KnxManufacturer.M_BISCHOFF_ELEKTRONIK: { /* '64' */