refactor TopoLinkServiceImpl class to use GraphDBOperation class.
diff --git a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/TopoLinkServiceImpl.java b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/TopoLinkServiceImpl.java
index 9d5fdba..f0634bc 100644
--- a/src/main/java/net/floodlightcontroller/linkdiscovery/internal/TopoLinkServiceImpl.java
+++ b/src/main/java/net/floodlightcontroller/linkdiscovery/internal/TopoLinkServiceImpl.java
@@ -8,7 +8,7 @@
import net.floodlightcontroller.linkdiscovery.internal.LinkStorageImpl.ExtractLink;
import net.floodlightcontroller.routing.Link;
import net.onrc.onos.util.GraphDBConnection;
-import net.onrc.onos.util.GraphDBConnection.Transaction;
+import net.onrc.onos.util.GraphDBOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -18,25 +18,24 @@
public class TopoLinkServiceImpl implements ITopoLinkService {
- public GraphDBConnection conn;
+ protected GraphDBOperation op;
protected static Logger log = LoggerFactory.getLogger(TopoLinkServiceImpl.class);
-
public void finalize() {
close();
}
@Override
public void close() {
- conn.close();
+ op.close();
}
@Override
public List<Link> getActiveLinks() {
// TODO Auto-generated method stub
- conn = GraphDBConnection.getInstance("");
- conn.close(); //Commit to ensure we see latest data
- Iterable<ISwitchObject> switches = conn.utils().getActiveSwitches(conn);
+ op = new GraphDBOperation(GraphDBConnection.getInstance(""));
+ op.close(); //Commit to ensure we see latest data
+ Iterable<ISwitchObject> switches = op.getActiveSwitches();
List<Link> links = new ArrayList<Link>();
for (ISwitchObject sw : switches) {
GremlinPipeline<Vertex, Link> pipe = new GremlinPipeline<Vertex, Link>();
@@ -52,7 +51,7 @@
}
}
- conn.endTx(Transaction.COMMIT);
+ op.commit();
return links;
}
@@ -60,7 +59,7 @@
public List<Link> getLinksOnSwitch(String dpid) {
// TODO Auto-generated method stub
List<Link> links = new ArrayList<Link>();
- ISwitchObject sw = conn.utils().searchSwitch(conn, dpid);
+ ISwitchObject sw = op.searchSwitch(dpid);
GremlinPipeline<Vertex, Link> pipe = new GremlinPipeline<Vertex, Link>();
ExtractLink extractor = new ExtractLink();