some code improvements

Author: sureshanaparti

plugins/network-elements/internal-loadbalancer/src/main/java/org/apache/cloudstack/network/element/InternalLoadBalancerElement.java

@@ -404,8 +404,6 @@ protected Map<Ip, List<LoadBalancingRule>> groupBySourceIp(List<LoadBalancingRul
 
     @Override
     public boolean validateLBRule(Network network, LoadBalancingRule rule) {
-        List<LoadBalancingRule> rules = new ArrayList<LoadBalancingRule>();
-        rules.add(rule);
         if (canHandle(network, rule.getScheme())) {
             List<DomainRouterVO> routers = _routerDao.listByNetworkAndRole(network.getId(), Role.INTERNAL_LB_VM);
             if (routers == null || routers.isEmpty()) {

server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java

@@ -711,11 +711,11 @@ public boolean validateLbRule(LoadBalancingRule lbRule) {
         Network network = _networkDao.findById(lbRule.getNetworkId());
         Purpose purpose = lbRule.getPurpose();
         if (purpose != Purpose.LoadBalancing) {
-            logger.debug("Unable to validate network rules for purpose: " + purpose.toString());
+            logger.debug("Unable to validate network rules for purpose: {}", purpose.toString());
             return false;
         }
-        for (LoadBalancingServiceProvider ne : _lbProviders) {
-            boolean validated = ne.validateLBRule(network, lbRule);
+        for (LoadBalancingServiceProvider lbProvider : _lbProviders) {
+            boolean validated = lbProvider.validateLBRule(network, lbRule);
             if (!validated)
                 return false;
         }

server/src/main/java/com/cloud/network/router/NetworkHelper.java

@@ -44,19 +44,19 @@
 
 public interface NetworkHelper {
 
-    public abstract boolean sendCommandsToRouter(VirtualRouter router,
-            Commands cmds) throws AgentUnavailableException, ResourceUnavailableException;
+    boolean sendCommandsToRouter(VirtualRouter router,
+                                 Commands cmds) throws AgentUnavailableException, ResourceUnavailableException;
 
-    public abstract void handleSingleWorkingRedundantRouter(
+    void handleSingleWorkingRedundantRouter(
             List<? extends VirtualRouter> connectedRouters,
             List<? extends VirtualRouter> disconnectedRouters, String reason)
                     throws ResourceUnavailableException;
 
-    public abstract NicTO getNicTO(VirtualRouter router, Long networkId,
-            String broadcastUri);
+    NicTO getNicTO(VirtualRouter router, Long networkId,
+                   String broadcastUri);
 
-    public abstract VirtualRouter destroyRouter(long routerId, Account caller,
-            Long callerUserId) throws ResourceUnavailableException,
+    VirtualRouter destroyRouter(long routerId, Account caller,
+                                Long callerUserId) throws ResourceUnavailableException,
             ConcurrentOperationException;
 
     /**
@@ -65,35 +65,35 @@ public abstract VirtualRouter destroyRouter(long routerId, Account caller,
      * @param router
      * @return
      */
-    public abstract boolean checkRouterVersion(VirtualRouter router);
-    public abstract boolean checkRouterTemplateVersion(VirtualRouter router);
+    boolean checkRouterVersion(VirtualRouter router);
+    boolean checkRouterTemplateVersion(VirtualRouter router);
 
-    public abstract List<DomainRouterVO> startRouters(
+    List<DomainRouterVO> startRouters(
             RouterDeploymentDefinition routerDeploymentDefinition)
                     throws StorageUnavailableException, InsufficientCapacityException,
                     ConcurrentOperationException, ResourceUnavailableException;
 
-    public abstract DomainRouterVO startVirtualRouter(DomainRouterVO router,
-            User user, Account caller, Map<Param, Object> params)
+    DomainRouterVO startVirtualRouter(DomainRouterVO router,
+                                      User user, Account caller, Map<Param, Object> params)
                     throws StorageUnavailableException, InsufficientCapacityException,
                     ConcurrentOperationException, ResourceUnavailableException;
 
-    public abstract DomainRouterVO deployRouter(
+    DomainRouterVO deployRouter(
             RouterDeploymentDefinition routerDeploymentDefinition, boolean startRouter)
                     throws InsufficientAddressCapacityException,
                     InsufficientServerCapacityException, InsufficientCapacityException,
                     StorageUnavailableException, ResourceUnavailableException;
 
-    public abstract void reallocateRouterNetworks(RouterDeploymentDefinition routerDeploymentDefinition, VirtualRouter router, VMTemplateVO template, HypervisorType hType)
+    void reallocateRouterNetworks(RouterDeploymentDefinition routerDeploymentDefinition, VirtualRouter router, VMTemplateVO template, HypervisorType hType)
             throws ConcurrentOperationException, InsufficientAddressCapacityException, InsufficientCapacityException;
 
-    public abstract LinkedHashMap<Network, List<? extends NicProfile>> configureDefaultNics(RouterDeploymentDefinition routerDeploymentDefinition)
+    LinkedHashMap<Network, List<? extends NicProfile>> configureDefaultNics(RouterDeploymentDefinition routerDeploymentDefinition)
             throws ConcurrentOperationException, InsufficientAddressCapacityException;
 
-    public abstract LinkedHashMap<Network, List<? extends NicProfile>> configureGuestNic(RouterDeploymentDefinition routerDeploymentDefinition)
+    LinkedHashMap<Network, List<? extends NicProfile>> configureGuestNic(RouterDeploymentDefinition routerDeploymentDefinition)
             throws ConcurrentOperationException, InsufficientAddressCapacityException;
 
-    public boolean validateHAProxyLBRule(final LoadBalancingRule rule);
+    boolean validateHAProxyLBRule(final LoadBalancingRule rule);
 
-    public Map<HypervisorType, ConfigKey<String>> getHypervisorRouterTemplateConfigMap();
+    Map<HypervisorType, ConfigKey<String>> getHypervisorRouterTemplateConfigMap();
 }