CSTACKEX-29 Resolve Review Comments

Author: Gupta, Surya

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

@@ -19,7 +19,6 @@
 
 package org.apache.cloudstack.storage.feign.client;
 
-import org.apache.cloudstack.storage.feign.model.AggregateResponse;
 import org.apache.cloudstack.storage.feign.model.Aggregate;
 import org.apache.cloudstack.storage.feign.FeignConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -41,4 +40,5 @@ public interface AggregateFeignClient {
 	@RequestMapping(method=RequestMethod.GET, value="/{uuid}")
 	Aggregate getAggregateByUUID(URI baseURL,@RequestHeader("Authorization") String header, @PathVariable(name = "uuid", required = true) String uuid);
 
-}
+}
+

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

@@ -35,3 +35,4 @@ public interface ClusterFeignClient {
     Cluster getCluster(URI baseURL, @RequestHeader("Authorization") String header, @RequestHeader("return_records") boolean value);
 
 }
+

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

@@ -20,7 +20,6 @@
 package org.apache.cloudstack.storage.feign.client;
 
 import org.apache.cloudstack.storage.feign.FeignConfiguration;
-import org.apache.cloudstack.storage.feign.model.SvmResponse;
 import org.apache.cloudstack.storage.feign.model.Svm;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -39,3 +38,4 @@ public interface SvmFeignClient {
 	Svm getSvmByUUID(URI baseURL, @RequestHeader("Authorization") String header);
 
 }
+

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

@@ -44,13 +44,6 @@ public Aggregate name(String name) {
         this.name = name;
         return this;
     }
-
-    /**
-     * Get name
-     *
-     * @return name
-     **/
-    @ApiModelProperty(value = "Name of aggregate")
     public String getName() {
         return name;
     }
@@ -64,12 +57,6 @@ public Aggregate uuid(String uuid) {
         return this;
     }
 
-    /**
-     * Get uuid
-     *
-     * @return uuid
-     **/
-    @ApiModelProperty(value = "UUID of aggregate")
     public String getUuid() {
         return uuid;
     }
@@ -109,3 +96,4 @@ public String toString() {
     }
 
 }
+

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

@@ -21,8 +21,8 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.gson.annotations.SerializedName;
-import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Objects;
 
 /**
  * Complete cluster information
@@ -35,7 +35,7 @@ public class Cluster {
 	private String uuid = null;
 
 	@JsonProperty("version")
-	private ClusterVersion version = null;
+	private Version version = null;
 	@JsonProperty("health")
 	private String health = null;
 
@@ -45,7 +45,7 @@ public class Cluster {
 	@JsonProperty("disaggregated")
 	private Boolean disaggregated = null;
 
-	@ApiModelProperty(example = "healthy", value = "")
+
 	public String getHealth() {
 		return health;
 	}
@@ -59,12 +59,7 @@ public Cluster name(String name) {
 		return this;
 	}
 
-	/**
-	 * Get name
-	 * 
-	 * @return name
-	 **/
-	@ApiModelProperty(example = "cluster1", value = "")
+
 	public String getName() {
 		return name;
 	}
@@ -73,49 +68,57 @@ public void setName(String name) {
 		this.name = name;
 	}
 
-	/**
-	 * Get uuid
-	 * 
-	 * @return uuid
-	 **/
-	@ApiModelProperty(example = "1cd8a442-86d1-11e0-ae1c-123478563412", value = "")
+
 	public String getUuid() {
 		return uuid;
 	}
 
-	public Cluster version(ClusterVersion version) {
+	public Cluster version(Version version) {
 		this.version = version;
 		return this;
 	}
 
-	/**
-	 * Get version
-	 * 
-	 * @return version
-	 **/
-	@ApiModelProperty(value = "")
-	public ClusterVersion getVersion() {
+	public Version getVersion() {
 		return version;
 	}
 
-	public void setVersion(ClusterVersion version) {
+	public void setVersion(Version version) {
 		this.version = version;
 	}
-	@ApiModelProperty(value = "")
+
 	public Boolean getSanOptimized() {
 		return sanOptimized;
 	}
 
 	public void setSanOptimized(Boolean sanOptimized) {
 		this.sanOptimized = sanOptimized;
 	}
-	@ApiModelProperty(value = "")
+
 	public Boolean getDisaggregated() {
 		return disaggregated;
 	}
 	public void setDisaggregated(Boolean disaggregated) {
 		this.disaggregated = disaggregated;
 	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(getName(), getUuid());
+	}
+
+	@Override
+	public boolean equals(java.lang.Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		Cluster cluster = (Cluster) o;
+		return Objects.equals(this.name, cluster.name) &&
+				Objects.equals(this.uuid, cluster.uuid);
+	}
+
 	@Override
 	public String toString() {
 		return "Cluster{" +
@@ -127,3 +130,4 @@ public String toString() {
 				'}';
 	}
 }
+