rhtyd closed pull request #2324: Remove annotation and "depends-on" declaration
not needed at cloud-engine-storage-image
URL: https://github.com/apache/cloudstack/pull/2324
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/engine/storage/snapshot/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml
b/engine/storage/snapshot/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml
index cb33f885c31..75545a89ed1 100644
---
a/engine/storage/snapshot/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml
+++
b/engine/storage/snapshot/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml
@@ -28,12 +28,10 @@
>
<bean id="snapshotServiceImpl"
- class="org.apache.cloudstack.storage.snapshot.SnapshotServiceImpl"
- depends-on="snapshotStateMachineManagerImpl, snapshotDataFactoryImpl,
dataStoreManagerImpl, dataMotionServiceImpl, objectInDataStoreManagerImpl" />
+ class="org.apache.cloudstack.storage.snapshot.SnapshotServiceImpl" />
<bean id="snapshotDataFactoryImpl"
- class="org.apache.cloudstack.storage.snapshot.SnapshotDataFactoryImpl"
- depends-on="dataStoreManagerImpl, snapshotDataStoreDaoImpl,
volumeDataFactoryImpl" />
+
class="org.apache.cloudstack.storage.snapshot.SnapshotDataFactoryImpl"/>
<bean id="snapshotStateMachineManagerImpl"
class="org.apache.cloudstack.storage.snapshot.SnapshotStateMachineManagerImpl"
/>
diff --git
a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java
index 171885e3f3b..5dd63e38976 100644
---
a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java
+++
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java
@@ -23,8 +23,6 @@
import javax.inject.Inject;
-import org.springframework.stereotype.Component;
-
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;
@@ -39,7 +37,6 @@
import com.cloud.storage.dao.SnapshotDao;
import com.cloud.utils.exception.CloudRuntimeException;
-@Component
public class SnapshotDataFactoryImpl implements SnapshotDataFactory {
@Inject
SnapshotDao snapshotDao;
diff --git
a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
index 85c25f18839..b7bc4475d16 100644
---
a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
+++
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
@@ -22,8 +22,6 @@
import javax.inject.Inject;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult;
import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult;
import org.apache.cloudstack.engine.subsystem.api.storage.DataMotionService;
@@ -48,6 +46,7 @@
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
+import org.apache.log4j.Logger;
import com.cloud.storage.CreateSnapshotPayload;
import com.cloud.storage.DataStoreRole;
@@ -62,7 +61,6 @@
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.fsm.NoTransitionException;
-@Component
public class SnapshotServiceImpl implements SnapshotService {
private static final Logger s_logger =
Logger.getLogger(SnapshotServiceImpl.class);
@Inject
diff --git
a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java
index 413762b1fb6..287c3783f89 100644
---
a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java
+++
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java
@@ -19,8 +19,6 @@
import javax.inject.Inject;
-import org.springframework.stereotype.Component;
-
import com.cloud.storage.Snapshot;
import com.cloud.storage.Snapshot.Event;
import com.cloud.storage.Snapshot.State;
@@ -30,7 +28,6 @@
import com.cloud.utils.fsm.NoTransitionException;
import com.cloud.utils.fsm.StateMachine2;
-@Component
public class SnapshotStateMachineManagerImpl implements
SnapshotStateMachineManager {
private StateMachine2<State, Event, SnapshotVO> stateMachine = new
StateMachine2<State, Event, SnapshotVO>();
@Inject
diff --git
a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java
index 3e4cdfff20f..692f3cc9791 100644
---
a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java
+++
b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java
@@ -23,8 +23,6 @@
import javax.inject.Inject;
-import org.springframework.stereotype.Component;
-
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;
@@ -37,7 +35,6 @@
import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.VolumeDao;
-@Component
public class VolumeDataFactoryImpl implements VolumeDataFactory {
@Inject
VolumeDao volumeDao;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
