From e92de9d97dad63f3c133765ca7e36f272eb5131f Mon Sep 17 00:00:00 2001 From: insanity Date: Wed, 27 Jun 2018 20:26:16 +0900 Subject: [PATCH] test --- pom.xml | 2 +- .../generator/service/GenerateUtil.java | 148 +++++----- .../generator/service/InfraHostGenerator.java | 166 +++++------ .../service/InfraHostWMIGenerator.java | 223 +++++++-------- .../service/InfraServiceGenerator.java | 198 ++++++------- .../service/InfraServiceJMXGenerator.java | 167 +++++------ .../service/InfraServiceMysqlGenerator.java | 262 +++++++++--------- .../service/SensorConfigGenerator.java | 40 +-- .../central/module/infra/dao/InfraDAO.java | 2 - ...ypeDAO.java => MetaCollectionItemDAO.java} | 5 +- ...O.java => MetaDisplayItemCategoryDAO.java} | 5 +- ...emUnitDAO.java => MetaDisplayItemDAO.java} | 6 +- .../meta/dao/MetaDisplayItemMappingDAO.java | 14 + .../module/meta/dao/MetaItemUnitDAO.java | 13 + .../meta/dao/MetaSensorDisplayItemDAO.java | 15 - .../meta/dao/MetaSensorDisplayMappingDAO.java | 21 -- .../module/meta/dao/MetaSensorItemKeyDAO.java | 15 - .../CentralMetaCollectionItemService.java | 21 ++ ...CentralMetaDisplayItemCategoryService.java | 33 +++ .../CentralMetaDisplayItemMappingService.java | 21 ++ .../CentralMetaDisplayItemService.java | 25 ++ .../service/CentralMetaItemUnitService.java | 20 ++ .../CentralMetaSensorDisplayItemService.java | 31 --- ...entralMetaSensorDisplayMappingService.java | 29 -- .../CentralMetaSensorItemKeyService.java | 40 --- .../service/CentralMetaSensorItemService.java | 25 -- .../CentralMetaSensorItemTypeService.java | 33 --- .../CentralMetaSensorItemUnitService.java | 22 -- .../sensor/dao/SensorItemDependencyDAO.java | 22 -- .../CentralSensorItemDependencyService.java | 49 ---- .../sensor/service/CentralSensorService.java | 12 +- .../target/service/CentralTargetService.java | 2 - .../dao/MetaSensorDisplayMappingDAOTest.java | 34 --- .../dao/SensorItemDependencyDAOTest.java | 35 --- .../service/CentralTargetServiceTest.java | 64 ----- 35 files changed, 774 insertions(+), 1046 deletions(-) rename src/main/java/com/loafle/overflow/central/module/meta/dao/{MetaSensorItemTypeDAO.java => MetaCollectionItemDAO.java} (59%) rename src/main/java/com/loafle/overflow/central/module/meta/dao/{MetaSensorItemDAO.java => MetaDisplayItemCategoryDAO.java} (57%) rename src/main/java/com/loafle/overflow/central/module/meta/dao/{MetaSensorItemUnitDAO.java => MetaDisplayItemDAO.java} (60%) create mode 100644 src/main/java/com/loafle/overflow/central/module/meta/dao/MetaDisplayItemMappingDAO.java create mode 100644 src/main/java/com/loafle/overflow/central/module/meta/dao/MetaItemUnitDAO.java delete mode 100644 src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayItemDAO.java delete mode 100644 src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayMappingDAO.java delete mode 100644 src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorItemKeyDAO.java create mode 100644 src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaCollectionItemService.java create mode 100644 src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaDisplayItemCategoryService.java create mode 100644 src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaDisplayItemMappingService.java create mode 100644 src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaDisplayItemService.java create mode 100644 src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaItemUnitService.java delete mode 100644 src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorDisplayItemService.java delete mode 100644 src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorDisplayMappingService.java delete mode 100644 src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemKeyService.java delete mode 100644 src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemService.java delete mode 100644 src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemTypeService.java delete mode 100644 src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemUnitService.java delete mode 100644 src/main/java/com/loafle/overflow/central/module/sensor/dao/SensorItemDependencyDAO.java delete mode 100644 src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorItemDependencyService.java delete mode 100644 src/test/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayMappingDAOTest.java delete mode 100644 src/test/java/com/loafle/overflow/central/module/sensor/dao/SensorItemDependencyDAOTest.java diff --git a/pom.xml b/pom.xml index 87cae74..8d1b90c 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ com.loafle.overflow commons-java - 1.0.101-SNAPSHOT + 1.0.102-SNAPSHOT diff --git a/src/main/java/com/loafle/overflow/central/module/generator/service/GenerateUtil.java b/src/main/java/com/loafle/overflow/central/module/generator/service/GenerateUtil.java index 9d9e957..b008ffe 100644 --- a/src/main/java/com/loafle/overflow/central/module/generator/service/GenerateUtil.java +++ b/src/main/java/com/loafle/overflow/central/module/generator/service/GenerateUtil.java @@ -1,96 +1,100 @@ -package com.loafle.overflow.central.module.generator.service; +// package com.loafle.overflow.central.module.generator.service; -import com.loafle.overflow.core.exception.OverflowException; -import com.loafle.overflow.model.meta.MetaCrawler; -import com.loafle.overflow.model.meta.MetaSensorItemKey; -import com.loafle.overflow.model.sensor.SensorItem; -import com.loafle.overflow.model.sensorconfig.Crawler; -import com.loafle.overflow.model.sensorconfig.Keys; -import com.loafle.overflow.service.central.meta.MetaSensorItemKeyService; +// import com.loafle.overflow.core.exception.OverflowException; +// import com.loafle.overflow.model.meta.MetaCrawler; +// import com.loafle.overflow.model.meta.MetaSensorItemKey; +// import com.loafle.overflow.model.sensor.SensorItem; +// import com.loafle.overflow.model.sensorconfig.Crawler; +// import com.loafle.overflow.model.sensorconfig.Keys; +// import com.loafle.overflow.service.central.meta.MetaSensorItemKeyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; +// import org.springframework.beans.factory.annotation.Autowired; +// import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +// import java.util.ArrayList; +// import java.util.HashMap; +// import java.util.List; +// import java.util.Map; -/** - * Created by snoop on 17. 9. 6. - */ -@Service("GenerateUtil") -public class GenerateUtil { +// /** +// * Created by snoop on 17. 9. 6. +// */ +// @Service("GenerateUtil") +// public class GenerateUtil { - @Autowired - private MetaSensorItemKeyService metaSensorItemKeyService; +// @Autowired +// private MetaSensorItemKeyService metaSensorItemKeyService; - private Map> mappingMap = null; +// private Map> mappingMap = null; - public Map initMappingMap(MetaCrawler metaCrawler) throws OverflowException { +// public Map initMappingMap(MetaCrawler +// metaCrawler) throws OverflowException { - if (this.mappingMap == null) { - this.mappingMap = new HashMap<>(); - } +// if (this.mappingMap == null) { +// this.mappingMap = new HashMap<>(); +// } - Map resultMap = this.mappingMap.get(metaCrawler.getId()); +// Map resultMap = +// this.mappingMap.get(metaCrawler.getId()); - if (resultMap != null) { - return resultMap; - } +// if (resultMap != null) { +// return resultMap; +// } - resultMap = this.metaSensorItemKeyService.readAllMapByMetaCrawlerID(metaCrawler.getId()); - this.mappingMap.put(metaCrawler.getId(), resultMap); +// resultMap = +// this.metaSensorItemKeyService.readAllMapByMetaCrawlerID(metaCrawler.getId()); +// this.mappingMap.put(metaCrawler.getId(), resultMap); - return resultMap; - } +// return resultMap; +// } - public Crawler getCrawler(MetaCrawler metaCrawler) throws OverflowException { +// public Crawler getCrawler(MetaCrawler metaCrawler) throws OverflowException { - Crawler crawler = new Crawler(); - crawler.setName(metaCrawler.getName()); +// Crawler crawler = new Crawler(); +// crawler.setName(metaCrawler.getName()); - String container = ""; +// String container = ""; - // if (metaCrawler.getId() == MetaCrawlerEnum.CASSANDRA_CRAWLER.getValue() - // || metaCrawler.getId() == MetaCrawlerEnum.CASSANDRA_CRAWLER.getValue() - // || metaCrawler.getId() == MetaCrawlerEnum.MONGODB_CRAWLER.getValue() - // || metaCrawler.getId() == MetaCrawlerEnum.MSSQL_CRAWLER.getValue() - // || metaCrawler.getId() == MetaCrawlerEnum.ORACLE_CRAWLER.getValue() - // || metaCrawler.getId() == MetaCrawlerEnum.POSTGRESQL_CRAWLER.getValue() - // || metaCrawler.getId() == MetaCrawlerEnum.JMX_CRAWLER.getValue()) { - // container = "java_proxy"; - // } else { - // container = "network_proxy"; - // } +// // if (metaCrawler.getId() == MetaCrawlerEnum.CASSANDRA_CRAWLER.getValue() +// // || metaCrawler.getId() == MetaCrawlerEnum.CASSANDRA_CRAWLER.getValue() +// // || metaCrawler.getId() == MetaCrawlerEnum.MONGODB_CRAWLER.getValue() +// // || metaCrawler.getId() == MetaCrawlerEnum.MSSQL_CRAWLER.getValue() +// // || metaCrawler.getId() == MetaCrawlerEnum.ORACLE_CRAWLER.getValue() +// // || metaCrawler.getId() == MetaCrawlerEnum.POSTGRESQL_CRAWLER.getValue() +// // || metaCrawler.getId() == MetaCrawlerEnum.JMX_CRAWLER.getValue()) { +// // container = "java_proxy"; +// // } else { +// // container = "network_proxy"; +// // } - crawler.setContainer(container); +// crawler.setContainer(container); - return crawler; - } +// return crawler; +// } - public Map> sortItems(List sensorItems, - Map keyMap) throws OverflowException { +// public Map> sortItems(List +// sensorItems, +// Map keyMap) throws OverflowException { - Map> metricMap = new HashMap<>(); +// Map> metricMap = new HashMap<>(); - MetaSensorItemKey itemKey = null; +// MetaSensorItemKey itemKey = null; - for (SensorItem sItem : sensorItems) { - itemKey = keyMap.get(sItem.getMetaSensorDisplayItem().getId()); - if (metricMap.containsKey(itemKey.getFroms()) == false) { - metricMap.put(itemKey.getFroms(), new ArrayList<>()); - } - metricMap.get(itemKey.getFroms()).add(itemKey); - } +// for (SensorItem sItem : sensorItems) { +// itemKey = keyMap.get(sItem.getMetaSensorDisplayItem().getId()); +// if (metricMap.containsKey(itemKey.getFroms()) == false) { +// metricMap.put(itemKey.getFroms(), new ArrayList<>()); +// } +// metricMap.get(itemKey.getFroms()).add(itemKey); +// } - return metricMap; - } +// return metricMap; +// } - public Keys createKeys(MetaSensorItemKey itemKey) throws OverflowException { - Keys keys = new Keys(); - keys.setKey(itemKey.getKey()); - keys.setMetric(itemKey.getMetaSensorItem().getKey()); - return keys; - } -} +// public Keys createKeys(MetaSensorItemKey itemKey) throws OverflowException { +// Keys keys = new Keys(); +// keys.setKey(itemKey.getKey()); +// keys.setMetric(itemKey.getMetaSensorItem().getKey()); +// return keys; +// } +// } diff --git a/src/main/java/com/loafle/overflow/central/module/generator/service/InfraHostGenerator.java b/src/main/java/com/loafle/overflow/central/module/generator/service/InfraHostGenerator.java index 72f6925..55480c4 100644 --- a/src/main/java/com/loafle/overflow/central/module/generator/service/InfraHostGenerator.java +++ b/src/main/java/com/loafle/overflow/central/module/generator/service/InfraHostGenerator.java @@ -1,110 +1,114 @@ -package com.loafle.overflow.central.module.generator.service; +// package com.loafle.overflow.central.module.generator.service; -import com.loafle.overflow.model.auth.AuthCrawler; -import com.loafle.overflow.model.infra.Infra; -import com.loafle.overflow.model.infra.InfraHost; -import com.loafle.overflow.model.meta.MetaSensorItemKey; -import com.loafle.overflow.model.sensor.Sensor; -import com.loafle.overflow.model.sensor.SensorItem; -import com.loafle.overflow.model.sensorconfig.Connection; -import com.loafle.overflow.model.sensorconfig.Crawler; -import com.loafle.overflow.model.sensorconfig.Schedule; -import com.loafle.overflow.model.sensorconfig.SensorConfig; -import com.loafle.overflow.model.sensorconfig.Target; +// import com.loafle.overflow.model.auth.AuthCrawler; +// import com.loafle.overflow.model.infra.Infra; +// import com.loafle.overflow.model.infra.InfraHost; +// import com.loafle.overflow.model.meta.MetaSensorItemKey; +// import com.loafle.overflow.model.sensor.Sensor; +// import com.loafle.overflow.model.sensor.SensorItem; +// import com.loafle.overflow.model.sensorconfig.Connection; +// import com.loafle.overflow.model.sensorconfig.Crawler; +// import com.loafle.overflow.model.sensorconfig.Schedule; +// import com.loafle.overflow.model.sensorconfig.SensorConfig; +// import com.loafle.overflow.model.sensorconfig.Target; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.core.type.TypeReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; +// import com.fasterxml.jackson.databind.ObjectMapper; +// import com.fasterxml.jackson.core.type.TypeReference; +// import org.springframework.beans.factory.annotation.Autowired; +// import org.springframework.stereotype.Service; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +// import java.util.HashMap; +// import java.util.List; +// import java.util.Map; -/** - * Created by snoop on 17. 9. 6. - */ -@Service("InfraHostGenerator") -public class InfraHostGenerator { +// /** +// * Created by snoop on 17. 9. 6. +// */ +// @Service("InfraHostGenerator") +// public class InfraHostGenerator { - @Autowired - private GenerateUtil generateUtil; +// @Autowired +// private GenerateUtil generateUtil; - @Autowired - private InfraHostWMIGenerator infraHostWMIGenerator; +// @Autowired +// private InfraHostWMIGenerator infraHostWMIGenerator; - @Autowired - private ObjectMapper objectMapper; +// @Autowired +// private ObjectMapper objectMapper; - public String process(Sensor dbSensor, List sensorItems, Infra infra) throws Exception { +// public String process(Sensor dbSensor, List sensorItems, Infra +// infra) throws Exception { - InfraHost infraHost = (InfraHost) infra; +// InfraHost infraHost = (InfraHost) infra; - SensorConfig sensorConfig = new SensorConfig(); - sensorConfig.setConfigID(String.valueOf(dbSensor.getId())); +// SensorConfig sensorConfig = new SensorConfig(); +// sensorConfig.setConfigID(String.valueOf(dbSensor.getId())); - Target target = this.createTarget(infraHost, dbSensor); +// Target target = this.createTarget(infraHost, dbSensor); - if (target == null) { - return null; - } +// if (target == null) { +// return null; +// } - sensorConfig.setTarget(target); +// sensorConfig.setTarget(target); - // FIXME: Interval - Schedule schedule = new Schedule(); - schedule.setInterval("5"); - sensorConfig.setSchedule(schedule); +// // FIXME: Interval +// Schedule schedule = new Schedule(); +// schedule.setInterval("5"); +// sensorConfig.setSchedule(schedule); - Crawler crawler = this.generateUtil.getCrawler(dbSensor.getMetaCrawler()); - sensorConfig.setCrawler(crawler); +// Crawler crawler = this.generateUtil.getCrawler(dbSensor.getMetaCrawler()); +// sensorConfig.setCrawler(crawler); - Map keyMap = this.generateUtil.initMappingMap(dbSensor.getMetaCrawler()); +// Map keyMap = +// this.generateUtil.initMappingMap(dbSensor.getMetaCrawler()); - // if (dbSensor.getMetaCrawler().getId() == - // MetaCrawlerEnum.WMI_CRAWLER.getValue()) { - // this.infraHostWMIGenerator.process(sensorItems, keyMap, dbSensor, - // sensorConfig); - // } +// // if (dbSensor.getMetaCrawler().getId() == +// // MetaCrawlerEnum.WMI_CRAWLER.getValue()) { +// // this.infraHostWMIGenerator.process(sensorItems, keyMap, dbSensor, +// // sensorConfig); +// // } - return objectMapper.writeValueAsString(sensorConfig); - } +// return objectMapper.writeValueAsString(sensorConfig); +// } - private Target createTarget(InfraHost infraHost, Sensor dbSensor) throws Exception { +// private Target createTarget(InfraHost infraHost, Sensor dbSensor) throws +// Exception { - // AuthCrawler authCrawler = - // this.authCrawlerService.readByMetaCrawlerIDAndTargetID(dbSensor.getMetaCrawler().getId(), - // dbSensor.getTarget().getId()); +// // AuthCrawler authCrawler = +// // +// this.authCrawlerService.readByMetaCrawlerIDAndTargetID(dbSensor.getMetaCrawler().getId(), +// // dbSensor.getTarget().getId()); - // if (authCrawler == null) { - // return null; - // } +// // if (authCrawler == null) { +// // return null; +// // } - // Target target = new Target(); - // Connection connection = new Connection(); - // // connection.setIp(infraHost.getIpv4()); +// // Target target = new Target(); +// // Connection connection = new Connection(); +// // // connection.setIp(infraHost.getIpv4()); - // HashMap optionMap = - // this.objectMapper.readValue(authCrawler.getAuthJson(), - // new TypeReference>() { - // }); +// // HashMap optionMap = +// // this.objectMapper.readValue(authCrawler.getAuthJson(), +// // new TypeReference>() { +// // }); - // if (dbSensor.getMetaCrawler().getId() == - // MetaCrawlerEnum.WMI_CRAWLER.getValue()) { - // connection.setPort(135); - // connection.setPortType(PortType.TCP); - // connection.setSsl(false); +// // if (dbSensor.getMetaCrawler().getId() == +// // MetaCrawlerEnum.WMI_CRAWLER.getValue()) { +// // connection.setPort(135); +// // connection.setPortType(PortType.TCP); +// // connection.setSsl(false); - // target.setConnection(connection); +// // target.setConnection(connection); - // Map auth = new HashMap<>(); - // auth.put("id", optionMap.get("ID")); - // auth.put("pw", optionMap.get("PassWord")); +// // Map auth = new HashMap<>(); +// // auth.put("id", optionMap.get("ID")); +// // auth.put("pw", optionMap.get("PassWord")); - // target.setAuth(auth); +// // target.setAuth(auth); - // } +// // } - return null; - } -} +// return null; +// } +// } diff --git a/src/main/java/com/loafle/overflow/central/module/generator/service/InfraHostWMIGenerator.java b/src/main/java/com/loafle/overflow/central/module/generator/service/InfraHostWMIGenerator.java index 04a10b7..9879915 100644 --- a/src/main/java/com/loafle/overflow/central/module/generator/service/InfraHostWMIGenerator.java +++ b/src/main/java/com/loafle/overflow/central/module/generator/service/InfraHostWMIGenerator.java @@ -1,141 +1,144 @@ -package com.loafle.overflow.central.module.generator.service; +// package com.loafle.overflow.central.module.generator.service; -import com.loafle.overflow.model.meta.MetaSensorItemKey; -import com.loafle.overflow.model.sensor.Sensor; -import com.loafle.overflow.model.sensor.SensorItem; -import com.loafle.overflow.model.sensorconfig.Item; -import com.loafle.overflow.model.sensorconfig.Keys; -import com.loafle.overflow.model.sensorconfig.MappingInfo; -import com.loafle.overflow.model.sensorconfig.QueryInfo; -import com.loafle.overflow.model.sensorconfig.SensorConfig; +// import com.loafle.overflow.model.meta.MetaSensorItemKey; +// import com.loafle.overflow.model.sensor.Sensor; +// import com.loafle.overflow.model.sensor.SensorItem; +// import com.loafle.overflow.model.sensorconfig.Item; +// import com.loafle.overflow.model.sensorconfig.Keys; +// import com.loafle.overflow.model.sensorconfig.MappingInfo; +// import com.loafle.overflow.model.sensorconfig.QueryInfo; +// import com.loafle.overflow.model.sensorconfig.SensorConfig; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.core.type.TypeReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; +// import com.fasterxml.jackson.databind.ObjectMapper; +// import com.fasterxml.jackson.core.type.TypeReference; +// import org.springframework.beans.factory.annotation.Autowired; +// import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +// import java.util.ArrayList; +// import java.util.HashMap; +// import java.util.List; +// import java.util.Map; -/** - * Created by snoop on 17. 9. 6. - */ -@Service("InfraHostWMIGenerator") -public class InfraHostWMIGenerator { +// /** +// * Created by snoop on 17. 9. 6. +// */ +// @Service("InfraHostWMIGenerator") +// public class InfraHostWMIGenerator { - @Autowired - private GenerateUtil generateUtil; +// @Autowired +// private GenerateUtil generateUtil; - @Autowired - private ObjectMapper objectMapper; +// @Autowired +// private ObjectMapper objectMapper; - public void process(List sensorItems, Map keyMap, Sensor dbSensor, - SensorConfig sensorConfig) throws Exception { +// public void process(List sensorItems, Map keyMap, Sensor dbSensor, +// SensorConfig sensorConfig) throws Exception { - Map> metricMap = null; - metricMap = this.generateUtil.sortItems(sensorItems, keyMap); +// Map> metricMap = null; +// metricMap = this.generateUtil.sortItems(sensorItems, keyMap); - // MetaSensorItemKey itemKey = null; - // - // for(SensorItem sItem : sensorItems) { - // itemKey = keyMap.get(sItem.getItem().getId()); - // if(metricMap.containsKey(itemKey.getFroms()) == false) { - // metricMap.put(itemKey.getFroms(), new ArrayList<>()); - // } - // metricMap.get(itemKey.getFroms()).add(itemKey); - // } +// // MetaSensorItemKey itemKey = null; +// // +// // for(SensorItem sItem : sensorItems) { +// // itemKey = keyMap.get(sItem.getItem().getId()); +// // if(metricMap.containsKey(itemKey.getFroms()) == false) { +// // metricMap.put(itemKey.getFroms(), new ArrayList<>()); +// // } +// // metricMap.get(itemKey.getFroms()).add(itemKey); +// // } - List itemList = new ArrayList<>(); - Item item = null; - QueryInfo queryInfo = null; - MappingInfo mappingInfo = null; +// List itemList = new ArrayList<>(); +// Item item = null; +// QueryInfo queryInfo = null; +// MappingInfo mappingInfo = null; - StringBuffer stringBuffer = new StringBuffer(); +// StringBuffer stringBuffer = new StringBuffer(); - Map extendMap = new HashMap<>(); - extendMap.put("nameSpace", "root/cimv2"); - extendMap.put("wmicPath", "/home/snoop/temp/wmic"); +// Map extendMap = new HashMap<>(); +// extendMap.put("nameSpace", "root/cimv2"); +// extendMap.put("wmicPath", "/home/snoop/temp/wmic"); - List keysList = null; - MetaSensorItemKey tempItemKey = null; - Keys keys = null; - for (Map.Entry> elems : metricMap.entrySet()) { - keysList = new ArrayList<>(); - item = new Item(); - stringBuffer.setLength(0); +// List keysList = null; +// MetaSensorItemKey tempItemKey = null; +// Keys keys = null; +// for (Map.Entry> elems : metricMap.entrySet()) +// { +// keysList = new ArrayList<>(); +// item = new Item(); +// stringBuffer.setLength(0); - stringBuffer.append("SELECT "); +// stringBuffer.append("SELECT "); - for (int indexI = 0; indexI < elems.getValue().size(); ++indexI) { +// for (int indexI = 0; indexI < elems.getValue().size(); ++indexI) { - tempItemKey = elems.getValue().get(indexI); - stringBuffer.append(tempItemKey.getKey()); - if (indexI + 1 < elems.getValue().size()) { - stringBuffer.append(", "); - } +// tempItemKey = elems.getValue().get(indexI); +// stringBuffer.append(tempItemKey.getKey()); +// if (indexI + 1 < elems.getValue().size()) { +// stringBuffer.append(", "); +// } - // keys = new Keys(); - // keys.setKey(tempItemKey.getKey()); - // keys.setMetric(tempItemKey.getItem().getKey()); - keysList.add(this.generateUtil.createKeys(tempItemKey)); - } +// // keys = new Keys(); +// // keys.setKey(tempItemKey.getKey()); +// // keys.setMetric(tempItemKey.getItem().getKey()); +// keysList.add(this.generateUtil.createKeys(tempItemKey)); +// } - List arrayColumns = null; +// List arrayColumns = null; - String json = tempItemKey.getOption(); - if (json != null && json.length() > 0) { - HashMap optionMap = this.objectMapper.readValue(json, new TypeReference>() { - }); +// String json = tempItemKey.getOption(); +// if (json != null && json.length() > 0) { +// HashMap optionMap = this.objectMapper.readValue(json, new +// TypeReference>() { +// }); - Object obj = null; - obj = optionMap.get("appends"); - if (obj != null) { - List appendsList = (List) obj; - for (String append : appendsList) { - stringBuffer.append(", "); - stringBuffer.append(append); - } - } +// Object obj = null; +// obj = optionMap.get("appends"); +// if (obj != null) { +// List appendsList = (List) obj; +// for (String append : appendsList) { +// stringBuffer.append(", "); +// stringBuffer.append(append); +// } +// } - stringBuffer.append(" FROM "); - stringBuffer.append(elems.getKey()); +// stringBuffer.append(" FROM "); +// stringBuffer.append(elems.getKey()); - obj = optionMap.get("where"); - if (obj != null) { - String where = (String) obj; - stringBuffer.append(" WHERE "); - stringBuffer.append(where); - } +// obj = optionMap.get("where"); +// if (obj != null) { +// String where = (String) obj; +// stringBuffer.append(" WHERE "); +// stringBuffer.append(where); +// } - obj = optionMap.get("arrayColumns"); - if (obj != null) { - arrayColumns = (List) obj; - } +// obj = optionMap.get("arrayColumns"); +// if (obj != null) { +// arrayColumns = (List) obj; +// } - } else { - stringBuffer.append(" FROM "); - stringBuffer.append(elems.getKey()); - } +// } else { +// stringBuffer.append(" FROM "); +// stringBuffer.append(elems.getKey()); +// } - queryInfo = new QueryInfo(); - queryInfo.setQuery(stringBuffer.toString()); - queryInfo.setExtend(extendMap); +// queryInfo = new QueryInfo(); +// queryInfo.setQuery(stringBuffer.toString()); +// queryInfo.setExtend(extendMap); - mappingInfo = new MappingInfo(); - mappingInfo.setParseDirection("col"); - mappingInfo.setArrayColumns(arrayColumns); +// mappingInfo = new MappingInfo(); +// mappingInfo.setParseDirection("col"); +// mappingInfo.setArrayColumns(arrayColumns); - item.setMappingInfo(mappingInfo); - item.setQueryInfo(queryInfo); - item.setKeys(keysList); +// item.setMappingInfo(mappingInfo); +// item.setQueryInfo(queryInfo); +// item.setKeys(keysList); - itemList.add(item); +// itemList.add(item); - } +// } - sensorConfig.setItems(itemList); +// sensorConfig.setItems(itemList); - } -} +// } +// } diff --git a/src/main/java/com/loafle/overflow/central/module/generator/service/InfraServiceGenerator.java b/src/main/java/com/loafle/overflow/central/module/generator/service/InfraServiceGenerator.java index 0c6ca84..6c12a48 100644 --- a/src/main/java/com/loafle/overflow/central/module/generator/service/InfraServiceGenerator.java +++ b/src/main/java/com/loafle/overflow/central/module/generator/service/InfraServiceGenerator.java @@ -1,125 +1,131 @@ -package com.loafle.overflow.central.module.generator.service; +// package com.loafle.overflow.central.module.generator.service; -import com.loafle.overflow.model.auth.AuthCrawler; -import com.loafle.overflow.model.infra.Infra; -import com.loafle.overflow.model.infra.InfraService; -import com.loafle.overflow.model.meta.MetaSensorItemKey; -import com.loafle.overflow.model.sensor.Sensor; -import com.loafle.overflow.model.sensor.SensorItem; -import com.loafle.overflow.model.sensorconfig.Connection; -import com.loafle.overflow.model.sensorconfig.Crawler; -import com.loafle.overflow.model.sensorconfig.Schedule; -import com.loafle.overflow.model.sensorconfig.SensorConfig; -import com.loafle.overflow.model.sensorconfig.Target; -import com.loafle.overflow.service.central.auth.AuthCrawlerService; +// import com.loafle.overflow.model.auth.AuthCrawler; +// import com.loafle.overflow.model.infra.Infra; +// import com.loafle.overflow.model.infra.InfraService; +// import com.loafle.overflow.model.meta.MetaSensorItemKey; +// import com.loafle.overflow.model.sensor.Sensor; +// import com.loafle.overflow.model.sensor.SensorItem; +// import com.loafle.overflow.model.sensorconfig.Connection; +// import com.loafle.overflow.model.sensorconfig.Crawler; +// import com.loafle.overflow.model.sensorconfig.Schedule; +// import com.loafle.overflow.model.sensorconfig.SensorConfig; +// import com.loafle.overflow.model.sensorconfig.Target; +// import com.loafle.overflow.service.central.auth.AuthCrawlerService; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.core.type.TypeReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; +// import com.fasterxml.jackson.databind.ObjectMapper; +// import com.fasterxml.jackson.core.type.TypeReference; +// import org.springframework.beans.factory.annotation.Autowired; +// import org.springframework.stereotype.Service; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +// import java.util.HashMap; +// import java.util.List; +// import java.util.Map; -/** - * Created by snoop on 17. 9. 6. - */ -@Service("InfraServiceGenerator") -public class InfraServiceGenerator { +// /** +// * Created by snoop on 17. 9. 6. +// */ +// @Service("InfraServiceGenerator") +// public class InfraServiceGenerator { - @Autowired - private GenerateUtil generateUtil; +// @Autowired +// private GenerateUtil generateUtil; - @Autowired - private InfraServiceMysqlGenerator infraServiceMysqlGenerator; +// @Autowired +// private InfraServiceMysqlGenerator infraServiceMysqlGenerator; - @Autowired - private InfraServiceJMXGenerator infraServiceJMXGenerator; +// @Autowired +// private InfraServiceJMXGenerator infraServiceJMXGenerator; - @Autowired - private ObjectMapper objectMapper; +// @Autowired +// private ObjectMapper objectMapper; - public String process(Sensor dbSensor, List sensorItems, Infra infra) throws Exception { - com.loafle.overflow.model.infra.InfraService infraService = (com.loafle.overflow.model.infra.InfraService) infra; +// public String process(Sensor dbSensor, List sensorItems, Infra +// infra) throws Exception { +// com.loafle.overflow.model.infra.InfraService infraService = +// (com.loafle.overflow.model.infra.InfraService) infra; - SensorConfig sensorConfig = new SensorConfig(); - sensorConfig.setConfigID(String.valueOf(dbSensor.getId())); +// SensorConfig sensorConfig = new SensorConfig(); +// sensorConfig.setConfigID(String.valueOf(dbSensor.getId())); - Target target = this.createTarget(infraService, dbSensor); +// Target target = this.createTarget(infraService, dbSensor); - if (target == null) { - return null; - } +// if (target == null) { +// return null; +// } - sensorConfig.setTarget(target); +// sensorConfig.setTarget(target); - // FIXME: Interval - Schedule schedule = new Schedule(); - schedule.setInterval("5"); - sensorConfig.setSchedule(schedule); +// // FIXME: Interval +// Schedule schedule = new Schedule(); +// schedule.setInterval("5"); +// sensorConfig.setSchedule(schedule); - Crawler crawler = this.generateUtil.getCrawler(dbSensor.getMetaCrawler()); - sensorConfig.setCrawler(crawler); +// Crawler crawler = this.generateUtil.getCrawler(dbSensor.getMetaCrawler()); +// sensorConfig.setCrawler(crawler); - Map keyMap = this.generateUtil.initMappingMap(dbSensor.getMetaCrawler()); +// Map keyMap = +// this.generateUtil.initMappingMap(dbSensor.getMetaCrawler()); - // if (dbSensor.getMetaCrawler().getId() == - // MetaCrawlerEnum.MYSQL_CRAWLER.getValue()) { - // this.infraServiceMysqlGenerator.process(sensorItems, keyMap, dbSensor, - // sensorConfig); - // } else if (dbSensor.getMetaCrawler().getId() == - // MetaCrawlerEnum.JMX_CRAWLER.getValue()) { - // this.infraServiceJMXGenerator.process(sensorItems, keyMap, dbSensor, - // sensorConfig); - // } +// // if (dbSensor.getMetaCrawler().getId() == +// // MetaCrawlerEnum.MYSQL_CRAWLER.getValue()) { +// // this.infraServiceMysqlGenerator.process(sensorItems, keyMap, dbSensor, +// // sensorConfig); +// // } else if (dbSensor.getMetaCrawler().getId() == +// // MetaCrawlerEnum.JMX_CRAWLER.getValue()) { +// // this.infraServiceJMXGenerator.process(sensorItems, keyMap, dbSensor, +// // sensorConfig); +// // } - return objectMapper.writeValueAsString(sensorConfig); - } +// return objectMapper.writeValueAsString(sensorConfig); +// } - private Target createTarget(InfraService infraService, Sensor sensor) throws Exception { +// private Target createTarget(InfraService infraService, Sensor sensor) throws +// Exception { - // AuthCrawler authCrawler = - // this.authCrawlerService.readByMetaCrawlerIDAndTargetID(sensor.getMetaCrawler().getId(), - // sensor.getTarget().getId()); +// // AuthCrawler authCrawler = +// // +// this.authCrawlerService.readByMetaCrawlerIDAndTargetID(sensor.getMetaCrawler().getId(), +// // sensor.getTarget().getId()); - // if (authCrawler == null) { - // return null; - // } +// // if (authCrawler == null) { +// // return null; +// // } - // Target target = new Target(); - // Connection connection = new Connection(); - // // connection.setIp(infraService.getInfraHost().getIpv4()); - // // connection.setPort(infraService.getPort()); - // // connection.setPortType(PortType.valueOf(infraService.getPortType())); - // // connection.setSsl(infraService.isTlsType()); +// // Target target = new Target(); +// // Connection connection = new Connection(); +// // // connection.setIp(infraService.getInfraHost().getIpv4()); +// // // connection.setPort(infraService.getPort()); +// // // connection.setPortType(PortType.valueOf(infraService.getPortType())); +// // // connection.setSsl(infraService.isTlsType()); - // target.setConnection(connection); +// // target.setConnection(connection); - // HashMap optionMap = - // this.objectMapper.readValue(authCrawler.getAuthJson(), - // new TypeReference>() { - // }); +// // HashMap optionMap = +// // this.objectMapper.readValue(authCrawler.getAuthJson(), +// // new TypeReference>() { +// // }); - // Map auth = new HashMap<>(); +// // Map auth = new HashMap<>(); - // // if (sensor.getMetaCrawler().getId() == - // MetaCrawlerEnum.MYSQL_CRAWLER.getValue()) { - // // auth.put("url", "jdbc:mysql://" + infraService.getInfraHost().getIpv4() + - // ":" + infraService.getPort()); - // // auth.put("id", optionMap.get("ID")); // FIXME: Auth Info - // // auth.put("pw", optionMap.get("PassWord")); // FIXME: Auth Info - // // } else if (sensor.getMetaCrawler().getId() == - // MetaCrawlerEnum.JMX_CRAWLER.getValue()) { - // // auth.put("id", optionMap.get("ID")); // FIXME: Auth Info - // // auth.put("pw", optionMap.get("PassWord")); // FIXME: Auth Info - // // connection.setPort(9840); - // // } +// // // if (sensor.getMetaCrawler().getId() == +// // MetaCrawlerEnum.MYSQL_CRAWLER.getValue()) { +// // // auth.put("url", "jdbc:mysql://" + infraService.getInfraHost().getIpv4() +// + +// // ":" + infraService.getPort()); +// // // auth.put("id", optionMap.get("ID")); // FIXME: Auth Info +// // // auth.put("pw", optionMap.get("PassWord")); // FIXME: Auth Info +// // // } else if (sensor.getMetaCrawler().getId() == +// // MetaCrawlerEnum.JMX_CRAWLER.getValue()) { +// // // auth.put("id", optionMap.get("ID")); // FIXME: Auth Info +// // // auth.put("pw", optionMap.get("PassWord")); // FIXME: Auth Info +// // // connection.setPort(9840); +// // // } - // target.setAuth(auth); +// // target.setAuth(auth); - // return target; - return null; - } +// // return target; +// return null; +// } -} +// } diff --git a/src/main/java/com/loafle/overflow/central/module/generator/service/InfraServiceJMXGenerator.java b/src/main/java/com/loafle/overflow/central/module/generator/service/InfraServiceJMXGenerator.java index 5329c8a..09655e2 100644 --- a/src/main/java/com/loafle/overflow/central/module/generator/service/InfraServiceJMXGenerator.java +++ b/src/main/java/com/loafle/overflow/central/module/generator/service/InfraServiceJMXGenerator.java @@ -1,108 +1,111 @@ -package com.loafle.overflow.central.module.generator.service; +// package com.loafle.overflow.central.module.generator.service; -import com.loafle.overflow.model.meta.MetaSensorItemKey; -import com.loafle.overflow.model.sensor.Sensor; -import com.loafle.overflow.model.sensor.SensorItem; -import com.loafle.overflow.model.sensorconfig.Item; -import com.loafle.overflow.model.sensorconfig.Keys; -import com.loafle.overflow.model.sensorconfig.MappingInfo; -import com.loafle.overflow.model.sensorconfig.QueryInfo; -import com.loafle.overflow.model.sensorconfig.SensorConfig; +// import com.loafle.overflow.model.meta.MetaSensorItemKey; +// import com.loafle.overflow.model.sensor.Sensor; +// import com.loafle.overflow.model.sensor.SensorItem; +// import com.loafle.overflow.model.sensorconfig.Item; +// import com.loafle.overflow.model.sensorconfig.Keys; +// import com.loafle.overflow.model.sensorconfig.MappingInfo; +// import com.loafle.overflow.model.sensorconfig.QueryInfo; +// import com.loafle.overflow.model.sensorconfig.SensorConfig; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.core.type.TypeReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; +// import com.fasterxml.jackson.databind.ObjectMapper; +// import com.fasterxml.jackson.core.type.TypeReference; +// import org.springframework.beans.factory.annotation.Autowired; +// import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +// import java.util.ArrayList; +// import java.util.HashMap; +// import java.util.List; +// import java.util.Map; -/** - * Created by geek on 17. 9. 11. - */ -@Service("InfraServiceJMXGenerator") -public class InfraServiceJMXGenerator { +// /** +// * Created by geek on 17. 9. 11. +// */ +// @Service("InfraServiceJMXGenerator") +// public class InfraServiceJMXGenerator { - @Autowired - private GenerateUtil generateUtil; +// @Autowired +// private GenerateUtil generateUtil; - @Autowired - private ObjectMapper objectMapper; +// @Autowired +// private ObjectMapper objectMapper; - public void process(List sensorItems, Map keyMap, Sensor dbSensor, - SensorConfig sensorConfig) throws Exception { - Map> metricMap = null; - metricMap = this.generateUtil.sortItems(sensorItems, keyMap); +// public void process(List sensorItems, Map keyMap, Sensor dbSensor, +// SensorConfig sensorConfig) throws Exception { +// Map> metricMap = null; +// metricMap = this.generateUtil.sortItems(sensorItems, keyMap); - List itemList = new ArrayList<>(); - Item item = null; - QueryInfo queryInfo = null; - MappingInfo mappingInfo = null; +// List itemList = new ArrayList<>(); +// Item item = null; +// QueryInfo queryInfo = null; +// MappingInfo mappingInfo = null; - StringBuffer buffer = new StringBuffer(); +// StringBuffer buffer = new StringBuffer(); - Map extendMap = new HashMap<>(); +// Map extendMap = new HashMap<>(); - List keysList = null; - MetaSensorItemKey tempItemKey = null; - Keys keys = null; +// List keysList = null; +// MetaSensorItemKey tempItemKey = null; +// Keys keys = null; - for (Map.Entry> elms : metricMap.entrySet()) { - keysList = new ArrayList<>(); - item = new Item(); - buffer.setLength(0); +// for (Map.Entry> elms : metricMap.entrySet()) +// { +// keysList = new ArrayList<>(); +// item = new Item(); +// buffer.setLength(0); - buffer.append(elms.getKey()); +// buffer.append(elms.getKey()); - for (int idx = 0; idx < elms.getValue().size(); idx++) { - tempItemKey = elms.getValue().get(idx); +// for (int idx = 0; idx < elms.getValue().size(); idx++) { +// tempItemKey = elms.getValue().get(idx); - buffer.append(tempItemKey.getKey()); +// buffer.append(tempItemKey.getKey()); - keys = new Keys(); - keys.setKey(tempItemKey.getKey()); - keys.setMetric(tempItemKey.getMetaSensorItem().getKey()); +// keys = new Keys(); +// keys.setKey(tempItemKey.getKey()); +// keys.setMetric(tempItemKey.getMetaSensorItem().getKey()); - keysList.add(this.generateUtil.createKeys(tempItemKey)); - } +// keysList.add(this.generateUtil.createKeys(tempItemKey)); +// } - String json = tempItemKey.getOption(); - List aliases = null; - List arrayCol = null; +// String json = tempItemKey.getOption(); +// List aliases = null; +// List arrayCol = null; - if (json != null && json.length() > 0) { - HashMap optionMap = this.objectMapper.readValue(json, new TypeReference>() { - }); +// if (json != null && json.length() > 0) { +// HashMap optionMap = this.objectMapper.readValue(json, new +// TypeReference>() { +// }); - Object obj = null; - obj = optionMap.get("aliases"); +// Object obj = null; +// obj = optionMap.get("aliases"); - if (obj != null) { - aliases = (List) obj; - } +// if (obj != null) { +// aliases = (List) obj; +// } - obj = optionMap.get("arrayColumns"); - if (obj != null) { - arrayCol = (List) obj; - } - } +// obj = optionMap.get("arrayColumns"); +// if (obj != null) { +// arrayCol = (List) obj; +// } +// } - queryInfo = new QueryInfo(); - queryInfo.setQuery(tempItemKey.getFroms()); - queryInfo.setExtend(extendMap); +// queryInfo = new QueryInfo(); +// queryInfo.setQuery(tempItemKey.getFroms()); +// queryInfo.setExtend(extendMap); - extendMap.put("aliases", aliases); - mappingInfo = new MappingInfo(); - mappingInfo.setArrayColumns(arrayCol); +// extendMap.put("aliases", aliases); +// mappingInfo = new MappingInfo(); +// mappingInfo.setArrayColumns(arrayCol); - item.setMappingInfo(mappingInfo); - item.setQueryInfo(queryInfo); - item.setKeys(keysList); - itemList.add(item); - } - sensorConfig.setItems(itemList); - } +// item.setMappingInfo(mappingInfo); +// item.setQueryInfo(queryInfo); +// item.setKeys(keysList); +// itemList.add(item); +// } +// sensorConfig.setItems(itemList); +// } -} +// } diff --git a/src/main/java/com/loafle/overflow/central/module/generator/service/InfraServiceMysqlGenerator.java b/src/main/java/com/loafle/overflow/central/module/generator/service/InfraServiceMysqlGenerator.java index 36c4a61..53adcbe 100644 --- a/src/main/java/com/loafle/overflow/central/module/generator/service/InfraServiceMysqlGenerator.java +++ b/src/main/java/com/loafle/overflow/central/module/generator/service/InfraServiceMysqlGenerator.java @@ -1,156 +1,160 @@ -package com.loafle.overflow.central.module.generator.service; +// package com.loafle.overflow.central.module.generator.service; -import com.loafle.overflow.model.meta.MetaSensorItemKey; -import com.loafle.overflow.model.sensor.Sensor; -import com.loafle.overflow.model.sensor.SensorItem; -import com.loafle.overflow.model.sensorconfig.Item; -import com.loafle.overflow.model.sensorconfig.Keys; -import com.loafle.overflow.model.sensorconfig.MappingInfo; -import com.loafle.overflow.model.sensorconfig.QueryInfo; -import com.loafle.overflow.model.sensorconfig.SensorConfig; +// import com.loafle.overflow.model.meta.MetaSensorItemKey; +// import com.loafle.overflow.model.sensor.Sensor; +// import com.loafle.overflow.model.sensor.SensorItem; +// import com.loafle.overflow.model.sensorconfig.Item; +// import com.loafle.overflow.model.sensorconfig.Keys; +// import com.loafle.overflow.model.sensorconfig.MappingInfo; +// import com.loafle.overflow.model.sensorconfig.QueryInfo; +// import com.loafle.overflow.model.sensorconfig.SensorConfig; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.core.type.TypeReference; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; +// import com.fasterxml.jackson.databind.ObjectMapper; +// import com.fasterxml.jackson.core.type.TypeReference; +// import org.springframework.beans.factory.annotation.Autowired; +// import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +// import java.util.ArrayList; +// import java.util.HashMap; +// import java.util.List; +// import java.util.Map; -/** - * Created by snoop on 17. 9. 6. - */ -@Service("InfraServiceMysqlGenerator") -public class InfraServiceMysqlGenerator { +// /** +// * Created by snoop on 17. 9. 6. +// */ +// @Service("InfraServiceMysqlGenerator") +// public class InfraServiceMysqlGenerator { - @Autowired - private GenerateUtil generateUtil; - @Autowired - private ObjectMapper objectMapper; +// @Autowired +// private GenerateUtil generateUtil; +// @Autowired +// private ObjectMapper objectMapper; - public void process(List sensorItems, Map keyMap, Sensor dbSensor, - SensorConfig sensorConfig) throws Exception { +// public void process(List sensorItems, Map keyMap, Sensor dbSensor, +// SensorConfig sensorConfig) throws Exception { - // List keysList = new ArrayList<>(); - // for(SensorItem sItem : sensorItems) { - // keys = new Keys(); - // keys.setMetric(sItem.getItem().getKey()); - // keys.setKey(KeyMap.get(sItem.getItem().getId()).getKey()); - // keysList.add(keys); - // } - // item.setKeys(keysList); - Map> metricMap = null; - metricMap = this.generateUtil.sortItems(sensorItems, keyMap); +// // List keysList = new ArrayList<>(); +// // for(SensorItem sItem : sensorItems) { +// // keys = new Keys(); +// // keys.setMetric(sItem.getItem().getKey()); +// // keys.setKey(KeyMap.get(sItem.getItem().getId()).getKey()); +// // keysList.add(keys); +// // } +// // item.setKeys(keysList); +// Map> metricMap = null; +// metricMap = this.generateUtil.sortItems(sensorItems, keyMap); - List itemList = new ArrayList<>(); +// List itemList = new ArrayList<>(); - QueryInfo queryInfo = null; - MappingInfo mappingInfo = null; +// QueryInfo queryInfo = null; +// MappingInfo mappingInfo = null; - List keysList = null; - MetaSensorItemKey tempItemKey = null; - Keys keys = null; - Item item = null; - StringBuffer stringBuffer = new StringBuffer(); - for (Map.Entry> elems : metricMap.entrySet()) { +// List keysList = null; +// MetaSensorItemKey tempItemKey = null; +// Keys keys = null; +// Item item = null; +// StringBuffer stringBuffer = new StringBuffer(); +// for (Map.Entry> elems : metricMap.entrySet()) +// { - keysList = new ArrayList<>(); - item = new Item(); - stringBuffer.setLength(0); +// keysList = new ArrayList<>(); +// item = new Item(); +// stringBuffer.setLength(0); - stringBuffer.append(elems.getKey()); +// stringBuffer.append(elems.getKey()); - stringBuffer.append(" where "); - for (int indexI = 0; indexI < elems.getValue().size(); ++indexI) { - tempItemKey = elems.getValue().get(indexI); +// stringBuffer.append(" where "); +// for (int indexI = 0; indexI < elems.getValue().size(); ++indexI) { +// tempItemKey = elems.getValue().get(indexI); - stringBuffer.append("variable_name = '"); - stringBuffer.append(tempItemKey.getKey()); - stringBuffer.append("'"); +// stringBuffer.append("variable_name = '"); +// stringBuffer.append(tempItemKey.getKey()); +// stringBuffer.append("'"); - if (indexI + 1 < elems.getValue().size()) { - stringBuffer.append(" or "); - } - keysList.add(this.generateUtil.createKeys(tempItemKey)); - } +// if (indexI + 1 < elems.getValue().size()) { +// stringBuffer.append(" or "); +// } +// keysList.add(this.generateUtil.createKeys(tempItemKey)); +// } - List keyColumns = null; - String valueColumn = null; +// List keyColumns = null; +// String valueColumn = null; - String json = tempItemKey.getOption(); - if (json != null && json.length() > 0) { - HashMap optionMap = this.objectMapper.readValue(json, new TypeReference>() { - }); +// String json = tempItemKey.getOption(); +// if (json != null && json.length() > 0) { +// HashMap optionMap = this.objectMapper.readValue(json, new +// TypeReference>() { +// }); - Object obj = null; - obj = optionMap.get("valueColumn"); - if (obj != null) { - valueColumn = (String) obj; - } +// Object obj = null; +// obj = optionMap.get("valueColumn"); +// if (obj != null) { +// valueColumn = (String) obj; +// } - obj = optionMap.get("keyColumns"); - if (obj != null) { - keyColumns = (List) obj; - } - } +// obj = optionMap.get("keyColumns"); +// if (obj != null) { +// keyColumns = (List) obj; +// } +// } - queryInfo = new QueryInfo(); - queryInfo.setQuery(stringBuffer.toString()); +// queryInfo = new QueryInfo(); +// queryInfo.setQuery(stringBuffer.toString()); - mappingInfo = new MappingInfo(); - mappingInfo.setParseDirection("row"); - mappingInfo.setValueColumn(valueColumn); - mappingInfo.setKeyColumns(keyColumns); +// mappingInfo = new MappingInfo(); +// mappingInfo.setParseDirection("row"); +// mappingInfo.setValueColumn(valueColumn); +// mappingInfo.setKeyColumns(keyColumns); - item.setMappingInfo(mappingInfo); - item.setQueryInfo(queryInfo); - item.setKeys(keysList); +// item.setMappingInfo(mappingInfo); +// item.setQueryInfo(queryInfo); +// item.setKeys(keysList); - itemList.add(item); +// itemList.add(item); - } +// } - sensorConfig.setItems(itemList); +// sensorConfig.setItems(itemList); - // ObjectMapper objectMapper = new ObjectMapper(); - // - // return objectMapper.writeValueAsString(config); - } +// // ObjectMapper objectMapper = new ObjectMapper(); +// // +// // return objectMapper.writeValueAsString(config); +// } - // public void setQueryAndMapping(MetaCrawler metaCrawler, List keysList, - // QueryInfo queryInfo, MappingInfo mappingInfo) { - // - // switch (metaCrawler.getId()) { - // case 11: // mysql - // { - // String query = "show status where "; - //// queryInfo.setQuery("show status where "); - // - // Keys keys = null; - // for(int indexI = 0 ; indexI < keysList.size(); ++indexI) { - // keys = keysList.get(indexI); - // query += "variable_name = '"; - // query += keys.getKey(); - // query += "'"; - // if(indexI + 1 < keysList.size()) { - // query += " or "; - // } - // } - // - // queryInfo.setQuery(query); - // - // mappingInfo.setParseDirection("row"); - // mappingInfo.setValueColumn("Value"); - // - // List keyColumns = new ArrayList<>(); - // keyColumns.add("Variable_name"); - // - // mappingInfo.setKeyColumns(keyColumns); - // } - // break; - // } - // - // } -} +// // public void setQueryAndMapping(MetaCrawler metaCrawler, List +// keysList, +// // QueryInfo queryInfo, MappingInfo mappingInfo) { +// // +// // switch (metaCrawler.getId()) { +// // case 11: // mysql +// // { +// // String query = "show status where "; +// //// queryInfo.setQuery("show status where "); +// // +// // Keys keys = null; +// // for(int indexI = 0 ; indexI < keysList.size(); ++indexI) { +// // keys = keysList.get(indexI); +// // query += "variable_name = '"; +// // query += keys.getKey(); +// // query += "'"; +// // if(indexI + 1 < keysList.size()) { +// // query += " or "; +// // } +// // } +// // +// // queryInfo.setQuery(query); +// // +// // mappingInfo.setParseDirection("row"); +// // mappingInfo.setValueColumn("Value"); +// // +// // List keyColumns = new ArrayList<>(); +// // keyColumns.add("Variable_name"); +// // +// // mappingInfo.setKeyColumns(keyColumns); +// // } +// // break; +// // } +// // +// // } +// } diff --git a/src/main/java/com/loafle/overflow/central/module/generator/service/SensorConfigGenerator.java b/src/main/java/com/loafle/overflow/central/module/generator/service/SensorConfigGenerator.java index 5e2a74d..5c999a0 100644 --- a/src/main/java/com/loafle/overflow/central/module/generator/service/SensorConfigGenerator.java +++ b/src/main/java/com/loafle/overflow/central/module/generator/service/SensorConfigGenerator.java @@ -1,26 +1,26 @@ -package com.loafle.overflow.central.module.generator.service; +// package com.loafle.overflow.central.module.generator.service; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.stereotype.Service; +// import org.springframework.beans.factory.annotation.Autowired; +// import org.springframework.data.domain.Page; +// import org.springframework.stereotype.Service; -import java.util.List; +// import java.util.List; -import com.loafle.overflow.core.model.PageParams; -import com.loafle.overflow.model.infra.Infra; -import com.loafle.overflow.model.sensor.Sensor; -import com.loafle.overflow.model.sensor.SensorItem; -import com.loafle.overflow.service.central.infra.InfraService; -import com.loafle.overflow.service.central.sensor.SensorItemService; +// import com.loafle.overflow.core.model.PageParams; +// import com.loafle.overflow.model.infra.Infra; +// import com.loafle.overflow.model.sensor.Sensor; +// import com.loafle.overflow.model.sensor.SensorItem; +// import com.loafle.overflow.service.central.infra.InfraService; +// import com.loafle.overflow.service.central.sensor.SensorItemService; -/** - * Created by snoop on 17. 9. 6. - */ -@Service("SensorConfigGenerator") -public class SensorConfigGenerator { +// /** +// * Created by snoop on 17. 9. 6. +// */ +// @Service("SensorConfigGenerator") +// public class SensorConfigGenerator { - public String generate(Sensor sensor) throws Exception { - return null; - } +// public String generate(Sensor sensor) throws Exception { +// return null; +// } -} +// } diff --git a/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraDAO.java b/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraDAO.java index 8e38b95..25adb47 100644 --- a/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraDAO.java +++ b/src/main/java/com/loafle/overflow/central/module/infra/dao/InfraDAO.java @@ -1,8 +1,6 @@ package com.loafle.overflow.central.module.infra.dao; import com.loafle.overflow.model.infra.Infra; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorItemTypeDAO.java b/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaCollectionItemDAO.java similarity index 59% rename from src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorItemTypeDAO.java rename to src/main/java/com/loafle/overflow/central/module/meta/dao/MetaCollectionItemDAO.java index 72927be..a3de5a7 100644 --- a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorItemTypeDAO.java +++ b/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaCollectionItemDAO.java @@ -1,6 +1,7 @@ package com.loafle.overflow.central.module.meta.dao; -import com.loafle.overflow.model.meta.MetaSensorItemType; +import com.loafle.overflow.model.meta.MetaCollectionItem; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @@ -8,5 +9,5 @@ import org.springframework.stereotype.Repository; * Created by insanity on 17. 6. 23. */ @Repository -public interface MetaSensorItemTypeDAO extends JpaRepository { +public interface MetaCollectionItemDAO extends JpaRepository { } diff --git a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorItemDAO.java b/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaDisplayItemCategoryDAO.java similarity index 57% rename from src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorItemDAO.java rename to src/main/java/com/loafle/overflow/central/module/meta/dao/MetaDisplayItemCategoryDAO.java index ccc12d1..799588a 100644 --- a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorItemDAO.java +++ b/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaDisplayItemCategoryDAO.java @@ -1,6 +1,7 @@ package com.loafle.overflow.central.module.meta.dao; -import com.loafle.overflow.model.meta.MetaSensorItem; +import com.loafle.overflow.model.meta.MetaDisplayItemCategory; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @@ -8,5 +9,5 @@ import org.springframework.stereotype.Repository; * Created by insanity on 17. 6. 23. */ @Repository -public interface MetaSensorItemDAO extends JpaRepository { +public interface MetaDisplayItemCategoryDAO extends JpaRepository { } diff --git a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorItemUnitDAO.java b/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaDisplayItemDAO.java similarity index 60% rename from src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorItemUnitDAO.java rename to src/main/java/com/loafle/overflow/central/module/meta/dao/MetaDisplayItemDAO.java index 8037ec7..709c441 100644 --- a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorItemUnitDAO.java +++ b/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaDisplayItemDAO.java @@ -1,13 +1,13 @@ package com.loafle.overflow.central.module.meta.dao; -import com.loafle.overflow.model.meta.MetaSensorItemUnit; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; +import com.loafle.overflow.model.meta.MetaDisplayItem; + /** * Created by insanity on 17. 9. 20. */ - @Repository -public interface MetaSensorItemUnitDAO extends JpaRepository { +public interface MetaDisplayItemDAO extends JpaRepository { } diff --git a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaDisplayItemMappingDAO.java b/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaDisplayItemMappingDAO.java new file mode 100644 index 0000000..392512b --- /dev/null +++ b/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaDisplayItemMappingDAO.java @@ -0,0 +1,14 @@ +package com.loafle.overflow.central.module.meta.dao; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import com.loafle.overflow.model.meta.MetaDisplayItemMapping; + +/** + * Created by insanity on 17. 11. 7. + */ +@Repository +public interface MetaDisplayItemMappingDAO extends JpaRepository { + +} diff --git a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaItemUnitDAO.java b/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaItemUnitDAO.java new file mode 100644 index 0000000..2379339 --- /dev/null +++ b/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaItemUnitDAO.java @@ -0,0 +1,13 @@ +package com.loafle.overflow.central.module.meta.dao; + +import com.loafle.overflow.model.meta.MetaItemUnit; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +/** + * Created by insanity on 17. 9. 20. + */ + +@Repository +public interface MetaItemUnitDAO extends JpaRepository { +} diff --git a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayItemDAO.java b/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayItemDAO.java deleted file mode 100644 index 7987182..0000000 --- a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayItemDAO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.loafle.overflow.central.module.meta.dao; - -import com.loafle.overflow.model.meta.MetaSensorDisplayItem; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * Created by insanity on 17. 9. 20. - */ -@Repository -public interface MetaSensorDisplayItemDAO extends JpaRepository { - public List findAllByMetaCrawlerId(Short metaCrawlerId); -} diff --git a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayMappingDAO.java b/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayMappingDAO.java deleted file mode 100644 index 956bbc9..0000000 --- a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayMappingDAO.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.loafle.overflow.central.module.meta.dao; - -import com.loafle.overflow.model.meta.MetaSensorDisplayMapping; -import com.loafle.overflow.model.meta.MetaSensorItemKey; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * Created by insanity on 17. 11. 7. - */ -@Repository -public interface MetaSensorDisplayMappingDAO extends JpaRepository { - - @Query("SELECT m.metaSensorItemKey from MetaSensorDisplayMapping m where m.metaSensorDisplayItem.id = :metaSensorDisplayItemId") - public List findAllMetaSensorItemKeyByMetaSensorDisplayItemId( - @Param("metaSensorDisplayItemId") Long metaSensorDisplayItemId); -} diff --git a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorItemKeyDAO.java b/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorItemKeyDAO.java deleted file mode 100644 index 28d628c..0000000 --- a/src/main/java/com/loafle/overflow/central/module/meta/dao/MetaSensorItemKeyDAO.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.loafle.overflow.central.module.meta.dao; - -import com.loafle.overflow.model.meta.MetaSensorItemKey; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * Created by snoop on 17. 8. 29. - */ -@Repository -public interface MetaSensorItemKeyDAO extends JpaRepository { - List findAllByMetaCrawlerId(Short metaCrawlerId); -} diff --git a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaCollectionItemService.java b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaCollectionItemService.java new file mode 100644 index 0000000..f4fd68e --- /dev/null +++ b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaCollectionItemService.java @@ -0,0 +1,21 @@ +package com.loafle.overflow.central.module.meta.service; + +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaCollectionItem; +import com.loafle.overflow.service.central.meta.MetaCollectionItemService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +@Service("MetaCollectionItemService") +public class CentralMetaCollectionItemService implements MetaCollectionItemService { + + @Override + public List readAll() throws OverflowException { + return null; + } + +} diff --git a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaDisplayItemCategoryService.java b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaDisplayItemCategoryService.java new file mode 100644 index 0000000..1cb4919 --- /dev/null +++ b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaDisplayItemCategoryService.java @@ -0,0 +1,33 @@ +package com.loafle.overflow.central.module.meta.service; + +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaDisplayItemCategory; +import com.loafle.overflow.service.central.meta.MetaDisplayItemCategoryService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ + +@Service("MetaDisplayItemCategoryService") +public class CentralMetaDisplayItemCategoryService implements MetaDisplayItemCategoryService { + + @Override + public List readAll() throws OverflowException { + return null; + } + + @Override + public MetaDisplayItemCategory regist(MetaDisplayItemCategory metaDisplayItemCategory) throws OverflowException { + return null; + } + + @Override + public List registAll(List metaDisplayItemCategories) + throws OverflowException { + return null; + } + +} diff --git a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaDisplayItemMappingService.java b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaDisplayItemMappingService.java new file mode 100644 index 0000000..0e7827e --- /dev/null +++ b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaDisplayItemMappingService.java @@ -0,0 +1,21 @@ +package com.loafle.overflow.central.module.meta.service; + +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaDisplayItemMapping; +import com.loafle.overflow.service.central.meta.MetaDisplayItemMappingService; + +import org.springframework.stereotype.Service; + +/** + * Created by insanity on 17. 11. 7. + */ +@Service("MetaDisplayItemMappingService") +public class CentralMetaDisplayItemMappingService implements MetaDisplayItemMappingService { + // @Autowired + // private MetaSensorDisplayMappingDAO mappingDAO; + + @Override + public MetaDisplayItemMapping regist(MetaDisplayItemMapping metaDisplayItemMapping) throws OverflowException { + return null; + } +} diff --git a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaDisplayItemService.java b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaDisplayItemService.java new file mode 100644 index 0000000..3e5387b --- /dev/null +++ b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaDisplayItemService.java @@ -0,0 +1,25 @@ +package com.loafle.overflow.central.module.meta.service; + +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaDisplayItem; +import com.loafle.overflow.service.central.meta.MetaDisplayItemService; +import org.springframework.stereotype.Service; + +/** + * Created by insanity on 17. 9. 20. + */ +@Service("MetaDisplayItemService") +public class CentralMetaDisplayItemService implements MetaDisplayItemService { + // @Autowired + // private MetaSensorDisplayItemDAO metaSensorDisplayItemDAO; + + @Override + public MetaDisplayItem regist(MetaDisplayItem metaDisplayItem) throws OverflowException { + return null; + } + + @Override + public MetaDisplayItem read(Long id) throws OverflowException { + return null; + } +} diff --git a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaItemUnitService.java b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaItemUnitService.java new file mode 100644 index 0000000..3e45aae --- /dev/null +++ b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaItemUnitService.java @@ -0,0 +1,20 @@ +package com.loafle.overflow.central.module.meta.service; + +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaItemUnit; +import com.loafle.overflow.service.central.meta.MetaItemUnitService; + +import org.springframework.stereotype.Service; + +/** + * Created by insanity on 17. 9. 20. + */ + +@Service("MetaSensorItemUnitService") +public class CentralMetaItemUnitService implements MetaItemUnitService { + + @Override + public MetaItemUnit regist(MetaItemUnit metaItemUnit) throws OverflowException { + return null; + } +} diff --git a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorDisplayItemService.java b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorDisplayItemService.java deleted file mode 100644 index 476220f..0000000 --- a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorDisplayItemService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.loafle.overflow.central.module.meta.service; - -import com.loafle.overflow.central.module.meta.dao.MetaSensorDisplayItemDAO; -import com.loafle.overflow.core.exception.OverflowException; -import com.loafle.overflow.model.meta.MetaSensorDisplayItem; -import com.loafle.overflow.service.central.meta.MetaSensorDisplayItemService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Created by insanity on 17. 9. 20. - */ -@Service("MetaSensorDisplayItemService") -public class CentralMetaSensorDisplayItemService implements MetaSensorDisplayItemService { - @Autowired - private MetaSensorDisplayItemDAO displayItemDAO; - - public MetaSensorDisplayItem regist(MetaSensorDisplayItem item) throws OverflowException { - return this.displayItemDAO.save(item); - } - - public MetaSensorDisplayItem read(Long id) throws OverflowException { - return this.displayItemDAO.findById(id).get(); - } - - public List readAllByCrawlerID(Short metaCrawlerID) throws OverflowException { - return this.displayItemDAO.findAllByMetaCrawlerId(metaCrawlerID); - } -} diff --git a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorDisplayMappingService.java b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorDisplayMappingService.java deleted file mode 100644 index b328c68..0000000 --- a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorDisplayMappingService.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.loafle.overflow.central.module.meta.service; - -import com.loafle.overflow.central.module.meta.dao.MetaSensorDisplayMappingDAO; -import com.loafle.overflow.core.exception.OverflowException; -import com.loafle.overflow.model.meta.MetaSensorDisplayMapping; -import com.loafle.overflow.model.meta.MetaSensorItemKey; -import com.loafle.overflow.service.central.meta.MetaSensorDisplayMappingService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Created by insanity on 17. 11. 7. - */ -@Service("MetaSensorDisplayMappingService") -public class CentralMetaSensorDisplayMappingService implements MetaSensorDisplayMappingService { - @Autowired - private MetaSensorDisplayMappingDAO mappingDAO; - - public MetaSensorDisplayMapping regist(MetaSensorDisplayMapping m) throws OverflowException { - return this.mappingDAO.save(m); - } - - public List readAllMetaSensorItemKeyByDisplayItemID(Long metaSensorDisplayItemID) - throws OverflowException { - return this.mappingDAO.findAllMetaSensorItemKeyByMetaSensorDisplayItemId(metaSensorDisplayItemID); - } -} diff --git a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemKeyService.java b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemKeyService.java deleted file mode 100644 index 690e495..0000000 --- a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemKeyService.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.loafle.overflow.central.module.meta.service; - -import com.loafle.overflow.central.module.meta.dao.MetaSensorItemKeyDAO; -import com.loafle.overflow.core.exception.OverflowException; -import com.loafle.overflow.model.meta.MetaSensorItemKey; -import com.loafle.overflow.service.central.meta.MetaSensorItemKeyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by snoop on 17. 8. 29. - */ - -@Service("MetaSensorItemKeyService") -public class CentralMetaSensorItemKeyService implements MetaSensorItemKeyService { - - @Autowired - private MetaSensorItemKeyDAO metaSensorItemKeyDAO; - - public List readAllByMetaCrawlerID(Short metaCrawlerID) throws OverflowException { - return this.metaSensorItemKeyDAO.findAllByMetaCrawlerId(metaCrawlerID); - } - - public Map readAllMapByMetaCrawlerID(Short metaCrawlerID) throws OverflowException { - - Map resultMap = new HashMap<>(); - - List resultList = this.metaSensorItemKeyDAO.findAllByMetaCrawlerId(metaCrawlerID); - - for (MetaSensorItemKey oa : resultList) { - resultMap.put(oa.getMetaSensorItem().getId(), oa); - } - - return resultMap; - } -} diff --git a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemService.java b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemService.java deleted file mode 100644 index 2b92d69..0000000 --- a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.loafle.overflow.central.module.meta.service; - -import com.loafle.overflow.central.module.meta.dao.MetaSensorItemDAO; -import com.loafle.overflow.core.exception.OverflowException; -import com.loafle.overflow.model.meta.MetaSensorItem; -import com.loafle.overflow.service.central.meta.MetaSensorItemService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -@Service("MetaSensorItemService") -public class CentralMetaSensorItemService implements MetaSensorItemService { - - @Autowired - private MetaSensorItemDAO metaSensorItemDAO; - - - public List readAll() throws OverflowException { - return this.metaSensorItemDAO.findAll(); - } -} diff --git a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemTypeService.java b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemTypeService.java deleted file mode 100644 index 2509e84..0000000 --- a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemTypeService.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.loafle.overflow.central.module.meta.service; - -import com.loafle.overflow.central.module.meta.dao.MetaSensorItemTypeDAO; -import com.loafle.overflow.core.exception.OverflowException; -import com.loafle.overflow.model.meta.MetaSensorItemType; -import com.loafle.overflow.service.central.meta.MetaSensorItemTypeService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ - -@Service("MetaSensorItemTypeService") -public class CentralMetaSensorItemTypeService implements MetaSensorItemTypeService { - - @Autowired - private MetaSensorItemTypeDAO sensorItemTypeDAO; - - public List readAll() throws OverflowException { - return this.sensorItemTypeDAO.findAll(); - } - - public MetaSensorItemType regist(MetaSensorItemType type) throws OverflowException { - return this.sensorItemTypeDAO.save(type); - } - - public List registAll(List list) throws OverflowException { - return (List) this.sensorItemTypeDAO.saveAll(list); - } -} diff --git a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemUnitService.java b/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemUnitService.java deleted file mode 100644 index 7302c55..0000000 --- a/src/main/java/com/loafle/overflow/central/module/meta/service/CentralMetaSensorItemUnitService.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.loafle.overflow.central.module.meta.service; - -import com.loafle.overflow.central.module.meta.dao.MetaSensorItemUnitDAO; -import com.loafle.overflow.core.exception.OverflowException; -import com.loafle.overflow.model.meta.MetaSensorItemUnit; -import com.loafle.overflow.service.central.meta.MetaSensorItemUnitService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * Created by insanity on 17. 9. 20. - */ - -@Service("MetaSensorItemUnitService") -public class CentralMetaSensorItemUnitService implements MetaSensorItemUnitService { - @Autowired - private MetaSensorItemUnitDAO sensorItemUnitDAO; - - public MetaSensorItemUnit regist(MetaSensorItemUnit sensorItemUnit) throws OverflowException { - return this.sensorItemUnitDAO.save(sensorItemUnit); - } -} diff --git a/src/main/java/com/loafle/overflow/central/module/sensor/dao/SensorItemDependencyDAO.java b/src/main/java/com/loafle/overflow/central/module/sensor/dao/SensorItemDependencyDAO.java deleted file mode 100644 index 81fa892..0000000 --- a/src/main/java/com/loafle/overflow/central/module/sensor/dao/SensorItemDependencyDAO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.loafle.overflow.central.module.sensor.dao; - -import com.loafle.overflow.model.meta.MetaSensorItemKey; -import com.loafle.overflow.model.sensor.SensorItemDependency; - -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * Created by insanity on 17. 9. 20. - */ -@Repository -public interface SensorItemDependencyDAO extends JpaRepository { - - @Query("SELECT s.metaSensorItemKey from SensorItemDependency s where s.metaSensorDisplayItem.id = :metaSensorDisplayItemId") - List findAllMetaSensorItemKeyByMetaSensorDisplayItemId( - @Param("metaSensorDisplayItemId") Long metaSensorDisplayItemId); -} diff --git a/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorItemDependencyService.java b/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorItemDependencyService.java deleted file mode 100644 index 2e1aee0..0000000 --- a/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorItemDependencyService.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.loafle.overflow.central.module.sensor.service; - -import com.loafle.overflow.central.module.sensor.dao.SensorItemDependencyDAO; -import com.loafle.overflow.core.exception.OverflowException; -import com.loafle.overflow.model.meta.MetaSensorDisplayItem; -import com.loafle.overflow.model.meta.MetaSensorItemKey; -import com.loafle.overflow.model.sensor.SensorItemDependency; - -import com.loafle.overflow.service.central.sensor.SensorItemDependencyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by insanity on 17. 9. 20. - */ - -@Service("SensorItemDependencyService") -public class CentralSensorItemDependencyService implements SensorItemDependencyService { - - @Autowired - private SensorItemDependencyDAO sensorItemDependencyDAO; - - public SensorItemDependency regist(SensorItemDependency dependency) throws OverflowException { - return this.sensorItemDependencyDAO.save(dependency); - } - - public List readAllMetaSensorItemKeyByMetaSensorDisplayItemID(Long metaSensorDisplayItemID) - throws OverflowException { - return this.sensorItemDependencyDAO.findAllMetaSensorItemKeyByMetaSensorDisplayItemId(metaSensorDisplayItemID); - } - - public Map> readAllMapByMetaSensorDisplayItems( - List metaSensorDisplayItems) throws OverflowException { - - Map> map = new HashMap>(); - - for (MetaSensorDisplayItem displayItem : metaSensorDisplayItems) { - List itemKeys = this.sensorItemDependencyDAO - .findAllMetaSensorItemKeyByMetaSensorDisplayItemId(displayItem.getId()); - map.put(displayItem.getKey(), itemKeys); - } - - return map; - } -} diff --git a/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorService.java b/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorService.java index 20d4daa..174726e 100644 --- a/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorService.java +++ b/src/main/java/com/loafle/overflow/central/module/sensor/service/CentralSensorService.java @@ -1,7 +1,6 @@ package com.loafle.overflow.central.module.sensor.service; import com.loafle.overflow.central.commons.utils.PageUtil; -import com.loafle.overflow.central.module.generator.service.SensorConfigGenerator; import com.loafle.overflow.central.module.sensor.dao.SensorDAO; import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.core.model.PageParams; @@ -30,9 +29,6 @@ public class CentralSensorService implements SensorService { @Autowired private SensorItemService sensorItemService; - @Autowired - private SensorConfigGenerator sensorConfigGenerator; - @Autowired private TargetService targetService; @@ -103,11 +99,9 @@ public class CentralSensorService implements SensorService { return sensor; } + @Override public String generateSensorConfig(Sensor sensor) throws OverflowException { - try { - return this.sensorConfigGenerator.generate(sensor); - } catch (Exception e) { - throw new OverflowException("", new Throwable()); - } + return null; } + } \ No newline at end of file diff --git a/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java b/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java index 8e79282..715fae6 100644 --- a/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java +++ b/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java @@ -8,13 +8,11 @@ import com.loafle.overflow.central.module.target.dao.TargetDAO; import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.model.infra.Infra; import com.loafle.overflow.model.infra.InfraHost; -import com.loafle.overflow.model.meta.MetaInfraType; import com.loafle.overflow.model.meta.MetaTargetHostType; import com.loafle.overflow.model.meta.MetaTargetStatus; import com.loafle.overflow.model.probe.Probe; import com.loafle.overflow.model.target.Target; import com.loafle.overflow.service.central.infra.InfraService; -import com.loafle.overflow.service.central.meta.MetaTargetServiceTypeService; import com.loafle.overflow.service.central.target.TargetService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayMappingDAOTest.java b/src/test/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayMappingDAOTest.java deleted file mode 100644 index a6b1b36..0000000 --- a/src/test/java/com/loafle/overflow/central/module/meta/dao/MetaSensorDisplayMappingDAOTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.loafle.overflow.central.module.meta.dao; - -import static org.junit.Assert.assertNotNull; - -import java.util.List; - -import com.loafle.overflow.central.spring.AppConfigTest; -import com.loafle.overflow.model.meta.MetaSensorItemKey; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * Created by snoop on 17. 9. 14. - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = {AppConfigTest.class}) -public class MetaSensorDisplayMappingDAOTest { - - @Autowired - private MetaSensorDisplayMappingDAO metaSensorDisplayMappingDAO; - - @Test - public void findAllMetaSensorItemKeyByMetaSensorDisplayItemId() throws Exception { - - List metaSensorItemKeys = this.metaSensorDisplayMappingDAO.findAllMetaSensorItemKeyByMetaSensorDisplayItemId(Long.valueOf(1)); - - assertNotNull(metaSensorItemKeys); - } - -} diff --git a/src/test/java/com/loafle/overflow/central/module/sensor/dao/SensorItemDependencyDAOTest.java b/src/test/java/com/loafle/overflow/central/module/sensor/dao/SensorItemDependencyDAOTest.java deleted file mode 100644 index 19684c6..0000000 --- a/src/test/java/com/loafle/overflow/central/module/sensor/dao/SensorItemDependencyDAOTest.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.loafle.overflow.central.module.sensor.dao; - -import static org.junit.Assert.assertNotNull; - -import java.util.List; - -import com.loafle.overflow.central.spring.AppConfigTest; -import com.loafle.overflow.model.meta.MetaSensorItemKey; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -/** - * Created by snoop on 17. 9. 14. - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { AppConfigTest.class }) -public class SensorItemDependencyDAOTest { - - @Autowired - private SensorItemDependencyDAO sensorItemDependencyDAO; - - @Test - public void findAllMetaSensorItemKeyByMetaSensorDisplayItemId() throws Exception { - - List metaSensorItemKeys = this.sensorItemDependencyDAO - .findAllMetaSensorItemKeyByMetaSensorDisplayItemId(Long.valueOf(1)); - - assertNotNull(metaSensorItemKeys); - } - -} diff --git a/src/test/java/com/loafle/overflow/central/module/target/service/CentralTargetServiceTest.java b/src/test/java/com/loafle/overflow/central/module/target/service/CentralTargetServiceTest.java index 000897a..47c9ac3 100644 --- a/src/test/java/com/loafle/overflow/central/module/target/service/CentralTargetServiceTest.java +++ b/src/test/java/com/loafle/overflow/central/module/target/service/CentralTargetServiceTest.java @@ -1,78 +1,14 @@ package com.loafle.overflow.central.module.target.service; import com.loafle.overflow.central.spring.AppConfigTest; -import com.loafle.overflow.core.exception.OverflowException; -import com.loafle.overflow.model.meta.*; -import com.loafle.overflow.model.sensor.Sensor; -import com.loafle.overflow.model.target.Target; -import com.loafle.overflow.service.central.infra.InfraService; -import com.loafle.overflow.service.central.meta.MetaCrawlerService; -import com.loafle.overflow.service.central.meta.MetaSensorStatusService; -import com.loafle.overflow.service.central.target.TargetService; -import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import java.util.ArrayList; -import java.util.List; - -import static org.junit.Assert.*; - @RunWith(SpringJUnit4ClassRunner.class) @ActiveProfiles("test") @ContextConfiguration(classes = { AppConfigTest.class }) public class CentralTargetServiceTest { - @Autowired - TargetService targetService; - - @Autowired - InfraService infraService; - - @Autowired - MetaCrawlerService metaCrawlerService; - - @Autowired - MetaSensorStatusService metaSensorStatusService; - - @Test - public void regist() { - } - - // List targets, Long probeID - @Test - public void registAll() throws OverflowException { - List targets = new ArrayList<>(); - List sensors = new ArrayList<>(); - - List metaCrawlers = this.metaCrawlerService.readAll(); - List metaSensorStatusList = this.metaSensorStatusService.readAll(); - // MetaSensorDisplayItem metaSensorDisplayItem = - // this.metaSensorDisplayItemService.read(Long.valueOf(1)); - - Target target = new Target(); - target.setMetaTargetType(MetaTargetServiceType.Enum.UNKNOWN.to()); - target.setInfra(new com.loafle.overflow.model.infra.InfraService(Long.valueOf((long) 3))); - - Sensor sensor = new Sensor(); - sensor.setItemCount(0); - sensor.setCrawlerInputItems(null); - sensor.setMetaCrawler(metaCrawlers.get(5)); - sensor.setName("Test Sensor"); - sensor.setTarget(target); - sensor.setMetaSensorStatus(metaSensorStatusList.get(0)); - - sensors.add(sensor); - - target.setSensors(sensors); - - targets.add(target); - // List targetList = this.targetService.registAll(targets, - // Long.valueOf(1)); - - // System.out.println("Target List Size: " + targetList.size()); - } }