more literals removed

Author: Daan Hoogland

engine/storage/cache/src/main/java/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java

@@ -49,7 +49,6 @@
 import org.apache.cloudstack.framework.async.AsyncCallFuture;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.managed.context.ManagedContextRunnable;
 import org.apache.cloudstack.storage.cache.allocator.StorageCacheAllocator;
 import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager;
@@ -58,7 +57,6 @@
 import com.cloud.agent.api.to.DataObjectType;
 import com.cloud.storage.DataStoreRole;
 import com.cloud.storage.StorageManager;
-import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.component.Manager;
 import com.cloud.utils.concurrency.NamedThreadFactory;
 import com.cloud.utils.db.GlobalLock;
@@ -79,8 +77,6 @@ public class StorageCacheManagerImpl implements StorageCacheManager, Manager, Co
     DataStoreManager dataStoreManager;
     @Inject
     StorageCacheReplacementAlgorithm cacheReplacementAlgorithm;
-    @Inject
-    ConfigurationDao configDao;
     Boolean cacheReplacementEnabled = Boolean.TRUE;
     int workers;
     ScheduledExecutorService executors;
@@ -164,7 +160,7 @@ public void setRunLevel(int level) {
     public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
         cacheReplacementEnabled = StorageCacheReplacementEnabled.value();
         cacheReplaceMentInterval = StorageCacheReplacementInterval.value();
-        workers = NumbersUtil.parseInt(configDao.getValue(StorageManager.ExpungeWorkers.key()), 10);
+        workers = StorageManager.ExpungeWorkers.value();
         executors = Executors.newScheduledThreadPool(workers, new NamedThreadFactory("StorageCacheManager-cache-replacement"));
         return true;
     }

plugins/storage/image/default/src/main/java/org/apache/cloudstack/storage/datastore/driver/CloudStackImageStoreDriverImpl.java

@@ -33,7 +33,6 @@
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
 import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.storage.image.NfsImageStoreDriverImpl;
 import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
 import org.apache.cloudstack.storage.image.store.ImageStoreImpl;
@@ -48,8 +47,6 @@
 
 public class CloudStackImageStoreDriverImpl extends NfsImageStoreDriverImpl {
 
-    @Inject
-    ConfigurationDao _configDao;
     @Inject
     HostDao _hostDao;
     @Inject
@@ -131,7 +128,7 @@ private String generateCopyUrl(String ipAddress, String fileName, String filePat
         String hostname = ipAddress;
         String scheme = "http";
         boolean _sslCopy = SecondaryStorageVmManager.SecStorageEncryptCopy.value();
-        String _ssvmUrlDomain = _configDao.getValue("secstorage.ssl.cert.domain");
+        String _ssvmUrlDomain = SecondaryStorageVmManager.SecStorageSecureCopyCert.value();
         if(_sslCopy && (_ssvmUrlDomain == null || _ssvmUrlDomain.isEmpty())){
             logger.warn("Empty secondary storage url domain, ignoring SSL");
             _sslCopy = false;

server/src/main/java/com/cloud/storage/StorageManagerImpl.java

@@ -4575,7 +4575,7 @@ public Long getDiskIopsReadRate(final ServiceOffering offering, final DiskOfferi
         if ((diskOffering != null) && (diskOffering.getIopsReadRate() != null) && (diskOffering.getIopsReadRate() > 0)) {
             return diskOffering.getIopsReadRate();
         } else {
-            Long iopsReadRate = Long.parseLong(_configDao.getValue(VmDiskThrottlingIopsReadRate.key()));
+            Long iopsReadRate = VmDiskThrottlingIopsReadRate.value().longValue();
             if ((iopsReadRate > 0) && ((offering == null) || (!offering.isSystemUse()))) {
                 return iopsReadRate;
             }
@@ -4589,7 +4589,7 @@ public Long getDiskIopsWriteRate(final ServiceOffering offering, final DiskOffer
         if ((diskOffering != null) && (diskOffering.getIopsWriteRate() != null) && (diskOffering.getIopsWriteRate() > 0)) {
             return diskOffering.getIopsWriteRate();
         } else {
-            Long iopsWriteRate = Long.parseLong(_configDao.getValue(VmDiskThrottlingIopsWriteRate.key()));
+            Long iopsWriteRate = VmDiskThrottlingIopsWriteRate.value().longValue();
             if ((iopsWriteRate > 0) && ((offering == null) || (!offering.isSystemUse()))) {
                 return iopsWriteRate;
             }