This is an automated email from the ASF dual-hosted git repository.
tmitsch pushed a change to branch extend-Field-with-type-information
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
omit 39c9b47 Added Implementation for S7 Driver.
omit 19e4265 Necessary changes to make the (new) plc scraper driver
agnostic: * The PlcField interface has a (default) method to return the
expected java type (to know this upfront) * The PlcConnection interface has a
new "parse()" method which allows to explicitly create a Field instance for a
given type.
add a89ecef Minor changes on getting-involved.adoc
add 9d113ee Minor Changes
add a89626c Merge pull request #45 from cptblaubaer/develop
add 527ae1b PLC4X-88: - introduced TriggeredScraper and belonging classes
- made classes of old scraper deprecated - added scheduled and S7-variable
trigger (boolean and numeric) - java-docs - tests for regex pattern of trigger
strategy added - added ToDos
add ee46d30 Merge pull request #46 from timbo2k/scraper-extention
add dc5b884 Add Class PlcDriver
add dec6ec2 - Fixed some java comment which was causing the site
generation to fail
new 11d2b20 Necessary changes to make the (new) plc scraper driver
agnostic: * The PlcField interface has a (default) method to return the
expected java type (to know this upfront) * The PlcConnection interface has a
new "parse()" method which allows to explicitly create a Field instance for a
given type. * Integration of java-type into TriggeredScraper * Tested and added
a TriggeredScraper for Modbus
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 (39c9b47)
\
N -- N -- N refs/heads/extend-Field-with-type-information
(11d2b20)
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 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:
.../main/java/org/apache/plc4x/Plc4xSchema.java | 6 +-
.../java/org/apache/plc4x/Plc4xSchemaFactory.java | 8 +-
.../java/org/apache/plc4x/DriverManagerTest.java | 3 +-
.../java/org/apache/plc4x/Plc4XBaseTableTest.java | 4 +-
.../{api/PlcConnection.cpp => spi/PlcDriver.cpp} | 4 +-
.../main/cpp/org/apache/plc4x/cpp/spi/PlcDriver.h | 85 +++++
.../org/apache/plc4x/java/s7/model/S7Field.java | 12 +-
plc4j/utils/scraper/pom.xml | 48 ++-
.../org/apache/plc4x/java/scraper/ScrapeJob.java | 35 +-
.../scraper/{ScrapeJob.java => ScrapeJobImpl.java} | 27 +-
.../org/apache/plc4x/java/scraper/Scraper.java | 151 +--------
.../scraper/{Scraper.java => ScraperImpl.java} | 52 +--
.../org/apache/plc4x/java/scraper/ScraperTask.java | 170 +---------
.../{ScraperTask.java => ScraperTaskImpl.java} | 30 +-
.../java/scraper/config/JobConfiguration.java | 47 +--
...onfiguration.java => JobConfigurationImpl.java} | 21 +-
...ilder.java => JobConfigurationImplBuilder.java} | 16 +-
.../java/scraper/config/ScraperConfiguration.java | 47 ++-
.../config/ScraperConfigurationBuilder.java | 12 +-
.../TriggeredJobConfiguration.java} | 29 +-
.../TriggeredJobConfigurationBuilder.java} | 34 +-
.../TriggeredScraperConfiguration.java} | 62 ++--
.../TriggeredScraperConfigurationBuilder.java} | 18 +-
.../ScraperConfigurationException.java | 2 +-
.../ScraperException.java} | 25 +-
.../triggeredscraper/TriggeredScrapeJobImpl.java | 73 ++++
.../TriggeredScraperImpl.java} | 91 ++---
.../triggeredscraper/TriggeredScraperTask.java | 225 +++++++++++++
.../triggerhandler/TriggerConfiguration.java | 374 +++++++++++++++++++++
.../triggerhandler/TriggerHandler.java | 130 +++++++
.../java/scraper/ScraperConfigurationTest.java | 10 +-
.../apache/plc4x/java/scraper/ScraperRunner.java | 5 +-
.../apache/plc4x/java/scraper/ScraperTaskTest.java | 8 +-
.../org/apache/plc4x/java/scraper/ScraperTest.java | 18 +-
...aperRunner.java => TriggeredScraperRunner.java} | 19 +-
.../java/scraper/TriggeredScraperRunnerModbus.java | 60 ++++
.../config/ScraperConfigurationBuilderTest.java | 13 +-
.../triggerhandler/TriggerConfigurationTest.java | 118 +++++++
...h_strings.yml => example_triggered_scraper.yml} | 27 +-
.../resources/example_triggered_scraper_modbus.yml | 14 +-
src/site/asciidoc/community/getting-involved.adoc | 4 +-
41 files changed, 1520 insertions(+), 617 deletions(-)
copy plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/{api/PlcConnection.cpp =>
spi/PlcDriver.cpp} (95%)
mode change 100755 => 100644
create mode 100644
plc4cpp/api/src/main/cpp/org/apache/plc4x/cpp/spi/PlcDriver.h
copy
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/{ScrapeJob.java
=> ScrapeJobImpl.java} (65%)
copy
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/{Scraper.java
=> ScraperImpl.java} (84%)
copy
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/{ScraperTask.java
=> ScraperTaskImpl.java} (86%)
copy
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/{JobConfiguration.java
=> JobConfigurationImpl.java} (66%)
copy
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/{JobConfigurationBuilder.java
=> JobConfigurationImplBuilder.java} (69%)
copy
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/{JobConfiguration.java
=> triggeredscraper/TriggeredJobConfiguration.java} (59%)
rename
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/{JobConfigurationBuilder.java
=> triggeredscraper/TriggeredJobConfigurationBuilder.java} (51%)
copy
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/{ScraperConfiguration.java
=> triggeredscraper/TriggeredScraperConfiguration.java} (58%)
copy
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/config/{ScraperConfigurationBuilder.java
=> triggeredscraper/TriggeredScraperConfigurationBuilder.java} (62%)
rename plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/{config
=> exception}/ScraperConfigurationException.java (96%)
copy
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/{ResultHandler.java
=> exception/ScraperException.java} (60%)
create mode 100644
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScrapeJobImpl.java
copy
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/{Scraper.java
=> triggeredscraper/TriggeredScraperImpl.java} (63%)
create mode 100644
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperTask.java
create mode 100644
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java
create mode 100644
plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandler.java
copy
plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/{ScraperRunner.java
=> TriggeredScraperRunner.java} (57%)
create mode 100644
plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/TriggeredScraperRunnerModbus.java
create mode 100644
plc4j/utils/scraper/src/test/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfigurationTest.java
copy plc4j/utils/scraper/src/test/resources/{example_with_strings.yml =>
example_triggered_scraper.yml} (74%)
copy integrations/apache-calcite/src/test/resources/example.yml =>
plc4j/utils/scraper/src/test/resources/example_triggered_scraper_modbus.yml
(84%)
