Enable checkstyle check for blocks without braces.
Enable the checkstyle rule to check for block statements
without curly braces and fix any violations it finds.
Change-Id: Id4c58cea26f0d9ce7ed78643a4943c042886a12d
diff --git a/src/main/java/net/onrc/onos/core/intent/ConstrainedBFSTree.java b/src/main/java/net/onrc/onos/core/intent/ConstrainedBFSTree.java
index c72ef4e..8704988 100644
--- a/src/main/java/net/onrc/onos/core/intent/ConstrainedBFSTree.java
+++ b/src/main/java/net/onrc/onos/core/intent/ConstrainedBFSTree.java
@@ -46,7 +46,9 @@
Switch sw = switchQueue.poll();
for (Link link : sw.getOutgoingLinks()) {
Switch reachedSwitch = link.getDstPort().getSwitch();
- if (switchSearched.contains(reachedSwitch)) continue;
+ if (switchSearched.contains(reachedSwitch)) {
+ continue;
+ }
if (intents != null &&
intents.getAvailableBandwidth(link) < bandwidth) {
continue;
diff --git a/src/main/java/net/onrc/onos/core/intent/Intent.java b/src/main/java/net/onrc/onos/core/intent/Intent.java
index a8a06b0..27067b3 100644
--- a/src/main/java/net/onrc/onos/core/intent/Intent.java
+++ b/src/main/java/net/onrc/onos/core/intent/Intent.java
@@ -82,16 +82,20 @@
@Override
public boolean equals(Object obj) {
- if (this == obj)
+ if (this == obj) {
return true;
- if ((obj == null) || (getClass() != obj.getClass()))
+ }
+ if ((obj == null) || (getClass() != obj.getClass())) {
return false;
+ }
Intent other = (Intent) obj;
if (id == null) {
- if (other.id != null)
+ if (other.id != null) {
return false;
- } else if (!id.equals(other.id))
+ }
+ } else if (!id.equals(other.id)) {
return false;
+ }
return true;
}
diff --git a/src/main/java/net/onrc/onos/core/intent/IntentMap.java b/src/main/java/net/onrc/onos/core/intent/IntentMap.java
index 2124d25..0bba44b 100644
--- a/src/main/java/net/onrc/onos/core/intent/IntentMap.java
+++ b/src/main/java/net/onrc/onos/core/intent/IntentMap.java
@@ -117,21 +117,26 @@
//================================================================================
protected void putIntent(Intent intent) {
- if (intents.containsKey(intent.getId()))
+ if (intents.containsKey(intent.getId())) {
removeIntent(intent.getId());
+ }
intents.put(intent.getId(), intent);
events.add(new ChangedEvent(ChangedEventType.ADDED, intent));
}
protected void removeIntent(String intentId) {
Intent intent = intents.remove(intentId);
- if (intent == null) return;
+ if (intent == null) {
+ return;
+ }
events.add(new ChangedEvent(ChangedEventType.REMOVED, intent));
}
protected void setState(String intentId, IntentState state) {
Intent intent = intents.get(intentId);
- if (intent == null) return;
+ if (intent == null) {
+ return;
+ }
intent.setState(state);
events.add(new ChangedEvent(ChangedEventType.STATE_CHANGED, intent));
}
diff --git a/src/main/java/net/onrc/onos/core/intent/PathIntentMap.java b/src/main/java/net/onrc/onos/core/intent/PathIntentMap.java
index ad6b1a5..f97b4c1 100644
--- a/src/main/java/net/onrc/onos/core/intent/PathIntentMap.java
+++ b/src/main/java/net/onrc/onos/core/intent/PathIntentMap.java
@@ -41,7 +41,9 @@
@Override
protected void putIntent(Intent intent) {
- if (!(intent instanceof PathIntent)) return; // TODO throw exception
+ if (!(intent instanceof PathIntent)) {
+ return; // TODO throw exception
+ }
super.putIntent(intent);
PathIntent pathIntent = (PathIntent) intent;
@@ -96,14 +98,17 @@
* @return
*/
public Double getAvailableBandwidth(Link link) {
- if (link == null) return null;
+ if (link == null) {
+ return null;
+ }
Double bandwidth = link.getCapacity();
LinkEvent linkEvent = new LinkEvent(link);
if (!bandwidth.isInfinite()) {
for (PathIntent intent : getIntentsByLink(linkEvent)) {
Double intentBandwidth = intent.getBandwidth();
- if (intentBandwidth == null || intentBandwidth.isInfinite() || intentBandwidth.isNaN())
+ if (intentBandwidth == null || intentBandwidth.isInfinite() || intentBandwidth.isNaN()) {
continue;
+ }
bandwidth -= intentBandwidth;
}
}
diff --git a/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntime.java b/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntime.java
index 0600fe3..5a6d2e9 100644
--- a/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntime.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntime.java
@@ -101,9 +101,9 @@
// generate new path-intent ID
String oldPathIntentId = spIntent.getPathIntentId();
String newPathIntentId;
- if (oldPathIntentId == null)
+ if (oldPathIntentId == null) {
newPathIntentId = PathIntent.createFirstId(spIntent.getId());
- else {
+ } else {
newPathIntentId = PathIntent.createNextId(oldPathIntentId);
// Request removal of low-level intent if it exists.
diff --git a/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java b/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java
index ddfaa38..5672c58 100755
--- a/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java
+++ b/src/main/java/net/onrc/onos/core/intent/runtime/PathCalcRuntimeModule.java
@@ -95,14 +95,16 @@
// ================================================================================
private void reroutePaths(Collection<Intent> oldPaths) {
- if (oldPaths == null || oldPaths.isEmpty())
+ if (oldPaths == null || oldPaths.isEmpty()) {
return;
+ }
IntentOperationList reroutingOperation = new IntentOperationList();
for (Intent intent : oldPaths) {
PathIntent pathIntent = (PathIntent) intent;
- if (pathIntent.isPathFrozen())
+ if (pathIntent.isPathFrozen()) {
continue;
+ }
if (pathIntent.getState().equals(IntentState.INST_ACK) && // XXX: path intents in flight
!reroutingOperation.contains(pathIntent.getParentIntent())) {
reroutingOperation.add(Operator.ADD, pathIntent.getParentIntent());
@@ -162,8 +164,9 @@
@Override
public IntentOperationList executeIntentOperations(IntentOperationList list) {
- if (list == null || list.size() == 0)
+ if (list == null || list.size() == 0) {
return null;
+ }
PerfLogger p = new PerfLogger("executeIntentOperations_" + list.get(0).operator);
lock.lock(); // TODO optimize locking using smaller steps
@@ -325,18 +328,21 @@
removedLinkEvents.size() > 0 ||
removedPortEvents.size() > 0) {
p.log("begin_getIntentsByLink");
- for (LinkEvent linkEvent : removedLinkEvents)
+ for (LinkEvent linkEvent : removedLinkEvents) {
affectedPaths.addAll(pathIntents.getIntentsByLink(linkEvent));
+ }
p.log("end_getIntentsByLink");
p.log("begin_getIntentsByPort");
- for (PortEvent portEvent : removedPortEvents)
+ for (PortEvent portEvent : removedPortEvents) {
affectedPaths.addAll(pathIntents.getIntentsByPort(portEvent.getDpid(), portEvent.getNumber()));
+ }
p.log("end_getIntentsByPort");
p.log("begin_getIntentsByDpid");
- for (SwitchEvent switchEvent : removedSwitchEvents)
+ for (SwitchEvent switchEvent : removedSwitchEvents) {
affectedPaths.addAll(pathIntents.getIntentsByDpid(switchEvent.getDpid()));
+ }
p.log("end_getIntentsByDpid");
}
p.log("begin_reroutePaths");
@@ -371,13 +377,16 @@
IntentStateList pathIntentStates = new IntentStateList();
for (Entry<String, IntentState> entry : value.entrySet()) {
PathIntent pathIntent = (PathIntent) pathIntents.getIntent(entry.getKey());
- if (pathIntent == null) continue;
+ if (pathIntent == null) {
+ continue;
+ }
Intent parentIntent = pathIntent.getParentIntent();
if (parentIntent == null ||
!(parentIntent instanceof ShortestPathIntent) ||
- !((ShortestPathIntent) parentIntent).getPathIntentId().equals(pathIntent.getId()))
+ !((ShortestPathIntent) parentIntent).getPathIntentId().equals(pathIntent.getId())) {
continue;
+ }
IntentState state = entry.getValue();
switch (state) {