Skip to content

Commit b5f03d3

Browse files
shwstpprshwstppr
committed
review comments
Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
1 parent 091f903 commit b5f03d3

File tree

12 files changed

+146
-152
lines changed

12 files changed

+146
-152
lines changed

‎api/src/main/java/com/cloud/network/Ipv6Address.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818

1919
import java.util.Date;
2020

21-
import com.cloud.exception.InvalidParameterValueException;
2221
import org.apache.cloudstack.api.Displayable;
2322
import org.apache.cloudstack.api.Identity;
2423
import org.apache.cloudstack.api.InternalIdentity;
24+
import org.apache.commons.lang3.StringUtils;
2525

26-
import org.apache.commons.lang.StringUtils;
26+
import com.cloud.exception.InvalidParameterValueException;
2727

2828
/**
2929
*
@@ -50,9 +50,8 @@ public static InternetProtocol fromValue(String protocol) {
5050
return IPv6;
5151
} else if (protocol.equalsIgnoreCase("DualStack")) {
5252
return DualStack;
53-
} else {
54-
throw new InvalidParameterValueException("Unexpected Internet Protocol : " + protocol);
5553
}
54+
throw new InvalidParameterValueException("Unexpected Internet Protocol : " + protocol);
5655
}
5756
}
5857

@@ -66,9 +65,8 @@ public static IPv6Routing fromValue(String mode) {
6665
return Static;
6766
} else if (mode.equalsIgnoreCase("Dynamic")) {
6867
return Dynamic;
69-
} else {
70-
throw new InvalidParameterValueException("Unexpected IPv6 routing mode : " + mode);
7168
}
69+
throw new InvalidParameterValueException("Unexpected IPv6 routing mode : " + mode);
7270
}
7371
}
7472

‎api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/CreateIpv6FirewallRuleCmd.java‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.ArrayList;
2020
import java.util.List;
2121

22-
import com.cloud.network.rules.FirewallRule;
2322
import org.apache.cloudstack.acl.RoleType;
2423
import org.apache.cloudstack.api.APICommand;
2524
import org.apache.cloudstack.api.ApiConstants;
@@ -30,12 +29,14 @@
3029
import org.apache.cloudstack.api.response.FirewallRuleResponse;
3130
import org.apache.cloudstack.api.response.NetworkResponse;
3231
import org.apache.cloudstack.context.CallContext;
33-
import org.apache.commons.lang.StringUtils;
32+
import org.apache.commons.lang3.StringUtils;
33+
import org.apache.commons.lang3.BooleanUtils;
3434
import org.apache.log4j.Logger;
3535

3636
import com.cloud.event.EventTypes;
3737
import com.cloud.exception.InvalidParameterValueException;
3838
import com.cloud.exception.ResourceUnavailableException;
39+
import com.cloud.network.rules.FirewallRule;
3940
import com.cloud.user.Account;
4041
import com.cloud.utils.net.NetUtils;
4142

@@ -83,11 +84,7 @@ public class CreateIpv6FirewallRuleCmd extends BaseAsyncCreateCmd {
8384

8485
@Override
8586
public boolean isDisplay() {
86-
if (display != null) {
87-
return display;
88-
} else {
89-
return true;
90-
}
87+
return BooleanUtils.toBooleanDefaultIfNull(display, true);
9188
}
9289

9390
public String getProtocol() {
@@ -105,11 +102,10 @@ public String getProtocol() {
105102
public List<String> getSourceCidrList() {
106103
if (cidrlist != null) {
107104
return cidrlist;
108-
} else {
109-
List<String> oneCidrList = new ArrayList<String>();
110-
oneCidrList.add(NetUtils.ALL_IP4_CIDRS);
111-
return oneCidrList;
112105
}
106+
List<String> oneCidrList = new ArrayList<String>();
107+
oneCidrList.add(NetUtils.ALL_IP4_CIDRS);
108+
return oneCidrList;
113109
}
114110

115111
public FirewallRule.TrafficType getTrafficType() {

‎api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/ListIpv6FirewallRulesCmd.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,21 @@
1919
import java.util.ArrayList;
2020
import java.util.List;
2121

22-
import com.cloud.network.rules.FirewallRule;
23-
import com.cloud.utils.Pair;
2422
import org.apache.cloudstack.acl.RoleType;
2523
import org.apache.cloudstack.api.APICommand;
2624
import org.apache.cloudstack.api.ApiConstants;
2725
import org.apache.cloudstack.api.BaseListTaggedResourcesCmd;
2826
import org.apache.cloudstack.api.Parameter;
2927
import org.apache.cloudstack.api.command.user.firewall.IListFirewallRulesCmd;
30-
import org.apache.cloudstack.api.response.ListResponse;
3128
import org.apache.cloudstack.api.response.FirewallRuleResponse;
29+
import org.apache.cloudstack.api.response.ListResponse;
3230
import org.apache.cloudstack.api.response.NetworkResponse;
31+
import org.apache.commons.lang3.BooleanUtils;
3332
import org.apache.log4j.Logger;
3433

34+
import com.cloud.network.rules.FirewallRule;
35+
import com.cloud.utils.Pair;
36+
3537
@APICommand(name = "listIpv6FirewallRules", description = "Lists all IPv6 firewall rules", responseObject = FirewallRuleResponse.class,
3638
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
3739
public class ListIpv6FirewallRulesCmd extends BaseListTaggedResourcesCmd implements IListFirewallRulesCmd {
@@ -98,10 +100,7 @@ public String getAction() {
98100

99101
@Override
100102
public Boolean getDisplay() {
101-
if (display != null) {
102-
return display;
103-
}
104-
return super.getDisplay();
103+
return BooleanUtils.toBooleanDefaultIfNull(display, super.getDisplay());
105104
}
106105

107106
/////////////////////////////////////////////////////

‎api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/UpdateIpv6FirewallRuleCmd.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,19 @@
1818

1919
import java.util.List;
2020

21-
import com.cloud.network.rules.FirewallRule;
2221
import org.apache.cloudstack.acl.RoleType;
2322
import org.apache.cloudstack.api.APICommand;
2423
import org.apache.cloudstack.api.ApiConstants;
2524
import org.apache.cloudstack.api.BaseAsyncCustomIdCmd;
2625
import org.apache.cloudstack.api.Parameter;
2726
import org.apache.cloudstack.api.response.FirewallRuleResponse;
2827
import org.apache.cloudstack.context.CallContext;
28+
import org.apache.commons.lang3.BooleanUtils;
2929
import org.apache.log4j.Logger;
3030

3131
import com.cloud.event.EventTypes;
3232
import com.cloud.exception.ResourceUnavailableException;
33+
import com.cloud.network.rules.FirewallRule;
3334
import com.cloud.user.Account;
3435

3536
@APICommand(name = "updateIpv6FirewallRule", description = "Updates Ipv6 firewall rule with specified ID", responseObject = FirewallRuleResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
@@ -76,11 +77,7 @@ public class UpdateIpv6FirewallRuleCmd extends BaseAsyncCustomIdCmd {
7677

7778
@Override
7879
public boolean isDisplay() {
79-
if (display != null) {
80-
return display;
81-
} else {
82-
return true;
83-
}
80+
return BooleanUtils.toBooleanDefaultIfNull(display, true);
8481
}
8582

8683
public Long getId() {

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@
130130
import com.cloud.network.Networks;
131131
import com.cloud.network.Networks.BroadcastDomainType;
132132
import com.cloud.network.Networks.TrafficType;
133-
import com.cloud.network.Ipv6Service;
134133
import com.cloud.network.PhysicalNetwork;
135134
import com.cloud.network.PhysicalNetworkSetupInfo;
136135
import com.cloud.network.RemoteAccessVpn;
@@ -324,9 +323,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
324323
@Inject
325324
private AnnotationDao annotationDao;
326325
@Inject
327-
Ipv6Service _ipv6Service;
328-
@Inject
329-
DataCenterIpv6AddressDao _ipv6AddressDao;
326+
DataCenterIpv6AddressDao ipv6AddressDao;
330327

331328
List<NetworkGuru> networkGurus;
332329

@@ -3138,7 +3135,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
31383135
}
31393136
});
31403137
// unmark IPv6 range
3141-
_ipv6AddressDao.unmark(network.getId(), network.getDomainId(), network.getAccountId());
3138+
ipv6AddressDao.unmark(network.getId(), network.getDomainId(), network.getAccountId());
31423139
if (_networksDao.findById(network.getId()) == null) {
31433140
// remove its related ACL permission
31443141
final Pair<Class<?>, Long> networkMsg = new Pair<Class<?>, Long>(Network.class, networkFinal.getId());

‎engine/schema/src/main/java/com/cloud/dc/DataCenterIpv6AddressVO.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
// under the License.
1717
package com.cloud.dc;
1818

19-
import com.cloud.network.Ipv6Address;
19+
import java.util.Date;
20+
import java.util.UUID;
2021

2122
import javax.persistence.Column;
2223
import javax.persistence.Entity;
@@ -26,8 +27,8 @@
2627
import javax.persistence.Table;
2728
import javax.persistence.Temporal;
2829
import javax.persistence.TemporalType;
29-
import java.util.Date;
30-
import java.util.UUID;
30+
31+
import com.cloud.network.Ipv6Address;
3132

3233
@Entity
3334
@Table(name = "dc_ipv6_range")
@@ -148,9 +149,13 @@ public Long getAccountId() {
148149
return accountId;
149150
}
150151

151-
public Long getNetworkId() { return networkId; }
152+
public Long getNetworkId() {
153+
return networkId;
154+
}
152155

153-
public void setNetworkId(Long networkId) { this.networkId = networkId; }
156+
public void setNetworkId(Long networkId) {
157+
this.networkId = networkId;
158+
}
154159

155160
public void setDomainId(Long domainId) {
156161
this.domainId = domainId;

0 commit comments

Comments
 (0)