SONAR suggestions - prevent truncation of arithmetic expressions
Change-Id: I4694c0c3183b991a4f0db793f584bc77a5fb7d60
diff --git a/apps/actn-mdsc/tetunnel-ctl/src/main/java/org/onosproject/actn/mdsc/tetunnelctl/TeTunnelCtl.java b/apps/actn-mdsc/tetunnel-ctl/src/main/java/org/onosproject/actn/mdsc/tetunnelctl/TeTunnelCtl.java
index 5415e83..77961ed 100644
--- a/apps/actn-mdsc/tetunnel-ctl/src/main/java/org/onosproject/actn/mdsc/tetunnelctl/TeTunnelCtl.java
+++ b/apps/actn-mdsc/tetunnel-ctl/src/main/java/org/onosproject/actn/mdsc/tetunnelctl/TeTunnelCtl.java
@@ -254,7 +254,7 @@
private TeTunnelKey getNextTeTunnelKey(TeTopologyKey key) {
//FIXME need a better way to get a te tunnel id
- long teTunnelId = teTunnelService.getTeTunnels(key).size() + 1;
+ long teTunnelId = teTunnelService.getTeTunnels(key).size() + 1L;
return new TeTunnelKey(key, teTunnelId);
}
diff --git a/apps/cpman/app/src/main/java/org/onosproject/cpman/gui/CpmanViewMessageHandler.java b/apps/cpman/app/src/main/java/org/onosproject/cpman/gui/CpmanViewMessageHandler.java
index 8f64844..873d23d 100644
--- a/apps/cpman/app/src/main/java/org/onosproject/cpman/gui/CpmanViewMessageHandler.java
+++ b/apps/cpman/app/src/main/java/org/onosproject/cpman/gui/CpmanViewMessageHandler.java
@@ -179,7 +179,7 @@
local.put(StringUtils.lowerCase(cmt.name()), data.get(cmt)[i]);
}
- String calculated = time.minusMinutes(numOfDp - i).format(TIME_FORMAT);
+ String calculated = time.minusMinutes((long) numOfDp - i).format(TIME_FORMAT);
local.put(LABEL, calculated);
populateMetric(cm.addDataPoint(calculated), local);
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
index 217a981..a07cdef 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java
@@ -86,7 +86,7 @@
private static final String ERR_PACKETIN = "Failed to handle packet in: ";
private static final String ERR_UNSUPPORTED_NET_TYPE = "Unsupported network type";
- private static final long TIME_OUT_SNAT_PORT_MS = 120 * 1000;
+ private static final long TIME_OUT_SNAT_PORT_MS = 120L * 1000L;
private static final int TP_PORT_MINIMUM_NUM = 65000;
private static final int TP_PORT_MAXIMUM_NUM = 65535;
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
index fd57f09..72243bb 100644
--- a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
+++ b/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
@@ -64,7 +64,7 @@
*/
public class DefaultRoutingHandler {
private static final int MAX_CONSTANT_RETRY_ATTEMPTS = 5;
- private static final int RETRY_INTERVAL_MS = 250;
+ private static final long RETRY_INTERVAL_MS = 250L;
private static final int RETRY_INTERVAL_SCALE = 1;
private static final long STABLITY_THRESHOLD = 10; //secs
private static final int UPDATE_INTERVAL = 5; //secs
diff --git a/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java b/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java
index 369a3af..3772bdb 100644
--- a/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java
+++ b/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java
@@ -588,7 +588,7 @@
FlowRuleOperations.Builder remove = FlowRuleOperations.builder();
for (Device d : devices) {
- for (int i = 0; i < this.flowPerDevice; i++) {
+ for (long i = 0; i < this.flowPerDevice; i++) {
sbuilder = DefaultTrafficSelector.builder();
sbuilder.matchEthSrc(MacAddress.valueOf(RandomUtils.nextInt() * i))
@@ -771,7 +771,7 @@
TrafficTreatment.Builder tbuilder = DefaultTrafficTreatment.builder();
tbuilder.add(Instructions.createOutput(PortNumber.portNumber(2)));
TrafficSelector.Builder sbuilder = DefaultTrafficSelector.builder();
- sbuilder.matchInPort(PortNumber.portNumber(i + 3));
+ sbuilder.matchInPort(PortNumber.portNumber(i + 3L));
sbuilder.matchEthDst(MacAddress.valueOf("12:00:00:00:00:10"));
FilteringObjective.Builder fobBuilder = DefaultFilteringObjective.builder();
diff --git a/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfInstaller.java b/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfInstaller.java
index 639ee84..f7e46cc 100644
--- a/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfInstaller.java
+++ b/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfInstaller.java
@@ -288,7 +288,7 @@
}
try {
- workers.awaitTermination(5 * cyclePeriod, TimeUnit.MILLISECONDS);
+ workers.awaitTermination(5L * cyclePeriod, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
log.warn("Failed to stop worker", e);
}
diff --git a/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngConfigurationManager.java b/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngConfigurationManager.java
index 1e8a5ed..c09d7cc 100644
--- a/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngConfigurationManager.java
+++ b/apps/virtualbng/src/main/java/org/onosproject/virtualbng/VbngConfigurationManager.java
@@ -167,7 +167,7 @@
return publicIpAddress;
}
- int prefixLen = prefix.getKey().prefixLength();
+ double prefixLen = prefix.getKey().prefixLength();
int availableIpNum = (int) Math.pow(2,
IpPrefix.MAX_INET_MASK_LENGTH - prefixLen) - 1;
for (int i = 1; i <= availableIpNum; i++) {