Skip to content

Commit be5e5cc

Browse files
author
Alex Huang
committed
All Checkstyle problems corrected
1 parent f33b247 commit be5e5cc

File tree

519 files changed

+18373
-17981
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

519 files changed

+18373
-17981
lines changed

‎agent/src/com/cloud/agent/AgentShell.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ public void init(String[] args) throws ConfigurationException {
304304
// For KVM agent, do it specially here
305305

306306
File file = new File("/etc/cloudstack/agent/log4j-cloud.xml");
307-
if(!file.exists()) {
307+
if (!file.exists()) {
308308
file = PropertiesUtil.findConfigFile("log4j-cloud.xml");
309309
}
310310

‎agent/src/com/cloud/agent/resource/DummyResource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ public boolean configure(String name, Map<String, Object> params) {
180180
return true;
181181
}
182182

183-
public void setParams(Map<String, Object> _params) {
184-
this._params = _params;
183+
public void setParams(Map<String, Object> params) {
184+
this._params = params;
185185
}
186186

187187
@Override

‎api/src/com/cloud/agent/api/to/NfsTO.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,17 @@ public String getUrl() {
4444
return _url;
4545
}
4646

47-
public void setUrl(String _url) {
48-
this._url = _url;
47+
public void setUrl(String url) {
48+
this._url = url;
4949
}
5050

5151
@Override
5252
public DataStoreRole getRole() {
5353
return _role;
5454
}
5555

56-
public void setRole(DataStoreRole _role) {
57-
this._role = _role;
56+
public void setRole(DataStoreRole role) {
57+
this._role = role;
5858
}
5959

6060
@Override

‎api/src/com/cloud/agent/api/to/VolumeTO.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,15 @@ public String getPoolUuid() {
129129
public String getChainInfo() {
130130
return chainInfo;
131131
}
132-
132+
133133
public void setChainInfo(String chainInfo) {
134-
this.chainInfo = chainInfo;
134+
this.chainInfo = chainInfo;
135135
}
136136

137137
public String getOsType() {
138138
return guestOsType;
139139
}
140-
140+
141141
public void setPath(String path) {
142142
this.path = path;
143143
}

‎api/src/com/cloud/alert/Alert.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,6 @@ public interface Alert extends Identity, InternalIdentity {
3939
Date getResolved();
4040

4141
boolean getArchived();
42+
4243
String getName();
4344
}

‎api/src/com/cloud/deploy/DeploymentPlanner.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,22 +99,22 @@ public static class ExcludeList {
9999
public ExcludeList() {
100100
}
101101

102-
public ExcludeList(Set<Long> _dcIds, Set<Long> _podIds, Set<Long> _clusterIds, Set<Long> _hostIds, Set<Long> _poolIds) {
103-
if (_dcIds != null) {
104-
this._dcIds = new HashSet<Long>(_dcIds);
102+
public ExcludeList(Set<Long> dcIds, Set<Long> podIds, Set<Long> clusterIds, Set<Long> hostIds, Set<Long> poolIds) {
103+
if (dcIds != null) {
104+
this._dcIds = new HashSet<Long>(dcIds);
105105
}
106-
if (_podIds != null) {
107-
this._podIds = new HashSet<Long>(_podIds);
106+
if (podIds != null) {
107+
this._podIds = new HashSet<Long>(podIds);
108108
}
109-
if (_clusterIds != null) {
110-
this._clusterIds = new HashSet<Long>(_clusterIds);
109+
if (clusterIds != null) {
110+
this._clusterIds = new HashSet<Long>(clusterIds);
111111
}
112112

113-
if (_hostIds != null) {
114-
this._hostIds = new HashSet<Long>(_hostIds);
113+
if (hostIds != null) {
114+
this._hostIds = new HashSet<Long>(hostIds);
115115
}
116-
if (_poolIds != null) {
117-
this._poolIds = new HashSet<Long>(_poolIds);
116+
if (poolIds != null) {
117+
this._poolIds = new HashSet<Long>(poolIds);
118118
}
119119
}
120120

‎api/src/com/cloud/event/EventTypes.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,6 @@ public class EventTypes {
455455
//Alert generation
456456
public static final String ALERT_GENERATE = "ALERT.GENERATE";
457457

458-
459458
static {
460459

461460
// TODO: need a way to force author adding event types to declare the entity details as well, with out braking

‎api/src/com/cloud/network/Networks.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public enum RouterPrivateIpStrategy {
3131
None, DcGlobal, // global to data center
3232
HostLocal;
3333

34-
public static String DummyPrivateIp = "169.254.1.1";
34+
public static final String DummyPrivateIp = "169.254.1.1";
3535
}
3636

3737
/**

‎api/src/com/cloud/network/OvsProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.apache.cloudstack.api.InternalIdentity;
2121

2222
public interface OvsProvider extends InternalIdentity, Identity {
23-
public boolean isEnabled();
23+
public boolean isEnabled();
2424

25-
public long getNspId();
25+
public long getNspId();
2626
}

‎api/src/com/cloud/network/VirtualNetworkApplianceService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,5 @@ public interface VirtualNetworkApplianceService {
6969

7070
List<Long> upgradeRouterTemplate(UpgradeRouterTemplateCmd cmd);
7171

72-
public static final String _minVRVersion = "4.2.0";
72+
public static final String MinVRVersion = "4.2.0";
7373
}

0 commit comments

Comments
 (0)