This is an automated email from the ASF dual-hosted git repository.
chrisdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
from f7b8557fc4 chore: licence fix
new 422ff98d35 chore: Updated the BACnet and KNX Vendor IDs
new e6b19dd4cf chore: Streamlined the artifactIds of some of the "tools"
to match the general pattern.
new 7f851ab259 feat: Updated all drivers that currently didn't support
subscriptions natively to use the new subscription emulation.
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:
plc4j/drivers/ab-eth/pom.xml | 5 +
.../apache/plc4x/java/abeth/AbEthConnection.java | 4 +-
.../abeth/manual/ManualAbEthSubscriptionTest.java | 89 +++
.../java/bacnetip/readwrite/BACnetVendorId.java | 6 +
plc4j/drivers/eip/pom.xml | 5 +
.../plc4x/java/eip/base/EipTcpConnection.java | 4 +-
.../base/manual/ManualEipSubscriptionTest.java} | 28 +-
.../java/knxnetip/readwrite/KnxManufacturer.java | 6 +-
plc4j/drivers/modbus/pom.xml | 5 +
.../java/modbus/ascii/ModbusAsciiConnection.java | 4 +-
.../plc4x/java/modbus/rtu/ModbusRtuConnection.java | 4 +-
.../plc4x/java/modbus/tcp/ModbusTcpConnection.java | 4 +-
.../manual/ManualModbusASCIISubscriptionTest.java} | 29 +-
.../manual/ManualModbusRTUSubscriptionTest.java} | 29 +-
.../manual/ManualModbusTCPSubscriptionTest.java | 88 +++
plc4j/drivers/slmp/pom.xml | 5 +
.../org/apache/plc4x/java/slmp/SlmpConnection.java | 4 +-
.../slmp/manual/ManualSlmpSubscriptionTest.java | 89 +++
plc4j/drivers/umas/pom.xml | 5 +
.../org/apache/plc4x/java/umas/UmasConnection.java | 4 +-
.../umas/manual/ManualUmasSubscriptionTest.java | 90 +++
plc4j/tools/capture-replay/pom.xml | 2 +-
plc4j/tools/connection-cache/pom.xml | 2 +-
plc4j/tools/opm/pom.xml | 2 +-
plc4j/tools/pom.xml | 2 -
plc4j/tools/scraper/README.md | 21 -
plc4j/tools/scraper/pom.xml | 124 ----
.../apache/plc4x/java/scraper/ResultHandler.java | 37 --
.../org/apache/plc4x/java/scraper/ScrapeJob.java | 47 --
.../apache/plc4x/java/scraper/ScrapeJobImpl.java | 67 --
.../org/apache/plc4x/java/scraper/Scraper.java | 40 --
.../org/apache/plc4x/java/scraper/ScraperImpl.java | 172 -----
.../org/apache/plc4x/java/scraper/ScraperTask.java | 48 --
.../apache/plc4x/java/scraper/ScraperTaskImpl.java | 233 -------
.../java/scraper/config/JobConfiguration.java | 38 --
.../config/JobConfigurationClassicImpl.java | 48 --
.../config/JobConfigurationClassicImplBuilder.java | 65 --
.../java/scraper/config/JobConfigurationImpl.java | 82 ---
.../java/scraper/config/ScraperConfiguration.java | 80 ---
.../config/ScraperConfigurationClassicImpl.java | 85 ---
.../ScraperConfigurationClassicImplBuilder.java | 53 --
.../JobConfigurationTriggeredImpl.java | 46 --
.../JobConfigurationTriggeredImplBuilder.java | 70 --
.../ScraperConfigurationTriggeredImpl.java | 125 ----
.../ScraperConfigurationTriggeredImplBuilder.java | 49 --
.../exception/ScraperConfigurationException.java | 42 --
.../java/scraper/exception/ScraperException.java | 36 -
.../triggeredscraper/TriggeredScrapeJobImpl.java | 72 --
.../triggeredscraper/TriggeredScraperImpl.java | 385 -----------
.../triggeredscraper/TriggeredScraperMBean.java | 32 -
.../triggeredscraper/TriggeredScraperTask.java | 275 --------
.../TriggeredScraperTaskMBean.java | 34 -
.../triggerhandler/TriggerConfiguration.java | 734 ---------------------
.../triggerhandler/TriggerHandler.java | 23 -
.../triggerhandler/TriggerHandlerImpl.java | 149 -----
.../triggerhandler/collector/TriggerCollector.java | 65 --
.../collector/TriggerCollectorImpl.java | 327 ---------
.../scraper/util/PercentageAboveThreshold.java | 57 --
.../apache/plc4x/java/s7/ManualS7PlcDriverMT.java | 202 ------
.../java/scraper/ScraperConfigurationTest.java | 203 ------
.../apache/plc4x/java/scraper/ScraperRunner.java | 39 --
.../apache/plc4x/java/scraper/ScraperTaskTest.java | 113 ----
.../org/apache/plc4x/java/scraper/ScraperTest.java | 173 -----
.../plc4x/java/scraper/TriggeredScraperRunner.java | 52 --
.../java/scraper/TriggeredScraperRunnerModbus.java | 61 --
.../config/ScraperConfigurationBuilderTest.java | 68 --
.../triggeredscraper/TriggeredScraperImplTest.java | 113 ----
.../triggerhandler/TriggerConfigurationTest.java | 146 ----
plc4j/tools/scraper/src/test/resources/config.json | 18 -
plc4j/tools/scraper/src/test/resources/config.yml | 29 -
plc4j/tools/scraper/src/test/resources/example.yml | 44 --
.../test/resources/example_triggered_scraper.yml | 74 ---
.../resources/example_triggered_scraper_modbus.yml | 30 -
.../src/test/resources/example_with_strings.yml | 41 --
.../scraper/src/test/resources/logback-test.xml | 37 --
.../src/test/resources/mock-scraper-config.yml | 57 --
.../protocols/bacnetip/bacnet-vendorids.mspec | 3 +
.../protocols/knxnetip/knx-master-data.mspec | 5 +-
.../users/pages/tools/connection-cache.adoc | 2 +-
79 files changed, 465 insertions(+), 5321 deletions(-)
create mode 100644
plc4j/drivers/ab-eth/src/test/java/org/apache/plc4x/java/abeth/manual/ManualAbEthSubscriptionTest.java
copy
plc4j/drivers/{s7/src/test/java/org/apache/plc4x/java/s7/manual/ManualWallS7300CyclicSubscribe.java
=>
eip/src/test/java/org/apache/plc4x/java/eip/base/manual/ManualEipSubscriptionTest.java}
(71%)
copy
plc4j/drivers/{s7/src/test/java/org/apache/plc4x/java/s7/manual/ManualWallS7300CyclicSubscribe.java
=>
modbus/src/test/java/org/apache/plc4x/java/modbus/ascii/manual/ManualModbusASCIISubscriptionTest.java}
(68%)
copy
plc4j/drivers/{s7/src/test/java/org/apache/plc4x/java/s7/manual/ManualWallS7300CyclicSubscribe.java
=>
modbus/src/test/java/org/apache/plc4x/java/modbus/rtu/manual/ManualModbusRTUSubscriptionTest.java}
(68%)
create mode 100644
plc4j/drivers/modbus/src/test/java/org/apache/plc4x/java/modbus/tcp/manual/ManualModbusTCPSubscriptionTest.java
create mode 100644
plc4j/drivers/slmp/src/test/java/org/apache/plc4x/java/slmp/manual/ManualSlmpSubscriptionTest.java
create mode 100644
plc4j/drivers/umas/src/test/java/org/apache/plc4x/java/umas/manual/ManualUmasSubscriptionTest.java
delete mode 100644 plc4j/tools/scraper/README.md
delete mode 100644 plc4j/tools/scraper/pom.xml
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/ResultHandler.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/ScrapeJob.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/ScrapeJobImpl.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/Scraper.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/ScraperImpl.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/ScraperTask.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/ScraperTaskImpl.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfiguration.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationClassicImpl.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationClassicImplBuilder.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationImpl.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfiguration.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationClassicImpl.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationClassicImplBuilder.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/JobConfigurationTriggeredImpl.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/JobConfigurationTriggeredImplBuilder.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/ScraperConfigurationTriggeredImpl.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/ScraperConfigurationTriggeredImplBuilder.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/exception/ScraperConfigurationException.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/exception/ScraperException.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScrapeJobImpl.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperMBean.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperTask.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperTaskMBean.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandler.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandlerImpl.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollector.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollectorImpl.java
delete mode 100644
plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/util/PercentageAboveThreshold.java
delete mode 100644
plc4j/tools/scraper/src/test/java/org/apache/plc4x/java/s7/ManualS7PlcDriverMT.java
delete mode 100644
plc4j/tools/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperConfigurationTest.java
delete mode 100644
plc4j/tools/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperRunner.java
delete mode 100644
plc4j/tools/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTaskTest.java
delete mode 100644
plc4j/tools/scraper/src/test/java/org/apache/plc4x/java/scraper/ScraperTest.java
delete mode 100644
plc4j/tools/scraper/src/test/java/org/apache/plc4x/java/scraper/TriggeredScraperRunner.java
delete mode 100644
plc4j/tools/scraper/src/test/java/org/apache/plc4x/java/scraper/TriggeredScraperRunnerModbus.java
delete mode 100644
plc4j/tools/scraper/src/test/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationBuilderTest.java
delete mode 100644
plc4j/tools/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImplTest.java
delete mode 100644
plc4j/tools/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfigurationTest.java
delete mode 100644 plc4j/tools/scraper/src/test/resources/config.json
delete mode 100644 plc4j/tools/scraper/src/test/resources/config.yml
delete mode 100644 plc4j/tools/scraper/src/test/resources/example.yml
delete mode 100644
plc4j/tools/scraper/src/test/resources/example_triggered_scraper.yml
delete mode 100644
plc4j/tools/scraper/src/test/resources/example_triggered_scraper_modbus.yml
delete mode 100644
plc4j/tools/scraper/src/test/resources/example_with_strings.yml
delete mode 100644 plc4j/tools/scraper/src/test/resources/logback-test.xml
delete mode 100644
plc4j/tools/scraper/src/test/resources/mock-scraper-config.yml
