Update of plc4x version to 0.11.0-connectorio-2.

A default constructor for OsgiDriverManager which might help with unit tests. Signed-off-by: Łukasz Dywicki <luke@code-house.org>
ConnectorIO · Nov 1, 2023 · 9f8b232 · 9f8b232
1 parent 8af0f92
commit 9f8b232
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/...ras.decorator/src/main/java/org/connectorio/plc4x/extras/decorator/ConnectionWrapper.java b/...ras.decorator/src/main/java/org/connectorio/plc4x/extras/decorator/ConnectionWrapper.java
@@ -22,6 +22,7 @@
 import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
 import org.apache.plc4x.java.api.exceptions.PlcInvalidTagException;
 import org.apache.plc4x.java.api.messages.PlcBrowseRequest;
+import org.apache.plc4x.java.api.messages.PlcPingResponse;
 import org.apache.plc4x.java.api.messages.PlcReadRequest.Builder;
 import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
 import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
@@ -64,7 +65,7 @@ public PlcTag parseTagAddress(String tagAddress) throws PlcInvalidTagException {
   }
 
   @Override
-  public CompletableFuture<Void> ping() {
+  public CompletableFuture<? extends PlcPingResponse> ping() {
     return connection.ping();
   }
 

diff --git a/...s.decorator/src/main/java/org/connectorio/plc4x/extras/decorator/DecoratorConnection.java b/...s.decorator/src/main/java/org/connectorio/plc4x/extras/decorator/DecoratorConnection.java
@@ -22,6 +22,7 @@
 import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
 import org.apache.plc4x.java.api.exceptions.PlcInvalidTagException;
 import org.apache.plc4x.java.api.messages.PlcBrowseRequest;
+import org.apache.plc4x.java.api.messages.PlcPingResponse;
 import org.apache.plc4x.java.api.messages.PlcReadRequest.Builder;
 import org.apache.plc4x.java.api.messages.PlcSubscriptionRequest;
 import org.apache.plc4x.java.api.messages.PlcUnsubscriptionRequest;
@@ -78,7 +79,7 @@ public PlcConnectionMetadata getMetadata() {
   }
 
   @Override
-  public CompletableFuture<Void> ping() {
+  public CompletableFuture<? extends PlcPingResponse> ping() {
     return delegate.ping();
   }
 

diff --git a/...core/src/main/java/org/connectorio/plc4x/extras/osgi/core/internal/OsgiDriverManager.java b/...core/src/main/java/org/connectorio/plc4x/extras/osgi/core/internal/OsgiDriverManager.java
@@ -19,9 +19,12 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
+import org.apache.plc4x.java.DefaultPlcDriverManager;
 import org.apache.plc4x.java.api.PlcConnectionManager;
 import org.apache.plc4x.java.api.PlcDriver;
 import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
@@ -35,6 +38,10 @@ public class OsgiDriverManager implements PlcDriverManager {
   private final PlcConnectionManager connectionManager;
   private final List<PlcDriver> drivers;
 
+  public OsgiDriverManager() {
+    this(lookup());
+  }
+
   public OsgiDriverManager(List<PlcDriver> drivers) {
     this.connectionManager = new OsgiConnectionManager(this);
     this.drivers = drivers;
@@ -78,4 +85,17 @@ public PlcDriver getDriver(String url) throws PlcConnectionException {
   void close() {
   }
 
+  private static List<PlcDriver> lookup() {
+    DefaultPlcDriverManager driverManager = new DefaultPlcDriverManager();
+    List<PlcDriver> drivers = new ArrayList<>();
+    for (String driver : driverManager.listDrivers()) {
+      try {
+        drivers.add(driverManager.getDriver(driver));
+      } catch (PlcConnectionException e) {
+        throw new RuntimeException(e);
+      }
+    }
+    return drivers;
+  }
+
 }
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -35,7 +35,7 @@
   <description>Parent for ConnectorIO supplied extensions to Apache PLC4X.</description>
 
   <properties>
-    <plc4x.version>0.11.0-connectorio-1</plc4x.version>
+    <plc4x.version>0.11.0-connectorio-2</plc4x.version>
     <karaf.version>4.3.9</karaf.version>
 
     <bucket4j.version>8.3.0</bucket4j.version>
@@ -137,6 +137,11 @@
         <artifactId>plc4j-driver-ads</artifactId>
         <version>${plc4x.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.plc4x</groupId>
+        <artifactId>plc4j-driver-can</artifactId>
+        <version>${plc4x.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.plc4x</groupId>
         <artifactId>plc4j-driver-canopen</artifactId>