Indentation cleanups - WHITESPACE ONLY
Change-Id: I58d5d4da6f703d07a2c31ecb109497b46be0d5d8
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/DoInterruptResource.java b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/DoInterruptResource.java
index 3c2920d..66704bf 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/DoInterruptResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/DoInterruptResource.java
@@ -7,8 +7,8 @@
/**
* FlowProgrammer REST API implementation: Interrupt synchronization to a switch.
- *
- * GET /wm/fprog/synchronizer/interrupt/{dpid}/json"
+ * <p/>
+ * GET /wm/fprog/synchronizer/interrupt/{dpid}/json"
*/
public class DoInterruptResource extends SynchronizerResource {
@@ -19,26 +19,26 @@
*/
@Get("json")
public boolean retrieve() {
- if (! init()) {
- return false;
- }
-
- long dpid;
- try {
- dpid = HexString.toLong((String)getRequestAttributes().get("dpid"));
- } catch (NumberFormatException e) {
- log.error("Invalid number format");
- return false;
- }
+ if (!init()) {
+ return false;
+ }
- IOFSwitch sw = provider.getSwitches().get(dpid);
- if (sw == null) {
- log.error("Invalid dpid");
- return false;
- }
-
- synchronizer.interrupt(sw);
-
- return true;
+ long dpid;
+ try {
+ dpid = HexString.toLong((String) getRequestAttributes().get("dpid"));
+ } catch (NumberFormatException e) {
+ log.error("Invalid number format");
+ return false;
+ }
+
+ IOFSwitch sw = provider.getSwitches().get(dpid);
+ if (sw == null) {
+ log.error("Invalid dpid");
+ return false;
+ }
+
+ synchronizer.interrupt(sw);
+
+ return true;
}
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/DoSynchronizeResource.java b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/DoSynchronizeResource.java
index dc8d431..c7deb11 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/DoSynchronizeResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/DoSynchronizeResource.java
@@ -7,8 +7,8 @@
/**
* FlowProgrammer REST API implementation: Begin synchronization to a switch.
- *
- * GET /wm/fprog/synchronizer/sync/{dpid}/json"
+ * <p/>
+ * GET /wm/fprog/synchronizer/sync/{dpid}/json"
*/
public class DoSynchronizeResource extends SynchronizerResource {
/**
@@ -18,27 +18,27 @@
*/
@Get("json")
public boolean retrieve() {
- if (! init()) {
- return false;
- }
-
- long dpid;
- try {
- dpid = HexString.toLong((String)getRequestAttributes().get("dpid"));
- } catch (NumberFormatException e) {
- log.error("Invalid number format");
- return false;
- }
+ if (!init()) {
+ return false;
+ }
- IOFSwitch sw = provider.getSwitches().get(dpid);
- if (sw == null) {
- log.error("Invalid dpid");
- return false;
- }
-
- synchronizer.synchronize(sw);
-
- return true;
+ long dpid;
+ try {
+ dpid = HexString.toLong((String) getRequestAttributes().get("dpid"));
+ } catch (NumberFormatException e) {
+ log.error("Invalid number format");
+ return false;
+ }
+
+ IOFSwitch sw = provider.getSwitches().get(dpid);
+ if (sw == null) {
+ log.error("Invalid dpid");
+ return false;
+ }
+
+ synchronizer.synchronize(sw);
+
+ return true;
}
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/FlowProgrammerWebRoutable.java b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/FlowProgrammerWebRoutable.java
index 9325a00..26ea765 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/FlowProgrammerWebRoutable.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/FlowProgrammerWebRoutable.java
@@ -8,21 +8,21 @@
public class FlowProgrammerWebRoutable implements RestletRoutable {
- @Override
- public Restlet getRestlet(Context context) {
- Router router = new Router(context);
- router.attach("/pusher/setrate/{dpid}/{rate}/json", SetPushRateResource.class);
- router.attach("/pusher/suspend/{dpid}/json", SuspendPusherResource.class);
- router.attach("/pusher/resume/{dpid}/json", ResumePusherResource.class);
- router.attach("/pusher/barrier/{dpid}/json", SendBarrierResource.class);
- router.attach("/synchronizer/sync/{dpid}/json", DoSynchronizeResource.class);
- router.attach("/synchronizer/interrupt/{dpid}/json", DoInterruptResource.class);
- return router;
- }
+ @Override
+ public Restlet getRestlet(Context context) {
+ Router router = new Router(context);
+ router.attach("/pusher/setrate/{dpid}/{rate}/json", SetPushRateResource.class);
+ router.attach("/pusher/suspend/{dpid}/json", SuspendPusherResource.class);
+ router.attach("/pusher/resume/{dpid}/json", ResumePusherResource.class);
+ router.attach("/pusher/barrier/{dpid}/json", SendBarrierResource.class);
+ router.attach("/synchronizer/sync/{dpid}/json", DoSynchronizeResource.class);
+ router.attach("/synchronizer/interrupt/{dpid}/json", DoInterruptResource.class);
+ return router;
+ }
- @Override
- public String basePath() {
- return "/wm/onos/flowprogrammer";
- }
+ @Override
+ public String basePath() {
+ return "/wm/onos/flowprogrammer";
+ }
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/PusherResource.java b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/PusherResource.java
index 4e1c0fc..5257646 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/PusherResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/PusherResource.java
@@ -11,23 +11,23 @@
protected final static Logger log = LoggerFactory.getLogger(PusherResource.class);
protected IFloodlightProviderService provider;
- protected IFlowPusherService pusher;
-
- protected boolean init() {
- provider = (IFloodlightProviderService)
- getContext().getAttributes().
- get(IFloodlightProviderService.class.getCanonicalName());
- if (provider == null) {
- log.debug("ONOS FloodlightProvider not found");
- return false;
- }
-
- pusher = (IFlowPusherService)getContext().getAttributes().
- get(IFlowPusherService.class.getCanonicalName());
- if (pusher == null) {
- log.debug("ONOS FlowPusherService not found");
- return false;
- }
- return true;
- }
+ protected IFlowPusherService pusher;
+
+ protected boolean init() {
+ provider = (IFloodlightProviderService)
+ getContext().getAttributes().
+ get(IFloodlightProviderService.class.getCanonicalName());
+ if (provider == null) {
+ log.debug("ONOS FloodlightProvider not found");
+ return false;
+ }
+
+ pusher = (IFlowPusherService) getContext().getAttributes().
+ get(IFlowPusherService.class.getCanonicalName());
+ if (pusher == null) {
+ log.debug("ONOS FlowPusherService not found");
+ return false;
+ }
+ return true;
+ }
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/ResumePusherResource.java b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/ResumePusherResource.java
index dcbe3e9..80f04f5 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/ResumePusherResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/ResumePusherResource.java
@@ -7,8 +7,8 @@
/**
* FlowProgrammer REST API implementation: Resume sending message to switch.
- *
- * GET /wm/fprog/pusher/resume/{dpid}/json"
+ * <p/>
+ * GET /wm/fprog/pusher/resume/{dpid}/json"
*/
public class ResumePusherResource extends PusherResource {
/**
@@ -18,24 +18,24 @@
*/
@Get("json")
public boolean retrieve() {
- if (! init()) {
- return false;
- }
-
- long dpid;
- try {
- dpid = HexString.toLong((String)getRequestAttributes().get("dpid"));
- } catch (NumberFormatException e) {
- log.error("Invalid number format");
- return false;
- }
+ if (!init()) {
+ return false;
+ }
- IOFSwitch sw = provider.getSwitches().get(dpid);
- if (sw == null) {
- log.error("Invalid dpid");
- return false;
- }
-
- return pusher.resume(sw);
+ long dpid;
+ try {
+ dpid = HexString.toLong((String) getRequestAttributes().get("dpid"));
+ } catch (NumberFormatException e) {
+ log.error("Invalid number format");
+ return false;
+ }
+
+ IOFSwitch sw = provider.getSwitches().get(dpid);
+ if (sw == null) {
+ log.error("Invalid dpid");
+ return false;
+ }
+
+ return pusher.resume(sw);
}
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SendBarrierResource.java b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SendBarrierResource.java
index 33b666a..53fd14f 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SendBarrierResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SendBarrierResource.java
@@ -8,8 +8,8 @@
/**
* FlowProgrammer REST API implementation: Send barrier message to switch.
- *
- * GET /wm/fprog/pusher/barrier/{dpid}/json"
+ * <p/>
+ * GET /wm/fprog/pusher/barrier/{dpid}/json"
*/
public class SendBarrierResource extends PusherResource {
/**
@@ -19,23 +19,23 @@
*/
@Get("json")
public OFBarrierReply retrieve() {
- if (! init()) {
- return null;
- }
- long dpid;
- try {
- dpid = HexString.toLong((String)getRequestAttributes().get("dpid"));
- } catch (NumberFormatException e) {
- log.error("Invalid number format");
- return null;
- }
+ if (!init()) {
+ return null;
+ }
+ long dpid;
+ try {
+ dpid = HexString.toLong((String) getRequestAttributes().get("dpid"));
+ } catch (NumberFormatException e) {
+ log.error("Invalid number format");
+ return null;
+ }
- IOFSwitch sw = provider.getSwitches().get(dpid);
- if (sw == null) {
- log.error("Invalid dpid");
- return null;
- }
-
- return pusher.barrier(sw);
+ IOFSwitch sw = provider.getSwitches().get(dpid);
+ if (sw == null) {
+ log.error("Invalid dpid");
+ return null;
+ }
+
+ return pusher.barrier(sw);
}
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SetPushRateResource.java b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SetPushRateResource.java
index 9431d65..5879069 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SetPushRateResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SetPushRateResource.java
@@ -7,8 +7,8 @@
/**
* FlowProgrammer REST API implementation: Set sending rate to the switch.
- *
- * GET /wm/fprog/pusher/setrate/{dpid}/{rate}/json"
+ * <p/>
+ * GET /wm/fprog/pusher/setrate/{dpid}/{rate}/json"
*/
public class SetPushRateResource extends PusherResource {
@@ -19,29 +19,29 @@
*/
@Get("json")
public boolean retrieve() {
- if (! init()) {
- return false;
- }
-
- long dpid;
- long rate;
-
- try {
- dpid = HexString.toLong((String)getRequestAttributes().get("dpid"));
- rate = Long.valueOf((String)getRequestAttributes().get("rate"));
- } catch (NumberFormatException e) {
- log.error("Invalid number format");
- return false;
- }
+ if (!init()) {
+ return false;
+ }
- IOFSwitch sw = provider.getSwitches().get(dpid);
- if (sw == null) {
- log.error("Invalid dpid");
- return false;
- }
-
- pusher.setRate(sw, rate);
-
- return true;
+ long dpid;
+ long rate;
+
+ try {
+ dpid = HexString.toLong((String) getRequestAttributes().get("dpid"));
+ rate = Long.valueOf((String) getRequestAttributes().get("rate"));
+ } catch (NumberFormatException e) {
+ log.error("Invalid number format");
+ return false;
+ }
+
+ IOFSwitch sw = provider.getSwitches().get(dpid);
+ if (sw == null) {
+ log.error("Invalid dpid");
+ return false;
+ }
+
+ pusher.setRate(sw, rate);
+
+ return true;
}
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SuspendPusherResource.java b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SuspendPusherResource.java
index 1a5266b..d01e259 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SuspendPusherResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SuspendPusherResource.java
@@ -9,8 +9,8 @@
/**
* FlowProgrammer REST API implementation: Suspend sending message to switch.
- *
- * GET /wm/fprog/pusher/suspend/{dpid}/json"
+ * <p/>
+ * GET /wm/fprog/pusher/suspend/{dpid}/json"
*/
public class SuspendPusherResource extends PusherResource {
@@ -23,24 +23,24 @@
*/
@Get("json")
public boolean retrieve() {
- if (! init()) {
- return false;
- }
-
- long dpid;
- try {
- dpid = HexString.toLong((String)getRequestAttributes().get("dpid"));
- } catch (NumberFormatException e) {
- log.error("Invalid number format");
- return false;
- }
+ if (!init()) {
+ return false;
+ }
- IOFSwitch sw = provider.getSwitches().get(dpid);
- if (sw == null) {
- log.error("Invalid dpid");
- return false;
- }
-
- return pusher.suspend(sw);
+ long dpid;
+ try {
+ dpid = HexString.toLong((String) getRequestAttributes().get("dpid"));
+ } catch (NumberFormatException e) {
+ log.error("Invalid number format");
+ return false;
+ }
+
+ IOFSwitch sw = provider.getSwitches().get(dpid);
+ if (sw == null) {
+ log.error("Invalid dpid");
+ return false;
+ }
+
+ return pusher.suspend(sw);
}
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SynchronizerResource.java b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SynchronizerResource.java
index 12bf8f3..b155fd3 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SynchronizerResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/web/SynchronizerResource.java
@@ -9,27 +9,27 @@
public class SynchronizerResource extends ServerResource {
protected final static Logger log = LoggerFactory.getLogger(SynchronizerResource.class);
-
+
protected IFloodlightProviderService provider;
protected IFlowSyncService synchronizer;
protected boolean init() {
- provider = (IFloodlightProviderService)
- getContext().getAttributes().
- get(IFloodlightProviderService.class.getCanonicalName());
- if (provider == null) {
- log.debug("ONOS FloodlightProvider not found");
- return false;
- }
-
- synchronizer = (IFlowSyncService)
- getContext().getAttributes().
- get(IFlowSyncService.class.getCanonicalName());
- if (synchronizer == null) {
- log.debug("ONOS FlowSyncService not found");
- return false;
- }
-
- return true;
+ provider = (IFloodlightProviderService)
+ getContext().getAttributes().
+ get(IFloodlightProviderService.class.getCanonicalName());
+ if (provider == null) {
+ log.debug("ONOS FloodlightProvider not found");
+ return false;
+ }
+
+ synchronizer = (IFlowSyncService)
+ getContext().getAttributes().
+ get(IFlowSyncService.class.getCanonicalName());
+ if (synchronizer == null) {
+ log.debug("ONOS FlowSyncService not found");
+ return false;
+ }
+
+ return true;
}
}