You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by hu...@apache.org on 2021/01/30 12:23:25 UTC

[plc4x] branch feature/native_opua_client updated (d8e54a0 -> b7767cf)

This is an automated email from the ASF dual-hosted git repository.

hutcheb pushed a change to branch feature/native_opua_client
in repository https://gitbox.apache.org/repos/asf/plc4x.git.


    from d8e54a0  Cleaned up parameter parsing and key store generator.
     new f4920e9  Minors changes, updating to latest 0.9-snapshot
     add 471873a  - Made the KNX driver return an error if the device we try to connect to doesn't support "tunneling"
     add 320cd6d  - Added more documentation on KNX operations
     add 191ecd2  - Added stuff for decoding the KNX DeviceDescriptors
     add d32e91a  - Fixed a wrong package name
     add ad6cc1d  - Replaced the manually created KnxDatatypes and DataIo with a fully generated version
     add 5e874e5  - Updated generated Go code
     add d9b9ddd  - Finished migrating the Go KNX client to the new model.
     add 1fe637e  - Some version updates of dependencies prior to cutting the release branch
     add 2f999a8  - Updated the list of fixed bugs in the RELEASE_NOTES
     add 86000d7  - Added the new programming languages to doe doap file
     add 7a3fe61  - Ensured all integrations and examples have all of our drivers available - Removed the "with-proxies" profile and everything that relies on this - Updated the prerequisiteCheck.groovy script to no longer check thrift-related things - Updated the release and release-validation sites
     add 066c2cc  - Made sure the generated code for accessing properties of a variable are start upercase
     add c2da3d2  removed http port
     add 14d5b30  [maven-release-plugin] prepare branch @{releaseLabel}
     add c55955a  - Updated the release documentation a bit more
     add 5c0c71e  [maven-release-plugin] prepare branch @{releaseLabel}
     add cadbe51  [maven-release-plugin] prepare for next development iteration
     add 57f012d  - Cleaned up after preparing the release-branch
     add 19598f4  - Cleaned up after preparing the release-branch
     add 61e933d  - Cleaned up after preparing the release-branch
     add 89e296d  - Cleanup after preparing the release
     add 7a08397  - Cleanup after preparing the release
     add 0dce67f  - Cleanup after preparing the release
     add 872e52c  - Made the download_staged_release.sh download a README and not a README.md
     add 63c9f87  - Fixed the profile names in the Dockerfile (Still doesn't work for me)
     add c33c2d8  - Made the versions more release-plugin-friendly
     add 5e12b09  - Merged some changes from the release branch
     add 2904a96  - Fixed the Docker build on Windows systems
     add 8c29037  - Added dataIo of the KNX property types - Refactored the Go KNX driver to support the concept of device-connections
     add 1a06b89  - Some minor bug-fixing of my latest changes
     add d53e601  - Updated the download and doap files after officially releasing 0.8.0
     new 042be9a  Merge branch 'develop' into feature/native_opua_client
     new b7767cf  Working on encryption

The 3 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:
 Dockerfile                                         |    15 +-
 NOTICE                                             |     2 +-
 README.md                                          |    23 +-
 RELEASE_NOTES                                      |    19 +-
 build-utils/language-base-freemarker/pom.xml       |     2 +-
 .../BaseFreemarkerLanguageTemplateHelper.java      |     4 +
 build-utils/language-c/pom.xml                     |     4 +-
 build-utils/language-go/pom.xml                    |     4 +-
 .../language/go/GoLanguageTemplateHelper.java      |   210 +-
 .../resources/templates/go/data-io-template.ftlh   |    14 +-
 .../templates/go/parser-factory-template.ftlh      |     2 +-
 .../templates/go/xml-parser-factory-template.ftlh  |     2 +-
 build-utils/language-java/pom.xml                  |     4 +-
 .../resources/templates/java/data-io-template.ftlh |    32 +-
 .../main/resources/templates/java/io-template.ftlh |    11 +
 build-utils/pom.xml                                |     2 +-
 build-utils/protocol-base-mspec/pom.xml            |     2 +-
 build-utils/protocol-test/pom.xml                  |     6 +-
 .../knxnetip/ParserSerializerTestsuite.xml         |    35 +-
 plc4go/cmd/main/drivers/knxnetip_test.go           |     5 +-
 .../plc4go/bacnetip/readwrite/ParserHelper.go      |     2 +-
 .../plc4go/bacnetip/readwrite/XmlParserHelper.go   |     2 +-
 .../{KnxNetIpWriter.go => KnxNetIpActiveReader.go} |    48 +-
 plc4go/internal/plc4go/knxnetip/KnxNetIpBrowser.go |    99 +-
 .../internal/plc4go/knxnetip/KnxNetIpConnection.go |  1136 +-
 .../internal/plc4go/knxnetip/KnxNetIpDiscoverer.go |     9 +-
 plc4go/internal/plc4go/knxnetip/KnxNetIpField.go   |    17 +
 .../plc4go/knxnetip/KnxNetIpMessageCodec.go        |    19 +-
 plc4go/internal/plc4go/knxnetip/KnxNetIpReader.go  |   714 +-
 .../internal/plc4go/knxnetip/KnxNetIpSubscriber.go |    60 +-
 plc4go/internal/plc4go/knxnetip/KnxNetIpWriter.go  |     3 +-
 .../plc4go/knxnetip/readwrite/ParserHelper.go      |   142 +-
 .../plc4go/knxnetip/readwrite/XmlParserHelper.go   |   378 +-
 .../plc4go/knxnetip/readwrite/model/APCI.go        |   193 -
 .../plc4go/knxnetip/readwrite/model/Apdu.go        |   286 +
 .../plc4go/knxnetip/readwrite/model/ApduControl.go |   236 +
 .../model/{LDataFrameAck.go => ApduControlAck.go}  |    68 +-
 .../{LDataFrameAck.go => ApduControlConnect.go}    |    68 +-
 .../readwrite/model/ApduControlContainer.go        |   166 +
 .../{LDataFrameAck.go => ApduControlDisconnect.go} |    68 +-
 .../model/{LDataFrameAck.go => ApduControlNack.go} |    68 +-
 .../plc4go/knxnetip/readwrite/model/ApduData.go    |   404 +
 .../model/{LDataFrameAck.go => ApduDataAdcRead.go} |    68 +-
 .../{LDataFrameAck.go => ApduDataAdcResponse.go}   |    68 +-
 .../knxnetip/readwrite/model/ApduDataContainer.go  |   166 +
 .../model/ApduDataDeviceDescriptorRead.go          |   164 +
 .../model/ApduDataDeviceDescriptorResponse.go      |   210 +
 .../plc4go/knxnetip/readwrite/model/ApduDataExt.go |   754 ++
 ...aFrameAck.go => ApduDataExtAuthorizeRequest.go} |    68 +-
 ...FrameAck.go => ApduDataExtAuthorizeResponse.go} |    68 +-
 ...FrameAck.go => ApduDataExtDomainAddressRead.go} |    68 +-
 ...eAck.go => ApduDataExtDomainAddressResponse.go} |    68 +-
 ...go => ApduDataExtDomainAddressSelectiveRead.go} |    68 +-
 ...=> ApduDataExtDomainAddressSerialNumberRead.go} |    68 +-
 ...pduDataExtDomainAddressSerialNumberResponse.go} |    68 +-
 ...> ApduDataExtDomainAddressSerialNumberWrite.go} |    68 +-
 ...rameAck.go => ApduDataExtDomainAddressWrite.go} |    68 +-
 ...meAck.go => ApduDataExtFileStreamInfoReport.go} |    68 +-
 ... => ApduDataExtGroupPropertyValueInfoReport.go} |    68 +-
 ...Ack.go => ApduDataExtGroupPropertyValueRead.go} |    68 +-
 ...go => ApduDataExtGroupPropertyValueResponse.go} |    68 +-
 ...ck.go => ApduDataExtGroupPropertyValueWrite.go} |    68 +-
 ...pduDataExtIndividualAddressSerialNumberRead.go} |    68 +-
 ...ataExtIndividualAddressSerialNumberResponse.go} |    68 +-
 ...duDataExtIndividualAddressSerialNumberWrite.go} |    68 +-
 ...{LDataFrameAck.go => ApduDataExtKeyResponse.go} |    68 +-
 .../{LDataFrameAck.go => ApduDataExtKeyWrite.go}   |    68 +-
 .../{LDataFrameAck.go => ApduDataExtLinkRead.go}   |    68 +-
 ...LDataFrameAck.go => ApduDataExtLinkResponse.go} |    68 +-
 .../{LDataFrameAck.go => ApduDataExtLinkWrite.go}  |    68 +-
 ...ataFrameAck.go => ApduDataExtMemoryBitWrite.go} |    68 +-
 ...meAck.go => ApduDataExtNetworkParameterRead.go} |    68 +-
 ...k.go => ApduDataExtNetworkParameterResponse.go} |    68 +-
 ...eAck.go => ApduDataExtNetworkParameterWrite.go} |    68 +-
 ...ck.go => ApduDataExtOpenRoutingTableRequest.go} |    68 +-
 ...ck.go => ApduDataExtPropertyDescriptionRead.go} |    68 +-
 ...o => ApduDataExtPropertyDescriptionResponse.go} |    68 +-
 .../model/ApduDataExtPropertyValueRead.go          |   248 +
 .../model/ApduDataExtPropertyValueResponse.go      |   292 +
 ...rameAck.go => ApduDataExtPropertyValueWrite.go} |    68 +-
 ...ck.go => ApduDataExtReadRouterMemoryRequest.go} |    68 +-
 ...k.go => ApduDataExtReadRouterMemoryResponse.go} |    68 +-
 ...ck.go => ApduDataExtReadRouterStatusRequest.go} |    68 +-
 ...k.go => ApduDataExtReadRouterStatusResponse.go} |    68 +-
 ...ck.go => ApduDataExtReadRoutingTableRequest.go} |    68 +-
 ...k.go => ApduDataExtReadRoutingTableResponse.go} |    68 +-
 ...k.go => ApduDataExtWriteRouterMemoryRequest.go} |    68 +-
 ...k.go => ApduDataExtWriteRouterStatusRequest.go} |    68 +-
 ...k.go => ApduDataExtWriteRoutingTableRequest.go} |    68 +-
 ...{LDataFrameAck.go => ApduDataGroupValueRead.go} |    68 +-
 ...taFrameAck.go => ApduDataGroupValueResponse.go} |    68 +-
 .../readwrite/model/ApduDataGroupValueWrite.go     |   210 +
 ...rameAck.go => ApduDataIndividualAddressRead.go} |    68 +-
 ...Ack.go => ApduDataIndividualAddressResponse.go} |    68 +-
 ...ameAck.go => ApduDataIndividualAddressWrite.go} |    68 +-
 .../{LDataFrameAck.go => ApduDataMemoryRead.go}    |    68 +-
 ...{LDataFrameAck.go => ApduDataMemoryResponse.go} |    68 +-
 .../{LDataFrameAck.go => ApduDataMemoryWrite.go}   |    68 +-
 .../knxnetip/readwrite/model/ApduDataOther.go      |   163 +
 .../model/{LDataFrameAck.go => ApduDataRestart.go} |    68 +-
 .../{LDataFrameAck.go => ApduDataUserMessage.go}   |    68 +-
 .../knxnetip/readwrite/model/ChannelInformation.go |   167 +
 .../plc4go/knxnetip/readwrite/model/ControlType.go |   109 -
 .../readwrite/model/DeviceDescriptorMediumType.go  |   123 +
 .../readwrite/model/DeviceDescriptorType0.go       |   476 +
 .../readwrite/model/DeviceDescriptorType2.go       |   371 +
 .../knxnetip/readwrite/model/ExtendedAPCI.go       |   368 -
 .../knxnetip/readwrite/model/FirmwareType.go       |   220 +
 .../knxnetip/readwrite/model/KnxDatapoint.go       | 13145 ++++++++++++++-----
 ...KnxDatapointType.go => KnxDatapointMainType.go} |   474 +-
 .../readwrite/model/KnxDatapointSubtype.go         |  5260 --------
 .../knxnetip/readwrite/model/KnxDatapointType.go   |  5492 +++++++-
 .../plc4go/knxnetip/readwrite/model/KnxProperty.go |  1407 ++
 .../plc4go/knxnetip/readwrite/model/LBusmonInd.go  |     2 +-
 .../plc4go/knxnetip/readwrite/model/LDataFrame.go  |    63 +-
 .../knxnetip/readwrite/model/LDataFrameData.go     |   325 +-
 .../knxnetip/readwrite/model/LDataFrameDataExt.go  |   325 +-
 .../readwrite/model/LDataFramePollingData.go       |    11 +-
 .../plc4go/modbus/readwrite/ParserHelper.go        |     2 +-
 .../plc4go/modbus/readwrite/XmlParserHelper.go     |     2 +-
 .../internal/plc4go/s7/readwrite/ParserHelper.go   |     2 +-
 .../plc4go/s7/readwrite/XmlParserHelper.go         |     2 +-
 plc4go/pom.xml                                     |    12 +-
 plc4j/api/pom.xml                                  |     2 +-
 plc4j/drivers/ab-eth/pom.xml                       |    16 +-
 plc4j/drivers/ads/pom.xml                          |    18 +-
 plc4j/drivers/canopen/pom.xml                      |    16 +-
 plc4j/drivers/eip/pom.xml                          |    16 +-
 plc4j/drivers/firmata/pom.xml                      |    16 +-
 plc4j/drivers/knxnetip/pom.xml                     |    22 +-
 .../plc4x/java/knxnetip/ets5/Ets5Parser.java       |    10 +-
 .../java/knxnetip/ets5/model/GroupAddress.java     |     8 +-
 .../knxnetip/protocol/KnxNetIpProtocolLogic.java   |    92 +-
 plc4j/drivers/mock/pom.xml                         |     6 +-
 plc4j/drivers/modbus/pom.xml                       |    20 +-
 plc4j/drivers/opcua/pom.xml                        |    12 +-
 .../java/opcua/config/OpcuaConfiguration.java      |     6 +-
 .../java/opcua/context/CertificateKeyPair.java     |     8 +-
 .../java/opcua/protocol/OpcuaProtocolLogic.java    |   550 +-
 plc4j/drivers/pom.xml                              |     2 +-
 plc4j/drivers/s7/pom.xml                           |    16 +-
 plc4j/drivers/simulated/pom.xml                    |    10 +-
 plc4j/examples/dummy-driver/pom.xml                |    96 -
 .../java/examples/dummydriver/DummyDriver.java     |    67 -
 .../dummydriver/connection/DummyConnection.java    |    82 -
 .../examples/dummydriver/model/DummyField.java     |    35 -
 .../examples/dummydriver/netty/DummyProtocol.java  |    75 -
 .../services/org.apache.plc4x.java.api.PlcDriver   |    19 -
 plc4j/examples/hello-cloud-azure/pom.xml           |     4 +-
 plc4j/examples/hello-cloud-google/pom.xml          |     4 +-
 plc4j/examples/hello-connectivity-kafka/pom.xml    |     6 +-
 plc4j/examples/hello-connectivity-mqtt/pom.xml     |     4 +-
 plc4j/examples/hello-integration-edgent/pom.xml    |     4 +-
 plc4j/examples/hello-integration-iotdb/pom.xml     |     6 +-
 plc4j/examples/hello-opm/pom.xml                   |     6 +-
 plc4j/examples/hello-storage-elasticsearch/pom.xml |     6 +-
 plc4j/examples/hello-webapp/client/pom.xml         |     2 +-
 plc4j/examples/hello-webapp/pom.xml                |     2 +-
 plc4j/examples/hello-webapp/webapp/pom.xml         |     8 +-
 plc4j/examples/hello-webservice/pom.xml            |    11 +-
 .../hello-world-plc4x-subscription/pom.xml         |     4 +-
 plc4j/examples/hello-world-plc4x-write/pom.xml     |     4 +-
 plc4j/examples/hello-world-plc4x/pom.xml           |    11 +-
 plc4j/examples/poll-loop/pom.xml                   |    10 +-
 plc4j/examples/pom.xml                             |    27 +-
 plc4j/examples/replay-test/pom.xml                 |    78 -
 plc4j/integrations/apache-calcite/pom.xml          |   108 +-
 plc4j/integrations/apache-camel/pom.xml            |   109 +-
 .../java/org/apache/plc4x/camel/ManualTest.java    |     2 +-
 plc4j/integrations/apache-edgent/pom.xml           |    98 +-
 plc4j/integrations/apache-kafka/pom.xml            |    28 +-
 .../apache-nifi/nifi-plc4x-nar/pom.xml             |    38 +-
 .../apache-nifi/nifi-plc4x-processors/pom.xml      |     6 +-
 plc4j/integrations/apache-nifi/pom.xml             |     4 +-
 plc4j/integrations/logstash-plugin/pom.xml         |    43 +-
 plc4j/integrations/opcua-server/pom.xml            |   239 +-
 .../opcua-server/src/main/resources/config.yml     |     1 -
 plc4j/integrations/pom.xml                         |     2 +-
 plc4j/karaf-features/README.md                     |    42 -
 plc4j/karaf-features/camel/pom.xml                 |    67 -
 plc4j/karaf-features/eip/pom.xml                   |    72 -
 plc4j/karaf-features/karaf-itest/pom.xml           |   207 -
 .../java/org/apache/plc4x/karaf/FeatureIT.java     |   100 -
 .../test/resources/etc/org.ops4j.pax.logging.cfg   |    71 -
 plc4j/karaf-features/pom.xml                       |    82 -
 plc4j/karaf-features/s7/pom.xml                    |    71 -
 plc4j/osgi/pom.xml                                 |    11 +-
 plc4j/pom.xml                                      |     3 +-
 plc4j/protocols/ads/pom.xml                        |     8 +-
 plc4j/protocols/benchmarks/pom.xml                 |     4 +-
 plc4j/protocols/delta-v/pom.xml                    |     2 +-
 plc4j/protocols/pom.xml                            |     2 +-
 plc4j/spi/pom.xml                                  |     4 +-
 plc4j/tools/capture-replay/pom.xml                 |     2 +-
 plc4j/tools/connection-pool/pom.xml                |     4 +-
 plc4j/tools/interop/pom.xml                        |   215 -
 plc4j/tools/interop/src/assembly/assembly.xml      |    41 -
 .../java/org/apache/plc4x/interop/impl/Client.java |    60 -
 .../org/apache/plc4x/interop/impl/Handler.java     |   163 -
 .../java/org/apache/plc4x/interop/impl/Server.java |    98 -
 plc4j/tools/opm/pom.xml                            |     8 +-
 plc4j/tools/pom.xml                                |    11 +-
 plc4j/tools/scraper/pom.xml                        |    10 +-
 plc4j/transports/pcap-replay/pom.xml               |    12 +-
 plc4j/transports/pcap-shared/pom.xml               |     6 +-
 plc4j/transports/pom.xml                           |     2 +-
 plc4j/transports/raw-socket/pom.xml                |    10 +-
 plc4j/transports/serial/pom.xml                    |     6 +-
 plc4j/transports/socketcan/pom.xml                 |     4 +-
 plc4j/transports/tcp/pom.xml                       |     6 +-
 plc4j/transports/test/pom.xml                      |     4 +-
 plc4j/transports/udp/pom.xml                       |     6 +-
 plc4j/utils/pcap-replay/pom.xml                    |     4 +-
 plc4j/utils/pcap-shared/pom.xml                    |     2 +-
 plc4j/utils/pom.xml                                |     2 +-
 plc4j/utils/raw-sockets/pom.xml                    |     6 +-
 plc4j/utils/test-utils/pom.xml                     |     8 +-
 pom.xml                                            |    12 +-
 protocols/ab-eth/pom.xml                           |     4 +-
 protocols/ads/pom.xml                              |     4 +-
 protocols/bacnetip/pom.xml                         |     4 +-
 protocols/canopen/pom.xml                          |     4 +-
 protocols/df1/pom.xml                              |     4 +-
 protocols/eip/pom.xml                              |     4 +-
 protocols/firmata/pom.xml                          |     4 +-
 protocols/knxnetip/pom.xml                         |     4 +-
 .../resources/protocols/knxnetip/knxnetip.mspec    |  1696 +--
 protocols/knxnetip/src/main/xslt/knx-types.xsl     |   283 +-
 protocols/knxnetip/src/site/asciidoc/index.adoc    |   114 +-
 .../knxnetip/ParserSerializerTestsuite.xml         |    35 +-
 protocols/modbus/pom.xml                           |     4 +-
 protocols/opcua/pom.xml                            |     4 +-
 .../src/main/resources/protocols/opcua/opcua.mspec |     8 +-
 protocols/opcua/src/main/xslt/opc-types.xsl        |     4 +-
 protocols/pom.xml                                  |    12 +-
 protocols/proxy/pom.xml                            |    35 -
 protocols/proxy/src/main/java/.keepMe              |    20 -
 .../apache/plc4x/protocols/proxy/interop.thrift    |    93 -
 protocols/s7/pom.xml                               |     4 +-
 protocols/simulated/pom.xml                        |     4 +-
 sandbox/code-gen/pom.xml                           |     2 +-
 sandbox/discovery/pom.xml                          |     4 +-
 sandbox/hello-influx-data-collection/pom.xml       |    12 +-
 sandbox/plc-simulator/pom.xml                      |    10 +-
 sandbox/plc4c/pom.xml                              |    13 +-
 sandbox/plc4cpp/pom.xml                            |    86 +-
 sandbox/plc4net/api/pom.xml                        |     2 +-
 sandbox/plc4net/plc4net.driver/pom.xml             |     2 +-
 sandbox/plc4net/pom.xml                            |     2 +-
 sandbox/plc4py/pom.xml                             |   105 +-
 sandbox/pom.xml                                    |     5 +-
 sandbox/test-java-bacnetip-driver/pom.xml          |    16 +-
 sandbox/test-java-df1-driver/pom.xml               |    16 +-
 sandbox/test-streampipes-plc4x-adapters/pom.xml    |    20 +-
 sandbox/test-streampipes-plc4x-processors/pom.xml  |    10 +-
 sandbox/test-streampipes-plc4x-shared/pom.xml      |     2 +-
 src/main/script/prerequisiteCheck.groovy           |    27 +-
 src/site/asciidoc/developers/release/release.adoc  |   115 +-
 .../asciidoc/developers/release/validation.adoc    |     1 +
 src/site/asciidoc/users/download.adoc              |    61 +-
 src/site/resources-filtered/plc4x-doap.rdf         |    14 +-
 tools/boost/pom.xml                                |     2 +-
 tools/download_staged_release.sh                   |     2 +-
 tools/logstash/pom.xml                             |     2 +-
 tools/pom.xml                                      |     8 +-
 tools/thrift/pom.xml                               |   407 -
 tools/thrift/src/assembly/compiler.xml             |    43 -
 tools/thrift/src/assembly/cpp.xml                  |    56 -
 tools/thrift/src/assembly/python.xml               |    43 -
 269 files changed, 26483 insertions(+), 19113 deletions(-)
 copy plc4go/internal/plc4go/knxnetip/{KnxNetIpWriter.go => KnxNetIpActiveReader.go} (51%)
 delete mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/APCI.go
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/Apdu.go
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControl.go
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduControlAck.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduControlConnect.go} (55%)
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/ApduControlContainer.go
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduControlDisconnect.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduControlNack.go} (56%)
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/ApduData.go
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataAdcRead.go} (56%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataAdcResponse.go} (55%)
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataContainer.go
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorRead.go
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataDeviceDescriptorResponse.go
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExt.go
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtAuthorizeRequest.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtAuthorizeResponse.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtDomainAddressRead.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtDomainAddressResponse.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtDomainAddressSelectiveRead.go} (54%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtDomainAddressSerialNumberRead.go} (53%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtDomainAddressSerialNumberResponse.go} (52%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtDomainAddressSerialNumberWrite.go} (53%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtDomainAddressWrite.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtFileStreamInfoReport.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtGroupPropertyValueInfoReport.go} (54%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtGroupPropertyValueRead.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtGroupPropertyValueResponse.go} (54%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtGroupPropertyValueWrite.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtIndividualAddressSerialNumberRead.go} (52%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtIndividualAddressSerialNumberResponse.go} (51%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtIndividualAddressSerialNumberWrite.go} (52%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtKeyResponse.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtKeyWrite.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtLinkRead.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtLinkResponse.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtLinkWrite.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtMemoryBitWrite.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtNetworkParameterRead.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtNetworkParameterResponse.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtNetworkParameterWrite.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtOpenRoutingTableRequest.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtPropertyDescriptionRead.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtPropertyDescriptionResponse.go} (54%)
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueRead.go
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataExtPropertyValueResponse.go
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtPropertyValueWrite.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtReadRouterMemoryRequest.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtReadRouterMemoryResponse.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtReadRouterStatusRequest.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtReadRouterStatusResponse.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtReadRoutingTableRequest.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtReadRoutingTableResponse.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtWriteRouterMemoryRequest.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtWriteRouterStatusRequest.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataExtWriteRoutingTableRequest.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataGroupValueRead.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataGroupValueResponse.go} (55%)
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataGroupValueWrite.go
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataIndividualAddressRead.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataIndividualAddressResponse.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataIndividualAddressWrite.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataMemoryRead.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataMemoryResponse.go} (55%)
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataMemoryWrite.go} (55%)
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/ApduDataOther.go
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataRestart.go} (56%)
 rename plc4go/internal/plc4go/knxnetip/readwrite/model/{LDataFrameAck.go => ApduDataUserMessage.go} (55%)
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/ChannelInformation.go
 delete mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/ControlType.go
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptorMediumType.go
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptorType0.go
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/DeviceDescriptorType2.go
 delete mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/ExtendedAPCI.go
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/FirmwareType.go
 copy plc4go/internal/plc4go/knxnetip/readwrite/model/{KnxDatapointType.go => KnxDatapointMainType.go} (55%)
 delete mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapointSubtype.go
 create mode 100644 plc4go/internal/plc4go/knxnetip/readwrite/model/KnxProperty.go
 delete mode 100644 plc4j/examples/dummy-driver/pom.xml
 delete mode 100644 plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/DummyDriver.java
 delete mode 100644 plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/connection/DummyConnection.java
 delete mode 100644 plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/model/DummyField.java
 delete mode 100644 plc4j/examples/dummy-driver/src/main/java/org/apache/plc4x/java/examples/dummydriver/netty/DummyProtocol.java
 delete mode 100644 plc4j/examples/dummy-driver/src/main/resources/META-INF/services/org.apache.plc4x.java.api.PlcDriver
 delete mode 100644 plc4j/examples/replay-test/pom.xml
 delete mode 100644 plc4j/karaf-features/README.md
 delete mode 100644 plc4j/karaf-features/camel/pom.xml
 delete mode 100644 plc4j/karaf-features/eip/pom.xml
 delete mode 100644 plc4j/karaf-features/karaf-itest/pom.xml
 delete mode 100644 plc4j/karaf-features/karaf-itest/src/test/java/org/apache/plc4x/karaf/FeatureIT.java
 delete mode 100644 plc4j/karaf-features/karaf-itest/src/test/resources/etc/org.ops4j.pax.logging.cfg
 delete mode 100644 plc4j/karaf-features/pom.xml
 delete mode 100644 plc4j/karaf-features/s7/pom.xml
 delete mode 100644 plc4j/tools/interop/pom.xml
 delete mode 100644 plc4j/tools/interop/src/assembly/assembly.xml
 delete mode 100644 plc4j/tools/interop/src/main/java/org/apache/plc4x/interop/impl/Client.java
 delete mode 100644 plc4j/tools/interop/src/main/java/org/apache/plc4x/interop/impl/Handler.java
 delete mode 100644 plc4j/tools/interop/src/main/java/org/apache/plc4x/interop/impl/Server.java
 delete mode 100644 protocols/proxy/pom.xml
 delete mode 100644 protocols/proxy/src/main/java/.keepMe
 delete mode 100644 protocols/proxy/src/main/resources/org/apache/plc4x/protocols/proxy/interop.thrift
 delete mode 100644 tools/thrift/pom.xml
 delete mode 100644 tools/thrift/src/assembly/compiler.xml
 delete mode 100644 tools/thrift/src/assembly/cpp.xml
 delete mode 100644 tools/thrift/src/assembly/python.xml


[plc4x] 02/03: Merge branch 'develop' into feature/native_opua_client

Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

hutcheb pushed a commit to branch feature/native_opua_client
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit 042be9a2409c4793d20160efee63a9f77861552b
Merge: f4920e9 d53e601
Author: hutcheb <be...@gmail.com>
AuthorDate: Thu Jan 28 20:56:28 2021 -0500

    Merge branch 'develop' into feature/native_opua_client

 Dockerfile                                         |    15 +-
 NOTICE                                             |     2 +-
 README.md                                          |    23 +-
 RELEASE_NOTES                                      |    19 +-
 build-utils/language-base-freemarker/pom.xml       |     2 +-
 .../BaseFreemarkerLanguageTemplateHelper.java      |     4 +
 build-utils/language-c/pom.xml                     |     4 +-
 build-utils/language-go/pom.xml                    |     4 +-
 .../language/go/GoLanguageTemplateHelper.java      |   210 +-
 .../resources/templates/go/data-io-template.ftlh   |    14 +-
 .../templates/go/parser-factory-template.ftlh      |     2 +-
 .../templates/go/xml-parser-factory-template.ftlh  |     2 +-
 build-utils/language-java/pom.xml                  |     4 +-
 .../resources/templates/java/data-io-template.ftlh |    22 +-
 build-utils/pom.xml                                |     2 +-
 build-utils/protocol-base-mspec/pom.xml            |     2 +-
 build-utils/protocol-test/pom.xml                  |     6 +-
 .../knxnetip/ParserSerializerTestsuite.xml         |    35 +-
 plc4go/cmd/main/drivers/knxnetip_test.go           |     5 +-
 .../plc4go/bacnetip/readwrite/ParserHelper.go      |     2 +-
 .../plc4go/bacnetip/readwrite/XmlParserHelper.go   |     2 +-
 .../{KnxNetIpWriter.go => KnxNetIpActiveReader.go} |    48 +-
 plc4go/internal/plc4go/knxnetip/KnxNetIpBrowser.go |    99 +-
 .../internal/plc4go/knxnetip/KnxNetIpConnection.go |  1136 +-
 .../internal/plc4go/knxnetip/KnxNetIpDiscoverer.go |     9 +-
 plc4go/internal/plc4go/knxnetip/KnxNetIpField.go   |    17 +
 .../plc4go/knxnetip/KnxNetIpMessageCodec.go        |    19 +-
 plc4go/internal/plc4go/knxnetip/KnxNetIpReader.go  |   714 +-
 .../internal/plc4go/knxnetip/KnxNetIpSubscriber.go |    60 +-
 plc4go/internal/plc4go/knxnetip/KnxNetIpWriter.go  |     3 +-
 .../plc4go/knxnetip/readwrite/ParserHelper.go      |   142 +-
 .../plc4go/knxnetip/readwrite/XmlParserHelper.go   |   378 +-
 .../plc4go/knxnetip/readwrite/model/APCI.go        |   193 -
 .../plc4go/knxnetip/readwrite/model/Apdu.go        |   286 +
 .../plc4go/knxnetip/readwrite/model/ApduControl.go |   236 +
 .../model/{LDataFrameAck.go => ApduControlAck.go}  |    68 +-
 .../{LDataFrameAck.go => ApduControlConnect.go}    |    68 +-
 .../readwrite/model/ApduControlContainer.go        |   166 +
 .../{LDataFrameAck.go => ApduControlDisconnect.go} |    68 +-
 .../model/{LDataFrameAck.go => ApduControlNack.go} |    68 +-
 .../plc4go/knxnetip/readwrite/model/ApduData.go    |   404 +
 .../model/{LDataFrameAck.go => ApduDataAdcRead.go} |    68 +-
 .../{LDataFrameAck.go => ApduDataAdcResponse.go}   |    68 +-
 .../knxnetip/readwrite/model/ApduDataContainer.go  |   166 +
 .../model/ApduDataDeviceDescriptorRead.go          |   164 +
 .../model/ApduDataDeviceDescriptorResponse.go      |   210 +
 .../plc4go/knxnetip/readwrite/model/ApduDataExt.go |   754 ++
 ...aFrameAck.go => ApduDataExtAuthorizeRequest.go} |    68 +-
 ...FrameAck.go => ApduDataExtAuthorizeResponse.go} |    68 +-
 ...FrameAck.go => ApduDataExtDomainAddressRead.go} |    68 +-
 ...eAck.go => ApduDataExtDomainAddressResponse.go} |    68 +-
 ...go => ApduDataExtDomainAddressSelectiveRead.go} |    68 +-
 ...=> ApduDataExtDomainAddressSerialNumberRead.go} |    68 +-
 ...pduDataExtDomainAddressSerialNumberResponse.go} |    68 +-
 ...> ApduDataExtDomainAddressSerialNumberWrite.go} |    68 +-
 ...rameAck.go => ApduDataExtDomainAddressWrite.go} |    68 +-
 ...meAck.go => ApduDataExtFileStreamInfoReport.go} |    68 +-
 ... => ApduDataExtGroupPropertyValueInfoReport.go} |    68 +-
 ...Ack.go => ApduDataExtGroupPropertyValueRead.go} |    68 +-
 ...go => ApduDataExtGroupPropertyValueResponse.go} |    68 +-
 ...ck.go => ApduDataExtGroupPropertyValueWrite.go} |    68 +-
 ...pduDataExtIndividualAddressSerialNumberRead.go} |    68 +-
 ...ataExtIndividualAddressSerialNumberResponse.go} |    68 +-
 ...duDataExtIndividualAddressSerialNumberWrite.go} |    68 +-
 ...{LDataFrameAck.go => ApduDataExtKeyResponse.go} |    68 +-
 .../{LDataFrameAck.go => ApduDataExtKeyWrite.go}   |    68 +-
 .../{LDataFrameAck.go => ApduDataExtLinkRead.go}   |    68 +-
 ...LDataFrameAck.go => ApduDataExtLinkResponse.go} |    68 +-
 .../{LDataFrameAck.go => ApduDataExtLinkWrite.go}  |    68 +-
 ...ataFrameAck.go => ApduDataExtMemoryBitWrite.go} |    68 +-
 ...meAck.go => ApduDataExtNetworkParameterRead.go} |    68 +-
 ...k.go => ApduDataExtNetworkParameterResponse.go} |    68 +-
 ...eAck.go => ApduDataExtNetworkParameterWrite.go} |    68 +-
 ...ck.go => ApduDataExtOpenRoutingTableRequest.go} |    68 +-
 ...ck.go => ApduDataExtPropertyDescriptionRead.go} |    68 +-
 ...o => ApduDataExtPropertyDescriptionResponse.go} |    68 +-
 .../model/ApduDataExtPropertyValueRead.go          |   248 +
 .../model/ApduDataExtPropertyValueResponse.go      |   292 +
 ...rameAck.go => ApduDataExtPropertyValueWrite.go} |    68 +-
 ...ck.go => ApduDataExtReadRouterMemoryRequest.go} |    68 +-
 ...k.go => ApduDataExtReadRouterMemoryResponse.go} |    68 +-
 ...ck.go => ApduDataExtReadRouterStatusRequest.go} |    68 +-
 ...k.go => ApduDataExtReadRouterStatusResponse.go} |    68 +-
 ...ck.go => ApduDataExtReadRoutingTableRequest.go} |    68 +-
 ...k.go => ApduDataExtReadRoutingTableResponse.go} |    68 +-
 ...k.go => ApduDataExtWriteRouterMemoryRequest.go} |    68 +-
 ...k.go => ApduDataExtWriteRouterStatusRequest.go} |    68 +-
 ...k.go => ApduDataExtWriteRoutingTableRequest.go} |    68 +-
 ...{LDataFrameAck.go => ApduDataGroupValueRead.go} |    68 +-
 ...taFrameAck.go => ApduDataGroupValueResponse.go} |    68 +-
 .../readwrite/model/ApduDataGroupValueWrite.go     |   210 +
 ...rameAck.go => ApduDataIndividualAddressRead.go} |    68 +-
 ...Ack.go => ApduDataIndividualAddressResponse.go} |    68 +-
 ...ameAck.go => ApduDataIndividualAddressWrite.go} |    68 +-
 .../{LDataFrameAck.go => ApduDataMemoryRead.go}    |    68 +-
 ...{LDataFrameAck.go => ApduDataMemoryResponse.go} |    68 +-
 .../{LDataFrameAck.go => ApduDataMemoryWrite.go}   |    68 +-
 .../knxnetip/readwrite/model/ApduDataOther.go      |   163 +
 .../model/{LDataFrameAck.go => ApduDataRestart.go} |    68 +-
 .../{LDataFrameAck.go => ApduDataUserMessage.go}   |    68 +-
 .../knxnetip/readwrite/model/ChannelInformation.go |   167 +
 .../plc4go/knxnetip/readwrite/model/ControlType.go |   109 -
 .../readwrite/model/DeviceDescriptorMediumType.go  |   123 +
 .../readwrite/model/DeviceDescriptorType0.go       |   476 +
 .../readwrite/model/DeviceDescriptorType2.go       |   371 +
 .../knxnetip/readwrite/model/ExtendedAPCI.go       |   368 -
 .../knxnetip/readwrite/model/FirmwareType.go       |   220 +
 .../knxnetip/readwrite/model/KnxDatapoint.go       | 13147 ++++++++++++++-----
 ...KnxDatapointType.go => KnxDatapointMainType.go} |   474 +-
 .../readwrite/model/KnxDatapointSubtype.go         |  5260 --------
 .../knxnetip/readwrite/model/KnxDatapointType.go   |  5492 +++++++-
 .../plc4go/knxnetip/readwrite/model/KnxProperty.go |  1407 ++
 .../plc4go/knxnetip/readwrite/model/LBusmonInd.go  |     2 +-
 .../plc4go/knxnetip/readwrite/model/LDataFrame.go  |    63 +-
 .../knxnetip/readwrite/model/LDataFrameData.go     |   325 +-
 .../knxnetip/readwrite/model/LDataFrameDataExt.go  |   325 +-
 .../readwrite/model/LDataFramePollingData.go       |    11 +-
 .../plc4go/modbus/readwrite/ParserHelper.go        |     2 +-
 .../plc4go/modbus/readwrite/XmlParserHelper.go     |     2 +-
 .../internal/plc4go/s7/readwrite/ParserHelper.go   |     2 +-
 .../plc4go/s7/readwrite/XmlParserHelper.go         |     2 +-
 plc4go/pom.xml                                     |    12 +-
 plc4j/api/pom.xml                                  |     2 +-
 plc4j/drivers/ab-eth/pom.xml                       |    16 +-
 plc4j/drivers/ads/pom.xml                          |    18 +-
 plc4j/drivers/canopen/pom.xml                      |    16 +-
 plc4j/drivers/eip/pom.xml                          |    16 +-
 plc4j/drivers/firmata/pom.xml                      |    16 +-
 plc4j/drivers/knxnetip/pom.xml                     |    22 +-
 .../plc4x/java/knxnetip/ets5/Ets5Parser.java       |    10 +-
 .../java/knxnetip/ets5/model/GroupAddress.java     |     8 +-
 .../knxnetip/protocol/KnxNetIpProtocolLogic.java   |    92 +-
 plc4j/drivers/mock/pom.xml                         |     6 +-
 plc4j/drivers/modbus/pom.xml                       |    20 +-
 plc4j/drivers/opcua/pom.xml                        |    12 +-
 plc4j/drivers/pom.xml                              |     2 +-
 plc4j/drivers/s7/pom.xml                           |    16 +-
 plc4j/drivers/simulated/pom.xml                    |    10 +-
 plc4j/examples/dummy-driver/pom.xml                |    96 -
 .../java/examples/dummydriver/DummyDriver.java     |    67 -
 .../dummydriver/connection/DummyConnection.java    |    82 -
 .../examples/dummydriver/model/DummyField.java     |    35 -
 .../examples/dummydriver/netty/DummyProtocol.java  |    75 -
 .../services/org.apache.plc4x.java.api.PlcDriver   |    19 -
 plc4j/examples/hello-cloud-azure/pom.xml           |     4 +-
 plc4j/examples/hello-cloud-google/pom.xml          |     4 +-
 plc4j/examples/hello-connectivity-kafka/pom.xml    |     6 +-
 plc4j/examples/hello-connectivity-mqtt/pom.xml     |     4 +-
 plc4j/examples/hello-integration-edgent/pom.xml    |     4 +-
 plc4j/examples/hello-integration-iotdb/pom.xml     |     6 +-
 plc4j/examples/hello-opm/pom.xml                   |     6 +-
 plc4j/examples/hello-storage-elasticsearch/pom.xml |     6 +-
 plc4j/examples/hello-webapp/client/pom.xml         |     2 +-
 plc4j/examples/hello-webapp/pom.xml                |     2 +-
 plc4j/examples/hello-webapp/webapp/pom.xml         |     8 +-
 plc4j/examples/hello-webservice/pom.xml            |    11 +-
 .../hello-world-plc4x-subscription/pom.xml         |     4 +-
 plc4j/examples/hello-world-plc4x-write/pom.xml     |     4 +-
 plc4j/examples/hello-world-plc4x/pom.xml           |    11 +-
 plc4j/examples/poll-loop/pom.xml                   |    10 +-
 plc4j/examples/pom.xml                             |    27 +-
 plc4j/examples/replay-test/pom.xml                 |    78 -
 plc4j/integrations/apache-calcite/pom.xml          |   108 +-
 plc4j/integrations/apache-camel/pom.xml            |   109 +-
 .../java/org/apache/plc4x/camel/ManualTest.java    |     2 +-
 plc4j/integrations/apache-edgent/pom.xml           |    98 +-
 plc4j/integrations/apache-kafka/pom.xml            |    28 +-
 .../apache-nifi/nifi-plc4x-nar/pom.xml             |    38 +-
 .../apache-nifi/nifi-plc4x-processors/pom.xml      |     6 +-
 plc4j/integrations/apache-nifi/pom.xml             |     4 +-
 plc4j/integrations/logstash-plugin/pom.xml         |    43 +-
 plc4j/integrations/opcua-server/pom.xml            |   239 +-
 .../opcua-server/src/main/resources/config.yml     |     1 -
 plc4j/integrations/pom.xml                         |     2 +-
 plc4j/karaf-features/README.md                     |    42 -
 plc4j/karaf-features/camel/pom.xml                 |    67 -
 plc4j/karaf-features/eip/pom.xml                   |    72 -
 plc4j/karaf-features/karaf-itest/pom.xml           |   207 -
 .../java/org/apache/plc4x/karaf/FeatureIT.java     |   100 -
 .../test/resources/etc/org.ops4j.pax.logging.cfg   |    71 -
 plc4j/karaf-features/pom.xml                       |    82 -
 plc4j/karaf-features/s7/pom.xml                    |    71 -
 plc4j/osgi/pom.xml                                 |    11 +-
 plc4j/pom.xml                                      |     3 +-
 plc4j/protocols/ads/pom.xml                        |     8 +-
 plc4j/protocols/benchmarks/pom.xml                 |     4 +-
 plc4j/protocols/delta-v/pom.xml                    |     2 +-
 plc4j/protocols/pom.xml                            |     2 +-
 plc4j/spi/pom.xml                                  |     4 +-
 plc4j/tools/capture-replay/pom.xml                 |     2 +-
 plc4j/tools/connection-pool/pom.xml                |     4 +-
 plc4j/tools/interop/pom.xml                        |   215 -
 plc4j/tools/interop/src/assembly/assembly.xml      |    41 -
 .../java/org/apache/plc4x/interop/impl/Client.java |    60 -
 .../org/apache/plc4x/interop/impl/Handler.java     |   163 -
 .../java/org/apache/plc4x/interop/impl/Server.java |    98 -
 plc4j/tools/opm/pom.xml                            |     8 +-
 plc4j/tools/pom.xml                                |    11 +-
 plc4j/tools/scraper/pom.xml                        |    10 +-
 plc4j/transports/pcap-replay/pom.xml               |    12 +-
 plc4j/transports/pcap-shared/pom.xml               |     6 +-
 plc4j/transports/pom.xml                           |     2 +-
 plc4j/transports/raw-socket/pom.xml                |    10 +-
 plc4j/transports/serial/pom.xml                    |     6 +-
 plc4j/transports/socketcan/pom.xml                 |     4 +-
 plc4j/transports/tcp/pom.xml                       |     6 +-
 plc4j/transports/test/pom.xml                      |     4 +-
 plc4j/transports/udp/pom.xml                       |     6 +-
 plc4j/utils/pcap-replay/pom.xml                    |     4 +-
 plc4j/utils/pcap-shared/pom.xml                    |     2 +-
 plc4j/utils/pom.xml                                |     2 +-
 plc4j/utils/raw-sockets/pom.xml                    |     6 +-
 plc4j/utils/test-utils/pom.xml                     |     8 +-
 pom.xml                                            |    12 +-
 protocols/ab-eth/pom.xml                           |     4 +-
 protocols/ads/pom.xml                              |     4 +-
 protocols/bacnetip/pom.xml                         |     4 +-
 protocols/canopen/pom.xml                          |     4 +-
 protocols/df1/pom.xml                              |     4 +-
 protocols/eip/pom.xml                              |     4 +-
 protocols/firmata/pom.xml                          |     4 +-
 protocols/knxnetip/pom.xml                         |     4 +-
 .../resources/protocols/knxnetip/knxnetip.mspec    |  1698 +--
 protocols/knxnetip/src/main/xslt/knx-types.xsl     |   291 +-
 protocols/knxnetip/src/site/asciidoc/index.adoc    |   114 +-
 .../knxnetip/ParserSerializerTestsuite.xml         |    35 +-
 protocols/modbus/pom.xml                           |     4 +-
 protocols/opcua/pom.xml                            |     4 +-
 protocols/pom.xml                                  |    12 +-
 protocols/proxy/pom.xml                            |    35 -
 protocols/proxy/src/main/java/.keepMe              |    20 -
 .../apache/plc4x/protocols/proxy/interop.thrift    |    93 -
 protocols/s7/pom.xml                               |     4 +-
 protocols/simulated/pom.xml                        |     4 +-
 sandbox/code-gen/pom.xml                           |     2 +-
 sandbox/discovery/pom.xml                          |     4 +-
 sandbox/hello-influx-data-collection/pom.xml       |    12 +-
 sandbox/plc-simulator/pom.xml                      |    10 +-
 sandbox/plc4c/pom.xml                              |    13 +-
 sandbox/plc4cpp/pom.xml                            |    86 +-
 sandbox/plc4net/api/pom.xml                        |     2 +-
 sandbox/plc4net/plc4net.driver/pom.xml             |     2 +-
 sandbox/plc4net/pom.xml                            |     2 +-
 sandbox/plc4py/pom.xml                             |   105 +-
 sandbox/pom.xml                                    |     5 +-
 sandbox/test-java-bacnetip-driver/pom.xml          |    16 +-
 sandbox/test-java-df1-driver/pom.xml               |    16 +-
 sandbox/test-streampipes-plc4x-adapters/pom.xml    |    20 +-
 sandbox/test-streampipes-plc4x-processors/pom.xml  |    10 +-
 sandbox/test-streampipes-plc4x-shared/pom.xml      |     2 +-
 src/main/script/prerequisiteCheck.groovy           |    27 +-
 src/site/asciidoc/developers/release/release.adoc  |   115 +-
 .../asciidoc/developers/release/validation.adoc    |     1 +
 src/site/asciidoc/users/download.adoc              |    61 +-
 src/site/resources-filtered/plc4x-doap.rdf         |    14 +-
 tools/boost/pom.xml                                |     2 +-
 tools/download_staged_release.sh                   |     2 +-
 tools/logstash/pom.xml                             |     2 +-
 tools/pom.xml                                      |     8 +-
 tools/thrift/pom.xml                               |   407 -
 tools/thrift/src/assembly/compiler.xml             |    43 -
 tools/thrift/src/assembly/cpp.xml                  |    56 -
 tools/thrift/src/assembly/python.xml               |    43 -
 263 files changed, 26066 insertions(+), 18945 deletions(-)

diff --cc plc4j/drivers/opcua/pom.xml
index 61267b7,2d67091..e4b4a59
--- a/plc4j/drivers/opcua/pom.xml
+++ b/plc4j/drivers/opcua/pom.xml
@@@ -146,12 -120,8 +146,12 @@@
      <dependency>
        <groupId>org.apache.plc4x</groupId>
        <artifactId>plc4j-spi</artifactId>
-       <version>0.8.0-SNAPSHOT</version>
+       <version>0.9.0-SNAPSHOT</version>
      </dependency>
 +    <dependency>
 +      <groupId>io.vavr</groupId>
 +      <artifactId>vavr</artifactId>
 +    </dependency>
  
      <dependency>
        <groupId>org.eclipse.milo</groupId>
diff --cc plc4j/integrations/opcua-server/pom.xml
index aa3b66a,c83fdad..2723b3e
--- a/plc4j/integrations/opcua-server/pom.xml
+++ b/plc4j/integrations/opcua-server/pom.xml
@@@ -203,11 -191,10 +191,11 @@@
        <groupId>org.slf4j</groupId>
        <artifactId>slf4j-simple</artifactId>
      </dependency>
 +
      <dependency>
- 	    <groupId>commons-io</groupId>
- 	    <artifactId>commons-io</artifactId>
- 	</dependency>
+       <groupId>commons-io</groupId>
+       <artifactId>commons-io</artifactId>
+     </dependency>
  
      <dependency>
        <groupId>io.vavr</groupId>


[plc4x] 03/03: Working on encryption

Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

hutcheb pushed a commit to branch feature/native_opua_client
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit b7767cfb7cc1c8a19ee177a3c1e5ba92498a4ce0
Author: hutcheb <be...@gmail.com>
AuthorDate: Sat Jan 30 07:22:35 2021 -0500

    Working on encryption
---
 .../resources/templates/java/data-io-template.ftlh |  10 +-
 .../main/resources/templates/java/io-template.ftlh |  11 +
 .../knxnetip/readwrite/model/KnxDatapoint.go       |  20 +-
 .../java/opcua/config/OpcuaConfiguration.java      |   5 +-
 .../java/opcua/context/CertificateKeyPair.java     |   8 +-
 .../java/opcua/protocol/OpcuaProtocolLogic.java    | 499 ++++++++++++++++-----
 .../resources/protocols/knxnetip/knxnetip.mspec    |   2 +-
 protocols/knxnetip/src/main/xslt/knx-types.xsl     |  16 +-
 .../src/main/resources/protocols/opcua/opcua.mspec |   8 +-
 protocols/opcua/src/main/xslt/opc-types.xsl        |   4 +-
 10 files changed, 433 insertions(+), 150 deletions(-)

diff --git a/build-utils/language-java/src/main/resources/templates/java/data-io-template.ftlh b/build-utils/language-java/src/main/resources/templates/java/data-io-template.ftlh
index a384f6e..3c423fb 100644
--- a/build-utils/language-java/src/main/resources/templates/java/data-io-template.ftlh
+++ b/build-utils/language-java/src/main/resources/templates/java/data-io-template.ftlh
@@ -91,6 +91,7 @@ public class ${type.name}IO {
         <#assign defaultCaseOutput=false>
         <#list type.switchField.cases as case><#if case.discriminatorValues?has_content>if(<#list case.discriminatorValues as discriminatorValue>EvaluationHelper.equals(${helper.toParseExpression(null, type.switchField.discriminatorExpressions[discriminatorValue?index], type.parserArguments)}, <#if helper.discriminatorValueNeedsStringEqualityCheck(type.switchField.discriminatorExpressions[discriminatorValue?index])>"${discriminatorValue}"<#else>${discriminatorValue}</#if>)<#sep> && </#se [...]
             <#assign valueDefined=false>
+
             <#list case.fields as field>
                 <#switch field.typeName>
                     <#case "array">
@@ -114,6 +115,7 @@ public class ${type.name}IO {
                     ${field.name}.add(new ${helper.getPlcValueTypeForTypeReference(field.type)}((${helper.getNonPrimitiveLanguageTypeNameForField(field)}) <#if helper.isSimpleTypeReference(field.type)>${helper.getReadBufferReadMethodCall(field.type)})<#else>${field.type.name}IO.staticParse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getLanguageTypeNameForTypeReference(helper.getArgumentType(field.type, parserArgument?index), true)}) (${helper.toParse [...]
                 }
             }
+            LOGGER.info("${field.name} - {}", ${field.name});
             <#-- In all other cases do we have to work with a list, that is later converted to an array -->
                         <#else>
             <#-- For a length array, we read data till the read position of the buffer reaches a given position -->
@@ -162,6 +164,7 @@ public class ${type.name}IO {
             if(${field.name} != ${type.name}.${field.name?upper_case}) {
                 throw new ParseException("Expected constant value " + ${type.name}.${field.name?upper_case} + " but got " + ${field.name});
             }
+            LOGGER.info("${field.name} - {}", ${field.name});
                         <#if field.name == "value">
                             <#assign valueDefined=true>
                         </#if>
@@ -170,6 +173,7 @@ public class ${type.name}IO {
 
             // Enum field (${field.name})
             ${helper.getNonPrimitiveLanguageTypeNameForField(field)} ${field.name} = ${helper.getNonPrimitiveLanguageTypeNameForField(field)}.enumForValue(${helper.getReadBufferReadMethodCall(helper.getEnumBaseTypeReference(field.type))});
+            LOGGER.info("${field.name} - {}", ${field.name});
                         <#if field.name == "value">
                             <#assign valueDefined=true>
                         </#if>
@@ -178,6 +182,7 @@ public class ${type.name}IO {
 
             // Manual Field (${field.name})
             ${helper.getLanguageTypeNameForField(field)} ${field.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toParseExpression(field, field.parseExpression, type.parserArguments)});
+            LOGGER.info("${field.name} - {}", ${field.name});
                         <#if field.name == "value">
                             <#assign valueDefined=true>
                         </#if>
@@ -197,9 +202,11 @@ public class ${type.name}IO {
                         <#if helper.isEnumField(field)>
             // Enum field (${field.name})
             ${helper.getNonPrimitiveLanguageTypeNameForField(field)} ${field.name} = ${helper.getNonPrimitiveLanguageTypeNameForField(field)}.enumForValue(${helper.getReadBufferReadMethodCall(helper.getEnumBaseTypeReference(field.type))});
+            LOGGER.info("${field.name} - {}", ${field.name});
                         <#else>
             // Simple Field (${field.name})
             ${helper.getNonPrimitiveLanguageTypeNameForField(field)} ${field.name} = <#if helper.isSimpleTypeReference(field.type)>${helper.getReadBufferReadMethodCall(field.type)}<#else>${field.type.name}IO.staticParse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getLanguageTypeNameForTypeReference(helper.getArgumentType(field.type, parserArgument?index), true)}) (${helper.toParseExpression(field, parserArgument, type.parserArguments)})<#sep>, </#sep [...]
+            LOGGER.info("${field.name} - {}", ${field.name});
                         </#if>
                         <#if case.name == "Struct" || ((case.name == "DATE_AND_TIME") && ((field.name == "year") || (field.name == "month") || (field.name == "day") || (field.name == "hour") || (field.name == "minutes") || (field.name == "seconds"))) || ((case.name == "DATE") && ((field.name == "year") || (field.name == "month") || (field.name == "day"))) || ((case.name == "TIME_OF_DAY") && ((field.name == "hour") || (field.name == "minutes") || (field.name == "seconds"))) || field.name  [...]
                             <#assign valueDefined=true>
@@ -261,7 +268,8 @@ public class ${type.name}IO {
                 <#assign valueDefined=true>
             </#if>
 
-            <#if valueDefined>
+
+        <#if valueDefined>
                 <#switch case.name>
                     <#case "TIME">
             return new PlcTIME(value);
diff --git a/build-utils/language-java/src/main/resources/templates/java/io-template.ftlh b/build-utils/language-java/src/main/resources/templates/java/io-template.ftlh
index ea54624..2514145 100644
--- a/build-utils/language-java/src/main/resources/templates/java/io-template.ftlh
+++ b/build-utils/language-java/src/main/resources/templates/java/io-template.ftlh
@@ -172,6 +172,8 @@ public class ${type.name}IO implements <#if outputFlavor != "passive">MessageIO<
                 ${arrayField.name}[curItem] = <#if helper.isSimpleTypeReference(arrayField.type)><#assign simpleTypeReference = arrayField.type>${helper.getReadBufferReadMethodCall(simpleTypeReference)}<#else>${arrayField.type.name}IO.staticParse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getLanguageTypeNameForTypeReference(helper.getArgumentType(arrayField.type, parserArgument?index), true)}) (${helper.toParseExpression(arrayField, parserArgument,  [...]
             }
         }
+            LOGGER.info("${arrayField.name} - {}", ${arrayField.name});
+
         <#-- In all other cases do we have to work with a list, that is later converted to an array -->
         <#else>
             <#-- For a length array, we read data till the read position of the buffer reaches a given position -->
@@ -229,6 +231,7 @@ public class ${type.name}IO implements <#if outputFlavor != "passive">MessageIO<
             if(checksum != checksumRef) {
                 throw new ParseException(String.format("Checksum verification failed. Expected %04X but got %04X", checksumRef & 0xFFFF, checksum & 0xFFFF));
             }
+            LOGGER.info("CheckSum - {}", checksum);
         }
         <#break>
     <#case "const">
@@ -240,6 +243,8 @@ public class ${type.name}IO implements <#if outputFlavor != "passive">MessageIO<
         if(${constField.name} != ${type.name}.${constField.name?upper_case}) {
             throw new ParseException("Expected constant value " + ${type.name}.${constField.name?upper_case} + " but got " + ${constField.name});
         }
+    LOGGER.info("${constField.name} - {}", ${constField.name});
+
         <#break>
     <#case "discriminator">
         <#assign discriminatorField = field>
@@ -250,12 +255,14 @@ public class ${type.name}IO implements <#if outputFlavor != "passive">MessageIO<
         <#else>
             ${helper.getLanguageTypeNameForField(field)} ${discriminatorField.name} = <#if helper.isSimpleTypeReference(discriminatorField.type)>${helper.getReadBufferReadMethodCall(discriminatorField.type)}<#else>${discriminatorField.type.name}IO.staticParse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getLanguageTypeNameForTypeReference(helper.getArgumentType(discriminatorField.type, parserArgument?index), true)}) (${helper.toParseExpression(discrim [...]
         </#if>
+    LOGGER.info("${discriminatorField.name} - {}", ${discriminatorField.name});
         <#break>
     <#case "enum">
         <#assign enumField = field>
 
         // Enum field (${enumField.name})
         ${helper.getLanguageTypeNameForField(field)} ${enumField.name} = ${helper.getLanguageTypeNameForField(field)}.enumForValue(${helper.getReadBufferReadMethodCall(helper.getEnumBaseTypeReference(enumField.type))});
+    LOGGER.info("${enumField.name} - {}", ${enumField.name});
         <#break>
     <#case "implicit">
         <#assign implicitField = field>
@@ -263,6 +270,7 @@ public class ${type.name}IO implements <#if outputFlavor != "passive">MessageIO<
 
         // Implicit Field (${implicitField.name}) (Used for parsing, but it's value is not stored as it's implicitly given by the objects content)
         ${helper.getLanguageTypeNameForField(field)} ${implicitField.name} = ${helper.getReadBufferReadMethodCall(simpleTypeReference)};
+    LOGGER.info("${implicitField.name} - {}", ${implicitField.name});
         <#break>
     <#case "manualArray">
         <#assign manualArrayField = field>
@@ -328,6 +336,7 @@ public class ${type.name}IO implements <#if outputFlavor != "passive">MessageIO<
 
         // Manual Field (${manualField.name})
         ${helper.getLanguageTypeNameForField(field)} ${manualField.name} = (${helper.getLanguageTypeNameForField(field)}) (${helper.toParseExpression(manualField, manualField.parseExpression, type.parserArguments)});
+    LOGGER.info("${manualField.name} - {}", ${manualField.name});
         <#break>
     <#case "optional">
         <#assign optionalField = field>
@@ -344,6 +353,7 @@ public class ${type.name}IO implements <#if outputFlavor != "passive">MessageIO<
             ${optionalField.name} = <#if helper.isSimpleTypeReference(optionalField.type)>${helper.getReadBufferReadMethodCall(optionalField.type)}<#else>${optionalField.type.name}IO.staticParse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getLanguageTypeNameForTypeReference(helper.getArgumentType(optionalField.type, parserArgument?index), true)}) (${helper.toParseExpression(optionalField, parserArgument, type.parserArguments)})<#sep>, </#sep></#list> [...]
             </#if>
         }
+    LOGGER.info("${optionalField.name} - {}", ${optionalField.name});
         <#break>
     <#case "padding">
         <#assign paddingField = field>
@@ -379,6 +389,7 @@ public class ${type.name}IO implements <#if outputFlavor != "passive">MessageIO<
         <#else>
         ${helper.getLanguageTypeNameForField(simpleField)} ${simpleField.name} = <#if helper.isSimpleTypeReference(simpleField.type)><#assign simpleTypeReference = simpleField.type>${helper.getReadBufferReadMethodCall(simpleTypeReference)}<#else><#assign complexTypeReference = simpleField.type>${complexTypeReference.name}IO.staticParse(io<#if field.params?has_content>, <#list field.params as parserArgument>(${helper.getLanguageTypeNameForTypeReference(helper.getArgumentType(simpleField.t [...]
         </#if>
+    LOGGER.info("${simpleField.name} - {}", ${simpleField.name});
         <#break>
     <#case "switch">
         <#assign switchField = field>
diff --git a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapoint.go b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapoint.go
index 04e41e4..152ada8 100644
--- a/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapoint.go
+++ b/plc4go/internal/plc4go/knxnetip/readwrite/model/KnxDatapoint.go
@@ -655,7 +655,7 @@ func KnxDatapointParse(io *utils.ReadBuffer, datapointType KnxDatapointType) (ap
             }
 
             // Simple Field (value)
-            value, _valueErr := io.ReadString(8)
+            value, _valueErr := io.ReadString(-1)
             if _valueErr != nil {
                 return nil, errors.New("Error parsing 'value' field " + _valueErr.Error())
             }
@@ -668,7 +668,7 @@ func KnxDatapointParse(io *utils.ReadBuffer, datapointType KnxDatapointType) (ap
             }
 
             // Simple Field (value)
-            value, _valueErr := io.ReadString(8)
+            value, _valueErr := io.ReadString(-1)
             if _valueErr != nil {
                 return nil, errors.New("Error parsing 'value' field " + _valueErr.Error())
             }
@@ -2890,7 +2890,7 @@ func KnxDatapointParse(io *utils.ReadBuffer, datapointType KnxDatapointType) (ap
             }
 
             // Simple Field (value)
-            value, _valueErr := io.ReadString(112)
+            value, _valueErr := io.ReadString(-1)
             if _valueErr != nil {
                 return nil, errors.New("Error parsing 'value' field " + _valueErr.Error())
             }
@@ -2903,7 +2903,7 @@ func KnxDatapointParse(io *utils.ReadBuffer, datapointType KnxDatapointType) (ap
             }
 
             // Simple Field (value)
-            value, _valueErr := io.ReadString(112)
+            value, _valueErr := io.ReadString(-1)
             if _valueErr != nil {
                 return nil, errors.New("Error parsing 'value' field " + _valueErr.Error())
             }
@@ -5850,7 +5850,7 @@ func KnxDatapointParse(io *utils.ReadBuffer, datapointType KnxDatapointType) (ap
             }
 
             // Simple Field (value)
-            value, _valueErr := io.ReadString(16)
+            value, _valueErr := io.ReadString(-1)
             if _valueErr != nil {
                 return nil, errors.New("Error parsing 'value' field " + _valueErr.Error())
             }
@@ -7350,7 +7350,7 @@ func KnxDatapointSerialize(io *utils.WriteBuffer, value api.PlcValue, datapointT
             }
 
             // Simple Field (value)
-            if _err := io.WriteString(8, "ASCII", value.GetString()); _err != nil {
+            if _err := io.WriteString(-1, "ASCII", value.GetString()); _err != nil {
                 return errors.New("Error serializing 'value' field " + _err.Error())
             }
         case datapointType == KnxDatapointType_DPT_Char_8859_1: // STRING
@@ -7361,7 +7361,7 @@ func KnxDatapointSerialize(io *utils.WriteBuffer, value api.PlcValue, datapointT
             }
 
             // Simple Field (value)
-            if _err := io.WriteString(8, "ISO-8859-1", value.GetString()); _err != nil {
+            if _err := io.WriteString(-1, "ISO-8859-1", value.GetString()); _err != nil {
                 return errors.New("Error serializing 'value' field " + _err.Error())
             }
         case datapointType == KnxDatapointType_DPT_Scaling: // USINT
@@ -9219,7 +9219,7 @@ func KnxDatapointSerialize(io *utils.WriteBuffer, value api.PlcValue, datapointT
             }
 
             // Simple Field (value)
-            if _err := io.WriteString(112, "ASCII", value.GetString()); _err != nil {
+            if _err := io.WriteString(-1, "ASCII", value.GetString()); _err != nil {
                 return errors.New("Error serializing 'value' field " + _err.Error())
             }
         case datapointType == KnxDatapointType_DPT_String_8859_1: // STRING
@@ -9230,7 +9230,7 @@ func KnxDatapointSerialize(io *utils.WriteBuffer, value api.PlcValue, datapointT
             }
 
             // Simple Field (value)
-            if _err := io.WriteString(112, "ISO-8859-1", value.GetString()); _err != nil {
+            if _err := io.WriteString(-1, "ISO-8859-1", value.GetString()); _err != nil {
                 return errors.New("Error serializing 'value' field " + _err.Error())
             }
         case datapointType == KnxDatapointType_DPT_SceneNumber: // USINT
@@ -11479,7 +11479,7 @@ func KnxDatapointSerialize(io *utils.WriteBuffer, value api.PlcValue, datapointT
             }
 
             // Simple Field (value)
-            if _err := io.WriteString(16, "ASCII", value.GetString()); _err != nil {
+            if _err := io.WriteString(-1, "ASCII", value.GetString()); _err != nil {
                 return errors.New("Error serializing 'value' field " + _err.Error())
             }
         case datapointType == KnxDatapointType_DPT_Tariff_ActiveEnergy: // Struct
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/config/OpcuaConfiguration.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/config/OpcuaConfiguration.java
index 4187173..0d5ea6b 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/config/OpcuaConfiguration.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/config/OpcuaConfiguration.java
@@ -50,6 +50,9 @@ public class OpcuaConfiguration implements Configuration, TcpTransportConfigurat
         Security.addProvider(new BouncyCastleProvider());
     }
 
+    private static final String nameSpaceSecurityPolicyNone = "http://opcfoundation.org/UA/SecurityPolicy#None";
+    private static final String nameSpaceSecurityPolicyUserName = "http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256";
+
     private static final Logger LOGGER = LoggerFactory.getLogger(OpcuaConfiguration.class);
 
     private String code;
@@ -175,7 +178,7 @@ public class OpcuaConfiguration implements Configuration, TcpTransportConfigurat
         this.endpoint = endpoint;
     }
 
-    public void openKeyStore() throws KeyStoreException, PlcConnectionException, CertificateException, NoSuchAlgorithmException, IOException, UnrecoverableKeyException {
+    public void openKeyStore() throws Exception {
         File securityTempDir = new File(certDirectory, "security");
         if (!securityTempDir.exists() && !securityTempDir.mkdirs()) {
             throw new PlcConnectionException("Unable to create directory please confirm folder permissions on "  + certDirectory);
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/context/CertificateKeyPair.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/context/CertificateKeyPair.java
index a70aa3b..6b33a49 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/context/CertificateKeyPair.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/context/CertificateKeyPair.java
@@ -20,19 +20,25 @@
 package org.apache.plc4x.java.opcua.context;
 
 import java.security.KeyPair;
+import java.security.MessageDigest;
 import java.security.cert.X509Certificate;
 
 public class CertificateKeyPair {
 
     private final KeyPair keyPair;
     private final X509Certificate certificate;
+    private final byte[] thumbprint;
 
-    public CertificateKeyPair(KeyPair keyPair, X509Certificate certificate) {
+    public CertificateKeyPair(KeyPair keyPair, X509Certificate certificate) throws Exception{
         this.keyPair = keyPair;
         this.certificate = certificate;
+        MessageDigest messageDigest = MessageDigest.getInstance("SHA-1");
+        this.thumbprint = messageDigest.digest(this.certificate.getEncoded());
     }
 
     public KeyPair getKeyPair() { return keyPair; }
 
     public X509Certificate getCertificate() { return certificate; }
+
+    public byte[] getThumbPrint() { return thumbprint; }
 }
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaProtocolLogic.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaProtocolLogic.java
index 1689fa8..6fa97e9 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaProtocolLogic.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaProtocolLogic.java
@@ -29,15 +29,16 @@ import org.apache.plc4x.java.api.messages.PlcWriteResponse;
 import org.apache.plc4x.java.api.types.PlcResponseCode;
 import org.apache.plc4x.java.api.value.PlcValue;
 import org.apache.plc4x.java.opcua.config.OpcuaConfiguration;
+import org.apache.plc4x.java.opcua.context.CertificateKeyPair;
 import org.apache.plc4x.java.opcua.readwrite.*;
-import org.apache.plc4x.java.opcua.readwrite.io.PascalStringIO;
-import org.apache.plc4x.java.opcua.readwrite.io.UserNameIdentityTokenIO;
+import org.apache.plc4x.java.opcua.readwrite.io.*;
 import org.apache.plc4x.java.opcua.readwrite.types.*;
 import org.apache.plc4x.java.spi.ConversationContext;
 import org.apache.plc4x.java.spi.Plc4xProtocolBase;
 import org.apache.plc4x.java.spi.configuration.HasConfiguration;
 import org.apache.plc4x.java.spi.context.DriverContext;
 import org.apache.plc4x.java.spi.generation.ParseException;
+import org.apache.plc4x.java.spi.generation.ReadBuffer;
 import org.apache.plc4x.java.spi.generation.WriteBuffer;
 import org.apache.plc4x.java.spi.messages.DefaultPlcReadRequest;
 import org.apache.plc4x.java.spi.messages.DefaultPlcReadResponse;
@@ -55,6 +56,7 @@ import java.io.ByteArrayInputStream;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.time.Duration;
@@ -97,13 +99,11 @@ public class OpcuaProtocolLogic extends Plc4xProtocolBase<OpcuaAPU> implements H
     private static final long epochOffset = 116444736000000000L;         //Offset between OPC UA epoch time and linux epoch time.
 
     private static final String CHUNK = "F";
-    private static final String nameSpaceSecurityPolicyNone = "http://opcfoundation.org/UA/SecurityPolicy#None";
-    private static final String nameSpaceSecurityPolicyUserName = "http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256";
+
     private static final String applicationUri = "urn:apache:plc4x:client";
     private static final String productUri = "urn:apache:plc4x:client";
     private static final String applicationText = "OPCUA client for the Apache PLC4X:PLC4J project";
 
-
     private final String sessionName = "UaSession:" + applicationText + ":" + RandomStringUtils.random(20, true, true);
     private final byte[] clientNonce = RandomUtils.nextBytes(40);
     private RequestTransactionManager tm;
@@ -116,6 +116,11 @@ public class OpcuaProtocolLogic extends Plc4xProtocolBase<OpcuaAPU> implements H
     private String certFile;
     private String securityPolicy;
     private String keyStoreFile;
+    private CertificateKeyPair ckp;
+    private PascalByteString publicCertificate;
+    private PascalByteString thumbprint;
+    private boolean isEncrypted;
+    private boolean checkedEndpoints = false;
     private AtomicInteger transactionIdentifierGenerator = new AtomicInteger(1);
     private AtomicInteger requestHandleGenerator = new AtomicInteger(1);
     private AtomicInteger tokenId = new AtomicInteger(1);
@@ -133,7 +138,24 @@ public class OpcuaProtocolLogic extends Plc4xProtocolBase<OpcuaAPU> implements H
         this.username = configuration.getUsername();
         this.password = configuration.getPassword();
         this.certFile = configuration.getCertDirectory();
-        this.securityPolicy = configuration.getSecurityPolicy();
+        this.securityPolicy = "http://opcfoundation.org/UA/SecurityPolicy#" + configuration.getSecurityPolicy();
+        LOGGER.info("---------------------------------------");
+        LOGGER.info(configuration.getSecurityPolicy());
+        this.ckp = configuration.getCertificateKeyPair();
+        if (configuration.getSecurityPolicy().equals("Basic256Sha256")) {
+            try {
+                this.publicCertificate = new PascalByteString(this.ckp.getCertificate().getEncoded().length, this.ckp.getCertificate().getEncoded());
+                this.isEncrypted = true;
+            } catch (CertificateEncodingException e) {
+                LOGGER.error("Failed to encode the certificate");
+            }
+            //this.thumbprint = new PascalByteString(this.ckp.getThumbPrint().length, this.ckp.getThumbPrint());
+            this.thumbprint =NULL_BYTE_STRING;
+        } else {
+            this.publicCertificate = NULL_BYTE_STRING;
+            this.thumbprint = NULL_BYTE_STRING;
+            this.isEncrypted = false;
+        }
         this.keyStoreFile = configuration.getKeyStoreFile();
 
         this.tm = new RequestTransactionManager(1);
@@ -169,21 +191,28 @@ public class OpcuaProtocolLogic extends Plc4xProtocolBase<OpcuaAPU> implements H
             requestHeader,
             true);
 
-        OpcuaMessageRequest messageRequest = new OpcuaMessageRequest(CHUNK,
-            channelId.get(),
-            tokenId.get(),
-            transactionId,
-            transactionId,
-            closeSessionRequest);
-
-        context.sendRequest(new OpcuaAPU(messageRequest))
-            .expectResponse(OpcuaAPU.class, REQUEST_TIMEOUT)
-            .check(p -> p.getMessage() instanceof OpcuaMessageResponse)
-            .unwrap(p -> (OpcuaMessageResponse) p.getMessage())
-            .handle(opcuaMessageResponse -> {
-                    LOGGER.info("Got Close Session Response Connection Response" + opcuaMessageResponse.toString());
-                    onDisconnectCloseSecureChannel(context);
-                });
+        try {
+            WriteBuffer buffer = new WriteBuffer(closeSessionRequest.getLengthInBytes(), true);
+            OpcuaMessageIO.staticSerialize(buffer, closeSessionRequest);
+
+            OpcuaMessageRequest messageRequest = new OpcuaMessageRequest(CHUNK,
+                channelId.get(),
+                tokenId.get(),
+                transactionId,
+                transactionId,
+                buffer.getData());
+
+            context.sendRequest(new OpcuaAPU(messageRequest))
+                .expectResponse(OpcuaAPU.class, REQUEST_TIMEOUT)
+                .check(p -> p.getMessage() instanceof OpcuaMessageResponse)
+                .unwrap(p -> (OpcuaMessageResponse) p.getMessage())
+                .handle(opcuaMessageResponse -> {
+                        LOGGER.info("Got Close Session Response Connection Response" + opcuaMessageResponse.toString());
+                        onDisconnectCloseSecureChannel(context);
+                    });
+        } catch (ParseException e) {
+            LOGGER.error("Failed to parse the Message Request");
+        }
     }
 
     private void onDisconnectCloseSecureChannel(ConversationContext<OpcuaAPU> context) {
@@ -257,7 +286,182 @@ public class OpcuaProtocolLogic extends Plc4xProtocolBase<OpcuaAPU> implements H
             .unwrap(p -> (OpcuaAcknowledgeResponse) p.getMessage())
             .handle(opcuaAcknowledgeResponse -> {
                 LOGGER.debug("Got Hello Response Connection Response");
-                onConnectOpenSecureChannel(context, opcuaAcknowledgeResponse);
+                if (this.isEncrypted & !this.checkedEndpoints) {
+                    onConnectGetEndpointsOpenSecureChannel(context, opcuaAcknowledgeResponse);
+                } else {
+                    onConnectOpenSecureChannel(context, opcuaAcknowledgeResponse);
+                }
+            });
+    }
+
+    public void onConnectGetEndpointsOpenSecureChannel(ConversationContext<OpcuaAPU> context, OpcuaAcknowledgeResponse opcuaAcknowledgeResponse) {
+        int transactionId = getTransactionIdentifier(securedConnection.get());
+
+        ExpandedNodeId expandedNodeId = new ExpandedNodeIdFourByte(false,           //Namespace Uri Specified
+            false,            //Server Index Specified
+            NULL_STRING,                      //Namespace Uri
+            1L,                     //Server Index
+            new FourByteNodeId((short) 0, 466));    //Identifier for OpenSecureChannel
+
+        RequestHeader requestHeader = new RequestHeader(authenticationToken,
+            getCurrentDateTime(),
+            0L,                                         //RequestHandle
+            0L,
+            NULL_STRING,
+            REQUEST_TIMEOUT_LONG,
+            NULL_EXTENSION_OBJECT);
+
+        OpenSecureChannelRequest openSecureChannelRequest = new OpenSecureChannelRequest((byte) 1,
+            (byte) 0,
+            requestHeader,
+            VERSION,
+            SecurityTokenRequestType.securityTokenRequestTypeIssue,
+            MessageSecurityMode.messageSecurityModeNone,
+            NULL_BYTE_STRING,
+            DEFAULT_CONNECTION_LIFETIME);
+
+        OpcuaOpenRequest openRequest = new OpcuaOpenRequest(CHUNK,
+            0,
+            new PascalString("http://opcfoundation.org/UA/SecurityPolicy#None".length(), "http://opcfoundation.org/UA/SecurityPolicy#None"),
+            NULL_BYTE_STRING,
+            NULL_BYTE_STRING,
+            transactionId,
+            transactionId,
+            openSecureChannelRequest);
+
+        context.sendRequest(new OpcuaAPU(openRequest))
+            .expectResponse(OpcuaAPU.class, REQUEST_TIMEOUT)
+            .check(p -> p.getMessage() instanceof OpcuaOpenResponse)
+            .unwrap(p -> (OpcuaOpenResponse) p.getMessage())
+            .handle(opcuaOpenResponse -> {
+                if (opcuaOpenResponse.getMessage() instanceof ServiceFault) {
+                    ServiceFault fault = (ServiceFault) opcuaOpenResponse.getMessage();
+                    LOGGER.error("Failed to connect to opc ua server for the following reason:- {}, {}", fault.getResponseHeader().getServiceResult().getStatusCode(), OpcuaStatusCodes.enumForValue(fault.getResponseHeader().getServiceResult().getStatusCode()));
+                } else {
+                    LOGGER.debug("Got Secure Response Connection Response");
+                    try {
+                        onConnectGetEndpointsRequest(context, opcuaOpenResponse);
+                    } catch (PlcConnectionException e) {
+                        LOGGER.error("Error occurred while connecting to OPC UA server");
+                    }
+                }
+            });
+    }
+
+    public void onConnectGetEndpointsRequest(ConversationContext<OpcuaAPU> context, OpcuaOpenResponse opcuaOpenResponse) throws PlcConnectionException {
+        certificateThumbprint = opcuaOpenResponse.getReceiverCertificateThumbprint();
+        OpenSecureChannelResponse openSecureChannelResponse = (OpenSecureChannelResponse) opcuaOpenResponse.getMessage();
+        tokenId.set((int) openSecureChannelResponse.getSecurityToken().getTokenId());
+        channelId.set((int) openSecureChannelResponse.getSecurityToken().getChannelId());
+
+        int transactionId = getTransactionIdentifier(securedConnection.get());
+
+        Integer nextSequenceNumber = opcuaOpenResponse.getSequenceNumber() + 1;
+        Integer nextRequestId = opcuaOpenResponse.getRequestId() + 1;
+
+        if (!(transactionId == nextSequenceNumber)) {
+            LOGGER.error("Sequence number isn't as expected, we might have missed a packet. - " +  transactionId + " != " + nextSequenceNumber);
+            throw new PlcConnectionException("Sequence number isn't as expected, we might have missed a packet. - " +  transactionId + " != " + nextSequenceNumber);
+        }
+
+        RequestHeader requestHeader = new RequestHeader(authenticationToken,
+            getCurrentDateTime(),
+            0L,
+            0L,
+            NULL_STRING,
+            REQUEST_TIMEOUT_LONG,
+            NULL_EXTENSION_OBJECT);
+
+        GetEndpointsRequest endpointsRequest = new GetEndpointsRequest((byte) 1,
+            (byte) 0,
+            requestHeader,
+            new PascalString(this.endpoint.length(), this.endpoint),
+            0,
+            null,
+            0,
+            null);
+
+        try {
+            WriteBuffer buffer = new WriteBuffer(endpointsRequest.getLengthInBytes(), true);
+            OpcuaMessageIO.staticSerialize(buffer, endpointsRequest);
+
+            OpcuaMessageRequest messageRequest = new OpcuaMessageRequest(CHUNK,
+                channelId.get(),
+                tokenId.get(),
+                nextSequenceNumber,
+                nextRequestId,
+                buffer.getData());
+
+            context.sendRequest(new OpcuaAPU(messageRequest))
+                .expectResponse(OpcuaAPU.class, REQUEST_TIMEOUT)
+                .check(p -> p.getMessage() instanceof OpcuaMessageResponse)
+                .unwrap(p -> (OpcuaMessageResponse) p.getMessage())
+                .handle(opcuaMessageResponse -> {
+                    try {
+                        OpcuaMessage message = OpcuaMessageIO.staticParse(new ReadBuffer(opcuaMessageResponse.getMessage(), true));
+                        if (message instanceof ServiceFault) {
+                            ServiceFault fault = (ServiceFault) message;
+                            LOGGER.error("Failed to connect to opc ua server for the following reason:- {}, {}", fault.getResponseHeader().getServiceResult().getStatusCode(), OpcuaStatusCodes.enumForValue(fault.getResponseHeader().getServiceResult().getStatusCode()));
+                        } else {
+                            LOGGER.debug("Got Create Session Response Connection Response");
+                            onConnectGetEndpointsCloseSecureChannel(context, (GetEndpointsResponse) message);
+                        }
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+
+                });
+        } catch (ParseException e) {
+            LOGGER.error("Unable to to Parse Create Session Request");
+        }
+    }
+
+    private void onConnectGetEndpointsCloseSecureChannel(ConversationContext<OpcuaAPU> context, GetEndpointsResponse message) {
+
+        int transactionId = getTransactionIdentifier(securedConnection.get());
+        EndpointDescription[] endpoints = message.getEndpoints();
+        for (EndpointDescription endpoint : endpoints) {
+            if (endpoint.getEndpointUrl().getStringValue().equals(this.endpoint) && endpoint.getSecurityPolicyUri().getStringValue().equals(this.securityPolicy)) {
+                LOGGER.info("Found OPC UA endpoint {}", this.endpoint);
+                this.senderCertificate = endpoint.getServerCertificate().getStringValue();
+            }
+        }
+
+        ExpandedNodeId expandedNodeId = new ExpandedNodeIdFourByte(false,           //Namespace Uri Specified
+            false,            //Server Index Specified
+            NULL_STRING,                      //Namespace Uri
+            1L,                     //Server Index
+            new FourByteNodeId((short) 0, 452));    //Identifier for CloseSecureChannel
+
+        RequestHeader requestHeader = new RequestHeader(authenticationToken,
+            getCurrentDateTime(),
+            0L,                                         //RequestHandle
+            0L,
+            NULL_STRING,
+            REQUEST_TIMEOUT_LONG,
+            NULL_EXTENSION_OBJECT);
+
+        CloseSecureChannelRequest closeSecureChannelRequest = new CloseSecureChannelRequest((byte) 1,
+            (byte) 0,
+            requestHeader);
+
+        OpcuaCloseRequest closeRequest = new OpcuaCloseRequest(CHUNK,
+            channelId.get(),
+            tokenId.get(),
+            transactionId,
+            transactionId,
+            closeSecureChannelRequest);
+
+        context.sendRequest(new OpcuaAPU(closeRequest))
+            .expectResponse(OpcuaAPU.class, REQUEST_TIMEOUT)
+            .check(p -> p.getMessage() instanceof OpcuaMessageResponse)
+            .unwrap(p -> (OpcuaMessageResponse) p.getMessage())
+            .handle(opcuaMessageResponse -> {
+                LOGGER.info("Got Close Secure Channel Response" + opcuaMessageResponse.toString());
+                this.checkedEndpoints = true;
+                channelId.set(0);
+                tokenId.set(0);
+                onConnect(context);
             });
     }
 
@@ -290,9 +494,9 @@ public class OpcuaProtocolLogic extends Plc4xProtocolBase<OpcuaAPU> implements H
 
         OpcuaOpenRequest openRequest = new OpcuaOpenRequest(CHUNK,
             0,
-            new PascalString(nameSpaceSecurityPolicyNone.length(), nameSpaceSecurityPolicyNone),
-            NULL_STRING,
-            NULL_STRING,
+            new PascalString(this.securityPolicy.length(), this.securityPolicy),
+            this.publicCertificate,
+            this.thumbprint,
             transactionId,
             transactionId,
             openSecureChannelRequest);
@@ -352,7 +556,7 @@ public class OpcuaProtocolLogic extends Plc4xProtocolBase<OpcuaAPU> implements H
         PascalString gatewayServerUri = NULL_STRING;
         PascalString discoveryProfileUri = NULL_STRING;
         int noOfDiscoveryUrls = -1;
-        PascalString discoveryUrls = null;
+        PascalString[] discoveryUrls = new PascalString[0];
 
         ApplicationDescription clientDescription = new ApplicationDescription(new PascalString(applicationUri.length(), applicationUri),
             new PascalString(productUri.length(), productUri),
@@ -375,35 +579,48 @@ public class OpcuaProtocolLogic extends Plc4xProtocolBase<OpcuaAPU> implements H
             120000L,
             0L);
 
-        OpcuaMessageRequest messageRequest = new OpcuaMessageRequest(CHUNK,
-            channelId.get(),
-            tokenId.get(),
-            nextSequenceNumber,
-            nextRequestId,
-            createSessionRequest);
-
-        context.sendRequest(new OpcuaAPU(messageRequest))
-            .expectResponse(OpcuaAPU.class, REQUEST_TIMEOUT)
-            .check(p -> p.getMessage() instanceof OpcuaMessageResponse)
-            .unwrap(p -> (OpcuaMessageResponse) p.getMessage())
-            .handle(opcuaMessageResponse -> {
-                if (opcuaMessageResponse.getMessage() instanceof ServiceFault) {
-                    ServiceFault fault = (ServiceFault) opcuaMessageResponse.getMessage();
-                    LOGGER.error("Failed to connect to opc ua server for the following reason:- {}, {}", fault.getResponseHeader().getServiceResult().getStatusCode(), OpcuaStatusCodes.enumForValue(fault.getResponseHeader().getServiceResult().getStatusCode()));
-                } else {
-                    LOGGER.debug("Got Create Session Response Connection Response");
+        try {
+            WriteBuffer buffer = new WriteBuffer(createSessionRequest.getLengthInBytes(), true);
+            OpcuaMessageIO.staticSerialize(buffer, createSessionRequest);
+
+            OpcuaMessageRequest messageRequest = new OpcuaMessageRequest(CHUNK,
+                channelId.get(),
+                tokenId.get(),
+                nextSequenceNumber,
+                nextRequestId,
+                buffer.getData());
+
+            context.sendRequest(new OpcuaAPU(messageRequest))
+                .expectResponse(OpcuaAPU.class, REQUEST_TIMEOUT)
+                .check(p -> p.getMessage() instanceof OpcuaMessageResponse)
+                .unwrap(p -> (OpcuaMessageResponse) p.getMessage())
+                .handle(opcuaMessageResponse -> {
                     try {
-                        onConnectActivateSessionRequest(context, opcuaMessageResponse);
-                    } catch (PlcConnectionException e) {
-                        LOGGER.error("Error occurred while connecting to OPC UA server");
+                        OpcuaMessage message = OpcuaMessageIO.staticParse(new ReadBuffer(opcuaMessageResponse.getMessage(), true));
+                        if (message instanceof ServiceFault) {
+                            ServiceFault fault = (ServiceFault) message;
+                            LOGGER.error("Failed to connect to opc ua server for the following reason:- {}, {}", fault.getResponseHeader().getServiceResult().getStatusCode(), OpcuaStatusCodes.enumForValue(fault.getResponseHeader().getServiceResult().getStatusCode()));
+                        } else {
+                            LOGGER.debug("Got Create Session Response Connection Response");
+                            try {
+                                onConnectActivateSessionRequest(context, opcuaMessageResponse, (CreateSessionResponse) message);
+                            } catch (PlcConnectionException e) {
+                                LOGGER.error("Error occurred while connecting to OPC UA server");
+                            }
+                        }
+                    } catch (ParseException e) {
+                        e.printStackTrace();
                     }
-                }
-            });
+
+                });
+        } catch (ParseException e) {
+            LOGGER.error("Unable to to Parse Create Session Request");
+        }
     }
 
-    private void onConnectActivateSessionRequest(ConversationContext<OpcuaAPU> context, OpcuaMessageResponse opcuaMessageResponse) throws PlcConnectionException {
+    private void onConnectActivateSessionRequest(ConversationContext<OpcuaAPU> context, OpcuaMessageResponse opcuaMessageResponse, CreateSessionResponse sessionResponse) throws PlcConnectionException {
 
-        CreateSessionResponse createSessionResponse = (CreateSessionResponse) opcuaMessageResponse.getMessage();
+        CreateSessionResponse createSessionResponse = sessionResponse;
         senderCertificate = createSessionResponse.getServerCertificate().getStringValue();
         senderNonce = createSessionResponse.getServerNonce().getStringValue();
 
@@ -474,34 +691,47 @@ public class OpcuaProtocolLogic extends Plc4xProtocolBase<OpcuaAPU> implements H
             userIdentityToken,
             clientSignature);
 
-        OpcuaMessageRequest activateMessageRequest = new OpcuaMessageRequest(CHUNK,
-            channelId.get(),
-            tokenId.get(),
-            nextSequenceNumber,
-            nextRequestId,
-            activateSessionRequest);
-
-        context.sendRequest(new OpcuaAPU(activateMessageRequest))
-            .expectResponse(OpcuaAPU.class, REQUEST_TIMEOUT)
-            .check(p -> p.getMessage() instanceof OpcuaMessageResponse)
-            .unwrap(p -> (OpcuaMessageResponse) p.getMessage())
-            .handle(opcuaActivateResponse -> {
-                LOGGER.debug("Got Activate Session Response Connection Response");
-                if (opcuaActivateResponse.getMessage() instanceof ServiceFault) {
-                    ServiceFault fault = (ServiceFault) opcuaActivateResponse.getMessage();
-                    LOGGER.error("Failed to connect to opc ua server for the following reason:- {}, {}", fault.getResponseHeader().getServiceResult().getStatusCode(), OpcuaStatusCodes.enumForValue(fault.getResponseHeader().getServiceResult().getStatusCode()));
-                } else {
-                    ActivateSessionResponse activateMessageResponse = (ActivateSessionResponse) opcuaActivateResponse.getMessage();
-
-                    long returnedRequestHandle = activateMessageResponse.getResponseHeader().getRequestHandle();
-                    if (!(requestHandle == returnedRequestHandle)) {
-                        LOGGER.error("Request handle isn't as expected, we might have missed a packet. {} != {}" ,requestHandle,  returnedRequestHandle);
+        try {
+            WriteBuffer buffer = new WriteBuffer(activateSessionRequest.getLengthInBytes(), true);
+            OpcuaMessageIO.staticSerialize(buffer, activateSessionRequest);
+
+            OpcuaMessageRequest activateMessageRequest = new OpcuaMessageRequest(CHUNK,
+                channelId.get(),
+                tokenId.get(),
+                nextSequenceNumber,
+                nextRequestId,
+                buffer.getData());
+
+            context.sendRequest(new OpcuaAPU(activateMessageRequest))
+                .expectResponse(OpcuaAPU.class, REQUEST_TIMEOUT)
+                .check(p -> p.getMessage() instanceof OpcuaMessageResponse)
+                .unwrap(p -> (OpcuaMessageResponse) p.getMessage())
+                .handle(opcuaActivateResponse -> {
+                    LOGGER.debug("Got Activate Session Response Connection Response");
+                    try {
+                        OpcuaMessage message = OpcuaMessageIO.staticParse(new ReadBuffer(opcuaActivateResponse.getMessage(), true));
+                        if (message instanceof ServiceFault) {
+                            ServiceFault fault = (ServiceFault) message;
+                            LOGGER.error("Failed to connect to opc ua server for the following reason:- {}, {}", fault.getResponseHeader().getServiceResult().getStatusCode(), OpcuaStatusCodes.enumForValue(fault.getResponseHeader().getServiceResult().getStatusCode()));
+                        } else {
+                            ActivateSessionResponse activateMessageResponse = (ActivateSessionResponse) message;
+
+                            long returnedRequestHandle = activateMessageResponse.getResponseHeader().getRequestHandle();
+                            if (!(requestHandle == returnedRequestHandle)) {
+                                LOGGER.error("Request handle isn't as expected, we might have missed a packet. {} != {}", requestHandle, returnedRequestHandle);
+                            }
+
+                            // Send an event that connection setup is complete.
+                            context.fireConnected();
+                        }
+                    } catch (ParseException e) {
+                        e.printStackTrace();
                     }
 
-                    // Send an event that connection setup is complete.
-                    context.fireConnected();
-                }
-            });
+                });
+        } catch (ParseException e) {
+            LOGGER.info("Unable to serialise the ActivateSessionRequest");
+        }
     }
 
     @Override
@@ -553,31 +783,42 @@ public class OpcuaProtocolLogic extends Plc4xProtocolBase<OpcuaAPU> implements H
 
         int transactionId = getTransactionIdentifier(securedConnection.get());
 
-        OpcuaMessageRequest readMessageRequest = new OpcuaMessageRequest(CHUNK,
-            channelId.get(),
-            tokenId.get(),
-            transactionId,
-            transactionId,
-            opcuaReadRequest);
-
-        RequestTransactionManager.RequestTransaction transaction = tm.startRequest();
-        transaction.submit(() -> context.sendRequest(new OpcuaAPU(readMessageRequest))
-            .expectResponse(OpcuaAPU.class, REQUEST_TIMEOUT)
-            .onTimeout(future::completeExceptionally)
-            .onError((p, e) -> future.completeExceptionally(e))
-            .check(p -> p.getMessage() instanceof OpcuaMessageResponse)
-            .unwrap(p -> (OpcuaMessageResponse) p.getMessage())
-            .handle(opcuaResponse -> {
-                // Prepare the response.
-                PlcReadResponse response = new DefaultPlcReadResponse(request,
-                    readResponse(request.getFieldNames(), (ReadResponse) opcuaResponse.getMessage()));
-
-                // Pass the response back to the application.
-                future.complete(response);
-
-                // Finish the request-transaction.
-                transaction.endRequest();
-            }));
+        try {
+            WriteBuffer buffer = new WriteBuffer(opcuaReadRequest.getLengthInBytes(), true);
+            OpcuaMessageIO.staticSerialize(buffer, opcuaReadRequest);
+
+            OpcuaMessageRequest readMessageRequest = new OpcuaMessageRequest(CHUNK,
+                channelId.get(),
+                tokenId.get(),
+                transactionId,
+                transactionId,
+                buffer.getData());
+
+            RequestTransactionManager.RequestTransaction transaction = tm.startRequest();
+            transaction.submit(() -> context.sendRequest(new OpcuaAPU(readMessageRequest))
+                .expectResponse(OpcuaAPU.class, REQUEST_TIMEOUT)
+                .onTimeout(future::completeExceptionally)
+                .onError((p, e) -> future.completeExceptionally(e))
+                .check(p -> p.getMessage() instanceof OpcuaMessageResponse)
+                .unwrap(p -> (OpcuaMessageResponse) p.getMessage())
+                .handle(opcuaResponse -> {
+                    // Prepare the response.
+                    PlcReadResponse response = null;
+                    try {
+                        response = new DefaultPlcReadResponse(request, readResponse(request.getFieldNames(), (ReadResponse) OpcuaMessageIO.staticParse(new ReadBuffer(opcuaResponse.getMessage(), true))));
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    };
+
+                    // Pass the response back to the application.
+                    future.complete(response);
+
+                    // Finish the request-transaction.
+                    transaction.endRequest();
+                }));
+        } catch (ParseException e) {
+            LOGGER.error("Unable to serialise the ReadRequest");
+        }
 
         return future;
     }
@@ -1060,30 +1301,42 @@ public class OpcuaProtocolLogic extends Plc4xProtocolBase<OpcuaAPU> implements H
 
         int transactionId = getTransactionIdentifier(securedConnection.get());
 
-        OpcuaMessageRequest writeMessageRequest = new OpcuaMessageRequest(CHUNK,
-            channelId.get(),
-            tokenId.get(),
-            transactionId,
-            transactionId,
-            opcuaWriteRequest);
-
-        RequestTransactionManager.RequestTransaction transaction = tm.startRequest();
-        transaction.submit(() -> context.sendRequest(new OpcuaAPU(writeMessageRequest))
-            .expectResponse(OpcuaAPU.class, REQUEST_TIMEOUT)
-            .onTimeout(future::completeExceptionally)
-            .onError((p, e) -> future.completeExceptionally(e))
-            .check(p -> p.getMessage() instanceof OpcuaMessageResponse)
-            .unwrap(p -> (OpcuaMessageResponse) p.getMessage())
-            .handle(opcuaResponse -> {
-                WriteResponse responseMessage = (WriteResponse) opcuaResponse.getMessage();
-                PlcWriteResponse response = writeResponse(request, responseMessage);
+        try {
+            WriteBuffer buffer = new WriteBuffer(opcuaWriteRequest.getLengthInBytes(), true);
+            OpcuaMessageIO.staticSerialize(buffer, opcuaWriteRequest);
+
+            OpcuaMessageRequest writeMessageRequest = new OpcuaMessageRequest(CHUNK,
+                channelId.get(),
+                tokenId.get(),
+                transactionId,
+                transactionId,
+                buffer.getData());
+
+            RequestTransactionManager.RequestTransaction transaction = tm.startRequest();
+            transaction.submit(() -> context.sendRequest(new OpcuaAPU(writeMessageRequest))
+                .expectResponse(OpcuaAPU.class, REQUEST_TIMEOUT)
+                .onTimeout(future::completeExceptionally)
+                .onError((p, e) -> future.completeExceptionally(e))
+                .check(p -> p.getMessage() instanceof OpcuaMessageResponse)
+                .unwrap(p -> (OpcuaMessageResponse) p.getMessage())
+                .handle(opcuaResponse -> {
+                    WriteResponse responseMessage = null;
+                    try {
+                        responseMessage = (WriteResponse) OpcuaMessageIO.staticParse(new ReadBuffer(opcuaResponse.getMessage(), true));
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                    }
+                    PlcWriteResponse response = writeResponse(request, responseMessage);
 
-                // Pass the response back to the application.
-                future.complete(response);
+                    // Pass the response back to the application.
+                    future.complete(response);
 
-                // Finish the request-transaction.
-                transaction.endRequest();
-            }));
+                    // Finish the request-transaction.
+                    transaction.endRequest();
+                }));
+        } catch (ParseException e) {
+            LOGGER.info("Unable to serialize write request");
+        }
 
         return future;
     }
diff --git a/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec b/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
index 916e086..349c625 100644
--- a/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
+++ b/protocols/knxnetip/src/main/resources/protocols/knxnetip/knxnetip.mspec
@@ -649,7 +649,7 @@
     ['0x20' MEDIUM_KNX_IP]
 ]
 
-[enum uint 8 'SupportedPhysicalMedia' [string 'description',                                                    bit 'knxSupport']
+[enum uint 8 'SupportedPhysicalMedia' [string '-1' 'description',                                                    bit 'knxSupport']
     ['0x00' OTHER                     ['used_for_undefined_physical_medium',                                    'true']]
     ['0x01' OIL_METER                 ['measures_volume_of_oil',                                                'true']]
     ['0x02' ELECTRICITY_METER         ['measures_electric_energy',                                              'true']]
diff --git a/protocols/knxnetip/src/main/xslt/knx-types.xsl b/protocols/knxnetip/src/main/xslt/knx-types.xsl
index 7a63db5..a00ed10 100644
--- a/protocols/knxnetip/src/main/xslt/knx-types.xsl
+++ b/protocols/knxnetip/src/main/xslt/knx-types.xsl
@@ -47,33 +47,33 @@
 // specific language governing permissions and limitations
 // under the License.
 //
-[enum uint 16 'KnxDatapointMainType' [uint 16 'number', uint 8 'sizeInBits', string 'name']
+[enum uint 16 'KnxDatapointMainType' [uint 16 'number', uint 8 'sizeInBits', string '-1' 'name']
     ['0' DPT_UNKNOWN ['0', '0', '"Unknown Datapoint Type"']]
     <xsl:apply-templates select="knx:KNX/knx:MasterData/knx:DatapointTypes/knx:DatapointType"/>
 ]
 
-[enum uint 32 'KnxDatapointType' [uint 16 'number', KnxDatapointMainType 'datapointMainType', string 'name']
+[enum uint 32 'KnxDatapointType' [uint 16 'number', KnxDatapointMainType 'datapointMainType', string '-1' 'name']
     ['0' DPT_UNKNOWN ['0', 'KnxDatapointMainType.DPT_UNKNOWN', '"Unknown Datapoint Subtype"']]
     <xsl:apply-templates select="knx:KNX/knx:MasterData/knx:DatapointTypes/knx:DatapointType/knx:DatapointSubtypes/knx:DatapointSubtype"/>
 ]
 
-[enum uint 16 'KnxInterfaceObjectType' [string 'code', string 'name']
+[enum uint 16 'KnxInterfaceObjectType' [string '-1' 'code', string '-1' 'name']
     ['0' OT_UNKNOWN ['U', '"Unknown Interface Object Type"']]
     ['1' OT_GENERAL ['G', '"General Interface Object Type"']]
     <xsl:apply-templates select="knx:KNX/knx:MasterData/knx:InterfaceObjectTypes/knx:InterfaceObjectType"/>
 ]
 
-[enum uint 32 'KnxInterfaceObjectProperty' [uint 8 'propertyId', KnxInterfaceObjectType 'objectType', KnxPropertyDataType 'propertyDataType', string 'name']
+[enum uint 32 'KnxInterfaceObjectProperty' [uint 8 'propertyId', KnxInterfaceObjectType 'objectType', KnxPropertyDataType 'propertyDataType', string '-1' 'name']
     ['0' PID_UNKNOWN ['0', 'KnxInterfaceObjectType.OT_UNKNOWN', 'KnxPropertyDataType.PDT_UNKNOWN', '"Unknown Interface Object Property"']]
     <xsl:apply-templates select="knx:KNX/knx:MasterData/knx:InterfaceObjectProperties/knx:InterfaceObjectProperty"/>
 ]
 
-[enum uint 8 'KnxPropertyDataType' [uint 8 'number', uint 8 'sizeInBytes', string 'name']
+[enum uint 8 'KnxPropertyDataType' [uint 8 'number', uint 8 'sizeInBytes', string '-1' 'name']
     ['0' PDT_UNKNOWN ['0', '0', '"Unknown Property Data Type"']]
     <xsl:apply-templates select="knx:KNX/knx:MasterData/knx:PropertyDataTypes/knx:PropertyDataType"/>
 ]
 
-[enum uint 16 'KnxManufacturer' [uint 16 'number', string 'name']
+[enum uint 16 'KnxManufacturer' [uint 16 'number', string '-1' 'name']
     ['0' M_UNKNOWN ['0', '"Unknown Manufacturer"']]
     <xsl:apply-templates select="knx:KNX/knx:MasterData/knx:Manufacturers/knx:Manufacturer"/>
 ]
@@ -321,7 +321,7 @@
                     </xsl:choose>
                 </xsl:variable>
             [reserved uint 8   '0x0']
-            [simple   string <xsl:value-of select="$datapointSubtype/knx:Format/knx:String/@Width"/> '<xsl:value-of select="$encoding"/>' 'value']
+            [simple   string '<xsl:value-of select="$datapointSubtype/knx:Format/knx:String/@Width"/>' '<xsl:value-of select="$encoding"/>' 'value']
             </xsl:when>
             <xsl:when test="$datapointSubtype/knx:Format/knx:UnsignedInteger">
                 <xsl:choose>
@@ -400,7 +400,7 @@
                         <xsl:when test="$field/@Encoding = 'iso-8859-1'">ISO-8859-1</xsl:when>
                     </xsl:choose>
                 </xsl:variable>
-                string <xsl:value-of select="$field/@Width"/> '<xsl:value-of select="$encoding"/>'</xsl:when>
+                string '<xsl:value-of select="$field/@Width"/>' '<xsl:value-of select="$encoding"/>'</xsl:when>
             <xsl:when test="name($field) = 'UnsignedInteger'">uint <xsl:value-of select="$field/@Width"/></xsl:when>
             <xsl:when test="name($field) = 'SignedInteger'">int <xsl:value-of select="$field/@Width"/></xsl:when>
             <xsl:when test="name($field) = 'Float'">
diff --git a/protocols/opcua/src/main/resources/protocols/opcua/opcua.mspec b/protocols/opcua/src/main/resources/protocols/opcua/opcua.mspec
index ffd7ca2..8dd59a9 100644
--- a/protocols/opcua/src/main/resources/protocols/opcua/opcua.mspec
+++ b/protocols/opcua/src/main/resources/protocols/opcua/opcua.mspec
@@ -59,8 +59,8 @@
             [implicit        int 32             'messageSize' 'lengthInBytes']
             [simple          int 32             'secureChannelId']
             [simple          PascalString       'endpoint']
-            [simple          PascalString       'senderCertificate']
-            [simple          PascalString       'receiverCertificateThumbprint']
+            [simple          PascalByteString   'senderCertificate']
+            [simple          PascalByteString   'receiverCertificateThumbprint']
             [simple          int 32             'sequenceNumber']
             [simple          int 32             'requestId']
             [simple          OpcuaMessage       'message']
@@ -97,7 +97,7 @@
            [simple          int 32             'secureTokenId']
            [simple          int 32             'sequenceNumber']
            [simple          int 32             'requestId']
-           [simple          OpcuaMessage       'message']
+           [array           int 8              'message' count 'messageSize - 24']
        ]
        ['MSG','true'     OpcuaMessageResponse
            [simple          string '8'         'chunk']
@@ -106,7 +106,7 @@
            [simple          int 32             'secureTokenId']
            [simple          int 32             'sequenceNumber']
            [simple          int 32             'requestId']
-           [simple          OpcuaMessage       'message']
+           [array           int 8              'message' count 'messageSize - 24']
        ]
     ]
 ]
diff --git a/protocols/opcua/src/main/xslt/opc-types.xsl b/protocols/opcua/src/main/xslt/opc-types.xsl
index ee44a6d..2dafce0 100644
--- a/protocols/opcua/src/main/xslt/opc-types.xsl
+++ b/protocols/opcua/src/main/xslt/opc-types.xsl
@@ -67,6 +67,8 @@
         <xsl:apply-templates select="$file/node:UANodeSet/node:UADataType[@BrowseName='WriteResponse']"/>
         <xsl:apply-templates select="$file/node:UANodeSet/node:UADataType[@BrowseName='BrowseRequest']"/>
         <xsl:apply-templates select="$file/node:UANodeSet/node:UADataType[@BrowseName='BrowseResponse']"/>
+        <xsl:apply-templates select="$file/node:UANodeSet/node:UADataType[@BrowseName='GetEndpointsRequest']"/>
+        <xsl:apply-templates select="$file/node:UANodeSet/node:UADataType[@BrowseName='GetEndpointsResponse']"/>
         <xsl:apply-templates select="$file/node:UANodeSet/node:UADataType[@BrowseName='ServiceFault']"/>
 
     ['473' CloseSessionRequest
@@ -434,7 +436,7 @@
     [simple PascalString 'gatewayServerUri']
     [simple PascalString 'discoveryProfileUri']
     [simple int 32 'noOfDiscoveryUrls']
-    [optional PascalString 'discoveryUrls' 'noOfDiscoveryUrls > 0']
+    [array PascalString 'discoveryUrls' count 'noOfDiscoveryUrls']
 ]
 
 [type 'EndpointDescription'


[plc4x] 01/03: Minors changes, updating to latest 0.9-snapshot

Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

hutcheb pushed a commit to branch feature/native_opua_client
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit f4920e9498626c37fb232d6ad6ba25eb6c31dfae
Author: hutcheb <be...@gmail.com>
AuthorDate: Thu Jan 28 20:35:36 2021 -0500

    Minors changes, updating to latest 0.9-snapshot
---
 .../java/opcua/config/OpcuaConfiguration.java      |  1 -
 .../java/opcua/protocol/OpcuaProtocolLogic.java    | 59 +++++-----------------
 2 files changed, 13 insertions(+), 47 deletions(-)

diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/config/OpcuaConfiguration.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/config/OpcuaConfiguration.java
index 0b6b86d..4187173 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/config/OpcuaConfiguration.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/config/OpcuaConfiguration.java
@@ -200,7 +200,6 @@ public class OpcuaConfiguration implements Configuration, TcpTransportConfigurat
         }
     }
 
-
     @Override
     public String toString() {
         return "Configuration{" +
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaProtocolLogic.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaProtocolLogic.java
index 5515121..1689fa8 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaProtocolLogic.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaProtocolLogic.java
@@ -18,39 +18,26 @@
  */
 package org.apache.plc4x.java.opcua.protocol;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.RandomUtils;
-import org.apache.plc4x.java.api.PlcConnection;
-import org.apache.plc4x.java.api.authentication.PlcAuthentication;
-import org.apache.plc4x.java.api.exceptions.*;
+import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
+import org.apache.plc4x.java.api.exceptions.PlcRuntimeException;
 import org.apache.plc4x.java.api.messages.PlcReadRequest;
 import org.apache.plc4x.java.api.messages.PlcReadResponse;
-import org.apache.plc4x.java.api.messages.PlcResponse;
 import org.apache.plc4x.java.api.messages.PlcWriteRequest;
 import org.apache.plc4x.java.api.messages.PlcWriteResponse;
-import org.apache.plc4x.java.api.model.PlcField;
 import org.apache.plc4x.java.api.types.PlcResponseCode;
-import org.apache.plc4x.java.spi.configuration.Configuration;
-import org.apache.plc4x.java.spi.configuration.ConfigurationFactory;
-import org.apache.plc4x.java.spi.connection.ChannelFactory;
-import org.apache.plc4x.java.spi.connection.DefaultNettyPlcConnection;
-import org.apache.plc4x.java.spi.transport.Transport;
-import org.apache.plc4x.java.spi.values.PlcNull;
 import org.apache.plc4x.java.api.value.PlcValue;
-import org.apache.plc4x.java.spi.values.IEC61131ValueHandler;
 import org.apache.plc4x.java.opcua.config.OpcuaConfiguration;
 import org.apache.plc4x.java.opcua.readwrite.*;
-import org.apache.plc4x.java.opcua.readwrite.io.*;
+import org.apache.plc4x.java.opcua.readwrite.io.PascalStringIO;
+import org.apache.plc4x.java.opcua.readwrite.io.UserNameIdentityTokenIO;
 import org.apache.plc4x.java.opcua.readwrite.types.*;
 import org.apache.plc4x.java.spi.ConversationContext;
 import org.apache.plc4x.java.spi.Plc4xProtocolBase;
 import org.apache.plc4x.java.spi.configuration.HasConfiguration;
 import org.apache.plc4x.java.spi.context.DriverContext;
 import org.apache.plc4x.java.spi.generation.ParseException;
-import org.apache.plc4x.java.spi.generation.ReadBuffer;
 import org.apache.plc4x.java.spi.generation.WriteBuffer;
 import org.apache.plc4x.java.spi.messages.DefaultPlcReadRequest;
 import org.apache.plc4x.java.spi.messages.DefaultPlcReadResponse;
@@ -58,46 +45,28 @@ import org.apache.plc4x.java.spi.messages.DefaultPlcWriteRequest;
 import org.apache.plc4x.java.spi.messages.DefaultPlcWriteResponse;
 import org.apache.plc4x.java.spi.messages.utils.ResponseItem;
 import org.apache.plc4x.java.spi.transaction.RequestTransactionManager;
-import org.apache.plc4x.java.spi.values.*;
+import org.apache.plc4x.java.spi.values.IEC61131ValueHandler;
+import org.apache.plc4x.java.spi.values.PlcList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.crypto.Cipher;
 import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
-import java.time.*;
-import java.math.BigInteger;
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.regex.Matcher;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.nio.charset.StandardCharsets;
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import java.security.*;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.Base64;
-
-
-/**
- * The S7 Protocol states that there can not be more then {min(maxAmqCaller, maxAmqCallee} "ongoing" requests.
- * So we need to limit those.
- * Thus, each request goes to a Work Queue and this Queue ensures, that only 3 are open at the same time.
- */
+
 public class OpcuaProtocolLogic extends Plc4xProtocolBase<OpcuaAPU> implements HasConfiguration<OpcuaConfiguration> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(OpcuaProtocolLogic.class);
@@ -328,8 +297,6 @@ public class OpcuaProtocolLogic extends Plc4xProtocolBase<OpcuaAPU> implements H
             transactionId,
             openSecureChannelRequest);
 
-
-
         context.sendRequest(new OpcuaAPU(openRequest))
             .expectResponse(OpcuaAPU.class, REQUEST_TIMEOUT)
             .check(p -> p.getMessage() instanceof OpcuaOpenResponse)