mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-08 13:46:10 +02:00
Code Issues Projects Releases Wiki Activity

[Falcon] fixes for Sonar Critical bugs

Browse Source 
Change-Id: I0a63578727693a2517f3002bd4f4c391b6f44aea
This commit is contained in:
Ray Milkey 2015-12-10 14:43:08 -08:00 committed by Gerrit Code Review
parent baf705480d
commit 4fd3ceb3df
16 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/cordfabric/src/main/java/org/onosproject/cordfabric/CordFabricManager.java
View File

@ -425,6 +425,7 @@ public class CordFabricManager implements FabricService {
deviceService.isAvailable(event.subject().id())) {
setupDefaultFlows();
}
break;
default:
break;
}

8
apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/OpenstackRestHandler.java
View File

@ -78,7 +78,7 @@ public class OpenstackRestHandler {
OpenstackNetworkCodec networkCodec = new OpenstackNetworkCodec();
networkList.forEach(n -> openstackNetworks.add(networkCodec.decode((ObjectNode) n, null)));
} catch (IOException e) {
e.printStackTrace();
log.warn("getNetworks()", e);
}
log.debug("networks response:" + response);
@ -106,7 +106,7 @@ public class OpenstackRestHandler {
OpenstackPortCodec portCodec = new OpenstackPortCodec();
portList.forEach(p -> openstackPorts.add(portCodec.decode((ObjectNode) p, null)));
} catch (IOException e) {
e.printStackTrace();
log.warn("getPorts()", e);
}
log.debug("port response:" + response);
@ -134,7 +134,7 @@ public class OpenstackRestHandler {
OpenstackSubnetCodec subnetCodec = new OpenstackSubnetCodec();
subnetList.forEach(s -> subnets.add(subnetCodec.decode((ObjectNode) s, null)));
} catch (IOException e) {
e.printStackTrace();
log.warn("getSubnets()", e);
}
log.debug("subnets response:" + response);
@ -163,7 +163,7 @@ public class OpenstackRestHandler {
ObjectNode node = (ObjectNode) mapper.readTree(response);
tokenId = node.path("access").path("token").path("id").asText();
} catch (IOException e) {
e.printStackTrace();
log.warn("getToken()", e);
}
log.debug("token response:" + response);
}

2
apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
View File

@ -184,7 +184,7 @@ public class IntentSynchronizer implements IntentSynchronizationService {
intentsToAdd.add(localIntent);
} else {
IntentState state = intentService.getIntentState(serviceIntent.key());
if (!IntentUtils.equals(serviceIntent, localIntent) || state == null ||
if (!IntentUtils.intentsAreEqual(serviceIntent, localIntent) || state == null ||
state == IntentState.WITHDRAW_REQ ||
state == IntentState.WITHDRAWING ||
state == IntentState.WITHDRAWN) {

2
apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java
View File

@ -135,7 +135,7 @@ public class PeerConnectivityManager {
buildSpeakerIntents(bgpSpeaker).forEach(i -> {
PointToPointIntent intent = existingIntents.remove(i.key());
if (intent == null || !IntentUtils.equals(i, intent)) {
if (intent == null || !IntentUtils.intentsAreEqual(i, intent)) {
peerIntents.put(i.key(), i);
intentSynchronizer.submit(i);
}

2
apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java
View File

@ -216,7 +216,7 @@ public class IntentSyncTest extends AbstractIntentTest {
// Compose a intent, which is equal to intent5 but the id is different.
MultiPointToSinglePointIntent intent5New =
staticIntentBuilder(intent5, routeEntry5, "00:00:00:00:00:01");
assertThat(IntentUtils.equals(intent5, intent5New), is(true));
assertThat(IntentUtils.intentsAreEqual(intent5, intent5New), is(true));
assertFalse(intent5.equals(intent5New));
MultiPointToSinglePointIntent intent6 = intentBuilder(

2
apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java
View File

@ -84,7 +84,7 @@ public final class TestIntentServiceHelper {
Intent providedIntent = (Intent) object;
providedString = providedIntent.toString();
return IntentUtils.equals(intent, providedIntent);
return IntentUtils.intentsAreEqual(intent, providedIntent);
}
}

6
apps/test/messaging-perf/src/main/java/org/onosproject/messagingperf/MessagingPerfApp.java
View File

@ -310,7 +310,7 @@ public class MessagingPerfApp {
messageSendingExecutor.submit(this::requestReply);
});
} catch (Exception e) {
e.printStackTrace();
log.info("requestReply()", e);
}
}
@ -323,7 +323,7 @@ public class MessagingPerfApp {
encoder,
randomPeer());
} catch (Exception e) {
e.printStackTrace();
log.info("unicast()", e);
}
messageSendingExecutor.submit(this::unicast);
}
@ -336,7 +336,7 @@ public class MessagingPerfApp {
TEST_UNICAST_MESSAGE_TOPIC,
encoder);
} catch (Exception e) {
e.printStackTrace();
log.info("broadcast()", e);
}
messageSendingExecutor.submit(this::broadcast);
}

1
cli/src/main/java/org/onosproject/cli/net/AddTestFlowsCommand.java
View File

@ -63,6 +63,7 @@ public class AddTestFlowsCommand extends AbstractShellCommand {
String numOfRuns = null;
@Override
@java.lang.SuppressWarnings("squid:S1148")
protected void execute() {
FlowRuleService flowService = get(FlowRuleService.class);
DeviceService deviceService = get(DeviceService.class);

1
cli/src/main/java/org/onosproject/cli/security/ReviewCommand.java
View File

@ -114,6 +114,7 @@ public class ReviewCommand extends AbstractShellCommand {
print("\t[Other] " + perm.getClass().getSimpleName() +
" " + perm.getName() + " (" + perm.getActions() + ")");
}
break;
default:
break;
}

2
core/api/src/main/java/org/onosproject/net/intent/IntentUtils.java
View File

@ -42,7 +42,7 @@ public final class IntentUtils {
* @param two second intent
* @return true if the two intents represent the same value, otherwise false
*/
public static boolean equals(Intent one, Intent two) {
public static boolean intentsAreEqual(Intent one, Intent two) {
if (one.getClass() != two.getClass()) {
return false;
}

3
core/security/src/main/java/org/onosproject/security/store/DistributedSecurityModeStore.java
View File

@ -232,6 +232,7 @@ public class DistributedSecurityModeStore
break;
case SECURED:
notifyDelegate(new SecurityModeEvent(SecurityModeEvent.Type.POLICY_ACCEPTED, appId));
break;
default:
break;
}
@ -312,4 +313,4 @@ public class DistributedSecurityModeStore
public void unsetDelegate(SecurityModeStoreDelegate delegate) {
super.setDelegate(delegate);
}
}
}

3
drivers/src/main/java/org/onosproject/driver/handshaker/CalientFiberSwitchHandshaker.java
View File

@ -87,8 +87,7 @@ public class CalientFiberSwitchHandshaker
try {
sendHandshakeOFExperimenterPortDescRequest();
} catch (IOException e) {
log.error("Exception while sending experimenter port desc:", e.getMessage());
e.printStackTrace();
log.error("Exception while sending experimenter port desc:", e);
}
}

2
protocols/ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/utils/FromJsonUtil.java
View File

@ -223,7 +223,7 @@ public final class FromJsonUtil {
JsonNode jsonNode = input.get(i);
Operation operation = operations.get(i);
if (jsonNode != null && jsonNode.size() > 0) {
if (i >= operations.size() || operation.getOp() != "select") {
if (i >= operations.size() || !operation.getOp().equals("select")) {
OperationResult or = objectMapper.convertValue(jsonNode, OperationResult.class);
operationResults.add(or);
} else {

2
providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
View File

@ -488,7 +488,7 @@ public class OpenFlowRuleProvider extends AbstractProvider
+ " tell us which one.");
}
}
break;
default:
log.debug("Unhandled message type: {}", msg.getType());
}

1
tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosCfgMojo.java
View File

@ -36,6 +36,7 @@ import java.util.List;
* Produces ONOS component configuration catalogue resources.
*/
@Mojo(name = "cfg", defaultPhase = LifecyclePhase.GENERATE_RESOURCES)
@java.lang.SuppressWarnings("squid:S1148")
public class OnosCfgMojo extends AbstractMojo {
private static final String COMPONENT = "org.apache.felix.scr.annotations.Component";

1
utils/misc/src/main/java/org/onlab/packet/pim/PIMHelloOption.java
View File

@ -85,6 +85,7 @@ public class PIMHelloOption {
case OPT_ADDRLIST:
this.optLength = 0; // We don't know what the length will be yet.
this.optValue = null;
break;
default:
//log.error("Unkown option type: " + type + "\n" );