CSTACKEX-01: Addressed additional comments

Author: Locharla, Sandeep

plugins/storage/volume/ontap/pom.xml

@@ -31,6 +31,8 @@
         <spring-cloud.version>2021.0.7</spring-cloud.version>
         <openfeign.version>11.0</openfeign.version>
         <json.version>20230227</json.version>
+        <jackson-databind.version>2.15.2</jackson-databind.version>
+        <httpclient.version>4.5.14</httpclient.version>
         <swagger-annotations.version>1.6.2</swagger-annotations.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
@@ -67,11 +69,6 @@
             <artifactId>feign-httpclient</artifactId>
             <version>${openfeign.version}</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>io.github.openfeign</groupId>-->
-<!--            <artifactId>feign-slf4j</artifactId>-->
-<!--            <version>${openfeign.version}</version>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-jackson</artifactId>
@@ -80,12 +77,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.15.2</version>
+            <version>${jackson-databind.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.14</version>
+            <version>${httpclient.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cloudstack</groupId>

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/driver/OntapPrimaryDatastoreDriver.java

@@ -64,7 +64,6 @@ public class OntapPrimaryDatastoreDriver implements PrimaryDataStoreDriver {
 
     @Inject private StoragePoolDetailsDao storagePoolDetailsDao;
     @Inject private PrimaryDataStoreDao storagePoolDao;
-    public OntapPrimaryDatastoreDriver() {}
     @Override
     public Map<String, String> getCapabilities() {
         s_logger.trace("OntapPrimaryDatastoreDriver: getCapabilities: Called");

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

@@ -101,7 +101,7 @@ public Encoder createEncoder() {
             @Override
             public void encode(Object object, Type bodyType, feign.RequestTemplate template) throws EncodeException {
                 if (object == null) {
-                    template.body((byte[]) null, StandardCharsets.UTF_8);
+                    template.body(null, StandardCharsets.UTF_8);
                     return;
                 }
                 try {

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

@@ -26,6 +26,7 @@
 import feign.Param;
 import feign.RequestLine;
 
+//TODO: Proper URLs should be added in the RequestLine annotations below
 public interface NASFeignClient {
 
     // File Operations

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

@@ -27,6 +27,7 @@
 import feign.RequestLine;
 import java.net.URI;
 
+//TODO: Proper URLs should be added in the RequestLine annotations below
 public interface SANFeignClient {
 
     // LUN Operation APIs
@@ -71,13 +72,6 @@ OntapResponse<Igroup> createIgroup(@Param("authHeader") String authHeader,
     @Headers({"Authorization: {authHeader}"})
     void deleteIgroup(@Param("baseUri") URI baseUri, @Param("authHeader") String authHeader, @Param("uuid") String uuid);
 
-    @RequestLine("POST /{uuid}/igroups")
-    @Headers({"Authorization: {authHeader}", "return_records: {returnRecords}"})
-    OntapResponse<Igroup> addNestedIgroups(@Param("authHeader") String authHeader,
-                                          @Param("uuid") String uuid,
-                                          Igroup igroupNestedRequest,
-                                          @Param("returnRecords") boolean returnRecords);
-
     // LUN Maps Operation APIs
     @RequestLine("POST /")
     @Headers({"Authorization: {authHeader}"})

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

@@ -29,6 +29,7 @@
 
 public interface SvmFeignClient {
 
+    // SVM Operation APIs
     @RequestLine("GET /api/svm/svms")
     @Headers({"Authorization: {authHeader}"})
     OntapResponse<Svm> getSvmResponse(@QueryMap Map<String, Object> queryMap, @Param("authHeader") String authHeader);

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/lifecycle/OntapPrimaryDatastoreLifecycle.java

@@ -144,11 +144,11 @@ public DataStore initialize(Map<String, Object> dsInfos) {
 
         // Parse key=value pairs from URL into details (skip empty segments)
         if (url != null && !url.isEmpty()) {
-            for (String segment : url.split(";")) {
+            for (String segment : url.split(Constants.SEMICOLON)) {
                 if (segment.isEmpty()) {
                     continue;
                 }
-                String[] kv = segment.split("=", 2);
+                String[] kv = segment.split(Constants.EQUALS, 2);
                 if (kv.length == 2) {
                     details.put(kv[0].trim(), kv[1].trim());
                 }