You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by jf...@apache.org on 2018/11/02 11:35:57 UTC
[incubator-plc4x] branch add-simple-mock-driver updated (38a4148 ->
594e19d)
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a change to branch add-simple-mock-driver
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
from 38a4148 Cleanup.
add 3d10fbc Add Simple Mock Driver.
add 1a3b151 Refactoring, fixed some stuff.
new b4217f3 Merge remote-tracking branch 'gitlab/add-simple-mock-driver' into add-simple-mock-driver
new 594e19d Test fixes.
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:
.../org/apache/plc4x/java/mock/MockDriver.java | 4 +-
.../apache/plc4x/java/mock/PlcMockDriverTest.java | 74 ++++++++++++++++++++++
.../java/mock/connection/PlcMockConnection.java} | 20 ++----
.../plc4x/java/mock/connection/PlcMockDriver.java} | 22 ++++---
.../org/apache/plc4x/java/mock/MockDevice.java | 3 -
.../java/org/apache/plc4x/java/mock/MockField.java | 0
.../apache/plc4x/java/mock/MockFieldHandler.java | 0
.../org/apache/plc4x/java/mock/MockReader.java | 51 +++++++++++++++
.../apache/plc4x/java/mock/PlcMockConnection.java | 30 ++-------
.../org/apache/plc4x/java/mock/PlcMockDriver.java} | 4 +-
.../services/org.apache.plc4x.java.spi.PlcDriver | 1 -
11 files changed, 153 insertions(+), 56 deletions(-)
create mode 100644 plc4j/core/src/test/java/org/apache/plc4x/java/mock/PlcMockDriverTest.java
copy plc4j/protocols/{test/src/main/java/org/apache/plc4x/java/mock/MockField.java => driver-bases/base/src/main/java/org/apache/plc4x/java/mock/connection/PlcMockConnection.java} (71%)
copy plc4j/{core/src/test/java/org/apache/plc4x/java/mock/DoubleMockDriver.java => protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/mock/connection/PlcMockDriver.java} (83%)
copy plc4j/protocols/{ => driver-bases}/test/src/main/java/org/apache/plc4x/java/mock/MockDevice.java (92%)
copy plc4j/protocols/{ => driver-bases}/test/src/main/java/org/apache/plc4x/java/mock/MockField.java (100%)
copy plc4j/protocols/{ => driver-bases}/test/src/main/java/org/apache/plc4x/java/mock/MockFieldHandler.java (100%)
create mode 100644 plc4j/protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/MockReader.java
copy plc4j/protocols/{ => driver-bases}/test/src/main/java/org/apache/plc4x/java/mock/PlcMockConnection.java (70%)
copy plc4j/{core/src/test/java/org/apache/plc4x/java/mock/MockDriver.java => protocols/driver-bases/test/src/main/java/org/apache/plc4x/java/mock/PlcMockDriver.java} (95%)
copy plc4j/protocols/{ => driver-bases}/test/src/main/resources/META-INF/services/org.apache.plc4x.java.spi.PlcDriver (95%)
[incubator-plc4x] 02/02: Test fixes.
Posted by jf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a commit to branch add-simple-mock-driver
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 594e19d78be554074448e1429a79f829c7626c36
Author: julian <j....@pragmaticminds.de>
AuthorDate: Fri Nov 2 12:35:49 2018 +0100
Test fixes.
---
plc4j/core/src/test/java/org/apache/plc4x/java/mock/MockDriver.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plc4j/core/src/test/java/org/apache/plc4x/java/mock/MockDriver.java b/plc4j/core/src/test/java/org/apache/plc4x/java/mock/MockDriver.java
index 6ebd36c..5e8b440 100644
--- a/plc4j/core/src/test/java/org/apache/plc4x/java/mock/MockDriver.java
+++ b/plc4j/core/src/test/java/org/apache/plc4x/java/mock/MockDriver.java
@@ -37,12 +37,12 @@ public class MockDriver implements PlcDriver {
@Override
public PlcConnection connect(String url) {
- return new PlcMockConnection(null);
+ return new MockConnection(null);
}
@Override
public PlcConnection connect(String url, PlcAuthentication authentication) {
- return new PlcMockConnection(authentication);
+ return new MockConnection(authentication);
}
}
[incubator-plc4x] 01/02: Merge remote-tracking branch
'gitlab/add-simple-mock-driver' into add-simple-mock-driver
Posted by jf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jfeinauer pushed a commit to branch add-simple-mock-driver
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit b4217f377733872efb0411b9d81777ec3d1a9ec1
Merge: 1a3b151 38a4148
Author: julian <j....@pragmaticminds.de>
AuthorDate: Fri Nov 2 12:11:41 2018 +0100
Merge remote-tracking branch 'gitlab/add-simple-mock-driver' into add-simple-mock-driver
examples/{azure => hello-cloud-azure}/pom.xml | 46 +-
.../cloud/azure}/S7PlcToAzureIoTHubSample.java | 32 +-
examples/{google => hello-cloud-google}/README.md | 0
examples/{google => hello-cloud-google}/pom.xml | 4 +-
.../examples/cloud/google}/MqttExampleOptions.java | 38 +-
.../cloud/google}/S7PlcToGoogleIoTCoreSample.java | 36 +-
.../src/main/resources/logback.xml | 0
.../src/remote-resources/META-INF/LICENSE | 0
.../kafka-connector.yml} | 18 +-
.../pom.xml | 13 +-
.../server.sh | 0
.../connectivity/kafka/KafkaConnector.java} | 54 +-
.../connectivity/kafka/model/Configuration.java | 56 ++
.../connectivity/kafka}/model/KafkaConfig.java | 36 +-
.../connectivity/kafka}/model/PlcConfig.java | 36 +-
.../connectivity/kafka}/model/PlcFieldConfig.java | 32 +-
.../connectivity/kafka/model/PlcMemoryBlock.java | 23 +-
.../src/main/resources/logback.xml | 0
.../mqtt-connector.yml} | 23 +-
examples/hello-connectivity-mqtt/pom.xml | 135 +++++
.../examples/connectivity/mqtt/MqttConnector.java | 154 ++++++
.../connectivity/mqtt/model/Configuration.java | 56 ++
.../connectivity/mqtt/model/MqttConfig.java | 56 ++
.../connectivity/mqtt}/model/PlcConfig.java | 36 +-
.../connectivity/mqtt}/model/PlcFieldConfig.java | 32 +-
.../connectivity/mqtt/model/PlcMemoryBlock.java | 23 +-
.../src/main/resources/logback.xml | 0
.../pom.xml | 8 +-
.../examples/integration/edgent}/PlcLogger.java | 36 +-
.../src/main/resources/logback.xml | 0
examples/{hello-plc4x => hello-opm}/pom.xml | 47 +-
.../plc4x/java/examples/helloopm/HelloOpm.java | 109 ++++
.../src/main/resources/logback.xml | 0
.../plc4x/java/examples/helloplc4x/HelloPlc4x.java | 108 ----
.../README.adoc | 0
.../pom.xml | 15 +-
.../elasticsearch/ElasticsearchStorage.java} | 52 +-
.../src/main/resources/log4j2.xml | 0
.../src/main/resources/logback.xml | 0
.../{hello-plc4x => hello-world-plc4x}/pom.xml | 11 +-
.../plc4x/java/examples/helloplc4x/HelloPlc4x.java | 111 ++++
.../src/main/resources/logback.xml | 0
examples/iotree/pom.xml | 84 ---
.../apache/plc4x/java/examples/iotree/IoTree.java | 109 ----
.../examples/kafkabridge/model/Configuration.java | 65 ---
.../examples/kafkabridge/model/PlcMemoryBlock.java | 41 --
examples/pom.xml | 15 +-
.../java/org/apache/plc4x/camel/Plc4XConsumer.java | 6 +-
.../org/apache/plc4x/kafka/Plc4xSourceTask.java | 12 +-
.../apache-nifi/nifi-plc4x-processors/pom.xml | 1 -
integrations/apache-nifi/pom.xml | 8 +
.../PlcUsernamePasswordAuthentication.java | 1 +
.../java/ads/connection/AdsTcpPlcConnection.java | 4 +-
.../apache/plc4x/java/ads/model/AdsDataType.java | 80 +--
.../plc4x/java/ads/model/AdsPlcFieldHandler.java | 148 +++---
.../ads/protocol/util/LittleEndianDecoder.java | 34 +-
.../ads/protocol/util/LittleEndianEncoder.java | 62 ++-
.../connection/AdsAbstractPlcConnectionTest.java | 3 +-
.../java/ads/model/AdsPlcFieldHandlerTest.java | 591 +++++++++++++++++++++
.../protocol/util/EncoderDecoderRoundTripTest.java | 100 ++++
plc4j/protocols/ads/src/test/resources/logback.xml | 2 +-
.../java/base/messages/DefaultPlcReadResponse.java | 5 +-
.../messages/DefaultPlcUnsubscriptionResponse.java | 8 +-
.../InternalPlcUnsubscriptionResponse.java | 2 +-
.../base/messages/items/BaseDefaultFieldItem.java | 2 +-
.../SingleItemToSingleRequestProtocol.java | 152 +++++-
.../SingleItemToSingleRequestProtocolTest.java | 200 ++++++-
.../base/protocol/Plc4XSupportedDataTypes.java | 4 +-
.../ethernetip/netty/Plc4XEtherNetIpProtocol.java | 9 +-
.../java/modbus/netty/Plc4XModbusProtocol.java | 2 +-
plc4j/protocols/s7/pom.xml | 29 +
.../plc4x/java/isotp/netty/IsoTPProtocol.java | 12 +-
.../java/isotp/netty/model/types/DeviceGroup.java | 17 +-
.../isotp/netty/model/types/DisconnectReason.java | 17 +-
.../isotp/netty/model/types/ParameterCode.java | 17 +-
.../isotp/netty/model/types/ProtocolClass.java | 17 +-
.../java/isotp/netty/model/types/RejectCause.java | 17 +-
.../java/isotp/netty/model/types/TpduCode.java | 17 +-
.../java/isotp/netty/model/types/TpduSize.java | 17 +-
.../plc4x/java/s7/connection/S7PlcConnection.java | 22 +-
.../org/apache/plc4x/java/s7/model/S7Field.java | 120 +++--
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 455 +++++++++-------
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 251 +++++----
.../java/s7/netty/events/S7IdentifiedEvent.java | 22 -
.../java/s7/netty/model/payloads/VarPayload.java | 9 +-
.../types/CpuServicesParameterFunctionGroup.java | 17 +-
.../CpuServicesParameterSubFunctionGroup.java | 17 +-
.../netty/model/types/DataTransportErrorCode.java | 17 +-
.../s7/netty/model/types/DataTransportSize.java | 19 +-
.../s7/netty/model/types/HeaderErrorClass.java | 17 +-
.../java/s7/netty/model/types/MemoryArea.java | 17 +-
.../java/s7/netty/model/types/MessageType.java | 17 +-
.../java/s7/netty/model/types/ParameterError.java | 17 +-
.../java/s7/netty/model/types/ParameterType.java | 17 +-
.../s7/netty/model/types/SpecificationType.java | 17 +-
.../plc4x/java/s7/netty/model/types/SslId.java | 17 +-
.../java/s7/netty/model/types/TransportSize.java | 19 +-
.../netty/model/types/VariableAddressingMode.java | 17 +-
.../strategies/DefaultS7MessageProcessor.java | 361 +++++++------
.../s7/netty/strategies/S7MessageProcessor.java | 2 +-
.../java/s7/netty/util/S7PlcFieldHandler.java | 206 ++++---
.../s7/netty/util/S7RequestSizeCalculator.java | 16 +-
.../s7/netty/util/S7ResponseSizeEstimator.java | 14 +-
.../plc4x/java/s7/netty/util/S7TypeDecoder.java | 97 ----
.../plc4x/java/s7/netty/util/S7TypeEncoder.java | 153 ------
.../plc4x/java/s7/utils/S7TsapIdEncoder.java | 12 +-
.../org/apache/plc4x/java/s7/S7PlcDriverTest.java | 29 +-
.../java/s7/connection/S7PlcConnectionIT.java | 92 ++--
.../java/s7/connection/S7PlcConnectionTests.java | 89 +---
.../java/s7/connection/S7PlcTestConnection.java | 152 +++---
.../apache/plc4x/java/s7/netty/S7ProtocolTest.java | 424 +++++++++++++--
.../s7/netty/model/payloads/S7PayloadTests.java | 67 +++
.../strategies/DefaultS7MessageProcessorTest.java | 28 +-
.../java/s7/netty/util/S7PlcFieldHandlerTest.java | 20 +-
.../s7/netty/util/S7RequestSizeCalculatorTest.java | 141 +++++
.../s7/netty/util/S7ResponseSizeEstimatorTest.java | 122 +++++
.../plc4x/java/s7/utils/S7TsapIdEncoderTest.java | 68 +++
plc4j/protocols/s7/src/test/resources/logback.xml | 2 +-
.../java/s7/connection/s7-read-var-request.pcapng | Bin 0 -> 400 bytes
.../java/s7/connection/s7-read-var-response.pcapng | Bin 0 -> 392 bytes
.../java/s7/connection/s7-write-var-request.pcapng | Bin 0 -> 404 bytes
.../s7/connection/s7-write-var-response.pcapng | Bin 0 -> 388 bytes
.../org/apache/plc4x/java/mock/MockDevice.java | 37 ++
.../java/org/apache/plc4x/java/mock/MockField.java | 36 ++
.../apache/plc4x/java/mock/MockFieldHandler.java | 33 ++
.../apache/plc4x/java/mock/PlcMockConnection.java | 127 +++++
.../org/apache/plc4x/java/mock/PlcMockDriver.java | 62 +++
.../java/org/apache/plc4x/java/test/TestField.java | 5 +
.../services/org.apache.plc4x.java.spi.PlcDriver | 1 +
.../apache/plc4x/java/mock/PlcMockDriverTest.java | 91 ++++
.../plc4x/java/utils/connectionpool/PoolKey.java | 73 +++
.../java/utils/connectionpool/PoolKeyFactory.java | 103 ++++
.../connectionpool/PooledPlcConnectionFactory.java | 8 +-
.../connectionpool/PooledPlcDriverManager.java | 217 +++-----
.../utils/connectionpool/PoolKeyFactoryTest.java | 93 ++++
.../connectionpool/PooledPlcDriverManagerTest.java | 110 +---
.../plc4x/java/opm/PlcEntityInterceptor.java | 21 +-
pom.xml | 11 +-
138 files changed, 5048 insertions(+), 2525 deletions(-)