add another GraphDBOperation constructor which creates an instance directry from GraphDBConnection configuration path.
diff --git a/src/main/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImpl.java b/src/main/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImpl.java
index 98b4a88..0428779 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImpl.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/devicemanager/internal/DeviceStorageImpl.java
@@ -15,8 +15,6 @@
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IPortObject;
import net.onrc.onos.ofcontroller.core.internal.SwitchStorageImpl;
import net.onrc.onos.ofcontroller.devicemanager.IDeviceStorage;
-import net.onrc.onos.util.GraphDBConnection;
-import net.onrc.onos.util.GraphDBConnection.Transaction;
import net.onrc.onos.util.GraphDBOperation;
/**
@@ -25,7 +23,6 @@
*/
public class DeviceStorageImpl implements IDeviceStorage {
- private GraphDBConnection conn;
private GraphDBOperation ope;
protected static Logger log = LoggerFactory.getLogger(SwitchStorageImpl.class);
@@ -36,10 +33,7 @@
@Override
public void init(String conf) {
try{
- if((conn = GraphDBConnection.getInstance(conf)) != null)
- {
- ope = new GraphDBOperation(conn);
- }
+ ope = new GraphDBOperation(conf);
} catch(Exception e) {
log.error(e.getMessage());
}
@@ -51,7 +45,7 @@
*/
@Override
public void close() {
- conn.close();
+ ope.close();
}
/***
diff --git a/src/main/java/net/onrc/onos/ofcontroller/devicemanager/web/TopoDevicesResource.java b/src/main/java/net/onrc/onos/ofcontroller/devicemanager/web/TopoDevicesResource.java
index 1cd6b90..97ecfcc 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/devicemanager/web/TopoDevicesResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/devicemanager/web/TopoDevicesResource.java
@@ -3,7 +3,6 @@
import java.util.Iterator;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IDeviceObject;
-import net.onrc.onos.util.GraphDBConnection;
import net.onrc.onos.util.GraphDBOperation;
import org.restlet.resource.Get;
@@ -13,12 +12,8 @@
@Get("json")
public Iterator<IDeviceObject> retrieve() {
-
- GraphDBConnection conn = GraphDBConnection.getInstance("");
- GraphDBOperation op = new GraphDBOperation(conn);
+ GraphDBOperation op = new GraphDBOperation("");
return op.getDevices().iterator();
-
}
-
}