This is an automated email from the ASF dual-hosted git repository.
tmitsch pushed a change to branch feature/improve-scraper-tim
in repository https://gitbox.apache.org/repos/asf/plc4x.git.
from f4ace2c adjusted logging to lower level
new 4fd496c minor change
new 1c1802b some refactoring
new 3bf49bc fixed some bugs
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:
.../java/org/apache/plc4x/Plc4XBaseTableTest.java | 6 +-
.../org/apache/plc4x/java/s7/model/S7Field.java | 11 ++
.../plc4x/java/s7/netty/Plc4XNettyException.java} | 35 ++--
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 202 +++++++++++----------
.../org/apache/plc4x/java/scraper/ScrapeJob.java | 7 +-
.../apache/plc4x/java/scraper/ScrapeJobImpl.java | 7 +-
.../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 | 53 ++++--
.../triggeredscraper/TriggeredScraperTask.java | 39 ++--
.../triggerhandler/TriggerConfiguration.java | 99 +++++-----
.../triggerhandler/collector/TriggerCollector.java | 3 +-
.../collector/TriggerCollectorImpl.java | 112 +++++-------
.../java/scraper/ScraperConfigurationTest.java | 21 ++-
.../apache/plc4x/java/scraper/ScraperRunner.java | 3 +-
.../plc4x/java/scraper/TriggeredScraperRunner.java | 6 +-
.../java/scraper/TriggeredScraperRunnerModbus.java | 5 +-
.../config/ScraperConfigurationBuilderTest.java | 12 +-
.../triggeredscraper/TriggeredScraperImplTest.java | 7 +-
.../triggerhandler/TriggerConfigurationTest.java | 5 +-
.../test/resources/example_triggered_scraper.yml | 22 ++-
33 files changed, 679 insertions(+), 592 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%)
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
