Removed unneeded & unused classes.

Signed-off-by: Evan Zeller <evanrzeller@gmail.com>

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java
index b4ec1c59ffd9cd5cf7e8526aa8de9f4692606b80..e61f34ea467eab6a3cd3b89d0b9c8fa2907adae4 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java
@@ -1,14 +1,11 @@
 package org.opendaylight.ovsdb.internal;
 
-import java.net.InetAddress;
 import java.util.*;
 
 import org.opendaylight.ovsdb.database.OVSBridge;
 import org.opendaylight.ovsdb.database.OVSInstance;
 import org.opendaylight.ovsdb.sal.configuration.IPluginInNetworkConfigurationService;
 import org.opendaylight.controller.sal.core.Node;
-import org.opendaylight.controller.sal.core.NodeConnector;
-import org.opendaylight.ovsdb.database.Uuid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -147,7 +144,6 @@ public class ConfigurationService implements IPluginInNetworkConfigurationServic
                 OvsdbMessage msg = new OvsdbMessage("transact", params);
 
                 connection.sendMessage(msg);
-                connection.readResponse(Uuid[].class);
             }
         }catch(Exception e){
             e.printStackTrace();
@@ -295,7 +291,6 @@ public class ConfigurationService implements IPluginInNetworkConfigurationServic
                 OvsdbMessage msg = new OvsdbMessage("transact", params);
 
                 connection.sendMessage(msg);
-                connection.readResponse(Uuid[].class);
             }
         }catch(Exception e){
             e.printStackTrace();
@@ -372,7 +367,6 @@ public class ConfigurationService implements IPluginInNetworkConfigurationServic
                 OvsdbMessage msg = new OvsdbMessage("transact", params);
 
                 connection.sendMessage(msg);
-                connection.readResponse(Uuid[].class);
             }
         }catch(Exception e){
             e.printStackTrace();
@@ -465,7 +459,7 @@ public class ConfigurationService implements IPluginInNetworkConfigurationServic
                 OvsdbMessage msg = new OvsdbMessage("transact", params);
 
                 connection.sendMessage(msg);
-                connection.readResponse(Uuid[].class);
+
             }
         }catch(Exception e){
             e.printStackTrace();
@@ -530,7 +524,7 @@ public class ConfigurationService implements IPluginInNetworkConfigurationServic
                 OvsdbMessage msg = new OvsdbMessage("transact", params);
 
                 connection.sendMessage(msg);
-                connection.readResponse(Uuid[].class);
+
             }
         }catch(Exception e){
             e.printStackTrace();

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Connection.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Connection.java
index fb23eb289ff9ac5e57f136d115a0966f2867e2d6..7a5c6cc4a107dac4f6c581fffcada14c8708c18c 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Connection.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Connection.java
@@ -6,7 +6,7 @@ import java.util.Map;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.utils.Status;
 import org.opendaylight.controller.sal.utils.StatusCode;
-import org.opendaylight.ovsdb.database.Uuid;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -94,10 +94,6 @@ public class Connection implements RequestListener {
                 for (String res : result) logger.info(res);
                 return result;
             }
-            else if(clazz.equals(Uuid[].class)){
-                Uuid[] result = this.rpcClient.readResponse(Uuid[].class, socket.getInputStream());
-                return result;
-            }
             else if(clazz.equals(Map.class)){
                 Map result = this.rpcClient.readResponse(Map.class, socket.getInputStream());
                 return result;

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConnectionService.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConnectionService.java
index bfb5b67687682d3e4bfcf0d2fcd263524a3857f6..639b2ba57e358fffdaaeea029e4aa62c178ece1f 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConnectionService.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConnectionService.java
@@ -1,10 +1,12 @@
 package org.opendaylight.ovsdb.internal;
 
 import java.net.InetAddress;
+import java.net.Socket;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import com.googlecode.jsonrpc4j.JsonRpcClient;
 import org.opendaylight.ovsdb.sal.connection.ConnectionConstants;
 import org.opendaylight.ovsdb.sal.connection.IPluginInConnectionService;
 import org.opendaylight.controller.sal.core.Node;
@@ -17,6 +19,7 @@ import org.opendaylight.controller.sal.utils.StatusCode;
  */
 public class ConnectionService implements IPluginInConnectionService, IConnectionServiceInternal
 {
+    private static final Integer defaultOvsdbPort = 6632;
     ConcurrentMap <String, Connection> ovsdbConnections;
     public void init() {
         ovsdbConnections = new ConcurrentHashMap<String, Connection>();
@@ -63,6 +66,7 @@ public class ConnectionService implements IPluginInConnectionService, IConnectio
     @Override
     public Node connect(String identifier, Map<ConnectionConstants, String> params) {
         InetAddress address;
+        Integer port;
 
         try {
             address = InetAddress.getByName(params.get(ConnectionConstants.ADDRESS));
@@ -74,15 +78,15 @@ public class ConnectionService implements IPluginInConnectionService, IConnectio
             return null;
         }
 
-        int port = OvsdbIO.defaultOvsdbPort;
-
-        try {
+       try {
             port = Integer.parseInt(params.get(ConnectionConstants.PORT));
         } catch (Exception e) {
-            port = OvsdbIO.defaultOvsdbPort;
+            port = defaultOvsdbPort;
         }
         try {
-            Connection connection = OvsdbIO.connect(identifier, address, port);
+            Socket clientSocket = new Socket(address, port);
+            Connection connection = new Connection(identifier, clientSocket, new JsonRpcClient());
+
             if (connection != null) {
                 ovsdbConnections.put(identifier, connection);
                 return connection.getNode();

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Encapsulation.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Encapsulation.java
old mode 100644 (file)
new mode 100755 (executable)