Refactoring datastore package
Preparation to make datastore replacable
- Extract datastore interfaces
- Add multi Read/Write/Remove
- Add a method to walk over RCTable
- Refactor serialize/deserialize RCObject
- Localize dependency to JRAMCloud
- Separate RAMCloud specific code into ramcloud package
- Remove dependency to RAMCloud exception classes
- Remove RC prefix from non RAMCloud specific code
- Cosmetics and update sample/test code
- reflect Naoki's comment
- more cosmetic fixes
- reordered OPERATION enums
- removed no longer used code
- follow pmd, etc. where easily possible
Change-Id: I6f9153d705600447acf48a64f713c654c9f26713
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudLinksResource.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudLinksResource.java
index abd1831..ad5059c 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudLinksResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudLinksResource.java
@@ -1,6 +1,6 @@
package net.onrc.onos.ofcontroller.networkgraph.web;
-import net.onrc.onos.datastore.topology.RCLink;
+import net.onrc.onos.datastore.topology.KVLink;
import org.restlet.resource.Get;
import org.restlet.resource.ServerResource;
@@ -8,7 +8,7 @@
public class RamcloudLinksResource extends ServerResource {
@Get("json")
- public Iterable<RCLink> retrieve() {
- return RCLink.getAllLinks();
+ public Iterable<KVLink> retrieve() {
+ return KVLink.getAllLinks();
}
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudPortsResource.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudPortsResource.java
index b2f88dd..bac73b3 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudPortsResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudPortsResource.java
@@ -1,6 +1,6 @@
package net.onrc.onos.ofcontroller.networkgraph.web;
-import net.onrc.onos.datastore.topology.RCPort;
+import net.onrc.onos.datastore.topology.KVPort;
import org.restlet.resource.Get;
import org.restlet.resource.ServerResource;
@@ -8,7 +8,7 @@
public class RamcloudPortsResource extends ServerResource {
@Get("json")
- public Iterable<RCPort> retrieve() {
- return RCPort.getAllPorts();
+ public Iterable<KVPort> retrieve() {
+ return KVPort.getAllPorts();
}
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudSwitchesResource.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudSwitchesResource.java
index e8998b0..b8a8fe6 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudSwitchesResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/web/RamcloudSwitchesResource.java
@@ -1,6 +1,6 @@
package net.onrc.onos.ofcontroller.networkgraph.web;
-import net.onrc.onos.datastore.topology.RCSwitch;
+import net.onrc.onos.datastore.topology.KVSwitch;
import org.restlet.resource.Get;
import org.restlet.resource.ServerResource;
@@ -8,8 +8,8 @@
public class RamcloudSwitchesResource extends ServerResource {
@Get("json")
- public Iterable<RCSwitch> retrieve() {
- return RCSwitch.getAllSwitches();
+ public Iterable<KVSwitch> retrieve() {
+ return KVSwitch.getAllSwitches();
}
}