General Sonar clean-up
authorStephen Kitt <skitt@redhat.com>
Fri, 24 Jul 2015 14:07:50 +0000 (16:07 +0200)
committerSam Hague <shague@redhat.com>
Thu, 6 Aug 2015 15:21:03 +0000 (15:21 +0000)
commit0580f394fcec784e4a573a7025db09c46541d4d3
tree92dc5e7b40039316006cd6beaafd87824ca89224
parent411401dae0858bf3351ce7167559c04987bc1205
General Sonar clean-up

Return simplification in a number of places:
* drop useless return at the end of void methods (unless it comes before
  commented code)
* simplify return ... ? true : false
* simplify variable declaration immediately followed by return

Drop unused local variables, and move some declarations closer to first
use (in particular when there's a redundant initialisation value).

Drop unused fields where it's safe to do so; in particular,
OvsdbClientImpl's exceptions were never initialised so we can even drop
the corresponding getter.

Drop unnecessary casts and use the Java 7 <> operator as appropriate.

Use primary types instead of wrappers where appropriate (dpid,
openFlowPort).

Drop redundant final modifiers on static methods.

Drop redundant .toString() calls.

Use .parseInt(), .parseShort() etc. instead of .decode().

Drop a few dead methods.

Avoid calling new String() explicitly.

Drive-by cleaning:
* AbstractHandler:
  - switch instead of multiple ifs
* BridgeConfigurationManagerImpl, ConfigurationServiceImpl:
  - rework getControllerIPAddress() to loop over the configuration
    properties
  - in getNormalizedRow(), avoid rebuilding the array every time we go
    through the loop
* ConfigurationServiceImpl:
  - in getTunnelEndPoint(), trace the tunnel endpoint only if we get
    one (avoids a NPE)
* EgressAclService, IngressAclService:
  - srcIpPrefix only makes sense if securityRuleIpPrefix != null, so
    move into the corresponding block

Change-Id: I7ca2a1a37f4795b3c0141b2b3a00977a15ffa5dd
Signed-off-by: Stephen Kitt <skitt@redhat.com>
27 files changed:
northbound/src/main/java/org/opendaylight/ovsdb/northbound/OvsdbNorthboundV2.java
northbound/src/test/java/org/opendaylight/ovsdb/northbound/NodeResourceTest.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/AbstractServiceInstance.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/PipelineOrchestratorImpl.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/ClassifierService.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/EgressAclService.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/IngressAclService.java
openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/services/L2ForwardingService.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/AbstractHandler.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/FWaasHandler.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSHandler.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolHandler.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/LBaaSPoolMemberHandler.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortSecurityHandler.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/SouthboundHandler.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/UuidUtils.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/BridgeConfigurationManagerImpl.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NodeCacheManagerImpl.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/SecurityServicesImpl.java
openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/VlanConfigurationCacheImpl.java
ovsdb-plugin-compatibility-layer/src/main/java/org/opendaylight/ovsdb/compatibility/plugin/internal/Activator.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConfigurationServiceImpl.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConnectionServiceImpl.java
plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/InventoryServiceImpl.java
utils/mdsal-node/src/main/java/org/opendaylight/ovsdb/utils/mdsal/node/NodeUtils.java
utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/InstructionUtils.java