Skip to content

Commit 7f6ae15

Browse files
rafaelweingartneryadvr
authored andcommitted
Remove annotation not needed at cloud-engine-storage-image (#2324)
remove bogus depends-on declaration at spring-engine-storage-snapshot-core-context
1 parent 14ab69e commit 7f6ae15

5 files changed

Lines changed: 3 additions & 16 deletions

File tree

engine/storage/snapshot/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@
2828
>
2929

3030
<bean id="snapshotServiceImpl"
31-
class="org.apache.cloudstack.storage.snapshot.SnapshotServiceImpl"
32-
depends-on="snapshotStateMachineManagerImpl, snapshotDataFactoryImpl, dataStoreManagerImpl, dataMotionServiceImpl, objectInDataStoreManagerImpl" />
31+
class="org.apache.cloudstack.storage.snapshot.SnapshotServiceImpl" />
3332

3433
<bean id="snapshotDataFactoryImpl"
35-
class="org.apache.cloudstack.storage.snapshot.SnapshotDataFactoryImpl"
36-
depends-on="dataStoreManagerImpl, snapshotDataStoreDaoImpl, volumeDataFactoryImpl" />
34+
class="org.apache.cloudstack.storage.snapshot.SnapshotDataFactoryImpl"/>
3735

3836
<bean id="snapshotStateMachineManagerImpl"
3937
class="org.apache.cloudstack.storage.snapshot.SnapshotStateMachineManagerImpl" />

engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotDataFactoryImpl.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323

2424
import javax.inject.Inject;
2525

26-
import org.springframework.stereotype.Component;
27-
2826
import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
2927
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
3028
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
@@ -39,7 +37,6 @@
3937
import com.cloud.storage.dao.SnapshotDao;
4038
import com.cloud.utils.exception.CloudRuntimeException;
4139

42-
@Component
4340
public class SnapshotDataFactoryImpl implements SnapshotDataFactory {
4441
@Inject
4542
SnapshotDao snapshotDao;

engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222

2323
import javax.inject.Inject;
2424

25-
import org.apache.log4j.Logger;
26-
import org.springframework.stereotype.Component;
2725
import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult;
2826
import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult;
2927
import org.apache.cloudstack.engine.subsystem.api.storage.DataMotionService;
@@ -48,6 +46,7 @@
4846
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
4947
import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
5048
import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO;
49+
import org.apache.log4j.Logger;
5150

5251
import com.cloud.storage.CreateSnapshotPayload;
5352
import com.cloud.storage.DataStoreRole;
@@ -62,7 +61,6 @@
6261
import com.cloud.utils.exception.CloudRuntimeException;
6362
import com.cloud.utils.fsm.NoTransitionException;
6463

65-
@Component
6664
public class SnapshotServiceImpl implements SnapshotService {
6765
private static final Logger s_logger = Logger.getLogger(SnapshotServiceImpl.class);
6866
@Inject

engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotStateMachineManagerImpl.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
import javax.inject.Inject;
2121

22-
import org.springframework.stereotype.Component;
23-
2422
import com.cloud.storage.Snapshot;
2523
import com.cloud.storage.Snapshot.Event;
2624
import com.cloud.storage.Snapshot.State;
@@ -30,7 +28,6 @@
3028
import com.cloud.utils.fsm.NoTransitionException;
3129
import com.cloud.utils.fsm.StateMachine2;
3230

33-
@Component
3431
public class SnapshotStateMachineManagerImpl implements SnapshotStateMachineManager {
3532
private StateMachine2<State, Event, SnapshotVO> stateMachine = new StateMachine2<State, Event, SnapshotVO>();
3633
@Inject

engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeDataFactoryImpl.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323

2424
import javax.inject.Inject;
2525

26-
import org.springframework.stereotype.Component;
27-
2826
import org.apache.cloudstack.engine.subsystem.api.storage.DataObject;
2927
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
3028
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
@@ -37,7 +35,6 @@
3735
import com.cloud.storage.VolumeVO;
3836
import com.cloud.storage.dao.VolumeDao;
3937

40-
@Component
4138
public class VolumeDataFactoryImpl implements VolumeDataFactory {
4239
@Inject
4340
VolumeDao volumeDao;

0 commit comments

Comments
 (0)