ing

src/main/java/com/loafle/overflow/central/module/generator/service/InfraHostGenerator.java

@@ -12,8 +12,8 @@ import com.loafle.overflow.model.sensorconfig.Schedule;
 import com.loafle.overflow.model.sensorconfig.SensorConfig;
 import com.loafle.overflow.model.sensorconfig.Target;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -61,8 +61,10 @@ public class InfraHostGenerator {
 
     Map<Integer, MetaSensorItemKey> keyMap = this.generateUtil.initMappingMap(dbSensor.getMetaCrawler());
 
-    // if (dbSensor.getMetaCrawler().getId() == MetaCrawlerEnum.WMI_CRAWLER.getValue()) {
+    // if (dbSensor.getMetaCrawler().getId() ==
-    //   this.infraHostWMIGenerator.process(sensorItems, keyMap, dbSensor, sensorConfig);
+    // MetaCrawlerEnum.WMI_CRAWLER.getValue()) {
+    // this.infraHostWMIGenerator.process(sensorItems, keyMap, dbSensor,
+    // sensorConfig);
     // }
 
     return objectMapper.writeValueAsString(sensorConfig);
@@ -70,7 +72,8 @@ public class InfraHostGenerator {
 
   private Target createTarget(InfraHost infraHost, Sensor dbSensor) throws Exception {
 
-    // AuthCrawler authCrawler = this.authCrawlerService.readByMetaCrawlerIDAndTargetID(dbSensor.getMetaCrawler().getId(),
+    // AuthCrawler authCrawler =
+    // this.authCrawlerService.readByMetaCrawlerIDAndTargetID(dbSensor.getMetaCrawler().getId(),
     // dbSensor.getTarget().getId());
 
     // if (authCrawler == null) {
@@ -81,11 +84,13 @@ public class InfraHostGenerator {
     // Connection connection = new Connection();
     // // connection.setIp(infraHost.getIpv4());
 
-    // HashMap<String, String> optionMap = this.objectMapper.readValue(authCrawler.getAuthJson(),
+    // HashMap<String, String> optionMap =
+    // this.objectMapper.readValue(authCrawler.getAuthJson(),
     // new TypeReference<Map<String, String>>() {
     // });
 
-    // if (dbSensor.getMetaCrawler().getId() == MetaCrawlerEnum.WMI_CRAWLER.getValue()) {
+    // if (dbSensor.getMetaCrawler().getId() ==
+    // MetaCrawlerEnum.WMI_CRAWLER.getValue()) {
     // connection.setPort(135);
     // connection.setPortType(PortType.TCP);
     // connection.setSsl(false);

src/main/java/com/loafle/overflow/central/module/generator/service/InfraHostWMIGenerator.java

@@ -9,8 +9,8 @@ import com.loafle.overflow.model.sensorconfig.MappingInfo;
 import com.loafle.overflow.model.sensorconfig.QueryInfo;
 import com.loafle.overflow.model.sensorconfig.SensorConfig;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/loafle/overflow/central/module/generator/service/InfraServiceGenerator.java

@@ -13,8 +13,8 @@ import com.loafle.overflow.model.sensorconfig.SensorConfig;
 import com.loafle.overflow.model.sensorconfig.Target;
 import com.loafle.overflow.service.central.auth.AuthCrawlerService;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -64,10 +64,14 @@ public class InfraServiceGenerator {
 
     Map<Integer, MetaSensorItemKey> keyMap = this.generateUtil.initMappingMap(dbSensor.getMetaCrawler());
 
-    // if (dbSensor.getMetaCrawler().getId() == MetaCrawlerEnum.MYSQL_CRAWLER.getValue()) {
+    // if (dbSensor.getMetaCrawler().getId() ==
-    //   this.infraServiceMysqlGenerator.process(sensorItems, keyMap, dbSensor, sensorConfig);
+    // MetaCrawlerEnum.MYSQL_CRAWLER.getValue()) {
-    // } else if (dbSensor.getMetaCrawler().getId() == MetaCrawlerEnum.JMX_CRAWLER.getValue()) {
+    // this.infraServiceMysqlGenerator.process(sensorItems, keyMap, dbSensor,
-    //   this.infraServiceJMXGenerator.process(sensorItems, keyMap, dbSensor, sensorConfig);
+    // sensorConfig);
+    // } else if (dbSensor.getMetaCrawler().getId() ==
+    // MetaCrawlerEnum.JMX_CRAWLER.getValue()) {
+    // this.infraServiceJMXGenerator.process(sensorItems, keyMap, dbSensor,
+    // sensorConfig);
     // }
 
     return objectMapper.writeValueAsString(sensorConfig);
@@ -75,7 +79,8 @@ public class InfraServiceGenerator {
 
   private Target createTarget(InfraService infraService, Sensor sensor) throws Exception {
 
-    // AuthCrawler authCrawler = this.authCrawlerService.readByMetaCrawlerIDAndTargetID(sensor.getMetaCrawler().getId(),
+    // AuthCrawler authCrawler =
+    // this.authCrawlerService.readByMetaCrawlerIDAndTargetID(sensor.getMetaCrawler().getId(),
     // sensor.getTarget().getId());
 
     // if (authCrawler == null) {
@@ -91,17 +96,21 @@ public class InfraServiceGenerator {
 
     // target.setConnection(connection);
 
-    // HashMap<String, String> optionMap = this.objectMapper.readValue(authCrawler.getAuthJson(),
+    // HashMap<String, String> optionMap =
+    // this.objectMapper.readValue(authCrawler.getAuthJson(),
     // new TypeReference<Map<String, String>>() {
     // });
 
     // Map<String, Object> auth = new HashMap<>();
 
-    // // if (sensor.getMetaCrawler().getId() == MetaCrawlerEnum.MYSQL_CRAWLER.getValue()) {
+    // // if (sensor.getMetaCrawler().getId() ==
-    // //   auth.put("url", "jdbc:mysql://" + infraService.getInfraHost().getIpv4() + ":" + infraService.getPort());
+    // 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()) {
+    // // } 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);

src/main/java/com/loafle/overflow/central/module/generator/service/InfraServiceJMXGenerator.java

@@ -9,8 +9,8 @@ import com.loafle.overflow.model.sensorconfig.MappingInfo;
 import com.loafle.overflow.model.sensorconfig.QueryInfo;
 import com.loafle.overflow.model.sensorconfig.SensorConfig;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/loafle/overflow/central/module/generator/service/InfraServiceMysqlGenerator.java

@@ -9,8 +9,8 @@ import com.loafle.overflow.model.sensorconfig.MappingInfo;
 import com.loafle.overflow.model.sensorconfig.QueryInfo;
 import com.loafle.overflow.model.sensorconfig.SensorConfig;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
-import org.codehaus.jackson.type.TypeReference;
+import com.fasterxml.jackson.core.type.TypeReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/loafle/overflow/central/module/noauthprobe/service/CentralNoAuthProbeService.java

@@ -26,7 +26,7 @@ import com.loafle.overflow.service.central.noauthprobe.NoAuthProbeService;
 import com.loafle.overflow.service.central.probe.ProbeHostService;
 import com.loafle.overflow.service.central.probe.ProbeService;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;

src/main/java/com/loafle/overflow/central/proxy/ServiceInvoker.java

@@ -4,8 +4,8 @@ import com.google.gson.internal.Primitives;
 import com.google.protobuf.ByteString;
 import com.loafle.overflow.core.exception.OverflowException;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
-import org.codehaus.jackson.type.JavaType;
+import com.fasterxml.jackson.databind.JavaType;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;

src/main/java/com/loafle/overflow/central/redis/service/RedisMessagePublisher.java

@@ -6,7 +6,7 @@ import com.loafle.overflow.core.model.PublishMessage;
 import com.loafle.overflow.model.member.Member;
 import com.loafle.overflow.service.central.member.MemberService;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.redis.core.RedisTemplate;

src/main/java/com/loafle/overflow/central/spring/AppConfig.java

@@ -1,7 +1,7 @@
 package com.loafle.overflow.central.spring;
 
-import org.codehaus.jackson.map.DeserializationConfig;
+import com.fasterxml.jackson.databind.DeserializationFeature;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.context.annotation.*;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 
@@ -44,7 +44,7 @@ public class AppConfig {
   @Bean
   public ObjectMapper getObjectMapper() {
     ObjectMapper objectMapper = new ObjectMapper();
-    objectMapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     return objectMapper;
   }
 

src/test/java/com/loafle/overflow/central/module/infra/service/InfraServiceTest.java

@@ -7,7 +7,7 @@ import java.util.List;
 import com.loafle.overflow.central.spring.AppConfigTest;
 import com.loafle.overflow.model.infra.InfraHost;
 
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

src/test/java/com/loafle/overflow/central/module/sensor/service/SensorServiceTest.java

@@ -5,7 +5,7 @@
 // import com.loafle.overflow.central.module.sensor.model.Sensor;
 // import com.loafle.overflow.central.module.target.model.Target;
 // import com.loafle.overflow.central.spring.AppConfigTest;
-// import org.codehaus.jackson.map.ObjectMapper;
+// import com.fasterxml.jackson.databind.ObjectMapper;
 // import org.junit.Assert;
 // import org.junit.Ignore;
 // import org.junit.Test;
@@ -32,7 +32,6 @@
 // @Autowired
 // ObjectMapper objectMapper;
 
-
 // @Ignore
 // @Test
 // public void regist() throws Exception {

src/test/java/com/loafle/overflow/central/spring/AppConfigTest.java

@@ -1,45 +1,36 @@
 package com.loafle.overflow.central.spring;
 
-import org.codehaus.jackson.map.DeserializationConfig;
+import com.fasterxml.jackson.databind.DeserializationFeature;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.context.annotation.*;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.test.context.TestPropertySource;
 
-
 /**
  * Created by geek on 17. 8. 8.
  */
 @Configuration
-@ComponentScan(basePackages = {"com.loafle.overflow"}, excludeFilters = @ComponentScan.Filter({Configuration.class}))
+@ComponentScan(basePackages = {
-@Import({
+        "com.loafle.overflow" }, excludeFilters = @ComponentScan.Filter({ Configuration.class }))
-        JdbcConfiguration.class,
+@Import({ JdbcConfiguration.class, MailConfiguration.class, RedisConfiguration.class, CacheConfiguration.class })
-        MailConfiguration.class,
+@TestPropertySource({ "classpath:database.properties", "classpath:mail.properties", "classpath:redis.properties",
-        RedisConfiguration.class,
+        "classpath:cache.properties" })
-        CacheConfiguration.class
-})
-@TestPropertySource({
-        "classpath:database.properties",
-        "classpath:mail.properties",
-        "classpath:redis.properties",
-        "classpath:cache.properties"
-})
 
 public class AppConfigTest {
 
-//    @Bean
+    // @Bean
-//    public static PropertyPlaceholderConfigurer propertyPlaceholderConfigurer() {
+    // public static PropertyPlaceholderConfigurer propertyPlaceholderConfigurer() {
-//        PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
+    // PropertyPlaceholderConfigurer ppc = new PropertyPlaceholderConfigurer();
-////        ppc.setLocation(new ClassPathResource("database.properties"));
+    //// ppc.setLocation(new ClassPathResource("database.properties"));
-//        ppc.setLocations(new Resource[] {
+    // ppc.setLocations(new Resource[] {
-//                new ClassPathResource("database.properties"),
+    // new ClassPathResource("database.properties"),
-//                new ClassPathResource("mail.properties"),
+    // new ClassPathResource("mail.properties"),
-//                new ClassPathResource("redis.properties")
+    // new ClassPathResource("redis.properties")
-//        });
+    // });
-//        ppc.setIgnoreUnresolvablePlaceholders(true);
+    // ppc.setIgnoreUnresolvablePlaceholders(true);
-//
+    //
-//        return ppc;
+    // return ppc;
-//    }
+    // }
     @Bean
     public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
         return new PropertySourcesPlaceholderConfigurer();
@@ -48,8 +39,7 @@ public class AppConfigTest {
     @Bean
     public ObjectMapper getObjectMapper() {
         ObjectMapper objectMapper = new ObjectMapper();
-      objectMapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         return objectMapper;
     }
 }
-