CSTACKEX-37 Utility Issue

Author: Gupta, Surya

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/utils/Utility.java

@@ -35,20 +35,18 @@
 import org.apache.cloudstack.storage.service.model.ProtocolType;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.springframework.stereotype.Component;
 import org.springframework.util.Base64Utils;
 
 import javax.inject.Inject;
 import java.net.URI;
 import java.util.Map;
 
-@Component
 public class Utility {
 
     private static final Logger s_logger = LogManager.getLogger(Utility.class);
-    @Inject private OntapStorage ontapStorage;
-    @Inject private PrimaryDataStoreDao storagePoolDao;
-    @Inject private StoragePoolDetailsDao storagePoolDetailsDao;
+    @Inject private static OntapStorage ontapStorage;
+    @Inject private static PrimaryDataStoreDao storagePoolDao;
+    @Inject private static StoragePoolDetailsDao storagePoolDetailsDao;
 
     private static final String BASIC = "Basic";
     private static final String AUTH_HEADER_COLON = ":";
@@ -60,17 +58,17 @@ public class Utility {
      * @param password -->> normal decoded password of the storage backend
      * @return
      */
-    public String generateAuthHeader (String username, String password) {
+    public static String generateAuthHeader (String username, String password) {
         byte[] encodedBytes = Base64Utils.encode((username + AUTH_HEADER_COLON + password).getBytes());
         return BASIC + StringUtils.SPACE + new String(encodedBytes);
     }
 
-    public URI generateURI (String path) {
+    public static URI generateURI (String path) {
         String uriString = Constants.HTTPS + ontapStorage.getManagementLIF() + path;
         return URI.create(uriString);
     }
 
-    public CloudStackVolume createCloudStackVolumeRequestByProtocol(StoragePoolVO storagePool, Map<String, String> details, DataObject dataObject) {
+    public static CloudStackVolume createCloudStackVolumeRequestByProtocol(StoragePoolVO storagePool, Map<String, String> details, DataObject dataObject) {
        CloudStackVolume cloudStackVolumeRequest = null;
 
        String protocol = details.get(Constants.PROTOCOL);
@@ -108,7 +106,7 @@ public CloudStackVolume createCloudStackVolumeRequestByProtocol(StoragePoolVO st
        }
     }
 
-    public StorageStrategy getStrategyByStoragePoolDetails(Map<String, String> details) {
+    public static StorageStrategy getStrategyByStoragePoolDetails(Map<String, String> details) {
         if (details == null || details.isEmpty()) {
             s_logger.error("getStrategyByStoragePoolDetails: Storage pool details are null or empty");
             throw new CloudRuntimeException("getStrategyByStoragePoolDetails: Storage pool details are null or empty");