Skip to content

Commit 453b31f

Browse files
kelvenykelveny
committed
Refactor ComponentLocator to be based on Spring so that legacy way of loading component can coexist with Spring
1 parent 0e9924f commit 453b31f

14 files changed

Lines changed: 1321 additions & 1264 deletions

File tree

‎agent/src/com/cloud/agent/AgentShell.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
import com.cloud.utils.backoff.BackoffAlgorithm;
5454
import com.cloud.utils.backoff.impl.ConstantTimeBackoff;
5555
import com.cloud.utils.component.Adapters;
56-
import com.cloud.utils.component.ComponentLocator;
56+
import com.cloud.utils.component.LegacyComponentLocator;
5757
import com.cloud.utils.exception.CloudRuntimeException;
5858
import com.cloud.utils.net.MacAddress;
5959
import com.cloud.utils.script.Script;
@@ -374,7 +374,7 @@ protected boolean parseCommand(final String[] args)
374374

375375
public void init(String[] args) throws ConfigurationException {
376376

377-
final ComponentLocator locator = ComponentLocator.getLocator("agent");
377+
final LegacyComponentLocator locator = LegacyComponentLocator.getLocator("agent");
378378

379379
final Class<?> c = this.getClass();
380380
_version = c.getPackage().getImplementationVersion();

‎agent/src/com/cloud/agent/VmmAgentShell.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import com.cloud.utils.backoff.BackoffAlgorithm;
4747
import com.cloud.utils.backoff.impl.ConstantTimeBackoff;
4848
import com.cloud.utils.component.Adapters;
49-
import com.cloud.utils.component.ComponentLocator;
49+
import com.cloud.utils.component.LegacyComponentLocator;
5050
import com.cloud.utils.exception.CloudRuntimeException;
5151
import com.cloud.utils.net.MacAddress;
5252
import com.cloud.utils.nio.HandlerFactory;
@@ -317,7 +317,7 @@ private void launchAgent() throws ConfigurationException {
317317

318318
private void init(String[] args) throws ConfigurationException{
319319

320-
final ComponentLocator locator = ComponentLocator.getLocator("agent");
320+
final LegacyComponentLocator locator = LegacyComponentLocator.getLocator("agent");
321321

322322
final Class<?> c = this.getClass();
323323
_version = c.getPackage().getImplementationVersion();

‎agent/src/com/cloud/agent/configuration/AgentComponentLibraryBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import com.cloud.utils.component.Adapter;
2323
import com.cloud.utils.component.ComponentLibraryBase;
24-
import com.cloud.utils.component.ComponentLocator.ComponentInfo;
24+
import com.cloud.utils.component.LegacyComponentLocator.ComponentInfo;
2525
import com.cloud.utils.component.Manager;
2626
import com.cloud.utils.component.PluggableService;
2727
import com.cloud.utils.db.GenericDao;

‎server/src/com/cloud/test/DatabaseConfig.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
import com.cloud.storage.DiskOfferingVO;
5555
import com.cloud.storage.dao.DiskOfferingDaoImpl;
5656
import com.cloud.utils.PropertiesUtil;
57-
import com.cloud.utils.component.ComponentLocator;
57+
import com.cloud.utils.component.LegacyComponentLocator;
5858
import com.cloud.utils.db.DB;
5959
import com.cloud.utils.db.Transaction;
6060
import com.cloud.utils.net.NfsUtils;
@@ -76,10 +76,10 @@ public class DatabaseConfig {
7676
private static HashSet<String> fieldNames = new HashSet<String>();
7777

7878
// Maintain an IPRangeConfig object to handle IP related logic
79-
private final IPRangeConfig iprc = ComponentLocator.inject(IPRangeConfig.class);
79+
private final IPRangeConfig iprc = LegacyComponentLocator.inject(IPRangeConfig.class);
8080

8181
// Maintain a PodZoneConfig object to handle Pod/Zone related logic
82-
private final PodZoneConfig pzc = ComponentLocator.inject(PodZoneConfig.class);
82+
private final PodZoneConfig pzc = LegacyComponentLocator.inject(PodZoneConfig.class);
8383

8484
// Global variables to store network.throttling.rate and multicast.throttling.rate from the configuration table
8585
// Will be changed from null to a non-null value if the value existed in the configuration table
@@ -359,7 +359,7 @@ public static void main(String[] args) {
359359
s_logger.error("error starting database config, missing initial data file");
360360
} else {
361361
try {
362-
DatabaseConfig config = ComponentLocator.inject(DatabaseConfig.class, args[0]);
362+
DatabaseConfig config = LegacyComponentLocator.inject(DatabaseConfig.class, args[0]);
363363
config.doVersionCheck();
364364
config.doConfig();
365365
System.exit(0);
@@ -918,7 +918,7 @@ protected void saveServiceOffering() {
918918
}
919919

920920
ServiceOfferingVO serviceOffering = new ServiceOfferingVO(name, cpu, ramSize, speed, null, null, ha, displayText, useLocalStorage, false, null, false, null, false);
921-
ServiceOfferingDaoImpl dao = ComponentLocator.inject(ServiceOfferingDaoImpl.class);
921+
ServiceOfferingDaoImpl dao = LegacyComponentLocator.inject(ServiceOfferingDaoImpl.class);
922922
try {
923923
dao.persist(serviceOffering);
924924
} catch (Exception e) {
@@ -967,7 +967,7 @@ protected void saveDiskOffering() {
967967
}
968968
DiskOfferingVO diskOffering = new DiskOfferingVO(domainId, name, displayText, diskSpace , tags, false);
969969
diskOffering.setUseLocalStorage(local);
970-
DiskOfferingDaoImpl offering = ComponentLocator.inject(DiskOfferingDaoImpl.class);
970+
DiskOfferingDaoImpl offering = LegacyComponentLocator.inject(DiskOfferingDaoImpl.class);
971971
try {
972972
offering.persist(diskOffering);
973973
} catch (Exception e) {

‎server/test/com/cloud/vpc/MockNetworkManagerImpl.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager{
9595
NetworkServiceMapDao _ntwkSrvcDao;
9696
@Inject
9797
NetworkOfferingServiceMapDao _ntwkOfferingSrvcDao;
98+
9899
@com.cloud.utils.component.Inject(adapter = NetworkElement.class)
99100
Adapters<NetworkElement> _networkElements;
100101

‎utils/src/com/cloud/utils/component/Adapters.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.util.Map;
2626

2727
import com.cloud.utils.EnumerationImpl;
28-
import com.cloud.utils.component.ComponentLocator.ComponentInfo;
28+
import com.cloud.utils.component.LegacyComponentLocator.ComponentInfo;
2929

3030
/**
3131
* the iterator even during dynamic reloading.

‎utils/src/com/cloud/utils/component/ComponentContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static ApplicationContext getApplicationContext() {
4545
return s_appContext;
4646
}
4747

48-
public static <T> T getCompanent(String name) {
48+
public static <T> T getCompanent(String name) {
4949
assert(s_appContext != null);
5050
return (T)s_appContext.getBean(name);
5151
}

‎utils/src/com/cloud/utils/component/ComponentLibrary.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.List;
2020
import java.util.Map;
2121

22-
import com.cloud.utils.component.ComponentLocator.ComponentInfo;
22+
import com.cloud.utils.component.LegacyComponentLocator.ComponentInfo;
2323
import com.cloud.utils.db.GenericDao;
2424

2525
/**

‎utils/src/com/cloud/utils/component/ComponentLibraryBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.Map;
2424

2525
import com.cloud.utils.Pair;
26-
import com.cloud.utils.component.ComponentLocator.ComponentInfo;
26+
import com.cloud.utils.component.LegacyComponentLocator.ComponentInfo;
2727
import com.cloud.utils.db.GenericDao;
2828

2929
public abstract class ComponentLibraryBase implements ComponentLibrary {

0 commit comments

Comments
 (0)