You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ot...@apache.org on 2021/01/06 21:43:00 UTC
[plc4x] 06/17: Merge branch 'develop' of
https://github.com/apache/plc4x into develop
This is an automated email from the ASF dual-hosted git repository.
otluk pushed a commit to branch feature/plc4py
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit c24dacd141523bea21838db60fb5ad7226d4569a
Merge: 38f2933 4d4efc5
Author: ottlukas <ot...@gmail.com>
AuthorDate: Thu Mar 26 21:57:41 2020 +0100
Merge branch 'develop' of https://github.com/apache/plc4x into develop
.../language/java/JavaLanguageTemplateHelper.java | 114 ++-
.../resources/templates/java/data-io-template.ftlh | 13 +-
.../main/resources/templates/java/io-template.ftlh | 15 +-
.../resources/templates/java/pojo-template.ftlh | 2 +-
.../plugins/codegenerator/language/mspec/MSpec.g4 | 3 +
.../mspec/parser/MessageFormatListener.java | 6 +-
plc4j/api/pom.xml | 4 +
.../org/apache/plc4x/java/api/model/PlcField.java | 3 +
.../apache/plc4x/java/api/value/PlcBigDecimal.java | 30 +-
.../apache/plc4x/java/api/value/PlcBigInteger.java | 30 +-
.../apache/plc4x/java/api/value/PlcBoolean.java | 42 +-
.../org/apache/plc4x/java/api/value/PlcByte.java | 30 +-
.../org/apache/plc4x/java/api/value/PlcDate.java | 14 +-
.../apache/plc4x/java/api/value/PlcDateTime.java | 18 +-
.../org/apache/plc4x/java/api/value/PlcDouble.java | 30 +-
.../org/apache/plc4x/java/api/value/PlcFloat.java | 30 +-
.../apache/plc4x/java/api/value/PlcInteger.java | 30 +-
.../org/apache/plc4x/java/api/value/PlcList.java | 16 +-
.../org/apache/plc4x/java/api/value/PlcLong.java | 30 +-
.../org/apache/plc4x/java/api/value/PlcShort.java | 30 +-
.../plc4x/java/api/value/PlcSimpleValue.java | 9 +-
.../org/apache/plc4x/java/api/value/PlcString.java | 23 +-
.../org/apache/plc4x/java/api/value/PlcStruct.java | 18 +-
.../org/apache/plc4x/java/api/value/PlcTime.java | 14 +-
.../org/apache/plc4x/java/api/value/PlcValue.java | 5 +-
.../plc4x/java/api/value/PlcValueAdapter.java | 46 +-
.../java/abeth/protocol/AbEthProtocolLogic.java | 7 +-
.../java/abeth/protocol/Plc4xAbEthProtocol.java | 7 +-
plc4j/{tools/scraper => drivers/eip}/pom.xml | 136 ++--
.../apache/plc4x/java/eip/readwrite/EIPDriver.java | 108 +++
.../readwrite/configuration/EIPConfiguration.java} | 40 +-
.../plc4x/java/eip/readwrite/field/EipField.java | 112 +++
.../java/eip/readwrite/field/EipFieldHandler.java | 434 ++++++++++
.../eip/readwrite/protocol/EipProtocolLogic.java | 488 +++++++++++
.../services/org.apache.plc4x.java.api.PlcDriver | 2 +-
.../java/eip/readwrite/EIPDriverTestsuite.java} | 16 +-
.../readwrite/EIPParserSerializerTestsuite.java} | 16 +-
.../resources/testsuite/EIPDriverTestsuite.xml | 152 ++++
.../testsuite/EIPParserSerializerTestsuite.xml | 183 +++++
plc4j/drivers/ethernet-ip/pom.xml | 120 ---
.../plc4x/java/ethernetip/EtherNetIpPlcDriver.java | 83 --
.../connection/BaseEtherNetIpPlcConnection.java | 107 ---
.../connection/EtherNetIpTcpPlcConnection.java | 83 --
.../org/apache/plc4x/java/ethernetip/EnipTest.java | 65 --
.../java/ethernetip/ManualPlc4XEtherNetIpTest.java | 55 --
.../src/test/resources/read-attribute.pcap | Bin 258 -> 0 bytes
.../readwrite/protocol/FirmataProtocolLogic.java | 11 +-
.../knxnetip/protocol/KnxNetIpProtocolLogic.java | 9 +-
.../plc4x/java/mock/connection/MockConnection.java | 6 +-
.../plc4x/java/mock/connection/MockDevice.java | 5 +-
.../java/modbus/protocol/ModbusProtocolLogic.java | 4 +-
.../opcua/connection/OpcuaTcpPlcConnection.java | 13 +-
.../opcua/protocol/OpcuaSubsriptionHandle.java | 7 +-
plc4j/drivers/pom.xml | 4 +-
.../plc4x/java/s7/readwrite/field/S7Field.java | 9 +-
.../java/s7/readwrite/optimizer/S7Optimizer.java | 6 +-
.../s7/readwrite/protocol/S7ProtocolLogic.java | 7 +-
.../apache/plc4x/java/s7/utils/StaticHelper.java | 19 +-
.../s7/src/test/resources/testsuite/S7DriverIT.xml | 76 +-
.../simulated/connection/SimulatedConnection.java | 20 +-
.../examples/hello-influx-data-collection/pom.xml | 4 -
.../java/examples/helloinflux/HelloInflux.java | 8 +-
plc4j/examples/hello-webapp/webapp/pom.xml | 5 -
.../watertank/service/WaterTankService.java | 15 +-
.../src/main/resources/application.properties | 5 +-
.../org/apache/plc4x/camel/Plc4XComponent.java | 4 +-
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 92 ++-
.../java/org/apache/plc4x/camel/Plc4XEndpoint.java | 71 +-
.../apache/plc4x/camel/Plc4XPollingConsumer.java | 69 +-
.../java/org/apache/plc4x/camel/Plc4XProducer.java | 27 +-
.../services/org/apache/camel/component/plc4x | 36 +-
.../org/apache/plc4x/camel/Plc4XComponentTest.java | 7 +-
.../org/apache/plc4x/camel/Plc4XProducerTest.java | 17 +-
plc4j/spi/pom.xml | 4 +
.../io/netty/bootstrap/EventLoopProvider.java} | 16 +-
.../java/io/netty/bootstrap/Plc4xBootstrap.java} | 36 +-
.../spi/connection/ChannelExposingConnection.java} | 16 +-
.../spi/connection/DefaultNettyPlcConnection.java | 3 +-
.../java/spi/connection/NettyChannelFactory.java | 33 +-
.../plc4x/java/spi/generation/ReadBuffer.java | 13 +-
.../plc4x/java/spi/generation/WriteBuffer.java | 2 +-
.../spi/messages/DefaultPlcProprietaryRequest.java | 9 +-
.../messages/DefaultPlcProprietaryResponse.java | 9 +-
.../java/spi/messages/DefaultPlcReadRequest.java | 23 +-
.../java/spi/messages/DefaultPlcReadResponse.java | 140 +++-
.../spi/messages/DefaultPlcSubscriptionEvent.java | 12 +-
.../messages/DefaultPlcSubscriptionRequest.java | 28 +-
.../messages/DefaultPlcSubscriptionResponse.java | 32 +-
.../messages/DefaultPlcUnsubscriptionRequest.java | 15 +-
.../messages/DefaultPlcUnsubscriptionResponse.java | 7 +-
.../java/spi/messages/DefaultPlcWriteRequest.java | 40 +-
.../java/spi/messages/DefaultPlcWriteResponse.java | 12 +-
.../java/spi/messages/InternalPlcFieldRequest.java | 2 +
.../spi/messages/InternalPlcFieldResponse.java | 2 +
.../java/spi/messages/InternalPlcMessage.java | 3 +
.../messages/InternalPlcProprietaryRequest.java | 3 +
.../messages/InternalPlcProprietaryResponse.java | 3 +
.../java/spi/messages/InternalPlcReadRequest.java | 2 +
.../java/spi/messages/InternalPlcReadResponse.java | 7 +-
.../java/spi/messages/InternalPlcRequest.java | 2 +
.../java/spi/messages/InternalPlcResponse.java | 2 +
.../spi/messages/InternalPlcSubscriptionEvent.java | 2 +
.../messages/InternalPlcSubscriptionRequest.java | 6 +-
.../messages/InternalPlcSubscriptionResponse.java | 7 +-
.../messages/InternalPlcUnsubscriptionRequest.java | 2 +
.../InternalPlcUnsubscriptionResponse.java | 2 +
.../java/spi/messages/InternalPlcWriteRequest.java | 2 +
.../spi/messages/InternalPlcWriteResponse.java | 2 +
.../java/spi/messages/PlcProprietaryRequest.java | 2 +
.../java/spi/messages/PlcProprietaryResponse.java | 2 +
.../java/spi/messages/PlcProprietarySender.java | 3 +
.../java/spi/messages/PlcProtocolMessage.java | 3 +
.../plc4x/java/spi/messages/PlcRawMessage.java | 2 +
.../apache/plc4x/java/spi/messages/PlcReader.java | 1 -
.../apache/plc4x/java/spi/messages/PlcWriter.java | 1 -
.../java/spi/messages/utils/FieldValueItem.java} | 23 +-
.../java/spi/messages/utils/ResponseItem.java} | 22 +-
.../plc4x/java/spi/optimizer/BaseOptimizer.java | 8 +-
.../java/spi/optimizer/SingleFieldOptimizer.java | 4 +-
.../SingleItemToSingleRequestProtocol.java | 12 +-
.../apache/plc4x/java/opm/ConnectedEntityTest.java | 5 +-
.../plc4x/java/opm/PlcEntityInterceptorTest.java | 6 +-
.../java/opm/PlcEntityManagerComplexTest.java | 7 +-
.../plc4x/java/opm/PlcEntityManagerTest.java | 10 +-
plc4j/tools/scraper/pom.xml | 13 +-
.../apache/plc4x/java/scraper/ScraperTaskTest.java | 6 +-
.../org/apache/plc4x/java/scraper/ScraperTest.java | 6 +-
.../triggeredscraper/TriggeredScraperImplTest.java | 14 +-
plc4j/transports/test/pom.xml | 4 +
.../channel/embedded/Plc4xEmbeddedChannel.java | 892 +++++++++++++++++++++
.../channel/embedded/Plc4xEmbeddedEventLoop.java | 147 ++++
.../java/transport/test/TestChannelFactory.java | 11 +-
plc4j/utils/test-utils/pom.xml | 36 +
.../plc4x/test/driver/DriverTestsuiteRunner.java | 304 ++++++-
.../java/org/apache/plc4x/test/driver/Lalala.java | 44 +
.../plc4x/test/driver/model/DriverTestsuite.java | 27 +-
.../driver/model/{TestStep.java => StepType.java} | 33 +-
.../apache/plc4x/test/driver/model/TestStep.java | 14 +-
.../model/{TestStep.java => api/TestField.java} | 26 +-
.../{TestStep.java => api/TestFieldRequest.java} | 16 +-
.../{TestStep.java => api/TestReadRequest.java} | 20 +-
.../model/{TestStep.java => api/TestRequest.java} | 18 +-
.../{TestStep.java => api/TestWriteRequest.java} | 20 +-
.../main/resources/schemas/driver-testsuite.xsd | 54 +-
{plc4j/api => protocols/eip}/pom.xml | 20 +-
.../org/apache/plc4x/protocol/eip/EipProtocol.java | 46 ++
...e.plc4x.plugins.codegenerator.protocol.Protocol | 2 +-
.../eip/src/main/resources/protocols/eip/eip.mspec | 131 +++
protocols/pom.xml | 1 +
.../s7/src/main/resources/protocols/s7/s7.mspec | 2 +
sandbox/code-gen/pom.xml | 7 -
.../org/apache/plc4x/codegen/DFDLUtilTest.java | 1 +
.../org/apache/plc4x/codegen/ModuleNodeTest.java | 1 -
.../apache/plc4x/java/s7/utils/StaticHelper.java | 18 +
.../amsads/connection/AdsTcpPlcConnection.java | 9 +-
.../java/amsads/protocol/Plc4x2AdsProtocol.java | 5 +-
.../protocol/PassiveBacNetIpProtocolLogic.java | 9 +-
.../java/bacnetip/PassiveBacNetIpDriverManual.java | 9 +-
.../plc4x/java/df1/protocol/Plc4XDf1Protocol.java | 7 +-
159 files changed, 4723 insertions(+), 1235 deletions(-)