You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by ke...@apache.org on 2017/12/27 21:43:09 UTC

[incubator-plc4x] 05/05: WIP PLC4X-12: apply current changes to scala core

This is an automated email from the ASF dual-hosted git repository.

keinmark pushed a commit to branch PLC4X-12
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git

commit 50e29cb1901adcdf0aef875b2f316f140cffa0d2
Author: Mark Keinhörster <ma...@codecentric.de>
AuthorDate: Wed Dec 27 22:41:16 2017 +0100

    WIP PLC4X-12: apply current changes to scala core
---
 .../main/scala/org/apache/plc4x/scala/core/PlcDriverManager.scala | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/PlcDriverManager.scala b/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/PlcDriverManager.scala
index 093033f..9a63a24 100644
--- a/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/PlcDriverManager.scala
+++ b/plc4s/core/src/main/scala/org/apache/plc4x/scala/core/PlcDriverManager.scala
@@ -19,11 +19,9 @@ under the License.
 package org.apache.plc4x.scala.core
 
 import org.apache.plc4x.java.{PlcDriverManager => JPlcDriverManager}
-import org.apache.plc4x.scala.api.PlcDriver
 import org.apache.plc4x.scala.api.PlcConnectionError
 
 import scala.util.{Failure, Success, Try}
-import scala.util.control.Exception._
 
 class PlcDriverManager private(val jPlcDriverManager: JPlcDriverManager){
 
@@ -31,9 +29,9 @@ class PlcDriverManager private(val jPlcDriverManager: JPlcDriverManager){
 
     def this() = this(Thread.currentThread.getContextClassLoader)
 
-    def getDriver(url: String): Either[PlcConnectionError, PlcDriver] = {
-        Try(jPlcDriverManager.getDriver(url)) match {
-            case Success(jDriver) => Right(new JPlcDriverWrapper(jDriver))
+    def getConnection(url: String): Either[PlcConnectionError, JPlcConnectionWrapper] = {
+        Try(jPlcDriverManager.getConnection(url)) match {
+            case Success(jConnection) => Right(new JPlcConnectionWrapper(jConnection))
             case Failure(ex) => Left(PlcConnectionError(ex.getMessage))
         }
     }

-- 
To stop receiving notification emails like this one, please contact
"commits@plc4x.apache.org" <co...@plc4x.apache.org>.