This is an automated email from the ASF dual-hosted git repository.
tmitsch pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from d647679 Removed settings file from .vscode (should not be in the repo)
add ad954fd PLC4X-90: scraper Refactoring *added TriggerCollector
(collect and execute all triggerRequests) *added date datatypes
(DateAndTime,Date and TimeOfDay) (PLC4X-104) *trigger comparison extended to
previous value instead of only static value (PLC4X-109) *fixed bug for strings
>127chars (PLC4X-141) *improved functionality *fixed several minor bugs *api
modification for scraper usage *renaming
new f98a536 Merge pull request #77 from apache/feature/improve-scraper-tim
The 1 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:
.../java/org/apache/plc4x/Plc4xSchemaFactory.java | 3 +-
.../java/org/apache/plc4x/DriverManagerTest.java | 4 +-
.../java/org/apache/plc4x/Plc4XBaseTableTest.java | 6 +-
.../org/apache/plc4x/java/s7/model/S7Field.java | 47 +-
.../plc4x/java/s7/netty/Plc4XNettyException.java} | 35 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 277 +++++---
.../org/apache/plc4x/java/s7/netty/S7Protocol.java | 45 +-
.../java/s7/netty/model/types/TransportSize.java | 7 +-
.../strategies/DefaultS7MessageProcessor.java | 1 +
.../ads/LINKS.md => utils/scraper/README.md} | 4 +-
.../org/apache/plc4x/java/scraper/ScrapeJob.java | 7 +-
.../apache/plc4x/java/scraper/ScrapeJobImpl.java | 7 +-
.../org/apache/plc4x/java/scraper/Scraper.java | 2 +-
.../apache/plc4x/java/scraper/ScraperTaskImpl.java | 47 +-
.../java/scraper/config/JobConfiguration.java | 7 +-
.../config/JobConfigurationClassicImpl.java | 49 ++
...ava => JobConfigurationClassicImplBuilder.java} | 20 +-
.../java/scraper/config/JobConfigurationImpl.java | 35 +-
.../java/scraper/config/ScraperConfiguration.java | 97 +--
.../config/ScraperConfigurationClassicImpl.java | 86 +++
...=> ScraperConfigurationClassicImplBuilder.java} | 16 +-
.../JobConfigurationTriggeredImpl.java | 47 ++
...a => JobConfigurationTriggeredImplBuilder.java} | 17 +-
...java => ScraperConfigurationTriggeredImpl.java} | 100 +--
... ScraperConfigurationTriggeredImplBuilder.java} | 18 +-
.../TriggeredJobConfiguration.java | 74 --
.../triggeredscraper/TriggeredScrapeJobImpl.java | 3 +-
.../triggeredscraper/TriggeredScraperImpl.java | 298 +++++++--
.../TriggeredScraperMBean.java} | 15 +-
.../triggeredscraper/TriggeredScraperTask.java | 145 ++--
.../TriggeredScraperTaskMBean.java} | 19 +-
.../triggerhandler/TriggerConfiguration.java | 744 +++++++++++++++------
.../triggerhandler/TriggerHandler.java | 112 +---
.../triggerhandler/TriggerHandlerImpl.java | 113 ++++
.../triggerhandler/collector/TriggerCollector.java | 62 ++
.../collector/TriggerCollectorImpl.java | 323 +++++++++
.../java/scraper/ScraperConfigurationTest.java | 21 +-
.../apache/plc4x/java/scraper/ScraperRunner.java | 3 +-
.../plc4x/java/scraper/TriggeredScraperRunner.java | 16 +-
.../java/scraper/TriggeredScraperRunnerModbus.java | 17 +-
.../config/ScraperConfigurationBuilderTest.java | 12 +-
.../triggeredscraper/TriggeredScraperImplTest.java | 118 ++++
.../triggerhandler/TriggerConfigurationTest.java | 65 +-
.../test/resources/example_triggered_scraper.yml | 40 +-
.../scraper/src/test/resources/logback-test.xml | 5 +-
...iggered_scraper.yml => mock-scraper-config.yml} | 33 +-
46 files changed, 2272 insertions(+), 950 deletions(-)
copy
plc4j/{api/src/main/java/org/apache/plc4x/java/api/exceptions/PlcConnectionException.java
=>
protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XNettyException.java}
(56%)
copy plc4j/{protocols/ads/LINKS.md => utils/scraper/README.md} (87%)
create mode 100644
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/JobConfigurationClassicImpl.java
rename
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/{JobConfigurationImplBuilder.java
=> JobConfigurationClassicImplBuilder.java} (62%)
create mode 100644
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/ScraperConfigurationClassicImpl.java
rename
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/{ScraperConfigurationBuilder.java
=> ScraperConfigurationClassicImplBuilder.java} (61%)
create mode 100644
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/JobConfigurationTriggeredImpl.java
rename
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/{TriggeredJobConfigurationBuilder.java
=> JobConfigurationTriggeredImplBuilder.java} (76%)
rename
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/{TriggeredScraperConfiguration.java
=> ScraperConfigurationTriggeredImpl.java} (50%)
rename
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/{TriggeredScraperConfigurationBuilder.java
=> ScraperConfigurationTriggeredImplBuilder.java} (62%)
delete mode 100644
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/triggeredscraper/TriggeredJobConfiguration.java
copy
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/{config/JobConfiguration.java
=> triggeredscraper/TriggeredScraperMBean.java} (76%)
copy
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/{config/JobConfiguration.java
=> triggeredscraper/TriggeredScraperTaskMBean.java} (76%)
create mode 100644
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandlerImpl.java
create mode 100644
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollector.java
create mode 100644
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/collector/TriggerCollectorImpl.java
create mode 100644
plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImplTest.java
copy plc4j/utils/scraper/src/test/resources/{example_triggered_scraper.yml =>
mock-scraper-config.yml} (72%)
