This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 70258ebce081ef65fe6bcc95f21ea2857116d85c Merge: b04fb86 22d573e Author: Christofer Dutz <[email protected]> AuthorDate: Sun Mar 17 11:41:20 2019 +0100 Merged GitHub and GitBox .../triggerhandler/TriggerConfiguration.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --cc plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java index a5cd508,9d89b6c..d373bbc --- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java +++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java @@@ -56,8 -53,8 +55,6 @@@ public class TriggerConfiguration private final Object compareValue; private final PlcField plcField; -- -- /** * default constructor when an S7Field should be used for triggering * @param triggerType type of trigger from enum @@@ -78,9 -75,9 +75,10 @@@ if(this.triggerType.equals(TriggerType.S7_TRIGGER_VAR)) { //test for valid field-connection string, on exception quit job and return message to user try { ++ // TODO: PLC4X-106 - Make the Scraper not depend on S7 directly this.plcField = S7Field.of(triggerVariable); } catch (PlcInvalidFieldException e) { - LOGGER.debug(e.getMessage(), e); + logger.debug(e.getMessage(), e); String exceptionMessage = String.format("Invalid trigger Field for Job %s: %s", triggeredScrapeJobImpl.getJobName(), triggerVariable); throw new ScraperException(exceptionMessage); } @@@ -112,7 -109,7 +110,6 @@@ this.compareValue = null; this.plcField = null; this.comparatorType = null; -- } /** @@@ -287,7 -284,6 +284,7 @@@ return Double.parseDouble(compareValue); } catch (Exception e){ - LOGGER.debug(e.getMessage(), e); ++ logger.debug(e.getMessage(), e); String exceptionMessage = String.format("No valid compare Value at DataType Numeric for trigger for Job %s: %s",triggeredScrapeJobImpl.getJobName(),compareValue); throw new ScraperException(exceptionMessage); }
