diff --git a/src/main/java/net/floodlightcontroller/hub/Hub.java b/src/main/java/net/floodlightcontroller/hub/Hub.java index 70b920345051bb51669ba15df09e787096b3fc3f..4a3549ba47224cc0b8a7821798f589d61fbabb52 100644 --- a/src/main/java/net/floodlightcontroller/hub/Hub.java +++ b/src/main/java/net/floodlightcontroller/hub/Hub.java @@ -73,7 +73,7 @@ public class Hub implements IFloodlightModule, IOFMessageListener { // set actions OFActionOutput action = new OFActionOutput() - .setPort((short) OFPort.OFPP_FLOOD.getValue()); + .setPort(OFPort.OFPP_FLOOD.getValue()); po.setActions(Collections.singletonList((OFAction)action)); po.setActionsLength((short) OFActionOutput.MINIMUM_LENGTH); diff --git a/src/main/java/net/floodlightcontroller/loadbalancer/LoadBalancer.java b/src/main/java/net/floodlightcontroller/loadbalancer/LoadBalancer.java index 90294f4209900eed9214067c4b21e93b6613e293..dabcef1e556231fdbb3c19d3496d5236e9714494 100644 --- a/src/main/java/net/floodlightcontroller/loadbalancer/LoadBalancer.java +++ b/src/main/java/net/floodlightcontroller/loadbalancer/LoadBalancer.java @@ -922,7 +922,7 @@ public class LoadBalancer implements IFloodlightModule, n = Pattern.compile("output=(?:((?:0x)?\\d+)|(all)|(controller)|(local)|(ingress-port)|(normal)|(flood))").matcher(subaction); if (n.matches()) { OFActionOutput action = new OFActionOutput(); - action.setMaxLength((short) Short.MAX_VALUE); + action.setMaxLength(Short.MAX_VALUE); short port = OFPort.OFPP_NONE.getValue(); if (n.group(1) != null) { try { @@ -1314,7 +1314,7 @@ public class LoadBalancer implements IFloodlightModule, // Parse int as decimal, hex (start with 0x or #) or octal (starts with 0) private static int get_int(String str) { - return (int)Integer.decode(str); + return Integer.decode(str); } // Parse short as decimal, hex (start with 0x or #) or octal (starts with 0) diff --git a/src/main/java/net/floodlightcontroller/packet/Ethernet.java b/src/main/java/net/floodlightcontroller/packet/Ethernet.java index 438e786a3459028888f1b95c6480ff052c5c5f45..60887b3158e27a3d714927aab4f57b7085242164 100644 --- a/src/main/java/net/floodlightcontroller/packet/Ethernet.java +++ b/src/main/java/net/floodlightcontroller/packet/Ethernet.java @@ -396,7 +396,7 @@ public class Ethernet extends BasePacket { StringBuffer sb = new StringBuffer("\n"); - IPacket pkt = (IPacket) this.getPayload(); + IPacket pkt = this.getPayload(); if (pkt instanceof ARP) sb.append("arp"); diff --git a/src/main/java/net/floodlightcontroller/routing/Link.java b/src/main/java/net/floodlightcontroller/routing/Link.java index b2d69f5eda335c80e3b092c82783012fdb52b36c..561ae04c09ba4b4d3849763da46796dff4c03f95 100755 --- a/src/main/java/net/floodlightcontroller/routing/Link.java +++ b/src/main/java/net/floodlightcontroller/routing/Link.java @@ -148,7 +148,7 @@ public class Link implements Comparable<Link> { if (this.getDst() != a.getDst()) return (int) (this.getDst() - a.getDst()); - return (int) (this.getDstPort() - a.getDstPort()); + return this.getDstPort() - a.getDstPort(); } } diff --git a/src/main/java/net/floodlightcontroller/staticflowentry/StaticFlowEntries.java b/src/main/java/net/floodlightcontroller/staticflowentry/StaticFlowEntries.java index f86e642d2e4e695997e8bb7be16c35811410d637..42329e5b4490da20f86c6af7182e93321f49470c 100644 --- a/src/main/java/net/floodlightcontroller/staticflowentry/StaticFlowEntries.java +++ b/src/main/java/net/floodlightcontroller/staticflowentry/StaticFlowEntries.java @@ -438,7 +438,7 @@ public class StaticFlowEntries { n = Pattern.compile("output=(?:((?:0x)?\\d+)|(all)|(controller)|(local)|(ingress-port)|(normal)|(flood))").matcher(subaction); if (n.matches()) { OFActionOutput action = new OFActionOutput(); - action.setMaxLength((short) Short.MAX_VALUE); + action.setMaxLength(Short.MAX_VALUE); short port = OFPort.OFPP_NONE.getValue(); if (n.group(1) != null) { try { @@ -830,7 +830,7 @@ public class StaticFlowEntries { // Parse int as decimal, hex (start with 0x or #) or octal (starts with 0) private static int get_int(String str) { - return (int)Integer.decode(str); + return Integer.decode(str); } // Parse short as decimal, hex (start with 0x or #) or octal (starts with 0) diff --git a/src/main/java/net/floodlightcontroller/storage/nosql/NoSqlResultSet.java b/src/main/java/net/floodlightcontroller/storage/nosql/NoSqlResultSet.java index b3a8c20df8e4bda01ae04b91ad081c6a36f0c0e7..ac2175eba6be434248505e429c2b80ec6d7ae7df 100644 --- a/src/main/java/net/floodlightcontroller/storage/nosql/NoSqlResultSet.java +++ b/src/main/java/net/floodlightcontroller/storage/nosql/NoSqlResultSet.java @@ -472,7 +472,7 @@ public class NoSqlResultSet implements IResultSet { @Override public void deleteRow() { - Object key = (String) rowList.get(currentIndex).get(primaryKeyName); + Object key = rowList.get(currentIndex).get(primaryKeyName); if (rowDeleteSet == null) rowDeleteSet = new HashSet<Object>(); rowDeleteSet.add(key); diff --git a/src/main/java/org/openflow/protocol/OFFlowMod.java b/src/main/java/org/openflow/protocol/OFFlowMod.java index 447a7debf43ae0bf8ef0403440c0f9b1f78e4edd..0d2aad2157d4bfcbf19572bb943d5fb026c6cbb7 100644 --- a/src/main/java/org/openflow/protocol/OFFlowMod.java +++ b/src/main/java/org/openflow/protocol/OFFlowMod.java @@ -368,7 +368,7 @@ public class OFFlowMod extends OFMessage implements OFActionFactoryAware, Clonea flowMod.setMatch(neoMatch); List<OFAction> neoActions = new LinkedList<OFAction>(); for(OFAction action: this.actions) - neoActions.add((OFAction) action.clone()); + neoActions.add(action.clone()); flowMod.setActions(neoActions); return flowMod; } diff --git a/src/main/java/org/openflow/protocol/OFFlowRemoved.java b/src/main/java/org/openflow/protocol/OFFlowRemoved.java index 33570063c73850cf995606890ac0c3e9e97f67f5..cfe2e14ce34691a6b6b096c181cfd67fa5c214aa 100644 --- a/src/main/java/org/openflow/protocol/OFFlowRemoved.java +++ b/src/main/java/org/openflow/protocol/OFFlowRemoved.java @@ -194,7 +194,7 @@ public class OFFlowRemoved extends OFMessage { this.match.readFrom(data); this.cookie = data.readLong(); this.priority = data.readShort(); - int reasonIndex = (int)(0xff & data.readByte()); + int reasonIndex = 0xff & data.readByte(); if (reasonIndex >= OFFlowRemovedReason.values().length) { reasonIndex = OFFlowRemovedReason.values().length - 1; } diff --git a/src/main/java/org/sdnplatform/sync/internal/AbstractStoreClient.java b/src/main/java/org/sdnplatform/sync/internal/AbstractStoreClient.java index 3d767d66836b45d451acd0cef08863a69a989459..fda2835e44d8770c905a36ebf4092e3c17a84abf 100644 --- a/src/main/java/org/sdnplatform/sync/internal/AbstractStoreClient.java +++ b/src/main/java/org/sdnplatform/sync/internal/AbstractStoreClient.java @@ -73,7 +73,7 @@ public abstract class AbstractStoreClient<K,V> implements IStoreClient<K, V> { @Override public void delete(K key, IVersion version) throws SyncException { - put(key, new Versioned<V>((V)null, version)); + put(key, new Versioned<V>(null, version)); } }