From 14b5f0da198b4acae79f1ef438b27250ee60b8f2 Mon Sep 17 00:00:00 2001 From: Min Chen Date: Wed, 17 Apr 2013 11:45:25 -0700 Subject: [PATCH] Rename ImageDataFactoryxxx to TemplateDataFactory to have consistent naming conventions for Template data factory class. --- .../{ImageDataFactory.java => TemplateDataFactory.java} | 2 +- ...ageDataFactoryImpl.java => TemplateDataFactoryImpl.java} | 6 +++--- .../apache/cloudstack/storage/test/volumeServiceTest.java | 4 ++-- .../storage/datastore/ObjectInDataStoreManagerImpl.java | 4 ++-- .../cloudstack/storage/datastore/PrimaryDataStoreImpl.java | 4 ++-- .../storage/volume/TemplateInstallStrategyImpl.java | 4 ++-- server/src/com/cloud/storage/StorageManagerImpl.java | 4 ++-- server/src/com/cloud/storage/VolumeManagerImpl.java | 4 ++-- .../src/com/cloud/template/HypervisorTemplateAdapter.java | 4 ++-- server/src/com/cloud/template/TemplateManagerImpl.java | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) rename engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/{ImageDataFactory.java => TemplateDataFactory.java} (96%) rename engine/storage/image/src/org/apache/cloudstack/storage/image/{ImageDataFactoryImpl.java => TemplateDataFactoryImpl.java} (95%) diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ImageDataFactory.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateDataFactory.java similarity index 96% rename from engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ImageDataFactory.java rename to engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateDataFactory.java index f0d69887c7d..c2775a351e8 100644 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ImageDataFactory.java +++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/TemplateDataFactory.java @@ -19,7 +19,7 @@ package org.apache.cloudstack.engine.subsystem.api.storage; -public interface ImageDataFactory { +public interface TemplateDataFactory { TemplateInfo getTemplate(long templateId, DataStore store); TemplateInfo getTemplate(DataObject obj, DataStore store); TemplateInfo getTemplate(long templateId); diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/ImageDataFactoryImpl.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java similarity index 95% rename from engine/storage/image/src/org/apache/cloudstack/storage/image/ImageDataFactoryImpl.java rename to engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java index 2c091cc0372..2f65b6bbd50 100644 --- a/engine/storage/image/src/org/apache/cloudstack/storage/image/ImageDataFactoryImpl.java +++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java @@ -23,7 +23,7 @@ import javax.inject.Inject; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; -import org.apache.cloudstack.engine.subsystem.api.storage.ImageDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; @@ -38,9 +38,9 @@ import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VMTemplatePoolDao; @Component -public class ImageDataFactoryImpl implements ImageDataFactory { +public class TemplateDataFactoryImpl implements TemplateDataFactory { private static final Logger s_logger = Logger - .getLogger(ImageDataFactoryImpl.class); + .getLogger(TemplateDataFactoryImpl.class); @Inject VMTemplateDao imageDataDao; @Inject diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java index 64d2143ba8c..f8aacc0d0ef 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/volumeServiceTest.java @@ -38,7 +38,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProviderManager; import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; -import org.apache.cloudstack.engine.subsystem.api.storage.ImageDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; @@ -110,7 +110,7 @@ public class volumeServiceTest extends CloudStackTestNGBase { @Inject EndPointSelector selector; @Inject - ImageDataFactory imageDataFactory; + TemplateDataFactory imageDataFactory; @Inject VolumeDataFactory volumeFactory; Long dcId; diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java index 6e1267887cc..89d61605de0 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java @@ -23,7 +23,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectType; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; -import org.apache.cloudstack.engine.subsystem.api.storage.ImageDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.State; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory; @@ -58,7 +58,7 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager { private static final Logger s_logger = Logger .getLogger(ObjectInDataStoreManagerImpl.class); @Inject - ImageDataFactory imageFactory; + TemplateDataFactory imageFactory; @Inject DataStoreManager storeMgr; @Inject diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java index 8be1c8a7e47..4c214c1b72a 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java @@ -29,7 +29,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectType; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreDriver; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; import org.apache.cloudstack.engine.subsystem.api.storage.HostScope; -import org.apache.cloudstack.engine.subsystem.api.storage.ImageDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreDriver; import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreLifeCycle; @@ -72,7 +72,7 @@ public class PrimaryDataStoreImpl implements PrimaryDataStore { @Inject private ObjectInDataStoreManager objectInStoreMgr; @Inject - ImageDataFactory imageDataFactory; + TemplateDataFactory imageDataFactory; @Inject SnapshotDataFactory snapshotFactory; protected DataStoreProvider provider; diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/TemplateInstallStrategyImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/TemplateInstallStrategyImpl.java index 69979e5a16a..b57d99dc1c6 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/TemplateInstallStrategyImpl.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/TemplateInstallStrategyImpl.java @@ -21,7 +21,7 @@ package org.apache.cloudstack.storage.volume; import javax.inject.Inject; import org.apache.cloudstack.engine.subsystem.api.storage.DataMotionService; -import org.apache.cloudstack.engine.subsystem.api.storage.ImageDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager; @@ -39,7 +39,7 @@ public class TemplateInstallStrategyImpl implements TemplateInstallStrategy { @Inject DataMotionService motionSrv; @Inject - ImageDataFactory imageFactory; + TemplateDataFactory imageFactory; protected long waitingTime = 1800; // half an hour protected long waitingRetries = 10; /* diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index d46b2c61369..fb3d3207ad3 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -55,7 +55,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProviderManager; import org.apache.cloudstack.engine.subsystem.api.storage.HostScope; import org.apache.cloudstack.engine.subsystem.api.storage.HypervisorHostListener; -import org.apache.cloudstack.engine.subsystem.api.storage.ImageDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.ImageStoreProvider; import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory; @@ -313,7 +313,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C @Inject VolumeDataFactory volFactory; @Inject - ImageDataFactory tmplFactory; + TemplateDataFactory tmplFactory; @Inject SnapshotDataFactory snapshotFactory; @Inject diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java b/server/src/com/cloud/storage/VolumeManagerImpl.java index 4b870800355..4a7a1409ae6 100644 --- a/server/src/com/cloud/storage/VolumeManagerImpl.java +++ b/server/src/com/cloud/storage/VolumeManagerImpl.java @@ -45,7 +45,7 @@ import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProviderManager; -import org.apache.cloudstack.engine.subsystem.api.storage.ImageDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStoreInfo; import org.apache.cloudstack.engine.subsystem.api.storage.Scope; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory; @@ -305,7 +305,7 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager { @Inject VolumeDataFactory volFactory; @Inject - ImageDataFactory tmplFactory; + TemplateDataFactory tmplFactory; @Inject SnapshotDataFactory snapshotFactory; private int _copyvolumewait; diff --git a/server/src/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/com/cloud/template/HypervisorTemplateAdapter.java index 3399ca1e92d..8906eaf9c62 100755 --- a/server/src/com/cloud/template/HypervisorTemplateAdapter.java +++ b/server/src/com/cloud/template/HypervisorTemplateAdapter.java @@ -34,7 +34,7 @@ import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd; import org.apache.cloudstack.engine.subsystem.api.storage.CommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; -import org.apache.cloudstack.engine.subsystem.api.storage.ImageDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService; import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope; import org.apache.cloudstack.framework.async.AsyncCallFuture; @@ -77,7 +77,7 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase implements Te @Inject DataStoreManager storeMgr; @Inject TemplateService imageService; - @Inject ImageDataFactory imageFactory; + @Inject TemplateDataFactory imageFactory; @Inject TemplateManager templateMgr; @Override diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index da0b884ecd5..7ef658c76e2 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -56,7 +56,7 @@ import org.apache.cloudstack.api.command.user.template.UpdateTemplatePermissions import org.apache.cloudstack.engine.subsystem.api.storage.CommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; -import org.apache.cloudstack.engine.subsystem.api.storage.ImageDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; @@ -248,7 +248,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, @Inject VolumeDataFactory volFactory; @Inject - ImageDataFactory tmplFactory; + TemplateDataFactory tmplFactory; @Inject SnapshotDataFactory snapshotFactory; @Inject