http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fb1a1e6/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java b/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java index c2bf1c3..f6ddf9f 100644 --- a/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java +++ b/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java @@ -22,6 +22,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.PostConstruct; +import javax.inject.Inject; + import org.apache.log4j.Logger; import com.cloud.usage.UsageNetworkOfferingVO; @@ -37,9 +40,17 @@ import com.cloud.utils.Pair; public class NetworkOfferingUsageParser { public static final Logger s_logger = Logger.getLogger(NetworkOfferingUsageParser.class.getName()); - private static ComponentLocator _locator = ComponentLocator.getLocator(UsageServer.Name, "usage-components.xml", "log4j-cloud_usage"); - private static UsageDao m_usageDao = _locator.getDao(UsageDao.class); - private static UsageNetworkOfferingDao m_usageNetworkOfferingDao = _locator.getDao(UsageNetworkOfferingDao.class); + private static UsageDao m_usageDao; + private static UsageNetworkOfferingDao m_usageNetworkOfferingDao; + + @Inject private UsageDao _usageDao; + @Inject private UsageNetworkOfferingDao _usageNetworkOfferingDao; + + @PostConstruct + void init() { + m_usageDao = _usageDao; + m_usageNetworkOfferingDao = _usageNetworkOfferingDao; + } public static boolean parse(AccountVO account, Date startDate, Date endDate) { if (s_logger.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fb1a1e6/usage/src/com/cloud/usage/parser/NetworkUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/NetworkUsageParser.java b/usage/src/com/cloud/usage/parser/NetworkUsageParser.java index c0ba15f..fb673d7 100644 --- a/usage/src/com/cloud/usage/parser/NetworkUsageParser.java +++ b/usage/src/com/cloud/usage/parser/NetworkUsageParser.java @@ -21,26 +21,35 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.PostConstruct; +import javax.inject.Inject; + import org.apache.log4j.Logger; import com.cloud.usage.UsageNetworkVO; -import com.cloud.usage.UsageServer; import com.cloud.usage.UsageTypes; import com.cloud.usage.UsageVO; import com.cloud.usage.dao.UsageDao; import com.cloud.usage.dao.UsageNetworkDao; import com.cloud.user.AccountVO; -import com.cloud.utils.Pair; import com.cloud.utils.db.SearchCriteria; public class NetworkUsageParser { public static final Logger s_logger = Logger.getLogger(NetworkUsageParser.class.getName()); - private static ComponentLocator _locator = ComponentLocator.getLocator(UsageServer.Name, "usage-components.xml", "log4j-cloud_usage"); - private static UsageDao m_usageDao = _locator.getDao(UsageDao.class); - private static UsageNetworkDao m_usageNetworkDao = _locator.getDao(UsageNetworkDao.class); + private static UsageDao m_usageDao; + private static UsageNetworkDao m_usageNetworkDao; + + @Inject private UsageDao _usageDao; + @Inject private UsageNetworkDao _usageNetworkDao; + @PostConstruct + void init() { + m_usageDao = _usageDao; + m_usageNetworkDao = _usageNetworkDao; + } + public static boolean parse(AccountVO account, Date startDate, Date endDate) { if (s_logger.isDebugEnabled()) { s_logger.debug("Parsing all Network usage events for account: " + account.getId()); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fb1a1e6/usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java b/usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java index 42cc74c..1692180 100644 --- a/usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java +++ b/usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java @@ -22,6 +22,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.PostConstruct; +import javax.inject.Inject; + import org.apache.log4j.Logger; import com.cloud.usage.UsagePortForwardingRuleVO; @@ -37,9 +40,17 @@ import com.cloud.utils.Pair; public class PortForwardingUsageParser { public static final Logger s_logger = Logger.getLogger(PortForwardingUsageParser.class.getName()); - private static ComponentLocator _locator = ComponentLocator.getLocator(UsageServer.Name, "usage-components.xml", "log4j-cloud_usage"); - private static UsageDao m_usageDao = _locator.getDao(UsageDao.class); - private static UsagePortForwardingRuleDao m_usagePFRuleDao = _locator.getDao(UsagePortForwardingRuleDao.class); + private static UsageDao m_usageDao; + private static UsagePortForwardingRuleDao m_usagePFRuleDao; + + @Inject private UsageDao _usageDao; + @Inject private UsagePortForwardingRuleDao _usagePFRuleDao; + + @PostConstruct + void init() { + m_usageDao = _usageDao; + _usagePFRuleDao = _usagePFRuleDao; + } public static boolean parse(AccountVO account, Date startDate, Date endDate) { if (s_logger.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fb1a1e6/usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.java b/usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.java index f175ae2..ed7acf3 100644 --- a/usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.java +++ b/usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.java @@ -22,6 +22,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.PostConstruct; +import javax.inject.Inject; + import org.apache.log4j.Logger; import com.cloud.usage.UsageSecurityGroupVO; @@ -37,9 +40,17 @@ import com.cloud.utils.Pair; public class SecurityGroupUsageParser { public static final Logger s_logger = Logger.getLogger(SecurityGroupUsageParser.class.getName()); - private static ComponentLocator _locator = ComponentLocator.getLocator(UsageServer.Name, "usage-components.xml", "log4j-cloud_usage"); - private static UsageDao m_usageDao = _locator.getDao(UsageDao.class); - private static UsageSecurityGroupDao m_usageSecurityGroupDao = _locator.getDao(UsageSecurityGroupDao.class); + private static UsageDao m_usageDao; + private static UsageSecurityGroupDao m_usageSecurityGroupDao; + + @Inject private UsageDao _usageDao; + @Inject private UsageSecurityGroupDao _usageSecurityGroupDao; + + @PostConstruct + void init() { + m_usageDao = _usageDao; + m_usageSecurityGroupDao = _usageSecurityGroupDao; + } public static boolean parse(AccountVO account, Date startDate, Date endDate) { if (s_logger.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fb1a1e6/usage/src/com/cloud/usage/parser/StorageUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/StorageUsageParser.java b/usage/src/com/cloud/usage/parser/StorageUsageParser.java index a0fee2d..7542063 100644 --- a/usage/src/com/cloud/usage/parser/StorageUsageParser.java +++ b/usage/src/com/cloud/usage/parser/StorageUsageParser.java @@ -22,6 +22,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.PostConstruct; +import javax.inject.Inject; + import org.apache.log4j.Logger; import com.cloud.usage.StorageTypes; @@ -38,9 +41,17 @@ import com.cloud.utils.Pair; public class StorageUsageParser { public static final Logger s_logger = Logger.getLogger(StorageUsageParser.class.getName()); - private static ComponentLocator _locator = ComponentLocator.getLocator(UsageServer.Name, "usage-components.xml", "log4j-cloud_usage"); - private static UsageDao m_usageDao = _locator.getDao(UsageDao.class); - private static UsageStorageDao m_usageStorageDao = _locator.getDao(UsageStorageDao.class); + private static UsageDao m_usageDao; + private static UsageStorageDao m_usageStorageDao; + + @Inject private UsageDao _usageDao; + @Inject private UsageStorageDao _usageStorageDao; + + @PostConstruct + void init() { + m_usageDao = _usageDao; + m_usageStorageDao = _usageStorageDao; + } public static boolean parse(AccountVO account, Date startDate, Date endDate) { if (s_logger.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fb1a1e6/usage/src/com/cloud/usage/parser/VMInstanceUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/VMInstanceUsageParser.java b/usage/src/com/cloud/usage/parser/VMInstanceUsageParser.java index 0680ec3..8d2e465 100644 --- a/usage/src/com/cloud/usage/parser/VMInstanceUsageParser.java +++ b/usage/src/com/cloud/usage/parser/VMInstanceUsageParser.java @@ -22,6 +22,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.PostConstruct; +import javax.inject.Inject; + import org.apache.log4j.Logger; import com.cloud.usage.UsageServer; @@ -37,9 +40,17 @@ import com.cloud.utils.Pair; public class VMInstanceUsageParser { public static final Logger s_logger = Logger.getLogger(VMInstanceUsageParser.class.getName()); - private static ComponentLocator _locator = ComponentLocator.getLocator(UsageServer.Name, "usage-components.xml", "log4j-cloud_usage"); - private static UsageDao m_usageDao = _locator.getDao(UsageDao.class); - private static UsageVMInstanceDao m_usageInstanceDao = _locator.getDao(UsageVMInstanceDao.class); + private static UsageDao m_usageDao; + private static UsageVMInstanceDao m_usageInstanceDao; + + @Inject private static UsageDao _usageDao;; + @Inject private static UsageVMInstanceDao _usageInstanceDao; + + @PostConstruct + void init() { + m_usageDao = _usageDao; + m_usageInstanceDao = _usageInstanceDao; + } public static boolean parse(AccountVO account, Date startDate, Date endDate) { if (s_logger.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fb1a1e6/usage/src/com/cloud/usage/parser/VPNUserUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/VPNUserUsageParser.java b/usage/src/com/cloud/usage/parser/VPNUserUsageParser.java index 7a96e3c..c9a863b 100644 --- a/usage/src/com/cloud/usage/parser/VPNUserUsageParser.java +++ b/usage/src/com/cloud/usage/parser/VPNUserUsageParser.java @@ -22,6 +22,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.PostConstruct; +import javax.inject.Inject; + import org.apache.log4j.Logger; import com.cloud.usage.UsageVPNUserVO; @@ -37,9 +40,17 @@ import com.cloud.utils.Pair; public class VPNUserUsageParser { public static final Logger s_logger = Logger.getLogger(VPNUserUsageParser.class.getName()); - private static ComponentLocator _locator = ComponentLocator.getLocator(UsageServer.Name, "usage-components.xml", "log4j-cloud_usage"); - private static UsageDao m_usageDao = _locator.getDao(UsageDao.class); - private static UsageVPNUserDao m_usageVPNUserDao = _locator.getDao(UsageVPNUserDao.class); + private static UsageDao m_usageDao; + private static UsageVPNUserDao m_usageVPNUserDao; + + @Inject private UsageDao _usageDao; + @Inject private UsageVPNUserDao _usageVPNUserDao; + + @PostConstruct + void init() { + m_usageDao = _usageDao; + m_usageVPNUserDao = _usageVPNUserDao; + } public static boolean parse(AccountVO account, Date startDate, Date endDate) { if (s_logger.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6fb1a1e6/usage/src/com/cloud/usage/parser/VolumeUsageParser.java ---------------------------------------------------------------------- diff --git a/usage/src/com/cloud/usage/parser/VolumeUsageParser.java b/usage/src/com/cloud/usage/parser/VolumeUsageParser.java index 1eb7664..e797f1c 100644 --- a/usage/src/com/cloud/usage/parser/VolumeUsageParser.java +++ b/usage/src/com/cloud/usage/parser/VolumeUsageParser.java @@ -22,6 +22,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.PostConstruct; +import javax.inject.Inject; + import org.apache.log4j.Logger; import com.cloud.usage.UsageServer; @@ -37,9 +40,17 @@ import com.cloud.utils.Pair; public class VolumeUsageParser { public static final Logger s_logger = Logger.getLogger(VolumeUsageParser.class.getName()); - private static ComponentLocator _locator = ComponentLocator.getLocator(UsageServer.Name, "usage-components.xml", "log4j-cloud_usage"); - private static UsageDao m_usageDao = _locator.getDao(UsageDao.class); - private static UsageVolumeDao m_usageVolumeDao = _locator.getDao(UsageVolumeDao.class); + private static UsageDao m_usageDao; + private static UsageVolumeDao m_usageVolumeDao; + + @Inject private UsageDao _usageDao; + @Inject private UsageVolumeDao _usageVolumeDao; + + @PostConstruct + void init() { + m_usageDao = _usageDao; + m_usageVolumeDao = _usageVolumeDao; + } public static boolean parse(AccountVO account, Date startDate, Date endDate) { if (s_logger.isDebugEnabled()) {
