CSTACKEX-35 Removed Type Casting for logger

Author: Gupta, Surya

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

@@ -58,7 +58,7 @@
 
 public class OntapPrimaryDatastoreDriver implements PrimaryDataStoreDriver {
 
-    private static final Logger s_logger = (Logger)LogManager.getLogger(OntapPrimaryDatastoreDriver.class);
+    private static final Logger s_logger = LogManager.getLogger(OntapPrimaryDatastoreDriver.class);
 
     @Inject private Utility utils;
     @Inject private StoragePoolDetailsDao storagePoolDetailsDao;
@@ -126,10 +126,6 @@ private String createCloudStackVolumeForTypeVolume(DataStore dataStore, DataObje
             throw new CloudRuntimeException("createCloudStackVolume : Storage Pool not found for id: " + dataStore.getId());
         }
         Map<String, String> details = storagePoolDetailsDao.listDetailsKeyPairs(dataStore.getId());
-        if(details == null || details.isEmpty()) {
-            s_logger.error("createCloudStackVolume : Storage Details not found for id: " + dataStore.getId());
-            throw new CloudRuntimeException("createCloudStackVolume : Storage Details not found for id: " + dataStore.getId());
-        }
         StorageStrategy storageStrategy = utils.getStrategyByStoragePoolDetails(details);
         s_logger.info("createCloudStackVolumeForTypeVolume: Connection to Ontap SVM [{}] successful, preparing CloudStackVolumeRequest", details.get(Constants.SVM_NAME));
         CloudStackVolume cloudStackVolumeRequest = utils.createCloudStackVolumeRequestByProtocol(storagePool, details, dataObject);

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/service/UnifiedSANStrategy.java

@@ -37,7 +37,7 @@
 
 public class UnifiedSANStrategy extends SANStrategy {
 
-    private static final Logger s_logger = (Logger) LogManager.getLogger(UnifiedSANStrategy.class);
+    private static final Logger s_logger = LogManager.getLogger(UnifiedSANStrategy.class);
     @Inject private Utility utils;
     @Inject private SANFeignClient sanFeignClient;
     public UnifiedSANStrategy(OntapStorage ontapStorage) {
@@ -56,7 +56,7 @@ public CloudStackVolume createCloudStackVolume(CloudStackVolume cloudstackVolume
             String authHeader = utils.generateAuthHeader(storage.getUsername(), storage.getPassword());
             // Create URI for lun creation
             URI url = utils.generateURI(Constants.CREATE_LUN);
-            //TODO: there is possible that Lun creation will take time and we may need to handle through async job.
+            //TODO: It is possible that Lun creation will take time and we may need to handle through async job.
             OntapResponse<Lun> createdLun = sanFeignClient.createLun(url, authHeader, true, cloudstackVolume.getLun());
             if (createdLun == null || createdLun.getRecords() == null || createdLun.getRecords().size() == 0) {
                 s_logger.error("createCloudStackVolume: LUN creation failed for Lun {}", cloudstackVolume.getLun().getName());

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

@@ -45,7 +45,7 @@
 @Component
 public class Utility {
 
-    private static final Logger s_logger = (Logger) LogManager.getLogger(Utility.class);
+    private static final Logger s_logger = LogManager.getLogger(Utility.class);
     @Inject private OntapStorage ontapStorage;
     @Inject private PrimaryDataStoreDao storagePoolDao;
     @Inject private StoragePoolDetailsDao storagePoolDetailsDao;
@@ -109,6 +109,10 @@ public CloudStackVolume createCloudStackVolumeRequestByProtocol(StoragePoolVO st
     }
 
     public 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");
+        }
         String protocol = details.get(Constants.PROTOCOL);
         OntapStorage ontapStorage = new OntapStorage(details.get(Constants.USERNAME), details.get(Constants.PASSWORD),
                 details.get(Constants.MANAGEMENT_LIF), details.get(Constants.SVM_NAME), ProtocolType.valueOf(protocol),
@@ -119,8 +123,8 @@ public StorageStrategy getStrategyByStoragePoolDetails(Map<String, String> detai
             s_logger.info("Connection to Ontap SVM [{}] successful", details.get(Constants.SVM_NAME));
             return storageStrategy;
         } else {
-            s_logger.error("createCloudStackVolumeForTypeVolume: Connection to Ontap SVM [" + details.get(Constants.SVM_NAME) + "] failed");
-            throw new CloudRuntimeException("createCloudStackVolumeForTypeVolume: Connection to Ontap SVM [" + details.get(Constants.SVM_NAME) + "] failed");
+            s_logger.error("getStrategyByStoragePoolDetails: Connection to Ontap SVM [" + details.get(Constants.SVM_NAME) + "] failed");
+            throw new CloudRuntimeException("getStrategyByStoragePoolDetails: Connection to Ontap SVM [" + details.get(Constants.SVM_NAME) + "] failed");
         }
     }
 }