model

src/main/java/com/loafle/overflow/dao/discovery/dao/HostDao.java

@@ -1,11 +0,0 @@
-package com.loafle.overflow.dao.discovery.dao;
-
-import com.loafle.overflow.dao.apikey.model.Apikey;
-import com.loafle.overflow.commons.dao.BaseDAO;
-import com.loafle.overflow.dao.discovery.model.Host;
-
-/**
- * Created by root on 17. 6. 4.
- */
-public interface HostDao extends BaseDAO<Host> {
-}

src/main/java/com/loafle/overflow/dao/sensor/model/Sensor.java

@@ -1,83 +0,0 @@
-package com.loafle.overflow.dao.sensor.model;
-
-import com.loafle.overflow.dao.crawler.model.Crawler;
-import com.loafle.overflow.dao.target.model.Target;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * Created by root on 17. 6. 9.
- */
-@Entity
-public class Sensor {
-
-    @Id
-    @GeneratedValue(strategy= GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(name = "INTERVAL")
-    private long interval;
-
-    @Column(name = "NOTIFICATION")
-    private String notification;
-
-    @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = true)
-    private Date createDate;
-
-    @ManyToOne
-    @JoinColumn(name = "TARGET_ID", nullable = false)
-    private Target target;
-
-    @ManyToOne
-    @JoinColumn(name = "CRAWLER_ID", nullable = false)
-    private Crawler crawler;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public long getInterval() {
-        return interval;
-    }
-
-    public void setInterval(long interval) {
-        this.interval = interval;
-    }
-
-    public String getNotification() {
-        return notification;
-    }
-
-    public void setNotification(String notification) {
-        this.notification = notification;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Target getTarget() {
-        return target;
-    }
-
-    public void setTarget(Target target) {
-        this.target = target;
-    }
-
-    public Crawler getCrawler() {
-        return crawler;
-    }
-
-    public void setCrawler(Crawler crawler) {
-        this.crawler = crawler;
-    }
-}

src/main/java/com/loafle/overflow/dao/sensor/model/SensorItem.java

@@ -1,94 +0,0 @@
-package com.loafle.overflow.dao.sensor.model;
-
-import com.loafle.overflow.dao.crawler.model.Crawler;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * Created by root on 17. 6. 9.
- */
-@Entity
-public class SensorItem {
-
-    @Id
-    @GeneratedValue(strategy= GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(name="NAME", nullable=false)
-    private String name;
-
-    @Column(name="DESCRIPTION", nullable=false)
-    private String description;
-
-    @Column(name="DATA_TYPE",nullable=false)
-    private String dataType;
-
-    @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = true)
-    private Date createDate;
-
-    @ManyToOne
-    @JoinColumn(name="CRAWLER_ID",nullable=false)
-    private Crawler crawler;
-
-    @ManyToOne
-    @JoinColumn(name="SENSOR_ITEM_CATEGORY_ID",nullable=false)
-    private SensorItemCategory sensorItemCategory;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(String dataType) {
-        this.dataType = dataType;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Crawler getCrawler() {
-        return crawler;
-    }
-
-    public void setCrawler(Crawler crawler) {
-        this.crawler = crawler;
-    }
-
-    public SensorItemCategory getSensorItemCategory() {
-        return sensorItemCategory;
-    }
-
-    public void setSensorItemCategory(SensorItemCategory sensorItemCategory) {
-        this.sensorItemCategory = sensorItemCategory;
-    }
-}

src/main/java/com/loafle/overflow/dao/sensor/model/SensorItemCategory.java

@@ -1,56 +0,0 @@
-package com.loafle.overflow.dao.sensor.model;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * Created by root on 17. 6. 9.
- */
-@Entity
-public class SensorItemCategory {
-
-    @Id
-    @GeneratedValue(strategy= GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(name="NAME",  nullable=false)
-    private String name;
-
-    @Column(name="DESCRIPTION", nullable=false)
-    private String description;
-
-    @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = true)
-    private Date createDate;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-}

src/main/java/com/loafle/overflow/dao/sensor/model/SensorItemMapping.java

@@ -1,58 +0,0 @@
-package com.loafle.overflow.dao.sensor.model;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * Created by root on 17. 6. 9.
- */
-@Entity
-public class SensorItemMapping {
-
-    @Id
-    @GeneratedValue(strategy= GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(name = "CREATE_DATE", nullable = false, columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false, updatable = true)
-    private Date createDate;
-
-    @ManyToOne
-    @JoinColumn(name = "SENSOR_ID", nullable = false)
-    private Sensor sensor;
-
-    @ManyToOne
-    @JoinColumn(name = "SENSOR_ITEM_ID", nullable = false)
-    private SensorItem sensorItem;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Sensor getSensor() {
-        return sensor;
-    }
-
-    public void setSensor(Sensor sensor) {
-        this.sensor = sensor;
-    }
-
-    public SensorItem getSensorItem() {
-        return sensorItem;
-    }
-
-    public void setSensorItem(SensorItem sensorItem) {
-        this.sensorItem = sensorItem;
-    }
-}

src/main/java/com/loafle/overflow/dao/target/dao/JPATargetDao.java

@@ -1,30 +0,0 @@
-package com.loafle.overflow.dao.target.dao;
-
-import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.target.model.Target;
-
-import javax.persistence.Query;
-import java.util.List;
-
-/**
- * Created by root on 17. 6. 5.
- */
-public class JPATargetDao extends JPABaseDAO<Target> implements TargetDao {
-
-    public List<Target> findAll(Target target) {
-
-        Query query = getEntityManager().createNativeQuery("SELECT tg.* FROM Target tg WHERE tg.MEMBER_ID = :memberId", Target.class);
-        query.setParameter("memberId", target.getMember().getId());
-
-        List<Target> targets = null;
-        try {
-            targets = (List<Target>)query.getResultList();
-        }catch(Exception e) {
-            e.printStackTrace();
-        }finally {
-            return targets;
-        }
-
-
-    }
-}

src/main/java/com/loafle/overflow/dao/target/dao/TargetDao.java

@@ -1,14 +0,0 @@
-package com.loafle.overflow.dao.target.dao;
-
-import com.loafle.overflow.commons.dao.BaseDAO;
-import com.loafle.overflow.dao.target.model.Target;
-
-import java.util.List;
-
-/**
- * Created by root on 17. 6. 5.
- */
-public interface TargetDao extends BaseDAO<Target> {
-
-    List<Target> findAll(Target target);
-}

src/main/java/com/loafle/overflow/dao/target/model/Target.java

@@ -1,130 +0,0 @@
-package com.loafle.overflow.dao.target.model;
-
-import com.loafle.overflow.dao.member.model.Member;
-import com.loafle.overflow.dao.target.type.PortType;
-import com.loafle.overflow.dao.target.type.TargetType;
-
-import javax.persistence.*;
-import java.util.Date;
-
-/**
- * Created by root on 17. 6. 5.
- */
-@Entity
-public class Target {
-
-    @Id
-    @GeneratedValue(strategy= GenerationType.IDENTITY)
-    private Long id;
-
-    @Column(name="IP", nullable=false)
-    private long ip;
-
-    @Column(name="PORT")
-    private int port;
-
-    @Column(name="TARGET_TYPE")
-    @Enumerated(EnumType.STRING)
-    private TargetType targetType;
-
-    @Column(name="VENDOR_NAME")
-    private String vendorName;
-
-    @Column(name="KINDS")
-    private String kinds;
-
-    @Column(name="VERSION")
-    private String version;
-
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name="CREATE_DATE", nullable=false , columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", insertable = false)
-    private Date createDate;
-
-    @Column(name="PORT_TYPE")
-    @Enumerated(EnumType.STRING)
-    private PortType portType;
-
-    @ManyToOne
-    @JoinColumn(name = "MEMBER_ID", nullable=false)
-    private Member member;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public long getIp() {
-        return ip;
-    }
-
-    public void setIp(long ip) {
-        this.ip = ip;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public TargetType getTargetType() {
-        return targetType;
-    }
-
-    public void setTargetType(TargetType targetType) {
-        this.targetType = targetType;
-    }
-
-    public String getVendorName() {
-        return vendorName;
-    }
-
-    public void setVendorName(String vendorName) {
-        this.vendorName = vendorName;
-    }
-
-    public String getKinds() {
-        return kinds;
-    }
-
-    public void setKinds(String kinds) {
-        this.kinds = kinds;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Member getMember() {
-        return member;
-    }
-
-    public void setMember(Member member) {
-        this.member = member;
-    }
-
-    public PortType getPortType() {
-        return portType;
-    }
-
-    public void setPortType(PortType portType) {
-        this.portType = portType;
-    }
-}

src/main/java/com/loafle/overflow/dao/target/type/PortType.java

@@ -1,19 +0,0 @@
-package com.loafle.overflow.dao.target.type;
-
-/**
- * Created by root on 17. 6. 7.
- */
-public enum PortType {
-
-    TCP("TCP"),
-    UDP("UDP");
-
-
-    private String stringValue;
-    PortType(String string) {stringValue = string;}
-
-    @Override
-    public String toString() {
-        return stringValue;
-    }
-}

src/main/java/com/loafle/overflow/dao/target/type/TargetType.java

@@ -1,21 +0,0 @@
-package com.loafle.overflow.dao.target.type;
-
-/**
- * Created by root on 17. 6. 5.
- */
-public enum TargetType {
-
-    MACHINE("MACHINE"),
-    DATABASE("DATABASE"),
-    WAS("WAS"),
-    OTHER("OTHER");
-
-    private String stringValue;
-    TargetType(String string) {stringValue = string;}
-
-    @Override
-    public String toString() {
-        return stringValue;
-    }
-
-}

src/main/java/com/loafle/overflow/meta/MetaCrawler.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_META_CRAWLER", schema = "public", catalog = "postgres")
-public class TblMetaCrawler {
+public class MetaCrawler {
     private short id;
     private Timestamp createDate;
     private String name;
@@ -59,7 +59,7 @@ public class TblMetaCrawler {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaCrawler that = (TblMetaCrawler) o;
+        MetaCrawler that = (MetaCrawler) o;
 
         if (id != that.id) return false;
         if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false;

src/main/java/com/loafle/overflow/meta/MetaCrawlerInputItem.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_META_CRAWLER_INPUT_ITEM", schema = "public", catalog = "postgres")
-public class TblMetaCrawlerInputItem {
+public class MetaCrawlerInputItem {
     private int id;
     private short typeId;
     private short crawlerId;
@@ -136,7 +136,7 @@ public class TblMetaCrawlerInputItem {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaCrawlerInputItem that = (TblMetaCrawlerInputItem) o;
+        MetaCrawlerInputItem that = (MetaCrawlerInputItem) o;
 
         if (id != that.id) return false;
         if (typeId != that.typeId) return false;

src/main/java/com/loafle/overflow/meta/MetaInfraType.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_META_INFRA_TYPE", schema = "public", catalog = "postgres")
-public class TblMetaInfraType {
+public class MetaInfraType {
     private int id;
     private String name;
     private Timestamp createDate;
@@ -48,7 +48,7 @@ public class TblMetaInfraType {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaInfraType that = (TblMetaInfraType) o;
+        MetaInfraType that = (MetaInfraType) o;
 
         if (id != that.id) return false;
         if (name != null ? !name.equals(that.name) : that.name != null) return false;

src/main/java/com/loafle/overflow/meta/MetaInfraVendor.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_META_INFRA_VENDOR", schema = "public", catalog = "postgres")
-public class TblMetaInfraVendor {
+public class MetaInfraVendor {
     private int id;
     private String name;
     private Timestamp createDate;
@@ -59,7 +59,7 @@ public class TblMetaInfraVendor {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaInfraVendor that = (TblMetaInfraVendor) o;
+        MetaInfraVendor that = (MetaInfraVendor) o;
 
         if (id != that.id) return false;
         if (typeId != that.typeId) return false;

src/main/java/com/loafle/overflow/meta/MetaInputType.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_META_INPUT_TYPE", schema = "public", catalog = "postgres")
-public class TblMetaInputType {
+public class MetaInputType {
     private short id;
     private String name;
     private String desc;
@@ -59,7 +59,7 @@ public class TblMetaInputType {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaInputType that = (TblMetaInputType) o;
+        MetaInputType that = (MetaInputType) o;
 
         if (id != that.id) return false;
         if (name != null ? !name.equals(that.name) : that.name != null) return false;

src/main/java/com/loafle/overflow/meta/MetaMemberStatus.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 
@@ -7,7 +7,7 @@ import javax.persistence.*;
  */
 @Entity
 @Table(name = "TBL_META_MEMBER_STATUS", schema = "public", catalog = "postgres")
-public class TblMetaMemberStatus {
+public class MetaMemberStatus {
     private short id;
     private String name;
 
@@ -36,7 +36,7 @@ public class TblMetaMemberStatus {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaMemberStatus that = (TblMetaMemberStatus) o;
+        MetaMemberStatus that = (MetaMemberStatus) o;
 
         if (id != that.id) return false;
         if (name != null ? !name.equals(that.name) : that.name != null) return false;

src/main/java/com/loafle/overflow/meta/MetaNotification.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_META_NOTIFICATION", schema = "public", catalog = "postgres")
-public class TblMetaNotification {
+public class MetaNotification {
     private long id;
     private Timestamp createDate;
     private String name;
@@ -59,7 +59,7 @@ public class TblMetaNotification {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaNotification that = (TblMetaNotification) o;
+        MetaNotification that = (MetaNotification) o;
 
         if (id != that.id) return false;
         if (createDate != null ? !createDate.equals(that.createDate) : that.createDate != null) return false;

src/main/java/com/loafle/overflow/meta/MetaProbeArchitecture.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_META_PROBE_ARCHITECTURE", schema = "public", catalog = "postgres")
-public class TblMetaProbeArchitecture {
+public class MetaProbeArchitecture {
     private short id;
     private String archi;
     private Timestamp createDate;
@@ -48,7 +48,7 @@ public class TblMetaProbeArchitecture {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaProbeArchitecture that = (TblMetaProbeArchitecture) o;
+        MetaProbeArchitecture that = (MetaProbeArchitecture) o;
 
         if (id != that.id) return false;
         if (archi != null ? !archi.equals(that.archi) : that.archi != null) return false;

src/main/java/com/loafle/overflow/meta/MetaProbeOs.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_META_PROBE_OS", schema = "public", catalog = "postgres")
-public class TblMetaProbeOs {
+public class MetaProbeOs {
     private short id;
     private String name;
     private Timestamp createDate;
@@ -48,7 +48,7 @@ public class TblMetaProbeOs {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaProbeOs that = (TblMetaProbeOs) o;
+        MetaProbeOs that = (MetaProbeOs) o;
 
         if (id != that.id) return false;
         if (name != null ? !name.equals(that.name) : that.name != null) return false;

src/main/java/com/loafle/overflow/meta/MetaProbePackage.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_META_PROBE_PACKAGE", schema = "public", catalog = "postgres")
-public class TblMetaProbePackage {
+public class MetaProbePackage {
     private long id;
     private short versionId;
     private short osId;
@@ -70,7 +70,7 @@ public class TblMetaProbePackage {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaProbePackage that = (TblMetaProbePackage) o;
+        MetaProbePackage that = (MetaProbePackage) o;
 
         if (id != that.id) return false;
         if (versionId != that.versionId) return false;

src/main/java/com/loafle/overflow/meta/MetaProbeTaskType.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_META_PROBE_TASK_TYPE", schema = "public", catalog = "postgres")
-public class TblMetaProbeTaskType {
+public class MetaProbeTaskType {
     private short id;
     private String name;
     private String desc;
@@ -59,7 +59,7 @@ public class TblMetaProbeTaskType {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaProbeTaskType that = (TblMetaProbeTaskType) o;
+        MetaProbeTaskType that = (MetaProbeTaskType) o;
 
         if (id != that.id) return false;
         if (name != null ? !name.equals(that.name) : that.name != null) return false;

src/main/java/com/loafle/overflow/meta/MetaProbeVersion.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_META_PROBE_VERSION", schema = "public", catalog = "postgres")
-public class TblMetaProbeVersion {
+public class MetaProbeVersion {
     private short id;
     private String version;
     private Timestamp createDate;
@@ -48,7 +48,7 @@ public class TblMetaProbeVersion {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaProbeVersion that = (TblMetaProbeVersion) o;
+        MetaProbeVersion that = (MetaProbeVersion) o;
 
         if (id != that.id) return false;
         if (version != null ? !version.equals(that.version) : that.version != null) return false;

src/main/java/com/loafle/overflow/meta/MetaSensorItem.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_META_SENSOR_ITEM", schema = "public", catalog = "postgres")
-public class TblMetaSensorItem {
+public class MetaSensorItem {
     private int id;
     private short typeId;
     private String key;
@@ -70,7 +70,7 @@ public class TblMetaSensorItem {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaSensorItem that = (TblMetaSensorItem) o;
+        MetaSensorItem that = (MetaSensorItem) o;
 
         if (id != that.id) return false;
         if (typeId != that.typeId) return false;

src/main/java/com/loafle/overflow/meta/MetaSensorItemType.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_META_SENSOR_ITEM_TYPE", schema = "public", catalog = "postgres")
-public class TblMetaSensorItemType {
+public class MetaSensorItemType {
     private short id;
     private String name;
     private String desc;
@@ -59,7 +59,7 @@ public class TblMetaSensorItemType {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaSensorItemType that = (TblMetaSensorItemType) o;
+        MetaSensorItemType that = (MetaSensorItemType) o;
 
         if (id != that.id) return false;
         if (name != null ? !name.equals(that.name) : that.name != null) return false;

src/main/java/com/loafle/overflow/meta/MetaVendorCrawler.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_META_VENDOR_CRAWLER", schema = "public", catalog = "postgres")
-public class TblMetaVendorCrawler {
+public class MetaVendorCrawler {
     private int id;
     private short crawlerId;
     private int vendorId;
@@ -59,7 +59,7 @@ public class TblMetaVendorCrawler {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaVendorCrawler that = (TblMetaVendorCrawler) o;
+        MetaVendorCrawler that = (MetaVendorCrawler) o;
 
         if (id != that.id) return false;
         if (crawlerId != that.crawlerId) return false;

src/main/java/com/loafle/overflow/meta/MetaVendorCrawlerSensorItem.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.meta;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_META_VENDOR_CRAWLER_SENSOR_ITEM", schema = "public", catalog = "postgres")
-public class TblMetaVendorCrawlerSensorItem {
+public class MetaVendorCrawlerSensorItem {
     private long id;
     private String interval;
     private String warnCondition;
@@ -92,7 +92,7 @@ public class TblMetaVendorCrawlerSensorItem {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblMetaVendorCrawlerSensorItem that = (TblMetaVendorCrawlerSensorItem) o;
+        MetaVendorCrawlerSensorItem that = (MetaVendorCrawlerSensorItem) o;
 
         if (id != that.id) return false;
         if (itemId != that.itemId) return false;

src/main/java/com/loafle/overflow/models/TblTarget.java

@@ -1,80 +0,0 @@
-package com.loafle.overflow.models;
-
-import javax.persistence.*;
-import java.sql.Timestamp;
-
-/**
- * Created by root on 17. 6. 22.
- */
-@Entity
-@Table(name = "TBL_TARGET", schema = "public", catalog = "postgres")
-public class TblTarget {
-    private long id;
-    private Timestamp createDate;
-    private long probeId;
-    private long infraId;
-
-    @Id
-    @Column(name = "ID", nullable = false)
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    @Basic
-    @Column(name = "CREATE_DATE", nullable = false)
-    public Timestamp getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Timestamp createDate) {
-        this.createDate = createDate;
-    }
-
-    @Basic
-    @Column(name = "PROBE_ID", nullable = false)
-    public long getProbeId() {
-        return probeId;
-    }
-
-    public void setProbeId(long probeId) {
-        this.probeId = probeId;
-    }
-
-    @Basic
-    @Column(name = "INFRA_ID", nullable = false)
-    public long getInfraId() {
-        return infraId;
-    }
-
-    public void setInfraId(long infraId) {
-        this.infraId = infraId;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        TblTarget tblTarget = (TblTarget) o;
-
-        if (id != tblTarget.id) return false;
-        if (probeId != tblTarget.probeId) return false;
-        if (infraId != tblTarget.infraId) return false;
-        if (createDate != null ? !createDate.equals(tblTarget.createDate) : tblTarget.createDate != null) return false;
-
-        return true;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = (int) (id ^ (id >>> 32));
-        result = 31 * result + (createDate != null ? createDate.hashCode() : 0);
-        result = 31 * result + (int) (probeId ^ (probeId >>> 32));
-        result = 31 * result + (int) (infraId ^ (infraId >>> 32));
-        return result;
-    }
-}

src/main/java/com/loafle/overflow/module/agent/dao/AgentDAO.java

@@ -1,8 +1,8 @@
-package com.loafle.overflow.dao.agent.dao;
+package com.loafle.overflow.module.agent.dao;
 
-import com.loafle.overflow.dao.agent.model.Agent;
+import com.loafle.overflow.module.agent.model.Agent;
 import com.loafle.overflow.commons.dao.BaseDAO;
-import com.loafle.overflow.dao.member.model.Member;
+import com.loafle.overflow.module.member.model.Member;
 
 import java.util.List;
 

src/main/java/com/loafle/overflow/module/agent/dao/JPAAgentDAO.java

@@ -1,8 +1,8 @@
-package com.loafle.overflow.dao.agent.dao;
+package com.loafle.overflow.module.agent.dao;
 
-import com.loafle.overflow.dao.agent.model.Agent;
+import com.loafle.overflow.module.agent.model.Agent;
 import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.member.model.Member;
+import com.loafle.overflow.module.member.model.Member;
 
 import javax.persistence.Query;
 import java.util.ArrayList;

src/main/java/com/loafle/overflow/module/agent/model/Agent.java

@@ -1,6 +1,6 @@
-package com.loafle.overflow.dao.agent.model;
+package com.loafle.overflow.module.agent.model;
 
-import com.loafle.overflow.dao.member.model.Member;
+import com.loafle.overflow.module.member.model.Member;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/loafle/overflow/module/apikey/dao/ApiKeyDao.java

@@ -1,6 +1,6 @@
-package com.loafle.overflow.dao.apikey.dao;
+package com.loafle.overflow.module.apikey.dao;
 
-import com.loafle.overflow.dao.apikey.model.Apikey;
+import com.loafle.overflow.module.apikey.model.Apikey;
 import com.loafle.overflow.commons.dao.BaseDAO;
 
 

src/main/java/com/loafle/overflow/module/apikey/dao/JPAApiKeyDao.java

@@ -1,6 +1,6 @@
-package com.loafle.overflow.dao.apikey.dao;
+package com.loafle.overflow.module.apikey.dao;
 
-import com.loafle.overflow.dao.apikey.model.Apikey;
+import com.loafle.overflow.module.apikey.model.Apikey;
 import com.loafle.overflow.commons.dao.JPABaseDAO;
 
 

src/main/java/com/loafle/overflow/module/apikey/model/Apikey.java

@@ -1,6 +1,6 @@
-package com.loafle.overflow.dao.apikey.model;
+package com.loafle.overflow.module.apikey.model;
 
-import com.loafle.overflow.dao.member.model.Member;
+import com.loafle.overflow.module.member.model.Member;
 
 import javax.persistence.*;
 import java.util.Date;

src/main/java/com/loafle/overflow/module/crawler/dao/CrawlerDAO.java

@@ -1,7 +1,7 @@
-package com.loafle.overflow.dao.crawler.dao;
+package com.loafle.overflow.module.crawler.dao;
 
 import com.loafle.overflow.commons.dao.BaseDAO;
-import com.loafle.overflow.dao.crawler.model.Crawler;
+import com.loafle.overflow.module.crawler.model.Crawler;
 
 import java.util.List;
 

src/main/java/com/loafle/overflow/module/crawler/dao/CrawlerInputItemDAO.java

@@ -1,7 +1,7 @@
-package com.loafle.overflow.dao.crawler.dao;
+package com.loafle.overflow.module.crawler.dao;
 
 import com.loafle.overflow.commons.dao.BaseDAO;
-import com.loafle.overflow.dao.crawler.model.CrawlerInputItem;
+import com.loafle.overflow.module.crawler.model.CrawlerInputItem;
 
 /**
  * Created by geek@loafle.com on 17. 6. 8.

src/main/java/com/loafle/overflow/module/crawler/dao/CrawlerInputItemMappingDAO.java

@@ -1,8 +1,8 @@
-package com.loafle.overflow.dao.crawler.dao;
+package com.loafle.overflow.module.crawler.dao;
 
 import com.loafle.overflow.commons.dao.BaseDAO;
-import com.loafle.overflow.dao.crawler.model.Crawler;
-import com.loafle.overflow.dao.crawler.model.CrawlerInputItemMapping;
+import com.loafle.overflow.module.crawler.model.Crawler;
+import com.loafle.overflow.module.crawler.model.CrawlerInputItemMapping;
 
 import java.util.List;
 

src/main/java/com/loafle/overflow/module/crawler/dao/JPACrawlerDAO.java

@@ -1,7 +1,7 @@
-package com.loafle.overflow.dao.crawler.dao;
+package com.loafle.overflow.module.crawler.dao;
 
 import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.crawler.model.Crawler;
+import com.loafle.overflow.module.crawler.model.Crawler;
 
 import javax.persistence.Query;
 import java.util.List;

src/main/java/com/loafle/overflow/module/crawler/dao/JPACrawlerInputItemDAO.java

@@ -1,7 +1,7 @@
-package com.loafle.overflow.dao.crawler.dao;
+package com.loafle.overflow.module.crawler.dao;
 
 import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.crawler.model.CrawlerInputItem;
+import com.loafle.overflow.module.crawler.model.CrawlerInputItem;
 
 /**
  * Created by geek@loafle.com on 17. 6. 8.

src/main/java/com/loafle/overflow/module/crawler/dao/JPACrawlerInputItemMappingDAO.java

@@ -1,8 +1,8 @@
-package com.loafle.overflow.dao.crawler.dao;
+package com.loafle.overflow.module.crawler.dao;
 
 import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.crawler.model.Crawler;
-import com.loafle.overflow.dao.crawler.model.CrawlerInputItemMapping;
+import com.loafle.overflow.module.crawler.model.Crawler;
+import com.loafle.overflow.module.crawler.model.CrawlerInputItemMapping;
 
 import javax.persistence.Query;
 import java.util.List;

src/main/java/com/loafle/overflow/module/crawler/model/Crawler.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.dao.crawler.model;
+package com.loafle.overflow.module.crawler.model;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/loafle/overflow/module/crawler/model/CrawlerInputItem.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.dao.crawler.model;
+package com.loafle.overflow.module.crawler.model;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/loafle/overflow/module/crawler/model/CrawlerInputItemMapping.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.dao.crawler.model;
+package com.loafle.overflow.module.crawler.model;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/loafle/overflow/module/discovery/dao/HostDao.java

@@ -0,0 +1,10 @@
+package com.loafle.overflow.module.discovery.dao;
+
+import com.loafle.overflow.commons.dao.BaseDAO;
+import com.loafle.overflow.module.discovery.model.Host;
+
+/**
+ * Created by root on 17. 6. 4.
+ */
+public interface HostDao extends BaseDAO<Host> {
+}

src/main/java/com/loafle/overflow/module/discovery/dao/JPAHostDao.java

@@ -1,7 +1,7 @@
-package com.loafle.overflow.dao.discovery.dao;
+package com.loafle.overflow.module.discovery.dao;
 
 import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.discovery.model.Host;
+import com.loafle.overflow.module.discovery.model.Host;
 
 /**
  * Created by root on 17. 6. 4.

src/main/java/com/loafle/overflow/module/discovery/dao/JPAPortDao.java

@@ -1,8 +1,7 @@
-package com.loafle.overflow.dao.discovery.dao;
+package com.loafle.overflow.module.discovery.dao;
 
-import com.loafle.overflow.commons.dao.BaseDAO;
 import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.discovery.model.Port;
+import com.loafle.overflow.module.discovery.model.Port;
 
 /**
  * Created by root on 17. 6. 4.

src/main/java/com/loafle/overflow/module/discovery/dao/JPAServiceDao.java

@@ -1,8 +1,7 @@
-package com.loafle.overflow.dao.discovery.dao;
+package com.loafle.overflow.module.discovery.dao;
 
-import com.loafle.overflow.commons.dao.BaseDAO;
 import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.discovery.model.Service;
+import com.loafle.overflow.module.discovery.model.Service;
 
 /**
  * Created by root on 17. 6. 4.

src/main/java/com/loafle/overflow/module/discovery/dao/JPAZoneDao.java

@@ -1,8 +1,8 @@
-package com.loafle.overflow.dao.discovery.dao;
+package com.loafle.overflow.module.discovery.dao;
 
 
 import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.discovery.model.Zone;
+import com.loafle.overflow.module.discovery.model.Zone;
 
 /**
  * Created by root on 17. 6. 4.

src/main/java/com/loafle/overflow/module/discovery/dao/PortDao.java

@@ -1,7 +1,7 @@
-package com.loafle.overflow.dao.discovery.dao;
+package com.loafle.overflow.module.discovery.dao;
 
 import com.loafle.overflow.commons.dao.BaseDAO;
-import com.loafle.overflow.dao.discovery.model.Port;
+import com.loafle.overflow.module.discovery.model.Port;
 
 /**
  * Created by root on 17. 6. 4.

src/main/java/com/loafle/overflow/module/discovery/dao/ServiceDao.java

@@ -1,7 +1,7 @@
-package com.loafle.overflow.dao.discovery.dao;
+package com.loafle.overflow.module.discovery.dao;
 
 import com.loafle.overflow.commons.dao.BaseDAO;
-import com.loafle.overflow.dao.discovery.model.Service;
+import com.loafle.overflow.module.discovery.model.Service;
 
 /**
  * Created by root on 17. 6. 4.

src/main/java/com/loafle/overflow/module/discovery/dao/ZoneDao.java

@@ -1,7 +1,7 @@
-package com.loafle.overflow.dao.discovery.dao;
+package com.loafle.overflow.module.discovery.dao;
 
 import com.loafle.overflow.commons.dao.BaseDAO;
-import com.loafle.overflow.dao.discovery.model.Zone;
+import com.loafle.overflow.module.discovery.model.Zone;
 
 /**
  * Created by root on 17. 6. 4.

src/main/java/com/loafle/overflow/module/discovery/model/Host.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.dao.discovery.model;
+package com.loafle.overflow.module.discovery.model;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 

src/main/java/com/loafle/overflow/module/discovery/model/Port.java

@@ -1,6 +1,6 @@
-package com.loafle.overflow.dao.discovery.model;
+package com.loafle.overflow.module.discovery.model;
 
-import com.loafle.overflow.dao.discovery.type.PortType;
+import com.loafle.overflow.module.discovery.type.PortType;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
 import javax.persistence.*;

src/main/java/com/loafle/overflow/module/discovery/model/Service.java

@@ -1,6 +1,6 @@
-package com.loafle.overflow.dao.discovery.model;
+package com.loafle.overflow.module.discovery.model;
 
-import com.loafle.overflow.dao.discovery.type.PortType;
+import com.loafle.overflow.module.discovery.type.PortType;
 import org.codehaus.jackson.annotate.JsonIgnore;
 
 import javax.persistence.*;

src/main/java/com/loafle/overflow/module/discovery/model/Zone.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.dao.discovery.model;
+package com.loafle.overflow.module.discovery.model;
 
 import javax.persistence.*;
 import java.util.Date;

src/main/java/com/loafle/overflow/module/discovery/type/DirectionType.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.dao.discovery.type;
+package com.loafle.overflow.module.discovery.type;
 
 /**
  * Created by root on 16. 11. 15.

src/main/java/com/loafle/overflow/module/discovery/type/PortType.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.dao.discovery.type;
+package com.loafle.overflow.module.discovery.type;
 
 /**
  * Created by root on 16. 11. 15.

src/main/java/com/loafle/overflow/module/email/dao/EmailAuthDAO.java

@@ -1,7 +1,7 @@
-package com.loafle.overflow.dao.email.dao;
+package com.loafle.overflow.module.email.dao;
 
 import com.loafle.overflow.commons.dao.BaseDAO;
-import com.loafle.overflow.dao.email.model.EmailAuth;
+import com.loafle.overflow.module.email.model.EmailAuth;
 
 import java.util.List;
 

src/main/java/com/loafle/overflow/module/email/dao/JPAEmailAuthDAO.java

@@ -1,7 +1,7 @@
-package com.loafle.overflow.dao.email.dao;
+package com.loafle.overflow.module.email.dao;
 
 import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.email.model.EmailAuth;
+import com.loafle.overflow.module.email.model.EmailAuth;
 
 import javax.persistence.Query;
 import java.util.List;

src/main/java/com/loafle/overflow/module/email/model/EmailAuth.java

@@ -1,6 +1,6 @@
-package com.loafle.overflow.dao.email.model;
+package com.loafle.overflow.module.email.model;
 
-import com.loafle.overflow.dao.member.model.Member;
+import com.loafle.overflow.module.member.model.Member;
 
 import javax.persistence.*;
 import java.io.Serializable;

src/main/java/com/loafle/overflow/module/infra/Infra.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.module.infra;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_INFRA", schema = "public", catalog = "postgres")
-public class TblInfra {
+public class Infra {
     private long id;
     private int typeId;
     private long childId;
@@ -59,7 +59,7 @@ public class TblInfra {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblInfra tblInfra = (TblInfra) o;
+        Infra tblInfra = (Infra) o;
 
         if (id != tblInfra.id) return false;
         if (typeId != tblInfra.typeId) return false;

src/main/java/com/loafle/overflow/module/infra/InfraHost.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.module.infra;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_INFRA_HOST", schema = "public", catalog = "postgres")
-public class TblInfraHost {
+public class InfraHost {
     private long id;
     private long osId;
     private int ip;
@@ -70,7 +70,7 @@ public class TblInfraHost {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblInfraHost that = (TblInfraHost) o;
+        InfraHost that = (InfraHost) o;
 
         if (id != that.id) return false;
         if (osId != that.osId) return false;

src/main/java/com/loafle/overflow/module/infra/InfraMachine.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.module.infra;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_INFRA_MACHINE", schema = "public", catalog = "postgres")
-public class TblInfraMachine {
+public class InfraMachine {
     private long id;
     private long probeId;
     private String meta;
@@ -59,7 +59,7 @@ public class TblInfraMachine {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblInfraMachine that = (TblInfraMachine) o;
+        InfraMachine that = (InfraMachine) o;
 
         if (id != that.id) return false;
         if (probeId != that.probeId) return false;

src/main/java/com/loafle/overflow/module/infra/InfraOs.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.module.infra;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_INFRA_OS", schema = "public", catalog = "postgres")
-public class TblInfraOs {
+public class InfraOs {
     private long id;
     private long machineId;
     private String meta;
@@ -70,7 +70,7 @@ public class TblInfraOs {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblInfraOs that = (TblInfraOs) o;
+        InfraOs that = (InfraOs) o;
 
         if (id != that.id) return false;
         if (machineId != that.machineId) return false;

src/main/java/com/loafle/overflow/module/infra/InfraOsApplication.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.module.infra;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_INFRA_OS_APPLICATION", schema = "public", catalog = "postgres")
-public class TblInfraOsApplication {
+public class InfraOsApplication {
     private long id;
     private long osId;
     private String name;
@@ -59,7 +59,7 @@ public class TblInfraOsApplication {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblInfraOsApplication that = (TblInfraOsApplication) o;
+        InfraOsApplication that = (InfraOsApplication) o;
 
         if (id != that.id) return false;
         if (osId != that.osId) return false;

src/main/java/com/loafle/overflow/module/infra/InfraOsDaemon.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.module.infra;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_INFRA_OS_DAEMON", schema = "public", catalog = "postgres")
-public class TblInfraOsDaemon {
+public class InfraOsDaemon {
     private long id;
     private long osId;
     private String name;
@@ -59,7 +59,7 @@ public class TblInfraOsDaemon {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblInfraOsDaemon that = (TblInfraOsDaemon) o;
+        InfraOsDaemon that = (InfraOsDaemon) o;
 
         if (id != that.id) return false;
         if (osId != that.osId) return false;

src/main/java/com/loafle/overflow/module/infra/InfraOsPort.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.module.infra;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_INFRA_OS_PORT", schema = "public", catalog = "postgres")
-public class TblInfraOsPort {
+public class InfraOsPort {
     private long id;
     private long osId;
     private Timestamp createDate;
@@ -92,7 +92,7 @@ public class TblInfraOsPort {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblInfraOsPort that = (TblInfraOsPort) o;
+        InfraOsPort that = (InfraOsPort) o;
 
         if (id != that.id) return false;
         if (osId != that.osId) return false;

src/main/java/com/loafle/overflow/module/infra/InfraService.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.module.infra;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_INFRA_SERVICE", schema = "public", catalog = "postgres")
-public class TblInfraService {
+public class InfraService {
     private long id;
     private long hostId;
     private String portType;
@@ -92,7 +92,7 @@ public class TblInfraService {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblInfraService that = (TblInfraService) o;
+        InfraService that = (InfraService) o;
 
         if (id != that.id) return false;
         if (hostId != that.hostId) return false;

src/main/java/com/loafle/overflow/module/member/dao/JPAMemberDAO.java

@@ -1,7 +1,7 @@
-package com.loafle.overflow.dao.member.dao;
+package com.loafle.overflow.module.member.dao;
 
 import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.member.model.Member;
+import com.loafle.overflow.module.member.model.Member;
 
 import javax.persistence.Query;
 

src/main/java/com/loafle/overflow/module/member/dao/MemberDAO.java

@@ -1,7 +1,7 @@
-package com.loafle.overflow.dao.member.dao;
+package com.loafle.overflow.module.member.dao;
 
 import com.loafle.overflow.commons.dao.BaseDAO;
-import com.loafle.overflow.dao.member.model.Member;
+import com.loafle.overflow.module.member.model.Member;
 
 /**
  * Created by insanity on 17. 5. 25.

src/main/java/com/loafle/overflow/module/member/model/Member.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.dao.member.model;
+package com.loafle.overflow.module.member.model;
 
 
 import javax.persistence.*;

src/main/java/com/loafle/overflow/module/noauthagent/dao/JPANoAuthAgentDAO.java

@@ -1,7 +1,7 @@
-package com.loafle.overflow.dao.noauthagent.dao;
+package com.loafle.overflow.module.noauthagent.dao;
 
 import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.noauthagent.model.NoAuthAgent;
+import com.loafle.overflow.module.noauthagent.model.NoAuthAgent;
 
 import javax.persistence.Query;
 import java.util.List;

src/main/java/com/loafle/overflow/module/noauthagent/dao/NoAuthAgentDao.java

@@ -1,7 +1,7 @@
-package com.loafle.overflow.dao.noauthagent.dao;
+package com.loafle.overflow.module.noauthagent.dao;
 
 import com.loafle.overflow.commons.dao.BaseDAO;
-import com.loafle.overflow.dao.noauthagent.model.NoAuthAgent;
+import com.loafle.overflow.module.noauthagent.model.NoAuthAgent;
 
 import java.util.List;
 

src/main/java/com/loafle/overflow/module/noauthagent/model/NoAuthAgent.java

@@ -1,6 +1,6 @@
-package com.loafle.overflow.dao.noauthagent.model;
+package com.loafle.overflow.module.noauthagent.model;
 
-import com.loafle.overflow.dao.noauthagent.type.AuthType;
+import com.loafle.overflow.module.noauthagent.type.AuthType;
 
 import javax.persistence.*;
 import java.util.Date;

src/main/java/com/loafle/overflow/module/noauthagent/type/AuthType.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.dao.noauthagent.type;
+package com.loafle.overflow.module.noauthagent.type;
 
 /**
  * Created by root on 17. 5. 31.

src/main/java/com/loafle/overflow/module/sensor/dao/JPASensorDao.java

@@ -1,9 +1,7 @@
-package com.loafle.overflow.dao.sensor.dao;
+package com.loafle.overflow.module.sensor.dao;
 
 
 import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.sensor.model.Sensor;
-import com.loafle.overflow.dao.target.model.Target;
 
 import javax.persistence.Query;
 import java.util.List;

src/main/java/com/loafle/overflow/module/sensor/dao/JPASensorItemCategoryDao.java

@@ -1,7 +1,6 @@
-package com.loafle.overflow.dao.sensor.dao;
+package com.loafle.overflow.module.sensor.dao;
 
 import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.sensor.model.SensorItemCategory;
 
 /**
  * Created by root on 17. 6. 9.

src/main/java/com/loafle/overflow/module/sensor/dao/JPASensorItemDao.java

@@ -1,8 +1,7 @@
-package com.loafle.overflow.dao.sensor.dao;
+package com.loafle.overflow.module.sensor.dao;
 
 import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.crawler.model.Crawler;
-import com.loafle.overflow.dao.sensor.model.SensorItem;
+import com.loafle.overflow.module.crawler.model.Crawler;
 
 
 import javax.persistence.Query;

src/main/java/com/loafle/overflow/module/sensor/dao/JPASensorItemMappingDao.java

@@ -1,8 +1,6 @@
-package com.loafle.overflow.dao.sensor.dao;
+package com.loafle.overflow.module.sensor.dao;
 
 import com.loafle.overflow.commons.dao.JPABaseDAO;
-import com.loafle.overflow.dao.sensor.model.Sensor;
-import com.loafle.overflow.dao.sensor.model.SensorItemMapping;
 
 import javax.persistence.Query;
 import java.util.List;

src/main/java/com/loafle/overflow/module/sensor/dao/SensorDao.java

@@ -1,9 +1,7 @@
-package com.loafle.overflow.dao.sensor.dao;
+package com.loafle.overflow.module.sensor.dao;
 
 
 import com.loafle.overflow.commons.dao.BaseDAO;
-import com.loafle.overflow.dao.sensor.model.Sensor;
-import com.loafle.overflow.dao.target.model.Target;
 
 import java.util.List;
 

src/main/java/com/loafle/overflow/module/sensor/dao/SensorItemCategoryDao.java

@@ -1,7 +1,6 @@
-package com.loafle.overflow.dao.sensor.dao;
+package com.loafle.overflow.module.sensor.dao;
 
 import com.loafle.overflow.commons.dao.BaseDAO;
-import com.loafle.overflow.dao.sensor.model.SensorItemCategory;
 
 /**
  * Created by root on 17. 6. 9.

src/main/java/com/loafle/overflow/module/sensor/dao/SensorItemDao.java

@@ -1,9 +1,8 @@
-package com.loafle.overflow.dao.sensor.dao;
+package com.loafle.overflow.module.sensor.dao;
 
 import com.loafle.overflow.commons.dao.BaseDAO;
 
-import com.loafle.overflow.dao.crawler.model.Crawler;
-import com.loafle.overflow.dao.sensor.model.SensorItem;
+import com.loafle.overflow.module.crawler.model.Crawler;
 
 import java.util.List;
 

src/main/java/com/loafle/overflow/module/sensor/dao/SensorItemMappingDao.java

@@ -1,8 +1,6 @@
-package com.loafle.overflow.dao.sensor.dao;
+package com.loafle.overflow.module.sensor.dao;
 
 import com.loafle.overflow.commons.dao.BaseDAO;
-import com.loafle.overflow.dao.sensor.model.Sensor;
-import com.loafle.overflow.dao.sensor.model.SensorItemMapping;
 
 import java.util.List;
 

src/main/java/com/loafle/overflow/module/sensor/model/Sensor.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.module.sensor.model;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_SENSOR", schema = "public", catalog = "postgres")
-public class TblSensor {
+public class Sensor {
     private long id;
     private Timestamp createDate;
     private String desc;
@@ -92,7 +92,7 @@ public class TblSensor {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblSensor tblSensor = (TblSensor) o;
+        Sensor tblSensor = (Sensor) o;
 
         if (id != tblSensor.id) return false;
         if (targetId != tblSensor.targetId) return false;

src/main/java/com/loafle/overflow/module/sensor/model/SensorItem.java

@@ -1,4 +1,4 @@
-package com.loafle.overflow.models;
+package com.loafle.overflow.module.sensor.model;
 
 import javax.persistence.*;
 import java.sql.Timestamp;
@@ -8,7 +8,7 @@ import java.sql.Timestamp;
  */
 @Entity
 @Table(name = "TBL_SENSOR_ITEM", schema = "public", catalog = "postgres")
-public class TblSensorItem {
+public class SensorItem {
     private long id;
     private long sensorId;
     private long itemId;
@@ -59,7 +59,7 @@ public class TblSensorItem {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        TblSensorItem that = (TblSensorItem) o;
+        SensorItem that = (SensorItem) o;
 
         if (id != that.id) return false;
         if (sensorId != that.sensorId) return false;

src/test/java/com/loafle/TestClient.java

@@ -4,8 +4,7 @@ package com.loafle;
 import com.loafle.overflow.db.api.DBGrpc;
 import com.loafle.overflow.db.api.DBInput;
 import com.loafle.overflow.db.api.DBOutput;
-import com.loafle.overflow.dao.member.model.Member;
-import com.loafle.overflow.dao.target.model.Target;
+import com.loafle.overflow.module.member.model.Member;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.StatusRuntimeException;
@@ -13,7 +12,6 @@ import org.codehaus.jackson.map.ObjectMapper;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;

src/test/java/com/loafle/overflow/agent/dao/JPAAgentDAOTest.java

@@ -1,8 +1,8 @@
 package com.loafle.overflow.agent.dao;
 
-import com.loafle.overflow.dao.agent.dao.JPAAgentDAO;
-import com.loafle.overflow.dao.agent.model.Agent;
-import com.loafle.overflow.dao.member.model.Member;
+import com.loafle.overflow.module.agent.dao.JPAAgentDAO;
+import com.loafle.overflow.module.agent.model.Agent;
+import com.loafle.overflow.module.member.model.Member;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;

src/test/java/com/loafle/overflow/apikey/dao/JPAApiKeyDaoTest.java

@@ -1,16 +1,14 @@
 package com.loafle.overflow.apikey.dao;
 
-import com.loafle.overflow.dao.apikey.dao.JPAApiKeyDao;
-import com.loafle.overflow.dao.apikey.model.Apikey;
-import com.loafle.overflow.dao.member.model.Member;
+import com.loafle.overflow.module.apikey.dao.JPAApiKeyDao;
+import com.loafle.overflow.module.apikey.model.Apikey;
+import com.loafle.overflow.module.member.model.Member;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Date;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by root on 17. 6. 4.
  */

src/test/java/com/loafle/overflow/crawler/dao/JPACrawlerDAOTest.java

@@ -1,8 +1,8 @@
 package com.loafle.overflow.crawler.dao;
 
 
-import com.loafle.overflow.dao.crawler.dao.JPACrawlerDAO;
-import com.loafle.overflow.dao.crawler.model.Crawler;
+import com.loafle.overflow.module.crawler.dao.JPACrawlerDAO;
+import com.loafle.overflow.module.crawler.model.Crawler;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -10,8 +10,6 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by geek@loafle.com on 17. 6. 8.
  */

src/test/java/com/loafle/overflow/crawler/dao/JPACrawlerInputItemDAOTest.java

@@ -1,7 +1,7 @@
 package com.loafle.overflow.crawler.dao;
 
-import com.loafle.overflow.dao.crawler.dao.JPACrawlerInputItemDAO;
-import com.loafle.overflow.dao.crawler.model.CrawlerInputItem;
+import com.loafle.overflow.module.crawler.dao.JPACrawlerInputItemDAO;
+import com.loafle.overflow.module.crawler.model.CrawlerInputItem;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -9,8 +9,6 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by geek@loafle.com on 17. 6. 8.
  */

src/test/java/com/loafle/overflow/crawler/dao/JPACrawlerInputItemMappingDAOTest.java

@@ -1,9 +1,9 @@
 package com.loafle.overflow.crawler.dao;
 
-import com.loafle.overflow.dao.crawler.dao.JPACrawlerInputItemMappingDAO;
-import com.loafle.overflow.dao.crawler.model.Crawler;
-import com.loafle.overflow.dao.crawler.model.CrawlerInputItem;
-import com.loafle.overflow.dao.crawler.model.CrawlerInputItemMapping;
+import com.loafle.overflow.module.crawler.dao.JPACrawlerInputItemMappingDAO;
+import com.loafle.overflow.module.crawler.model.Crawler;
+import com.loafle.overflow.module.crawler.model.CrawlerInputItem;
+import com.loafle.overflow.module.crawler.model.CrawlerInputItemMapping;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -11,8 +11,6 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by geek@loafle.com on 17. 6. 8.
  */

src/test/java/com/loafle/overflow/email/dao/JPAEmailAuthDAOTest.java

@@ -1,8 +1,8 @@
 package com.loafle.overflow.email.dao;
 
-import com.loafle.overflow.dao.email.dao.JPAEmailAuthDAO;
-import com.loafle.overflow.dao.email.model.EmailAuth;
-import com.loafle.overflow.dao.member.model.Member;
+import com.loafle.overflow.module.email.dao.JPAEmailAuthDAO;
+import com.loafle.overflow.module.email.model.EmailAuth;
+import com.loafle.overflow.module.member.model.Member;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;

src/test/java/com/loafle/overflow/member/dao/JPAMemberDAOTest.java

@@ -1,13 +1,11 @@
 package com.loafle.overflow.member.dao;
 
-import com.loafle.overflow.dao.member.dao.JPAMemberDAO;
-import com.loafle.overflow.dao.member.model.Member;
+import com.loafle.overflow.module.member.dao.JPAMemberDAO;
+import com.loafle.overflow.module.member.model.Member;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by root on 17. 6. 4.
  */

src/test/java/com/loafle/overflow/noauthagent/dao/JPANoAuthAgentDAOTest.java

@@ -1,16 +1,13 @@
 package com.loafle.overflow.noauthagent.dao;
 
-import com.loafle.overflow.dao.noauthagent.dao.JPANoAuthAgentDAO;
-import com.loafle.overflow.dao.noauthagent.model.NoAuthAgent;
-import com.loafle.overflow.dao.noauthagent.type.AuthType;
+import com.loafle.overflow.module.noauthagent.dao.JPANoAuthAgentDAO;
+import com.loafle.overflow.module.noauthagent.model.NoAuthAgent;
+import com.loafle.overflow.module.noauthagent.type.AuthType;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Date;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by root on 17. 6. 4.
  */

src/test/java/com/loafle/overflow/sensor/dao/JPASensorDaoTest.java

@@ -1,16 +1,12 @@
 package com.loafle.overflow.sensor.dao;
 
-import com.loafle.overflow.dao.crawler.model.Crawler;
-import com.loafle.overflow.dao.sensor.dao.JPASensorDao;
-import com.loafle.overflow.dao.sensor.dao.SensorDao;
-import com.loafle.overflow.dao.sensor.model.Sensor;
-import com.loafle.overflow.dao.target.model.Target;
+import com.loafle.overflow.module.crawler.model.Crawler;
+import com.loafle.overflow.module.sensor.dao.JPASensorDao;
+import com.loafle.overflow.module.sensor.dao.SensorDao;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by root on 17. 6. 9.
  */

src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemCategoryDaoTest.java

@@ -1,14 +1,11 @@
 package com.loafle.overflow.sensor.dao;
 
-import com.loafle.overflow.dao.sensor.dao.JPASensorItemCategoryDao;
-import com.loafle.overflow.dao.sensor.dao.SensorItemCategoryDao;
-import com.loafle.overflow.dao.sensor.model.SensorItemCategory;
+import com.loafle.overflow.module.sensor.dao.JPASensorItemCategoryDao;
+import com.loafle.overflow.module.sensor.dao.SensorItemCategoryDao;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by root on 17. 6. 9.
  */

src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemDaoTest.java

@@ -1,18 +1,14 @@
 package com.loafle.overflow.sensor.dao;
 
-import com.loafle.overflow.dao.crawler.model.Crawler;
-import com.loafle.overflow.dao.sensor.dao.JPASensorItemDao;
-import com.loafle.overflow.dao.sensor.dao.SensorItemDao;
-import com.loafle.overflow.dao.sensor.model.SensorItem;
-import com.loafle.overflow.dao.sensor.model.SensorItemCategory;
+import com.loafle.overflow.module.crawler.model.Crawler;
+import com.loafle.overflow.module.sensor.dao.JPASensorItemDao;
+import com.loafle.overflow.module.sensor.dao.SensorItemDao;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by root on 17. 6. 9.
  */

src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemMappingDaoTest.java

@@ -1,18 +1,13 @@
 package com.loafle.overflow.sensor.dao;
 
-import com.loafle.overflow.dao.sensor.dao.JPASensorItemMappingDao;
-import com.loafle.overflow.dao.sensor.dao.SensorItemMappingDao;
-import com.loafle.overflow.dao.sensor.model.Sensor;
-import com.loafle.overflow.dao.sensor.model.SensorItem;
-import com.loafle.overflow.dao.sensor.model.SensorItemMapping;
+import com.loafle.overflow.module.sensor.dao.JPASensorItemMappingDao;
+import com.loafle.overflow.module.sensor.dao.SensorItemMappingDao;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.*;
-
 /**
  * Created by root on 17. 6. 9.
  */