Commit c10b7b18 authored by peng-yongsheng's avatar peng-yongsheng
Browse files

Change all daos to be services.

parent b744d402

apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java

+1 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import org.skywalking.apm.collector.queue.service.QueueCreatorService; 
import org.skywalking.apm.collector.storage.StorageModule;

import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;

import org.skywalking.apm.collector.storage.dao.ICpuMetricPersistenceDAO;

import org.skywalking.apm.collector.storage.service.DAOService;

import org.skywalking.apm.collector.storage.table.jvm.CpuMetric;

import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;

import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
@@ -46,7 +45,7 @@ public class CpuMetricPersistenceWorker extends PersistenceWorker<CpuMetric, Cpu 
    }



    @Override protected IPersistenceDAO persistenceDAO() {

        return getModuleManager().find(StorageModule.NAME).getService(DAOService.class).getPersistenceDAO(ICpuMetricPersistenceDAO.class);

        return getModuleManager().find(StorageModule.NAME).getService(ICpuMetricPersistenceDAO.class);

    }



    public static class Factory extends AbstractLocalAsyncWorkerProvider<CpuMetric, CpuMetric, CpuMetricPersistenceWorker> {

apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java

+1 −5
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import org.skywalking.apm.collector.queue.service.QueueCreatorService; 
import org.skywalking.apm.collector.storage.StorageModule;

import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;

import org.skywalking.apm.collector.storage.dao.IGCMetricPersistenceDAO;

import org.skywalking.apm.collector.storage.service.DAOService;

import org.skywalking.apm.collector.storage.table.jvm.GCMetric;

import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;

import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
@@ -33,11 +32,8 @@ import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker; 
 */

public class GCMetricPersistenceWorker extends PersistenceWorker<GCMetric, GCMetric> {



    private final DAOService daoService;



    public GCMetricPersistenceWorker(ModuleManager moduleManager) {

        super(moduleManager);

        this.daoService = getModuleManager().find(StorageModule.NAME).getService(DAOService.class);

    }



    @Override public int id() {
@@ -49,7 +45,7 @@ public class GCMetricPersistenceWorker extends PersistenceWorker<GCMetric, GCMet 
    }



    @Override protected IPersistenceDAO persistenceDAO() {

        return daoService.getPersistenceDAO(IGCMetricPersistenceDAO.class);

        return getModuleManager().find(StorageModule.NAME).getService(IGCMetricPersistenceDAO.class);

    }



    public static class Factory extends AbstractLocalAsyncWorkerProvider<GCMetric, GCMetric, GCMetricPersistenceWorker> {

apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java

+1 −5
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import org.skywalking.apm.collector.queue.service.QueueCreatorService; 
import org.skywalking.apm.collector.storage.StorageModule;

import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;

import org.skywalking.apm.collector.storage.dao.IInstanceHeartBeatPersistenceDAO;

import org.skywalking.apm.collector.storage.service.DAOService;

import org.skywalking.apm.collector.storage.table.register.Instance;

import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;

import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
@@ -33,11 +32,8 @@ import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker; 
 */

public class InstHeartBeatPersistenceWorker extends PersistenceWorker<Instance, Instance> {



    private final DAOService daoService;



    public InstHeartBeatPersistenceWorker(ModuleManager moduleManager) {

        super(moduleManager);

        this.daoService = getModuleManager().find(StorageModule.NAME).getService(DAOService.class);

    }



    @Override public int id() {
@@ -49,7 +45,7 @@ public class InstHeartBeatPersistenceWorker extends PersistenceWorker<Instance, 
    }



    @Override protected IPersistenceDAO persistenceDAO() {

        return daoService.getPersistenceDAO(IInstanceHeartBeatPersistenceDAO.class);

        return getModuleManager().find(StorageModule.NAME).getService(IInstanceHeartBeatPersistenceDAO.class);

    }



    public static class Factory extends AbstractLocalAsyncWorkerProvider<Instance, Instance, InstHeartBeatPersistenceWorker> {

apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java

+1 −5
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import org.skywalking.apm.collector.queue.service.QueueCreatorService; 
import org.skywalking.apm.collector.storage.StorageModule;

import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;

import org.skywalking.apm.collector.storage.dao.IMemoryMetricPersistenceDAO;

import org.skywalking.apm.collector.storage.service.DAOService;

import org.skywalking.apm.collector.storage.table.jvm.MemoryMetric;

import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;

import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
@@ -33,11 +32,8 @@ import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker; 
 */

public class MemoryMetricPersistenceWorker extends PersistenceWorker<MemoryMetric, MemoryMetric> {



    private final DAOService daoService;



    public MemoryMetricPersistenceWorker(ModuleManager moduleManager) {

        super(moduleManager);

        this.daoService = getModuleManager().find(StorageModule.NAME).getService(DAOService.class);

    }



    @Override public int id() {
@@ -49,7 +45,7 @@ public class MemoryMetricPersistenceWorker extends PersistenceWorker<MemoryMetri 
    }



    @Override protected IPersistenceDAO persistenceDAO() {

        return daoService.getPersistenceDAO(IMemoryMetricPersistenceDAO.class);

        return getModuleManager().find(StorageModule.NAME).getService(IMemoryMetricPersistenceDAO.class);

    }



    public static class Factory extends AbstractLocalAsyncWorkerProvider<MemoryMetric, MemoryMetric, MemoryMetricPersistenceWorker> {

apm-collector/apm-collector-agent/collector-agent-stream/src/main/java/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java

+1 −5
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import org.skywalking.apm.collector.queue.service.QueueCreatorService; 
import org.skywalking.apm.collector.storage.StorageModule;

import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;

import org.skywalking.apm.collector.storage.dao.IMemoryPoolMetricPersistenceDAO;

import org.skywalking.apm.collector.storage.service.DAOService;

import org.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetric;

import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;

import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
@@ -37,11 +36,8 @@ public class MemoryPoolMetricPersistenceWorker extends PersistenceWorker<MemoryP 
        return 0;

    }



    private final DAOService daoService;



    public MemoryPoolMetricPersistenceWorker(ModuleManager moduleManager) {

        super(moduleManager);

        this.daoService = getModuleManager().find(StorageModule.NAME).getService(DAOService.class);

    }



    @Override protected boolean needMergeDBData() {
@@ -49,7 +45,7 @@ public class MemoryPoolMetricPersistenceWorker extends PersistenceWorker<MemoryP 
    }



    @Override protected IPersistenceDAO persistenceDAO() {

        return daoService.getPersistenceDAO(IMemoryPoolMetricPersistenceDAO.class);

        return getModuleManager().find(StorageModule.NAME).getService(IMemoryPoolMetricPersistenceDAO.class);

    }



    public static class Factory extends AbstractLocalAsyncWorkerProvider<MemoryPoolMetric, MemoryPoolMetric, MemoryPoolMetricPersistenceWorker> {