CSTACKEX-31 Resolve Review Comments

Author: Gupta, Surya

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

@@ -28,7 +28,6 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * ExportRule
@@ -51,11 +50,7 @@ public enum ProtocolsEnum {
 
         nfs3("nfs3"),
 
-        nfs4("nfs4"),
-
-        cifs("cifs"),
-
-        flexcache("flexcache");
+        nfs4("nfs4");
 
         private String value;
 
@@ -116,14 +111,6 @@ public ExportRule clients(List<ExportClient> clients) {
         return this;
     }
 
-    public ExportRule addClientsItem(ExportClient clientsItem) {
-        if (this.clients == null) {
-            this.clients = new ArrayList<ExportClient>();
-        }
-        this.clients.add(clientsItem);
-        return this;
-    }
-
     public List<ExportClient> getClients() {
         return clients;
     }
@@ -160,23 +147,22 @@ public List<ProtocolsEnum> getProtocols() {
     public void setProtocols(List<ProtocolsEnum> protocols) {
         this.protocols = protocols;
     }
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
+
+    public static class ExportClient {
+        @JsonProperty("match")
+        private String match = null;
+
+        public ExportClient match (String match) {
+            this.match = match;
+            return this;
         }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
+        public String getMatch () {
+            return match;
         }
-        ExportRule exportRule = (ExportRule) o;
-        return Objects.equals(this.anonymousUser, exportRule.anonymousUser)
-                && Objects.equals(this.clients, exportRule.clients) && Objects.equals(this.index, exportRule.index)
-                && Objects.equals(this.protocols, exportRule.protocols);
-    }
 
-    @Override
-    public int hashCode() {
-        return Objects.hash(anonymousUser, clients, index, protocols);
+        public void setMatch (String match) {
+            this.match = match;
+        }
     }
 
     @Override
@@ -191,33 +177,10 @@ public String toString() {
         sb.append("}");
         return sb.toString();
     }
-
-    /**
-     * Convert the given object to string with each line indented by 4 spaces
-     * (except the first line).
-     */
     private String toIndentedString(Object o) {
         if (o == null) {
             return "null";
         }
         return o.toString().replace("\n", "\n    ");
     }
-
-    public static class ExportClient {
-        @JsonProperty("match")
-        private String match = null;
-
-        public ExportClient match (String match) {
-            this.match = match;
-            return this;
-        }
-        public String getMatch () {
-            return match;
-        }
-
-        public void setMatch (String match) {
-            this.match = match;
-        }
-    }
-
 }

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

@@ -62,22 +62,7 @@ public class FileInfo {
    */
   public enum TypeEnum {
     FILE("file"),
-    
-    DIRECTORY("directory"),
-    
-    BLOCKDEV("blockdev"),
-    
-    CHARDEV("chardev"),
-    
-    SYMLINK("symlink"),
-    
-    SOCKET("socket"),
-    
-    FIFO("fifo"),
-    
-    STREAM("stream"),
-    
-    LUN("lun");
+    DIRECTORY("directory");
 
     private String value;