This is an automated email from the ASF dual-hosted git repository.
skorikov pushed a change to branch feature/refactor-abstract-connection
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
discard 9ed446b fixed hello plc4x example
discard 6f6d96d extracted AbstractPlcConnection class
discard 9a5f6fd renamed AbstractPlcConnection to NettyPlcConnection
add 08dd73e [plc4j-pool] invalidating proxy after returning it to the
pool.
add 1b9ca25 [plc4j-pool] added test for pool removal method. + Added TODO
for maybe necessary connection eviction.
add 89309b5 [plc4j-pool] increased test coverage and fixed some sonar
issues
add 9bb69d9 [plc4j-pool] removed obsolete exception
add 4ad765e [plc4j-opm] fixed build, fixed some issues and added some
tests.
add 1c51cfd [plc4j-opm] added fqn of entity to fields on request
add c947721 [plc4j-opm] added sanity checks for getter having no
parameters.
add 3a187b3 [plc4j-opm] fixed is-getter calls.
add 2bfb4ec [plc4j-opm] renamed single letter parameters
add 33af28e [plc4j-opm] rearrange exception blocks (sonar issue :/)
add 1716a22 [plc4j-opm] make timeout configurable
add 778b224 [plc4j-opm] added left over types and added test for the
remaining once.
add 5670401 - Fixed some version related problems (Made sure they can't
reoccur)
add 4a1b19e - Replaced the S7FieldItems with the Default ones from
driver-base
add 5b80c1b [OPM] Moved connection string from Entity to the connect /
read methods.
add d168e12 [OPM] Small refactoring, introduced OpmUtils.
add 2906972 fix build
add 29c83a2 [OPM] Refactoring. Added PlcEntityInterceptor.
add a5ae69b [OPM] Added Documentation, some refactoring.
add 0654828 [plc4j-pool] invalidate connections on PlcConnectionException
add 342fb75 [driver-bases] re-enabled subscription support on
SingleItemToSingleRequestProtocol un-sub still needs to be re-enabling
add 0d7c25d - Cleaning up in the examples - Added an mqtt example
(untested)
add b978413 - Made the MqttConnector actually work with a dummy public
server using the test-driver.
add 2ce3b2f - Get rid of an annoying sonar report ...
new d07c612 renamed AbstractPlcConnection to NettyPlcConnection
new 14ab66e extracted AbstractPlcConnection class
new 512a733 fixed hello plc4x example
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (9ed446b)
\
N -- N -- N refs/heads/feature/refactor-abstract-connection
(512a733)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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:
examples/{azure => hello-cloud-azure}/pom.xml | 4 +-
.../cloud/azure}/S7PlcToAzureIoTHubSample.java | 32 +-
examples/{google => hello-cloud-google}/README.md | 0
examples/{google => hello-cloud-google}/pom.xml | 4 +-
.../examples/cloud/google}/MqttExampleOptions.java | 38 +-
.../cloud/google}/S7PlcToGoogleIoTCoreSample.java | 36 +-
.../src/main/resources/logback.xml | 0
.../src/remote-resources/META-INF/LICENSE | 0
.../kafka-connector.yml} | 18 +-
.../pom.xml | 13 +-
.../server.sh | 0
.../connectivity/kafka/KafkaConnector.java} | 54 +--
.../connectivity/kafka/model/Configuration.java | 56 +++
.../connectivity/kafka}/model/KafkaConfig.java | 36 +-
.../connectivity/kafka}/model/PlcConfig.java | 36 +-
.../connectivity/kafka}/model/PlcFieldConfig.java | 32 +-
.../connectivity/kafka/model/PlcMemoryBlock.java | 22 +-
.../src/main/resources/logback.xml | 0
.../mqtt-connector.yml} | 23 +-
examples/hello-connectivity-mqtt/pom.xml | 135 +++++++
.../examples/connectivity/mqtt/MqttConnector.java | 154 ++++++++
.../connectivity/mqtt/model/Configuration.java | 56 +++
.../connectivity/mqtt/model/MqttConfig.java | 47 ++-
.../connectivity/mqtt}/model/PlcConfig.java | 36 +-
.../connectivity/mqtt}/model/PlcFieldConfig.java | 32 +-
.../connectivity/mqtt/model/PlcMemoryBlock.java | 22 +-
.../src/main/resources/logback.xml | 0
.../pom.xml | 8 +-
.../examples/integration/edgent}/PlcLogger.java | 36 +-
.../src/main/resources/logback.xml | 0
.../README.adoc | 0
.../pom.xml | 8 +-
.../elasticsearch/ElasticsearchStorage.java} | 41 +--
.../src/main/resources/log4j2.xml | 0
.../src/main/resources/logback.xml | 0
.../{hello-plc4x => hello-world-plc4x}/pom.xml | 11 +-
.../plc4x/java/examples/helloplc4x/HelloPlc4x.java | 111 ++++++
.../src/main/resources/logback.xml | 0
examples/iotree/pom.xml | 84 -----
.../apache/plc4x/java/examples/iotree/IoTree.java | 109 ------
.../examples/kafkabridge/model/Configuration.java | 65 ----
.../examples/kafkabridge/model/PlcMemoryBlock.java | 41 ---
examples/pom.xml | 14 +-
.../apache-nifi/nifi-plc4x-processors/pom.xml | 1 -
integrations/apache-nifi/pom.xml | 8 +
.../ads/connection/AdsSerialPlcConnection.java | 5 +-
.../java/ads/connection/AdsTcpPlcConnection.java | 2 +-
.../messages/DefaultPlcSubscriptionRequest.java | 10 +-
.../messages/DefaultPlcSubscriptionResponse.java | 4 +
.../base/messages/InternalPlcFieldRequest.java | 2 +-
.../messages/InternalPlcSubscriptionRequest.java | 3 +
.../messages/InternalPlcSubscriptionResponse.java | 7 +-
.../SingleItemToSingleRequestProtocol.java | 73 +++-
.../SingleItemToSingleRequestProtocolTest.java | 393 ++++++++++++---------
.../modbus/connection/ModbusTcpPlcConnection.java | 5 +-
.../s7/messages/items/S7BigIntegerFieldItem.java | 43 ---
.../java/s7/messages/items/S7BooleanFieldItem.java | 52 ---
.../messages/items/S7LocalDateTimeFieldItem.java | 49 ---
.../java/s7/messages/items/S7LongFieldItem.java | 53 ---
.../java/s7/messages/items/S7StringFieldItem.java | 47 ---
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 53 ++-
.../java/s7/netty/util/S7PlcFieldHandler.java | 174 +++++----
.../java/s7/netty/util/S7PlcFieldHandlerTest.java | 86 +++--
.../connectionpool/PooledPlcConnectionFactory.java | 2 +-
.../connectionpool/PooledPlcDriverManager.java | 59 ++--
.../WrappedPooledConnectionException.java | 33 --
.../connectionpool/PooledPlcDriverManagerTest.java | 132 ++++++-
plc4j/utils/opm/pom.xml | 21 +-
.../java/opm/{OPMException.java => OpmUtils.java} | 25 +-
.../java/org/apache/plc4x/java/opm/PlcEntity.java | 1 -
.../plc4x/java/opm/PlcEntityInterceptor.java | 321 +++++++++++++++++
.../apache/plc4x/java/opm/PlcEntityManager.java | 311 ++++------------
.../java/org/apache/plc4x/java/opm/PlcField.java | 3 +
.../utils/opm/src/site/asciidoc/opm/using-opm.adoc | 61 ++++
plc4j/utils/opm/src/site/site.xml | 30 ++
.../plc4x/java/opm/PlcEntityManagerTest.java | 265 ++++++++++----
.../opm/src/test}/resources/logback.xml | 4 +-
pom.xml | 11 +-
78 files changed, 2226 insertions(+), 1537 deletions(-)
rename examples/{azure => hello-cloud-azure}/pom.xml (96%)
rename
examples/{azure/src/main/java/org/apache/plc4x/java/examples/azure/iothub =>
hello-cloud-azure/src/main/java/org/apache/plc4x/java/examples/cloud/azure}/S7PlcToAzureIoTHubSample.java
(77%)
rename examples/{google => hello-cloud-google}/README.md (100%)
rename examples/{google => hello-cloud-google}/pom.xml (97%)
rename
examples/{google/src/main/java/org/apache/plc4x/java/examples/google/iotcore =>
hello-cloud-google/src/main/java/org/apache/plc4x/java/examples/cloud/google}/MqttExampleOptions.java
(85%)
rename
examples/{google/src/main/java/org/apache/plc4x/java/examples/google/iotcore =>
hello-cloud-google/src/main/java/org/apache/plc4x/java/examples/cloud/google}/S7PlcToGoogleIoTCoreSample.java
(93%)
rename examples/{google => hello-cloud-google}/src/main/resources/logback.xml
(100%)
rename examples/{google =>
hello-cloud-google}/src/remote-resources/META-INF/LICENSE (100%)
copy examples/{kafka-bridge/kafka-bridge.yml =>
hello-connectivity-kafka/kafka-connector.yml} (82%)
rename examples/{kafka-bridge => hello-connectivity-kafka}/pom.xml (90%)
rename examples/{kafka-bridge => hello-connectivity-kafka}/server.sh (100%)
rename
examples/{kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/KafkaBridge.java
=>
hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/KafkaConnector.java}
(77%)
create mode 100644
examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/Configuration.java
rename
examples/{kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge
=>
hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka}/model/KafkaConfig.java
(51%)
copy
examples/{kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge
=>
hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka}/model/PlcConfig.java
(51%)
copy
examples/{kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge
=>
hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka}/model/PlcFieldConfig.java
(51%)
copy
plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestFieldItem.java
=>
examples/hello-connectivity-kafka/src/main/java/org/apache/plc4x/java/examples/connectivity/kafka/model/PlcMemoryBlock.java
(66%)
rename examples/{kafka-bridge =>
hello-connectivity-kafka}/src/main/resources/logback.xml (100%)
rename examples/{kafka-bridge/kafka-bridge.yml =>
hello-connectivity-mqtt/mqtt-connector.yml} (75%)
create mode 100644 examples/hello-connectivity-mqtt/pom.xml
create mode 100644
examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/MqttConnector.java
create mode 100644
examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/Configuration.java
rename
plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7FloatingPointFieldItem.java
=>
examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/MqttConfig.java
(50%)
rename
examples/{kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge
=>
hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt}/model/PlcConfig.java
(51%)
rename
examples/{kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge
=>
hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt}/model/PlcFieldConfig.java
(51%)
copy
plc4j/protocols/test/src/main/java/org/apache/plc4x/java/test/TestFieldItem.java
=>
examples/hello-connectivity-mqtt/src/main/java/org/apache/plc4x/java/examples/connectivity/mqtt/model/PlcMemoryBlock.java
(66%)
rename examples/{iotree =>
hello-connectivity-mqtt}/src/main/resources/logback.xml (100%)
rename examples/{plclogger => hello-integration-edgent}/pom.xml (90%)
rename
examples/{plclogger/src/main/java/org/apache/plc4x/java/examples/plclogger =>
hello-integration-edgent/src/main/java/org/apache/plc4x/java/examples/integration/edgent}/PlcLogger.java
(66%)
rename examples/{plclogger =>
hello-integration-edgent}/src/main/resources/logback.xml (100%)
rename examples/{iot-factory => hello-storage-elasticsearch}/README.adoc (100%)
rename examples/{iot-factory => hello-storage-elasticsearch}/pom.xml (92%)
rename
examples/{iot-factory/src/main/java/org/apache/plc4x/java/examples/iotfactory/IotElasticsearchFactory.java
=>
hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java}
(91%)
rename examples/{iot-factory =>
hello-storage-elasticsearch}/src/main/resources/log4j2.xml (100%)
rename examples/{iot-factory =>
hello-storage-elasticsearch}/src/main/resources/logback.xml (100%)
rename examples/{hello-plc4x => hello-world-plc4x}/pom.xml (88%)
create mode 100644
examples/hello-world-plc4x/src/main/java/org/apache/plc4x/java/examples/helloplc4x/HelloPlc4x.java
rename examples/{hello-plc4x =>
hello-world-plc4x}/src/main/resources/logback.xml (100%)
delete mode 100644 examples/iotree/pom.xml
delete mode 100644
examples/iotree/src/main/java/org/apache/plc4x/java/examples/iotree/IoTree.java
delete mode 100644
examples/kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/model/Configuration.java
delete mode 100644
examples/kafka-bridge/src/main/java/org/apache/plc4x/java/examples/kafkabridge/model/PlcMemoryBlock.java
delete mode 100644
plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7BigIntegerFieldItem.java
delete mode 100644
plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7BooleanFieldItem.java
delete mode 100644
plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7LocalDateTimeFieldItem.java
delete mode 100644
plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7LongFieldItem.java
delete mode 100644
plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/messages/items/S7StringFieldItem.java
delete mode 100644
plc4j/utils/connection-pool/src/main/java/org/apache/plc4x/java/utils/connectionpool/WrappedPooledConnectionException.java
copy
plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/{OPMException.java =>
OpmUtils.java} (53%)
create mode 100644
plc4j/utils/opm/src/main/java/org/apache/plc4x/java/opm/PlcEntityInterceptor.java
create mode 100644 plc4j/utils/opm/src/site/asciidoc/opm/using-opm.adoc
create mode 100644 plc4j/utils/opm/src/site/site.xml
copy plc4j/{protocols/benchmarks/src/main =>
utils/opm/src/test}/resources/logback.xml (95%)
