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:27 UTC
[plc4x] 01/02: Merge remote-tracking branch 'origin/develop' into chore/profinet-phase-3
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(-)