Skip to content

Commit a74c021

Browse files
Gupta, SuryaGupta, Surya
Gupta, Surya
authored and
Gupta, Surya
committed
CSTACKEX-29 Resolve ALL Style issues
1 parent 0363ab5 commit a74c021

File tree

3 files changed

+110
-107
lines changed

3 files changed

+110
-107
lines changed

‎plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/AggregateFeignClient.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@
3434
@Lazy
3535
@FeignClient(name="AggregateClient", url="https://{clusterIP}/api/storage/aggregates", configuration = FeignConfiguration.class)
3636
public interface AggregateFeignClient {
37-
@RequestMapping(method=RequestMethod.GET)
38-
OnTapResponse<Aggregate> getAggregateResponse(URI baseURL, @RequestHeader("Authorization") String header);
3937

40-
@RequestMapping(method=RequestMethod.GET, value="/{uuid}")
41-
Aggregate getAggregateByUUID(URI baseURL,@RequestHeader("Authorization") String header, @PathVariable(name = "uuid", required = true) String uuid);
38+
@RequestMapping(method=RequestMethod.GET)
39+
OnTapResponse<Aggregate> getAggregateResponse(URI baseURL, @RequestHeader("Authorization") String header);
40+
41+
@RequestMapping(method=RequestMethod.GET, value="/{uuid}")
42+
Aggregate getAggregateByUUID(URI baseURL,@RequestHeader("Authorization") String header, @PathVariable(name = "uuid", required = true) String uuid);
4243

4344
}
4445

‎plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/client/SvmFeignClient.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@
3131

3232
@FeignClient(name = "SvmClient", url = "https://{clusterIP}/api/svm/svms", configuration = FeignConfiguration.class)
3333
public interface SvmFeignClient {
34-
@RequestMapping(method = RequestMethod.GET)
35-
OnTapResponse<Svm> getSvmResponse(URI baseURL, @RequestHeader("Authorization") String header);
3634

37-
@RequestMapping(method = RequestMethod.GET, value = "/{uuid}")
38-
Svm getSvmByUUID(URI baseURL, @RequestHeader("Authorization") String header);
35+
@RequestMapping(method = RequestMethod.GET)
36+
OnTapResponse<Svm> getSvmResponse(URI baseURL, @RequestHeader("Authorization") String header);
37+
38+
@RequestMapping(method = RequestMethod.GET, value = "/{uuid}")
39+
Svm getSvmByUUID(URI baseURL, @RequestHeader("Authorization") String header);
3940

4041
}
4142

‎plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Cluster.java‎

Lines changed: 100 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -27,106 +27,107 @@
2727
/**
2828
* Complete cluster information
2929
*/
30+
@SuppressWarnings("checkstyle:RegexpSingleline")
3031
@JsonInclude(JsonInclude.Include.NON_NULL)
3132
public class Cluster {
32-
@JsonProperty("name")
33-
private String name = null;
34-
@JsonProperty("uuid")
35-
private String uuid = null;
36-
37-
@JsonProperty("version")
38-
private Version version = null;
39-
@JsonProperty("health")
40-
private String health = null;
41-
42-
@JsonProperty("san_optimized")
43-
private Boolean sanOptimized = null;
44-
45-
@JsonProperty("disaggregated")
46-
private Boolean disaggregated = null;
47-
48-
49-
public String getHealth() {
50-
return health;
51-
}
52-
53-
public void setHealth(String health) {
54-
this.health = health;
55-
}
56-
57-
public Cluster name(String name) {
58-
this.name = name;
59-
return this;
60-
}
61-
62-
63-
public String getName() {
64-
return name;
65-
}
66-
67-
public void setName(String name) {
68-
this.name = name;
69-
}
70-
71-
72-
public String getUuid() {
73-
return uuid;
74-
}
75-
76-
public Cluster version(Version version) {
77-
this.version = version;
78-
return this;
79-
}
80-
81-
public Version getVersion() {
82-
return version;
83-
}
84-
85-
public void setVersion(Version version) {
86-
this.version = version;
87-
}
88-
89-
public Boolean getSanOptimized() {
90-
return sanOptimized;
91-
}
92-
93-
public void setSanOptimized(Boolean sanOptimized) {
94-
this.sanOptimized = sanOptimized;
95-
}
96-
97-
public Boolean getDisaggregated() {
98-
return disaggregated;
99-
}
100-
public void setDisaggregated(Boolean disaggregated) {
101-
this.disaggregated = disaggregated;
102-
}
103-
104-
@Override
105-
public int hashCode() {
106-
return Objects.hash(getName(), getUuid());
107-
}
108-
109-
@Override
110-
public boolean equals(java.lang.Object o) {
111-
if (this == o) {
112-
return true;
113-
}
114-
if (o == null || getClass() != o.getClass()) {
115-
return false;
116-
}
117-
Cluster cluster = (Cluster) o;
118-
return Objects.equals(this.name, cluster.name) &&
119-
Objects.equals(this.uuid, cluster.uuid);
120-
}
121-
@Override
122-
public String toString() {
123-
return "Cluster{" +
124-
"name='" + name + '\'' +
125-
", uuid='" + uuid + '\'' +
126-
", version=" + version +
127-
", sanOptimized=" + sanOptimized +
128-
", disaggregated=" + disaggregated +
129-
'}';
130-
}
33+
34+
@JsonProperty("name")
35+
private String name = null;
36+
@JsonProperty("uuid")
37+
private String uuid = null;
38+
@JsonProperty("version")
39+
private Version version = null;
40+
@JsonProperty("health")
41+
private String health = null;
42+
43+
@JsonProperty("san_optimized")
44+
private Boolean sanOptimized = null;
45+
46+
@JsonProperty("disaggregated")
47+
private Boolean disaggregated = null;
48+
49+
50+
public String getHealth() {
51+
return health;
52+
}
53+
54+
public void setHealth(String health) {
55+
this.health = health;
56+
}
57+
58+
public Cluster name(String name) {
59+
this.name = name;
60+
return this;
61+
}
62+
63+
64+
public String getName() {
65+
return name;
66+
}
67+
68+
public void setName(String name) {
69+
this.name = name;
70+
}
71+
72+
73+
public String getUuid() {
74+
return uuid;
75+
}
76+
77+
public Cluster version(Version version) {
78+
this.version = version;
79+
return this;
80+
}
81+
82+
public Version getVersion() {
83+
return version;
84+
}
85+
86+
public void setVersion(Version version) {
87+
this.version = version;
88+
}
89+
90+
public Boolean getSanOptimized() {
91+
return sanOptimized;
92+
}
93+
94+
public void setSanOptimized(Boolean sanOptimized) {
95+
this.sanOptimized = sanOptimized;
96+
}
97+
98+
public Boolean getDisaggregated() {
99+
return disaggregated;
100+
}
101+
public void setDisaggregated(Boolean disaggregated) {
102+
this.disaggregated = disaggregated;
103+
}
104+
105+
@Override
106+
public int hashCode() {
107+
return Objects.hash(getName(), getUuid());
108+
}
109+
110+
@Override
111+
public boolean equals(java.lang.Object o) {
112+
if (this == o) {
113+
return true;
114+
}
115+
if (o == null || getClass() != o.getClass()) {
116+
return false;
117+
}
118+
Cluster cluster = (Cluster) o;
119+
return Objects.equals(this.name, cluster.name) &&
120+
Objects.equals(this.uuid, cluster.uuid);
121+
}
122+
@Override
123+
public String toString() {
124+
return "Cluster{" +
125+
"name='" + name + '\'' +
126+
", uuid='" + uuid + '\'' +
127+
", version=" + version +
128+
", sanOptimized=" + sanOptimized +
129+
", disaggregated=" + disaggregated +
130+
'}';
131+
}
131132
}
132133

0 commit comments

Comments
 (0)