You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by tm...@apache.org on 2019/08/11 22:47:15 UTC
[plc4x] 01/01: Merge pull request #77 from
apache/feature/improve-scraper-tim
This is an automated email from the ASF dual-hosted git repository.
tmitsch pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit f98a5363940ff707cbbbfb87c42e87f489a618c2
Merge: d647679 ad954fd
Author: timbo2k <43...@users.noreply.github.com>
AuthorDate: Mon Aug 12 00:47:10 2019 +0200
Merge pull request #77 from apache/feature/improve-scraper-tim
Feature/improve scraper tim
.../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 | 37 +
.../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 +
plc4j/utils/scraper/README.md | 21 +
.../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, 2311 insertions(+), 930 deletions(-)