Add fixes based on code review

Signed-off-by: Rohit Yadav <[email protected]>

Author: yadvr

engine/schema/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java

@@ -112,7 +112,7 @@ public int countZoneVlans(long dcId, boolean onlyCountAllocated) {
     private List<DataCenterVnetVO> findOverlappingVnets(final long dcId, final Long physicalNetworkId, final String vnet) {
         final List<Integer> searchVnets = UriUtils.expandVlanUri(vnet);
         final List<DataCenterVnetVO> overlappingVnets = new ArrayList<>();
-        if (searchVnets == null || searchVnets.size() == 0) {
+        if (searchVnets == null || searchVnets.isEmpty()) {
             return overlappingVnets;
         }
         SearchCriteria<DataCenterVnetVO> sc = VnetDcSearch.create();

server/src/com/cloud/hypervisor/HypervisorGuruBase.java

@@ -148,15 +148,9 @@ protected VirtualMachineTO toVirtualMachineTO(VirtualMachineProfile vmProfile) {
             if (network != null) {
                 final Map<NetworkOffering.Detail, String> details = networkOfferingDetailsDao.getNtwkOffDetails(network.getNetworkOfferingId());
                 if (details != null) {
-                    if (!details.containsKey(NetworkOffering.Detail.PromiscuousMode)) {
-                        details.put(NetworkOffering.Detail.PromiscuousMode, NetworkOrchestrationService.PromiscuousMode.value().toString());
-                    }
-                    if (!details.containsKey(NetworkOffering.Detail.MacAddressChanges)) {
-                        details.put(NetworkOffering.Detail.MacAddressChanges, NetworkOrchestrationService.MacAddressChanges.value().toString());
-                    }
-                    if (!details.containsKey(NetworkOffering.Detail.ForgedTransmits)) {
-                        details.put(NetworkOffering.Detail.ForgedTransmits, NetworkOrchestrationService.ForgedTransmits.value().toString());
-                    }
+                    details.putIfAbsent(NetworkOffering.Detail.PromiscuousMode, NetworkOrchestrationService.PromiscuousMode.value().toString());
+                    details.putIfAbsent(NetworkOffering.Detail.MacAddressChanges, NetworkOrchestrationService.MacAddressChanges.value().toString());
+                    details.putIfAbsent(NetworkOffering.Detail.ForgedTransmits, NetworkOrchestrationService.ForgedTransmits.value().toString());
                 }
                 nicTo.setDetails(details);
             }

utils/src/main/java/com/cloud/utils/UriUtils.java

@@ -30,6 +30,7 @@
 import java.net.URLEncoder;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.StringTokenizer;
@@ -438,11 +439,6 @@ public static boolean checkVlanUriOverlap(final String vlanRange1, final String
         if (vlans1 == null || vlans2 == null) {
             return true;
         }
-        for (final Integer vlan1: vlans1) {
-            if (vlans2.contains(vlan1)) {
-                return true;
-            }
-        }
-        return false;
+        return !Collections.disjoint(vlans1, vlans2);
     }
 }

vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java

@@ -38,6 +38,7 @@
 import javax.xml.transform.stream.StreamResult;
 
 import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -515,11 +516,11 @@ public static Pair<ManagedObjectReference, String> prepareNetwork(String physica
             }
             networkName = composeCloudNetworkName(namePrefix, vlanId, secondaryvlanId, networkRateMbps, physicalNetwork);
 
-            if (vlanId != null && !UNTAGGED_VLAN_NAME.equalsIgnoreCase(vlanId) && !vlanId.contains(",") && !vlanId.contains("-")) {
+            if (vlanId != null && !UNTAGGED_VLAN_NAME.equalsIgnoreCase(vlanId) && !StringUtils.containsAny(vlanId, ",-")) {
                 createGCTag = true;
                 vid = Integer.parseInt(vlanId);
             }
-            if (vlanId != null && (vlanId.contains(",") || vlanId.contains("-"))) {
+            if (vlanId != null && StringUtils.containsAny(vlanId, ",-")) {
                 createGCTag = true;
             }
             if (secondaryvlanId != null) {