This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new b0638b0142c CAMEL-19965 - Camel-Plc4x: Upgrade to 0.11.0 (#11668)
b0638b0142c is described below
commit b0638b0142c64f19fe3ec7b3fb5d364c85a5edcc
Author: Andrea Cosentino <[email protected]>
AuthorDate: Mon Oct 9 10:57:44 2023 +0200
CAMEL-19965 - Camel-Plc4x: Upgrade to 0.11.0 (#11668)
Signed-off-by: Andrea Cosentino <[email protected]>
---
components/camel-plc4x/pom.xml | 5 -----
.../org/apache/camel/component/plc4x/Plc4XConsumer.java | 2 +-
.../org/apache/camel/component/plc4x/Plc4XEndpoint.java | 15 +++++++--------
.../camel/component/plc4x/Plc4XPollingConsumer.java | 2 +-
.../org/apache/camel/component/plc4x/Plc4XProducer.java | 4 ++--
parent/pom.xml | 2 +-
6 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/components/camel-plc4x/pom.xml b/components/camel-plc4x/pom.xml
index 596e7bb54e1..52d89c8b85a 100644
--- a/components/camel-plc4x/pom.xml
+++ b/components/camel-plc4x/pom.xml
@@ -44,11 +44,6 @@
<artifactId>plc4j-api</artifactId>
<version>${plc4x-version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.plc4x</groupId>
- <artifactId>plc4j-connection-pool</artifactId>
- <version>${plc4x-version}</version>
- </dependency>
<dependency>
<groupId>org.apache.plc4x</groupId>
<artifactId>plc4j-scraper</artifactId>
diff --git
a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XConsumer.java
b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XConsumer.java
index 5940ca31cd1..478fdd5e3b6 100644
---
a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XConsumer.java
+++
b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XConsumer.java
@@ -106,7 +106,7 @@ public class Plc4XConsumer extends DefaultConsumer {
try {
Exchange exchange = plc4XEndpoint.createExchange();
Map<String, Object> rsp = new HashMap<>();
- for (String field : response.getFieldNames()) {
+ for (String field : response.getTagNames()) {
rsp.put(field, response.getObject(field));
}
exchange.getIn().setBody(rsp);
diff --git
a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
index 4dcccc1abbc..7d41994be26 100644
---
a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
+++
b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
@@ -29,13 +29,12 @@ import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.support.DefaultEndpoint;
-import org.apache.plc4x.java.PlcDriverManager;
+import org.apache.plc4x.java.DefaultPlcDriverManager;
import org.apache.plc4x.java.api.PlcConnection;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcIncompatibleDatatypeException;
import org.apache.plc4x.java.api.messages.PlcReadRequest;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
-import org.apache.plc4x.java.utils.connectionpool.PooledPlcDriverManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,7 +46,7 @@ import org.slf4j.LoggerFactory;
public class Plc4XEndpoint extends DefaultEndpoint {
private static final Logger LOGGER =
LoggerFactory.getLogger(Plc4XEndpoint.class);
- protected PlcDriverManager plcDriverManager;
+ protected DefaultPlcDriverManager plcDriverManager;
protected PlcConnection connection;
@UriPath
@@ -71,7 +70,7 @@ public class Plc4XEndpoint extends DefaultEndpoint {
public Plc4XEndpoint(String endpointUri, Component component) {
super(endpointUri, component);
- this.plcDriverManager = new PlcDriverManager();
+ this.plcDriverManager = new DefaultPlcDriverManager();
this.uri = endpointUri.replaceFirst("plc4x:/?/?", "");
}
@@ -93,7 +92,7 @@ public class Plc4XEndpoint extends DefaultEndpoint {
public void setTrigger(String trigger) {
this.trigger = trigger;
- this.plcDriverManager = new PooledPlcDriverManager();
+ this.plcDriverManager = new DefaultPlcDriverManager();
}
public void setAutoReconnect(boolean autoReconnect) {
@@ -187,7 +186,7 @@ public class Plc4XEndpoint extends DefaultEndpoint {
if (tags != null) {
for (Map.Entry<String, String> tag : tags.entrySet()) {
try {
- builder.addItem(tag.getKey(), tag.getValue());
+ builder.addTagAddress(tag.getKey(), tag.getValue());
} catch (PlcIncompatibleDatatypeException e) {
LOGGER.warn("For consumer, please use Map<String,String>,
currently using {}",
tags.getClass().getSimpleName());
@@ -212,12 +211,12 @@ public class Plc4XEndpoint extends DefaultEndpoint {
String name = entry.getKey();
String query = entry.getValue().keySet().iterator().next();
Object value = entry.getValue().get(query);
- builder.addItem(name, query, value);
+ builder.addTagAddress(name, query, value);
}
return builder.build();
}
- public PlcDriverManager getPlcDriverManager() {
+ public DefaultPlcDriverManager getPlcDriverManager() {
return plcDriverManager;
}
diff --git
a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XPollingConsumer.java
b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XPollingConsumer.java
index edc83475e0d..570fd07a24a 100644
---
a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XPollingConsumer.java
+++
b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XPollingConsumer.java
@@ -99,7 +99,7 @@ public class Plc4XPollingConsumer extends
EventDrivenPollingConsumer {
}
Map<String, Object> rsp = new HashMap<>();
- for (String field : response.getFieldNames()) {
+ for (String field : response.getTagNames()) {
rsp.put(field, response.getObject(field));
}
exchange.getIn().setBody(rsp);
diff --git
a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XProducer.java
b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XProducer.java
index 7db6b96ac9c..2f513f70136 100644
---
a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XProducer.java
+++
b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XProducer.java
@@ -27,7 +27,7 @@ import org.apache.camel.Message;
import org.apache.camel.support.DefaultAsyncProducer;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.exceptions.PlcException;
-import org.apache.plc4x.java.api.exceptions.PlcInvalidFieldException;
+import org.apache.plc4x.java.api.exceptions.PlcInvalidTagException;
import org.apache.plc4x.java.api.messages.PlcWriteRequest;
import org.apache.plc4x.java.api.messages.PlcWriteResponse;
import org.slf4j.Logger;
@@ -82,7 +82,7 @@ public class Plc4XProducer extends DefaultAsyncProducer {
Map<String, Map<String, Object>> tags = (Map<String, Map<String,
Object>>) body;
plcWriteRequest = plc4XEndpoint.buildPlcWriteRequest(tags);
} else {
- throw new PlcInvalidFieldException("The body must contain a
Map<String,Map<String,Object>");
+ throw new PlcInvalidTagException("The body must contain a
Map<String,Map<String,Object>");
}
CompletableFuture<? extends PlcWriteResponse> completableFuture =
plcWriteRequest.execute();
int currentlyOpenRequests = openRequests.incrementAndGet();
diff --git a/parent/pom.xml b/parent/pom.xml
index 7f54f27d7af..2b23397469a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -376,7 +376,7 @@
<pgjdbc-driver-version>42.6.0</pgjdbc-driver-version>
<pgjdbc-ng-driver-version>0.8.9</pgjdbc-ng-driver-version>
<picocli-version>4.7.5</picocli-version>
- <plc4x-version>0.10.0</plc4x-version>
+ <plc4x-version>0.11.0</plc4x-version>
<pooled-jms-version>3.1.3</pooled-jms-version>
<properties-maven-plugin-version>1.1.0</properties-maven-plugin-version>
<proto-google-common-protos-version>2.22.0</proto-google-common-protos-version>
