Merge remote-tracking branch 'origin/master'

This commit is contained in:
snoop 2017-06-26 16:30:33 +09:00
commit 46dc9758b2

View File

@ -12,6 +12,7 @@ import com.loafle.overflow.module.probe.dao.ProbeDAO;
import com.loafle.overflow.module.probe.dao.ProbeTaskDAO; import com.loafle.overflow.module.probe.dao.ProbeTaskDAO;
import com.loafle.overflow.module.sensor.dao.SensorDao; import com.loafle.overflow.module.sensor.dao.SensorDao;
import com.loafle.overflow.module.sensor.dao.SensorItemDao; import com.loafle.overflow.module.sensor.dao.SensorItemDao;
import com.loafle.overflow.module.target.dao.TargetDAO;
import io.grpc.ServerBuilder; import io.grpc.ServerBuilder;
import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.ObjectMapper;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
@ -50,7 +51,7 @@ public class DBProxy {
daoMap.put("sensor", ctx.getBean(SensorDao.class)); daoMap.put("sensor", ctx.getBean(SensorDao.class));
daoMap.put("sensorItem", ctx.getBean(SensorItemDao.class)); daoMap.put("sensorItem", ctx.getBean(SensorItemDao.class));
daoMap.put("domain", ctx.getBean(DomainDAO.class)); daoMap.put("domain", ctx.getBean(DomainDAO.class));
daoMap.put("target", ctx.getBean(DomainDAO.class)); daoMap.put("target", ctx.getBean(TargetDAO.class));
daoMap.put("infra", ctx.getBean(InfraDAO.class)); daoMap.put("infra", ctx.getBean(InfraDAO.class));
daoMap.put("infraHost", ctx.getBean(InfraHostDAO.class)); daoMap.put("infraHost", ctx.getBean(InfraHostDAO.class));
daoMap.put("infraMachine", ctx.getBean(InfraMachineDAO.class)); daoMap.put("infraMachine", ctx.getBean(InfraMachineDAO.class));