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/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) {