Skip to content

Commit 82d70a0

Browse files
normalize usage of primitive types and Java type wrapper classes
1 parent 0cd6426 commit 82d70a0

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ Network createGuestNetwork(long networkOfferingId, String name, String displayTe
215215
Network createGuestNetwork(long networkOfferingId, String name, String displayText, String gateway, String cidr, String vlanId, boolean bypassVlanOverlapCheck, String networkDomain, Account owner,
216216
Long domainId, PhysicalNetwork physicalNetwork, long zoneId, ACLType aclType, Boolean subdomainAccess, Long vpcId, String ip6Gateway, String ip6Cidr,
217217
Boolean displayNetworkEnabled, String isolatedPvlan, Network.PVlanType isolatedPvlanType, String externalId, String routerIp, String routerIpv6,
218-
String ip4Dns1, String ip4Dns2, String ip6Dns1, String ip6Dns2, Pair<Integer, Integer> vrIfaceMTUs, Integer networkCidrSize, Boolean keepMacAddressOnPublicNic) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException;
218+
String ip4Dns1, String ip4Dns2, String ip6Dns1, String ip6Dns2, Pair<Integer, Integer> vrIfaceMTUs, Integer networkCidrSize, boolean keepMacAddressOnPublicNic) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException;
219219

220220
UserDataServiceProvider getPasswordResetProvider(Network network);
221221

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2744,7 +2744,7 @@ public Network createGuestNetwork(final long networkOfferingId, final String nam
27442744
final long zoneId, final ACLType aclType, Boolean subdomainAccess, final Long vpcId, final String ip6Gateway, final String ip6Cidr,
27452745
final Boolean isDisplayNetworkEnabled, final String isolatedPvlan, Network.PVlanType isolatedPvlanType, String externalId,
27462746
String routerIp, String routerIpv6, String ip4Dns1, String ip4Dns2, String ip6Dns1, String ip6Dns2,
2747-
Pair<Integer, Integer> vrIfaceMTUs, Integer networkCidrSize, Boolean keepMacAddressOnPublicNic) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException {
2747+
Pair<Integer, Integer> vrIfaceMTUs, Integer networkCidrSize, boolean keepMacAddressOnPublicNic) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException {
27482748
// create Isolated/Shared/L2 network
27492749
return createGuestNetwork(networkOfferingId, name, displayText, gateway, cidr, vlanId, bypassVlanOverlapCheck,
27502750
networkDomain, owner, domainId, pNtwk, zoneId, aclType, subdomainAccess, vpcId, ip6Gateway, ip6Cidr,
@@ -2759,7 +2759,7 @@ private Network createGuestNetwork(final long networkOfferingId, final String na
27592759
final Boolean isDisplayNetworkEnabled, final String isolatedPvlan, Network.PVlanType isolatedPvlanType, String externalId,
27602760
final Boolean isPrivateNetwork, String routerIp, String routerIpv6, final String ip4Dns1, final String ip4Dns2,
27612761
final String ip6Dns1, final String ip6Dns2, Pair<Integer, Integer> vrIfaceMTUs, Integer networkCidrSize,
2762-
Boolean keepMacAddressOnPublicNic) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException {
2762+
boolean keepMacAddressOnPublicNic) throws ConcurrentOperationException, InsufficientCapacityException, ResourceAllocationException {
27632763

27642764
final NetworkOfferingVO ntwkOff = _networkOfferingDao.findById(networkOfferingId);
27652765
final DataCenterVO zone = _dcDao.findById(zoneId);

server/src/main/java/com/cloud/network/NetworkServiceImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,7 +1547,7 @@ public Network createGuestNetwork(CreateNetworkCmd cmd) throws InsufficientCapac
15471547

15481548
DataCenter zone = getAndValidateZone(cmd, pNtwk);
15491549

1550-
Boolean keepMacAddressOnPublicNic = getAndValidateSupportForKeepMacAddressOnPublicNicParameter(cmd.getKeepMacAddressOnPublicNic(), ntwkOff);
1550+
boolean keepMacAddressOnPublicNic = getAndValidateSupportForKeepMacAddressOnPublicNicParameter(cmd.getKeepMacAddressOnPublicNic(), ntwkOff);
15511551

15521552
_accountMgr.checkAccess(owner, ntwkOff, zone);
15531553

@@ -2300,7 +2300,7 @@ protected Network commitNetwork(final Long networkOfferingId, final String gatew
23002300
final Boolean displayNetwork, final Long aclId, final String isolatedPvlan, final PVlanType isolatedPvlanType, final NetworkOffering ntwkOff, final PhysicalNetwork pNtwk, final ACLType aclType, final Account ownerFinal,
23012301
final String cidr, final boolean createVlan, final String externalId, String routerIp, String routerIpv6,
23022302
final Network associatedNetwork, final String ip4Dns1, final String ip4Dns2, final String ip6Dns1, final String ip6Dns2, Pair<Integer, Integer> vrIfaceMTUs,
2303-
final Integer networkCidrSize, final Boolean keepMacAddressOnPublicNic) throws InsufficientCapacityException, ResourceAllocationException {
2303+
final Integer networkCidrSize, final boolean keepMacAddressOnPublicNic) throws InsufficientCapacityException, ResourceAllocationException {
23042304
try {
23052305
Network network = Transaction.execute(new TransactionCallbackWithException<Network, Exception>() {
23062306
@Override

0 commit comments

Comments
 (0)