You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2013/01/08 20:07:49 UTC
[2/2] git commit: convert existing singleton objects into Spring
loadable bean components
Updated Branches:
refs/heads/javelin 559933f06 -> 992fa473b
convert existing singleton objects into Spring loadable bean components
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/992fa473
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/992fa473
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/992fa473
Branch: refs/heads/javelin
Commit: 992fa473bec2356f5328bf77e877ffd6d718f0d0
Parents: b96bb8f
Author: Kelven Yang <ke...@gmail.com>
Authored: Tue Jan 8 11:07:22 2013 -0800
Committer: Kelven Yang <ke...@gmail.com>
Committed: Tue Jan 8 11:07:22 2013 -0800
----------------------------------------------------------------------
server/src/com/cloud/api/ApiDispatcher.java | 8 +++-----
server/src/com/cloud/server/StatsCollector.java | 13 ++++---------
.../cloud/utils/component/ComponentContext.java | 2 +-
3 files changed, 8 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/992fa473/server/src/com/cloud/api/ApiDispatcher.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java
index 651ef0f..3c1b0b0 100755
--- a/server/src/com/cloud/api/ApiDispatcher.java
+++ b/server/src/com/cloud/api/ApiDispatcher.java
@@ -30,6 +30,7 @@ import java.util.regex.Matcher;
import javax.inject.Inject;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.api.BaseCmd.CommandType;
import com.cloud.api.commands.ListEventsCmd;
@@ -46,7 +47,6 @@ import com.cloud.server.ManagementServer;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
import com.cloud.utils.DateUtil;
-import com.cloud.utils.component.ComponentContext;
import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.component.PluggableService;
import com.cloud.utils.exception.CSExceptionErrorCode;
@@ -56,6 +56,7 @@ import com.cloud.uuididentity.dao.IdentityDao;
/**
* A class that dispatches API commands to the appropriate manager for execution.
*/
+@Component
public class ApiDispatcher {
private static final Logger s_logger = Logger.getLogger(ApiDispatcher.class.getName());
@@ -66,14 +67,11 @@ public class ApiDispatcher {
private static ApiDispatcher s_instance;
public static ApiDispatcher getInstance() {
- if(s_instance == null) {
- s_instance = new ApiDispatcher();
- s_instance = ComponentContext.inject(s_instance);
- }
return s_instance;
}
public ApiDispatcher() {
+ s_instance = this;
}
public void dispatchCreateCmd(BaseAsyncCreateCmd cmd, Map<String, String> params) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/992fa473/server/src/com/cloud/server/StatsCollector.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java
index 7f0e8ae..be83c18 100755
--- a/server/src/com/cloud/server/StatsCollector.java
+++ b/server/src/com/cloud/server/StatsCollector.java
@@ -32,6 +32,7 @@ import javax.inject.Inject;
import com.cloud.resource.ResourceManager;
import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
import com.cloud.agent.AgentManager;
import com.cloud.agent.AgentManager.OnError;
@@ -60,8 +61,6 @@ import com.cloud.storage.dao.StoragePoolHostDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.storage.secondary.SecondaryStorageVmManager;
import com.cloud.utils.NumbersUtil;
-import com.cloud.utils.component.ComponentContext;
-import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.vm.UserVmManager;
@@ -73,6 +72,7 @@ import com.cloud.vm.dao.UserVmDao;
* Provides real time stats for various agent resources up to x seconds
*
*/
+@Component
public class StatsCollector {
public static final Logger s_logger = Logger.getLogger(StatsCollector.class.getName());
@@ -106,18 +106,13 @@ public class StatsCollector {
public static StatsCollector getInstance() {
return s_instance;
}
+
public static StatsCollector getInstance(Map<String, String> configs) {
- if (s_instance == null) {
-
- s_instance = new StatsCollector();
- s_instance = ComponentContext.inject(s_instance);
- s_instance.init(configs);
-
- }
return s_instance;
}
public StatsCollector() {
+ s_instance = this;
}
private void init(Map<String, String> configs) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/992fa473/utils/src/com/cloud/utils/component/ComponentContext.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/component/ComponentContext.java b/utils/src/com/cloud/utils/component/ComponentContext.java
index 6fd3788..3a47bb2 100644
--- a/utils/src/com/cloud/utils/component/ComponentContext.java
+++ b/utils/src/com/cloud/utils/component/ComponentContext.java
@@ -70,7 +70,7 @@ public class ComponentContext implements ApplicationContextAware {
return entry.getValue();
}
- s_logger.warn("Unable to uniquely locate bean type " + beanType.getName(), e);
+ s_logger.warn("Unable to uniquely locate bean type " + beanType.getName());
return (T)matchedTypes.values().toArray()[0];
}
}