Code formatting and cleanups

Author: rafaelweingartner

api/src/main/java/com/cloud/network/vpc/NetworkACLService.java

@@ -29,6 +29,7 @@
 import com.cloud.utils.Pair;
 
 public interface NetworkACLService {
+
     /**
      * Creates Network ACL for the specified VPC
      */

api/src/main/java/org/apache/cloudstack/api/command/user/network/MoveNetworkAclItemCmd.java

@@ -43,7 +43,6 @@ public class MoveNetworkAclItemCmd extends BaseAsyncCustomIdCmd {
     @Parameter(name = ApiConstants.ID_NEXT_ACL_RULE, type = CommandType.STRING, description = "The ID of the rule that is right after the new position where the rule being moved is going to be placed. This value can be 'NULL' if the rule is being moved to the last position of the network ACL list.")
     private String nextAclRuleUuid;
 
-
     @Override
     public void execute() {
         CallContext.current().setEventDetails(getEventDescription());

engine/schema/src/main/java/com/cloud/network/vpc/NetworkACLItemDao.java

@@ -20,7 +20,7 @@
 
 import com.cloud.utils.db.GenericDao;
 
-/*
+/**
  * Data Access Object for network_acl_item table
  */
 public interface NetworkACLItemDao extends GenericDao<NetworkACLItemVO, Long> {

engine/schema/src/main/java/com/cloud/network/vpc/dao/NetworkACLItemCidrsDaoImpl.java

@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 

engine/schema/src/main/java/com/cloud/network/vpc/dao/NetworkACLItemDaoImpl.java

@@ -22,8 +22,6 @@
 
 import javax.inject.Inject;
 
-import com.google.common.collect.Lists;
-import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
 import com.cloud.network.vpc.NetworkACLItem.State;
@@ -38,11 +36,11 @@
 import com.cloud.utils.db.SearchCriteria.Op;
 import com.cloud.utils.db.TransactionLegacy;
 import com.cloud.utils.exception.CloudRuntimeException;
+import com.google.common.collect.Lists;
 
-@Component
 @DB()
+@Component
 public class NetworkACLItemDaoImpl extends GenericDaoBase<NetworkACLItemVO, Long> implements NetworkACLItemDao {
-    private static final Logger s_logger = Logger.getLogger(NetworkACLItemDaoImpl.class);
 
     protected final SearchBuilder<NetworkACLItemVO> AllFieldsSearch;
     protected final SearchBuilder<NetworkACLItemVO> NotRevokedSearch;
@@ -118,12 +116,14 @@ public boolean revoke(NetworkACLItemVO rule) {
 
     @Override
     public List<NetworkACLItemVO> listByACL(Long aclId) {
-        if (aclId == null) return Lists.newArrayList();
+        if (aclId == null) {
+            return Lists.newArrayList();
+        }
 
         SearchCriteria<NetworkACLItemVO> sc = AllFieldsSearch.create();
         sc.setParameters("aclId", aclId);
         List<NetworkACLItemVO> list = listBy(sc);
-        for(NetworkACLItemVO item :list) {
+        for (NetworkACLItemVO item : list) {
             loadCidrs(item);
         }
         return list;
@@ -143,7 +143,7 @@ public NetworkACLItemVO findByAclAndNumber(long aclId, int number) {
         sc.setParameters("aclId", aclId);
         sc.setParameters("number", number);
         NetworkACLItemVO vo = findOneBy(sc);
-        if(vo != null) {
+        if (vo != null) {
             loadCidrs(vo);
         }
         return vo;
@@ -177,6 +177,7 @@ public void loadCidrs(NetworkACLItemVO item) {
     }
 
     private String sqlUpdateNumberFieldNetworkItem = "UPDATE network_acl_item SET number = ? where id =?";
+
     @Override
     public void updateNumberFieldNetworkItem(long networkItemId, int newNumberValue) {
         try (TransactionLegacy txn = TransactionLegacy.currentTxn();

server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java

@@ -959,7 +959,7 @@ public NetworkACLItem moveNetworkAclRuleToNewPosition(MoveNetworkAclItemCmd move
         validateMoveAclRulesData(ruleBeingMoved, previousRule, nextRule);
 
         List<NetworkACLItemVO> allAclRules = getAllAclRulesSortedByNumber(ruleBeingMoved.getAclId());
-        if(previousRule == null) {
+        if (previousRule == null) {
             return moveRuleToTheTop(ruleBeingMoved, allAclRules);
         }
         if (nextRule == null) {
@@ -983,8 +983,8 @@ public int compare(NetworkACLItemVO o1, NetworkACLItemVO o2) {
     private NetworkACLItem moveRuleBetweenAclRules(NetworkACLItemVO ruleBeingMoved, List<NetworkACLItemVO> allAclRules, NetworkACLItemVO previousRule, NetworkACLItemVO nextRule) {
         if (previousRule.getNumber() + 1 != nextRule.getNumber()) {
             int newNumberFieldValue = previousRule.getNumber() + 1;
-            for(NetworkACLItemVO networkACLItemVO: allAclRules) {
-                if(networkACLItemVO.getNumber() == newNumberFieldValue) {
+            for (NetworkACLItemVO networkACLItemVO : allAclRules) {
+                if (networkACLItemVO.getNumber() == newNumberFieldValue) {
                     throw new InvalidParameterValueException("There are some inconsistencies with the data you sent. The new position calculated already has a ACL rule on it.");
                 }
             }
@@ -1016,7 +1016,8 @@ private NetworkACLItem moveRuleToTheTop(NetworkACLItemVO ruleBeingMoved, List<Ne
         return updateAclRuleToNewPositionAndExecuteShiftIfNecessary(ruleBeingMoved, 1, allAclRules, 0);
     }
 
-    private NetworkACLItem updateAclRuleToNewPositionAndExecuteShiftIfNecessary(NetworkACLItemVO ruleBeingMoved, int newNumberFieldValue, List<NetworkACLItemVO> allAclRules, int indexToStartProcessing) {
+    private NetworkACLItem updateAclRuleToNewPositionAndExecuteShiftIfNecessary(NetworkACLItemVO ruleBeingMoved, int newNumberFieldValue, List<NetworkACLItemVO> allAclRules,
+            int indexToStartProcessing) {
         ruleBeingMoved.setNumber(newNumberFieldValue);
         for (int i = indexToStartProcessing; i < allAclRules.size(); i++) {
             NetworkACLItemVO networkACLItemVO = allAclRules.get(i);
@@ -1050,7 +1051,7 @@ private void validateMoveAclRulesData(NetworkACLItemVO ruleBeingMoved, NetworkAC
         }
         long aclId = ruleBeingMoved.getAclId();
 
-        if((nextRule != null && nextRule.getAclId() != aclId) || (previousRule != null && previousRule.getAclId() != aclId)) {
+        if ((nextRule != null && nextRule.getAclId() != aclId) || (previousRule != null && previousRule.getAclId() != aclId)) {
             throw new InvalidParameterValueException("Cannot use ACL rules from differenting ACLs. Rule being moved.");
         }
         NetworkACLVO acl = _networkACLDao.findById(aclId);

server/src/main/java/com/cloud/server/ManagementServerImpl.java

@@ -2333,7 +2333,6 @@ public Pair<String, Integer> getVncPort(final VirtualMachine vm) {
         return new Pair<String, Integer>(null, -1);
     }
 
-
     @Override
     public Pair<List<? extends Alert>, Integer> searchForAlerts(final ListAlertsCmd cmd) {
         final Filter searchFilter = new Filter(AlertVO.class, "lastSent", false, cmd.getStartIndex(), cmd.getPageSizeVal());