Formatting fixes for datagrid - WHITESPACE ONLY
Change-Id: I39c99795fcfef974b5b8c95cb7493e12322f6f74
diff --git a/src/main/java/net/onrc/onos/datagrid/web/GetNGFlowsSummaryResource.java b/src/main/java/net/onrc/onos/datagrid/web/GetNGFlowsSummaryResource.java
index 16f41ef..2b38caa 100644
--- a/src/main/java/net/onrc/onos/datagrid/web/GetNGFlowsSummaryResource.java
+++ b/src/main/java/net/onrc/onos/datagrid/web/GetNGFlowsSummaryResource.java
@@ -33,82 +33,82 @@
*
* NOTE: This REST API call is needed for the ONOS GUI.
*
- * GET /wm/onos/datagrid/get/ng-flows/summary/json
+ * GET /wm/onos/datagrid/get/ng-flows/summary/json
*/
public class GetNGFlowsSummaryResource extends ServerResource {
public static final Logger log = LoggerFactory.getLogger(GetNGFlowsSummaryResource.class);
-
+
@Get("json")
public ArrayList<FlowPath> retrieve() {
- ArrayList<FlowPath> result = new ArrayList<>();
- SortedMap<Long, FlowPath> sortedFlowPaths = new TreeMap<>();
+ ArrayList<FlowPath> result = new ArrayList<>();
+ SortedMap<Long, FlowPath> sortedFlowPaths = new TreeMap<>();
IPathCalcRuntimeService pathRuntime =
- (IPathCalcRuntimeService)getContext().
- getAttributes().get(IPathCalcRuntimeService.class.getCanonicalName());
- log.debug("Get NG Flows Summary");
+ (IPathCalcRuntimeService) getContext().
+ getAttributes().get(IPathCalcRuntimeService.class.getCanonicalName());
+ log.debug("Get NG Flows Summary");
- IntentMap parentIntentMap = pathRuntime.getHighLevelIntents();
- IntentMap intentMap = pathRuntime.getPathIntents();
- for (Intent parentIntent : parentIntentMap.getAllIntents()) {
- // Get only installed Shortest Paths
- if (parentIntent.getState() != IntentState.INST_ACK)
- continue;
- if (! (parentIntent instanceof ShortestPathIntent))
- continue;
- ShortestPathIntent spIntent = (ShortestPathIntent)parentIntent;
+ IntentMap parentIntentMap = pathRuntime.getHighLevelIntents();
+ IntentMap intentMap = pathRuntime.getPathIntents();
+ for (Intent parentIntent : parentIntentMap.getAllIntents()) {
+ // Get only installed Shortest Paths
+ if (parentIntent.getState() != IntentState.INST_ACK)
+ continue;
+ if (!(parentIntent instanceof ShortestPathIntent))
+ continue;
+ ShortestPathIntent spIntent = (ShortestPathIntent) parentIntent;
- // Get the Path Intent
- Intent intent = intentMap.getIntent(spIntent.getPathIntentId());
- if (! (intent instanceof PathIntent))
- continue;
- PathIntent pathIntent = (PathIntent)intent;
+ // Get the Path Intent
+ Intent intent = intentMap.getIntent(spIntent.getPathIntentId());
+ if (!(intent instanceof PathIntent))
+ continue;
+ PathIntent pathIntent = (PathIntent) intent;
- // Decode the Shortest Path ID
- String applnIntentId = parentIntent.getId();
- String intentId = applnIntentId.split(":")[1];
+ // Decode the Shortest Path ID
+ String applnIntentId = parentIntent.getId();
+ String intentId = applnIntentId.split(":")[1];
- // Create the Flow Path
- FlowId flowId = new FlowId(intentId);
- FlowPath flowPath = new FlowPath();
- flowPath.setFlowId(flowId);
- sortedFlowPaths.put(flowPath.flowId().value(), flowPath);
+ // Create the Flow Path
+ FlowId flowId = new FlowId(intentId);
+ FlowPath flowPath = new FlowPath();
+ flowPath.setFlowId(flowId);
+ sortedFlowPaths.put(flowPath.flowId().value(), flowPath);
- flowPath.setInstallerId(new CallerId("E"));
- flowPath.setFlowEntryActions(null);
- flowPath.setFlowPathType(FlowPathType.FP_TYPE_SHORTEST_PATH);
- flowPath.setFlowPathUserState(FlowPathUserState.FP_USER_ADD);
+ flowPath.setInstallerId(new CallerId("E"));
+ flowPath.setFlowEntryActions(null);
+ flowPath.setFlowPathType(FlowPathType.FP_TYPE_SHORTEST_PATH);
+ flowPath.setFlowPathUserState(FlowPathUserState.FP_USER_ADD);
- // Setup the Source and Destination DPID and Port
- SwitchPort srcPort = flowPath.dataPath().srcPort();
- SwitchPort dstPort = flowPath.dataPath().dstPort();
- srcPort.setDpid(new Dpid(spIntent.getSrcSwitchDpid()));
- srcPort.setPort(new Port((short)spIntent.getSrcPortNumber()));
- dstPort.setDpid(new Dpid(spIntent.getDstSwitchDpid()));
- dstPort.setPort(new Port((short)spIntent.getDstPortNumber()));
+ // Setup the Source and Destination DPID and Port
+ SwitchPort srcPort = flowPath.dataPath().srcPort();
+ SwitchPort dstPort = flowPath.dataPath().dstPort();
+ srcPort.setDpid(new Dpid(spIntent.getSrcSwitchDpid()));
+ srcPort.setPort(new Port((short) spIntent.getSrcPortNumber()));
+ dstPort.setDpid(new Dpid(spIntent.getDstSwitchDpid()));
+ dstPort.setPort(new Port((short) spIntent.getDstPortNumber()));
- // Extract the Flow Entries
- Path path = pathIntent.getPath();
- FlowEntry flowEntry;
- ArrayList<FlowEntry> flowEntries = new ArrayList<>();
- for (LinkEvent linkEvent : path) {
- Dpid dpid = new Dpid(linkEvent.getSrc().getDpid());
- flowEntry = new FlowEntry();
- flowEntry.setDpid(dpid);
- flowEntries.add(flowEntry);
- }
- // Add the final Flow Entry
- flowEntry = new FlowEntry();
- flowEntry.setDpid(new Dpid(spIntent.getDstSwitchDpid()));
- flowEntries.add(flowEntry);
- flowPath.dataPath().setFlowEntries(flowEntries);
- }
+ // Extract the Flow Entries
+ Path path = pathIntent.getPath();
+ FlowEntry flowEntry;
+ ArrayList<FlowEntry> flowEntries = new ArrayList<>();
+ for (LinkEvent linkEvent : path) {
+ Dpid dpid = new Dpid(linkEvent.getSrc().getDpid());
+ flowEntry = new FlowEntry();
+ flowEntry.setDpid(dpid);
+ flowEntries.add(flowEntry);
+ }
+ // Add the final Flow Entry
+ flowEntry = new FlowEntry();
+ flowEntry.setDpid(new Dpid(spIntent.getDstSwitchDpid()));
+ flowEntries.add(flowEntry);
+ flowPath.dataPath().setFlowEntries(flowEntries);
+ }
- // Prepare the return result
- for (FlowPath flowPath : sortedFlowPaths.values())
- result.add(flowPath);
+ // Prepare the return result
+ for (FlowPath flowPath : sortedFlowPaths.values())
+ result.add(flowPath);
- return result;
+ return result;
}
}