From a4265672f51efe13366ab6f2d31fa9300fe7fd6b Mon Sep 17 00:00:00 2001 From: Shigeru Yasuda Date: Fri, 11 Jul 2014 21:55:17 +0900 Subject: [PATCH] Fixed some sonar warnings. Change-Id: I6eb8668cfa18e745d4db1d70ede65cb76ce34238 Signed-off-by: Shigeru Yasuda --- .../opendaylight/vtn/manager/NodeRoute.java | 2 +- .../manager/internal/CacheRetryException.java | 12 +++++++++ .../vtn/manager/internal/ContainerConfig.java | 6 ++--- .../manager/internal/DataFlowFilterImpl.java | 25 ++++++++----------- .../internal/GlobalResourceManager.java | 4 +-- .../manager/internal/cluster/MacMapImpl.java | 4 +-- .../internal/cluster/MacTableEntry.java | 10 +++----- .../internal/cluster/PortProtoMatchImpl.java | 5 ++-- .../manager/internal/cluster/VBridgeImpl.java | 14 +++-------- 9 files changed, 38 insertions(+), 44 deletions(-) diff --git a/manager/api/src/main/java/org/opendaylight/vtn/manager/NodeRoute.java b/manager/api/src/main/java/org/opendaylight/vtn/manager/NodeRoute.java index 5cd90801..7c8668d2 100644 --- a/manager/api/src/main/java/org/opendaylight/vtn/manager/NodeRoute.java +++ b/manager/api/src/main/java/org/opendaylight/vtn/manager/NodeRoute.java @@ -141,7 +141,7 @@ public final class NodeRoute implements Serializable { NodeConnector outport, String outname) { Node nd = inport.getNode(); if (!nd.equals(outport.getNode())) { - throw new NullPointerException + throw new IllegalArgumentException ("Input and output port must belong to the same switch: " + inport + ", " + outport); } diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/CacheRetryException.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/CacheRetryException.java index 9a8ca411..66e885f8 100644 --- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/CacheRetryException.java +++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/CacheRetryException.java @@ -11,6 +11,8 @@ package org.opendaylight.vtn.manager.internal; import org.opendaylight.vtn.manager.VTNException; +import org.opendaylight.controller.sal.utils.Status; + /** * An exception which indicates the cluster cache operation should be * retried. @@ -22,4 +24,14 @@ public class CacheRetryException extends VTNException { public CacheRetryException() { super(null); } + + /** + * Construct a new instance. + * + * @param cause The {@link Throwable} object which indicates the cause of + * an error. + */ + public CacheRetryException(Throwable cause) { + super((Status)null, cause); + } } diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/ContainerConfig.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/ContainerConfig.java index ea1b7ba4..c4f29df1 100644 --- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/ContainerConfig.java +++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/ContainerConfig.java @@ -153,10 +153,8 @@ public final class ContainerConfig implements IObjectReader { File file = getPath(type, key); ObjectReader rdr = new ObjectReader(); Object obj = rdr.read(this, file.getPath()); - if (obj == null) { - if (delete(file)) { - LOG.warn("Delete broken configuration file: {}", file); - } + if (obj == null && delete(file)) { + LOG.warn("Delete broken configuration file: {}", file); } return obj; } diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/DataFlowFilterImpl.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/DataFlowFilterImpl.java index a52d3a8f..7967c57f 100644 --- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/DataFlowFilterImpl.java +++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/DataFlowFilterImpl.java @@ -218,22 +218,19 @@ public final class DataFlowFilterImpl { } } - if (port != null && indexType != INDEX_PORT) { - // Check whether the VTN flow depends on the specified switch port - // or not. - if (!vflow.getFlowPorts().contains(port)) { - // Switch port does not match. - return false; - } + // Check whether the VTN flow depends on the specified switch port + // or not. + if (port != null && indexType != INDEX_PORT && + !vflow.getFlowPorts().contains(port)) { + // Switch port does not match. + return false; } - if (node != null && indexType != INDEX_SWITCH) { - // Check whether the VTN flow depends on the specified switch - // or not. - if (!vflow.getFlowNodes().contains(node)) { - // Switch does not match. - return false; - } + // Check whether the VTN flow depends on the specified switch or not. + if (node != null && indexType != INDEX_SWITCH && + !vflow.getFlowNodes().contains(node)) { + // Switch does not match. + return false; } return true; diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/GlobalResourceManager.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/GlobalResourceManager.java index 6f3e4bbf..90fc22b4 100644 --- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/GlobalResourceManager.java +++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/GlobalResourceManager.java @@ -255,7 +255,7 @@ public class GlobalResourceManager throw e; } - throw new CacheRetryException(); + throw new CacheRetryException(e); } if (changed) { @@ -1368,7 +1368,6 @@ public class GlobalResourceManager * @param ref A reference to the virtual mapping. */ private void purge(VTNManagerImpl mgr, MapReference ref) { - String container = mgr.getContainerName(); VBridgePath path = ref.getPath(); PathMapCleaner cleaner = new PathMapCleaner(path); cleaner.purge(mgr, null); @@ -1383,7 +1382,6 @@ public class GlobalResourceManager * VLAN network on a switch port. */ private void purge(VTNManagerImpl mgr, VBridgePath path, PortVlan pvlan) { - String container = mgr.getContainerName(); NodeConnector port = pvlan.getNodeConnector(); short vlan = pvlan.getVlan(); diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/MacMapImpl.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/MacMapImpl.java index 61ec4a48..edd0d934 100644 --- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/MacMapImpl.java +++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/MacMapImpl.java @@ -421,7 +421,6 @@ public final class MacMapImpl implements VBridgeNode, Serializable, Cloneable { protected void remove(Set dlhosts) throws VTNException { Set removed = getRemovedSet(); - HashSet macSet = new HashSet(); for (DataLinkHost dlhost: dlhosts) { MacVlan mvlan = new MacVlan(dlhost); if (allowedHosts.contains(mvlan)) { @@ -1171,7 +1170,8 @@ public final class MacMapImpl implements VBridgeNode, Serializable, Cloneable { MacVlan host = e.getHost(); MapReference ref = e.getMapReference(); assert ref.getMapType() == MapType.MAC; - throw new VTNException(alreadyMapped(host, ref.getAbsolutePath())); + throw new VTNException + (alreadyMapped(host, ref.getAbsolutePath()), e); } return removing; diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/MacTableEntry.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/MacTableEntry.java index 13803618..13ad0d2c 100644 --- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/MacTableEntry.java +++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/MacTableEntry.java @@ -388,15 +388,11 @@ public class MacTableEntry implements Serializable { append(",vlan=").append((int)vlan). append(",ipaddr={"); - char sep = 0; + String sep = ""; synchronized (this) { for (InetAddress ipaddr: ipAddresses) { - if (sep == 0) { - sep = ','; - } else { - builder.append(sep); - } - builder.append(ipaddr.getHostAddress()); + builder.append(sep).append(ipaddr.getHostAddress()); + sep = ","; } } diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/PortProtoMatchImpl.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/PortProtoMatchImpl.java index a63f7c75..9a04b0e7 100644 --- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/PortProtoMatchImpl.java +++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/PortProtoMatchImpl.java @@ -172,14 +172,15 @@ public abstract class PortProtoMatchImpl extends L4MatchImpl { public final String toString() { StringBuilder builder = new StringBuilder(getClass().getSimpleName()); builder.append('['); - String sep = ","; + String sep = ""; if (sourcePort != null) { builder.append("src=").append(sourcePort.toString()); sep = ","; } if (destinationPort != null) { - builder.append("dst=").append(destinationPort.toString()); + builder.append(sep).append("dst="). + append(destinationPort.toString()); } builder.append(']'); diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VBridgeImpl.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VBridgeImpl.java index 3504fbaa..cc1ab7ba 100644 --- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VBridgeImpl.java +++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VBridgeImpl.java @@ -50,7 +50,6 @@ import org.opendaylight.vtn.manager.VlanMap; import org.opendaylight.vtn.manager.VlanMapConfig; import org.opendaylight.vtn.manager.internal.ActionList; import org.opendaylight.vtn.manager.internal.EdgeUpdateState; -import org.opendaylight.vtn.manager.internal.IVTNResourceManager; import org.opendaylight.vtn.manager.internal.MacAddressTable; import org.opendaylight.vtn.manager.internal.MiscUtils; import org.opendaylight.vtn.manager.internal.NodeUtils; @@ -489,8 +488,6 @@ public final class VBridgeImpl implements Serializable { // Create a VLAN mapping instance. VlanMapImpl vmap = new VlanMapImpl(bridgePath, id, vlconf); - - VlanMapPath path = vmap.getPath(); NodeVlan nvlan = new NodeVlan(node, vlan); Lock wrlock = rwLock.writeLock(); @@ -793,7 +790,7 @@ public final class VBridgeImpl implements Serializable { Lock wrlock = rwLock.writeLock(); wrlock.lock(); try { - MacMapImpl mmap = prepareMacMap(op); + MacMapImpl mmap = prepareMacMap(); MacMapConfig newconf = mmap.setMacMap(mgr, op, mcconf); return commitMacMap(mgr, mmap, newconf); } finally { @@ -822,7 +819,7 @@ public final class VBridgeImpl implements Serializable { Lock wrlock = rwLock.writeLock(); wrlock.lock(); try { - MacMapImpl mmap = prepareMacMap(op); + MacMapImpl mmap = prepareMacMap(); MacMapConfig newconf = mmap.setMacMap(mgr, op, aclType, dlhosts); return commitMacMap(mgr, mmap, newconf); } finally { @@ -1259,7 +1256,6 @@ public final class VBridgeImpl implements Serializable { */ void destroy(VTNManagerImpl mgr, boolean retain) { VBridge vbridge = getVBridge(mgr); - IVTNResourceManager resMgr = mgr.getResourceManager(); Lock wrlock = rwLock.writeLock(); wrlock.lock(); @@ -1541,13 +1537,9 @@ public final class VBridgeImpl implements Serializable { * lock. *

* - * @param op A {@link UpdateOperation} instance which indicates - * how to change the MAC mapping configuration. * @return A {@link MacMapImpl} instance. - * @throws VTNException An error occurred. */ - private MacMapImpl prepareMacMap(UpdateOperation op) - throws VTNException { + private MacMapImpl prepareMacMap() { MacMapImpl mmap = macMap; if (mmap == null) { mmap = new MacMapImpl(bridgePath); -- 2.36.6