You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/08/27 13:58:27 UTC
[plc4x] 39/44: Revert "logstash adapter + adapter test"
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/plc4x.git
commit 69e0346fc4966834e22d779649807f40ccf5b94b
Author: Till Voss <ti...@codecentric.de>
AuthorDate: Fri Aug 23 08:13:48 2019 +0200
Revert "logstash adapter + adapter test"
This reverts commit 148f151e26840264581c9d39398df507e63f3530.
---
.../scraper/triggeredscraper/TriggeredScraperImpl.java | 14 +++++++-------
...redScraperImplMBean.java => TriggeredScraperMBean.java} | 0
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java
index 5cd894a..dbaf9d2 100644
--- a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java
+++ b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImpl.java
@@ -62,9 +62,9 @@ import java.util.stream.Collectors;
* right now boolean variables as well as numeric variables could be used as data-types
* available comparators are ==,!= for all data-types and >,>=,<,<= for numeric data-types
*/
-public class TriggeredScraperImplImpl implements Scraper, TriggeredScraperImplMBean {
+public class TriggeredScraperImpl implements Scraper, TriggeredScraperMBean {
- private static final Logger LOGGER = LoggerFactory.getLogger(TriggeredScraperImplImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(TriggeredScraperImpl.class);
private static final String MX_DOMAIN = "org.apache.plc4x.java";
private static final int DEFAULT_FUTURE_TIME_OUT = 2000;
@@ -92,7 +92,7 @@ public class TriggeredScraperImplImpl implements Scraper, TriggeredScraperImplMB
* @param triggerCollector the trigger collector
* @throws ScraperException something went wrong
*/
- public TriggeredScraperImplImpl(ScraperConfiguration config, ResultHandler resultHandler, TriggerCollector triggerCollector) throws ScraperException {
+ public TriggeredScraperImpl(ScraperConfiguration config, ResultHandler resultHandler, TriggerCollector triggerCollector) throws ScraperException {
this(resultHandler, createPooledDriverManager(), config.getJobs(),triggerCollector,DEFAULT_FUTURE_TIME_OUT);
}
@@ -104,7 +104,7 @@ public class TriggeredScraperImplImpl implements Scraper, TriggeredScraperImplMB
* @param triggerCollector the trigger collector
* @throws ScraperException something went wrong
*/
- public TriggeredScraperImplImpl(ScraperConfiguration config, PlcDriverManager plcDriverManager, ResultHandler resultHandler, TriggerCollector triggerCollector) throws ScraperException {
+ public TriggeredScraperImpl(ScraperConfiguration config, PlcDriverManager plcDriverManager, ResultHandler resultHandler,TriggerCollector triggerCollector) throws ScraperException {
this(resultHandler, plcDriverManager, config.getJobs(),triggerCollector,DEFAULT_FUTURE_TIME_OUT);
}
@@ -118,7 +118,7 @@ public class TriggeredScraperImplImpl implements Scraper, TriggeredScraperImplMB
* @param poolSizeScheduler the pool size of the scheduler
* @throws ScraperException something went wrong
*/
- public TriggeredScraperImplImpl(ScraperConfigurationTriggeredImpl config, PlcDriverManager plcDriverManager, ResultHandler resultHandler, TriggerCollector triggerCollector, int poolSizeScheduler, int poolSizeExecutor) throws ScraperException {
+ public TriggeredScraperImpl(ScraperConfigurationTriggeredImpl config, PlcDriverManager plcDriverManager, ResultHandler resultHandler, TriggerCollector triggerCollector, int poolSizeScheduler, int poolSizeExecutor) throws ScraperException {
this(resultHandler, plcDriverManager, config.getJobs(),triggerCollector,DEFAULT_FUTURE_TIME_OUT,poolSizeScheduler,poolSizeExecutor);
}
@@ -130,11 +130,11 @@ public class TriggeredScraperImplImpl implements Scraper, TriggeredScraperImplMB
* @param triggerCollector a collection that centralizes the trigger requests and joins them to grouped plc requests
* @param futureTimeOut max duration of future to return a result
*/
- public TriggeredScraperImplImpl(ResultHandler resultHandler, PlcDriverManager plcDriverManager, List<ScrapeJob> jobs, TriggerCollector triggerCollector, long futureTimeOut) {
+ public TriggeredScraperImpl(ResultHandler resultHandler, PlcDriverManager plcDriverManager, List<ScrapeJob> jobs,TriggerCollector triggerCollector, long futureTimeOut) {
this(resultHandler,plcDriverManager,jobs,triggerCollector,futureTimeOut,20,5);
}
- public TriggeredScraperImplImpl(ResultHandler resultHandler, PlcDriverManager plcDriverManager, List<ScrapeJob> jobs, TriggerCollector triggerCollector, long futureTimeOut, int poolSizeScheduler, int poolSizeExecutor) {
+ public TriggeredScraperImpl(ResultHandler resultHandler, PlcDriverManager plcDriverManager, List<ScrapeJob> jobs,TriggerCollector triggerCollector, long futureTimeOut, int poolSizeScheduler, int poolSizeExecutor) {
this.resultHandler = resultHandler;
Validate.notEmpty(jobs);
this.driverManager = plcDriverManager;
diff --git a/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImplMBean.java b/plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperMBean.java
similarity index 100%
rename from plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperImplMBean.java
rename to plc4j/utils/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/TriggeredScraperMBean.java