From 37b9da0f66a9bc50be733e881e5d92e4be753fdf Mon Sep 17 00:00:00 2001 From: insanity Date: Thu, 22 Jun 2017 17:15:52 +0900 Subject: [PATCH] model --- .../overflow/dao/discovery/dao/HostDao.java | 11 -- .../overflow/dao/sensor/model/Sensor.java | 83 ----------- .../overflow/dao/sensor/model/SensorItem.java | 94 ------------- .../dao/sensor/model/SensorItemCategory.java | 56 -------- .../dao/sensor/model/SensorItemMapping.java | 58 -------- .../overflow/dao/target/dao/JPATargetDao.java | 30 ---- .../overflow/dao/target/dao/TargetDao.java | 14 -- .../overflow/dao/target/model/Target.java | 130 ------------------ .../overflow/dao/target/type/PortType.java | 19 --- .../overflow/dao/target/type/TargetType.java | 21 --- .../MetaCrawler.java} | 6 +- .../MetaCrawlerInputItem.java} | 6 +- .../MetaInfraType.java} | 6 +- .../MetaInfraVendor.java} | 6 +- .../MetaInputType.java} | 6 +- .../MetaMemberStatus.java} | 6 +- .../MetaNotification.java} | 6 +- .../MetaProbeArchitecture.java} | 6 +- .../MetaProbeOs.java} | 6 +- .../MetaProbePackage.java} | 6 +- .../MetaProbeTaskType.java} | 6 +- .../MetaProbeVersion.java} | 6 +- .../MetaSensorItem.java} | 6 +- .../MetaSensorItemType.java} | 6 +- .../MetaVendorCrawler.java} | 6 +- .../MetaVendorCrawlerSensorItem.java} | 6 +- .../com/loafle/overflow/models/TblTarget.java | 80 ----------- .../{dao => module}/agent/dao/AgentDAO.java | 6 +- .../agent/dao/JPAAgentDAO.java | 6 +- .../{dao => module}/agent/model/Agent.java | 4 +- .../{dao => module}/apikey/dao/ApiKeyDao.java | 4 +- .../apikey/dao/JPAApiKeyDao.java | 4 +- .../{dao => module}/apikey/model/Apikey.java | 4 +- .../crawler/dao/CrawlerDAO.java | 4 +- .../crawler/dao/CrawlerInputItemDAO.java | 4 +- .../dao/CrawlerInputItemMappingDAO.java | 6 +- .../crawler/dao/JPACrawlerDAO.java | 4 +- .../crawler/dao/JPACrawlerInputItemDAO.java | 4 +- .../dao/JPACrawlerInputItemMappingDAO.java | 6 +- .../crawler/model/Crawler.java | 2 +- .../crawler/model/CrawlerInputItem.java | 2 +- .../model/CrawlerInputItemMapping.java | 2 +- .../module/discovery/dao/HostDao.java | 10 ++ .../discovery/dao/JPAHostDao.java | 4 +- .../discovery/dao/JPAPortDao.java | 5 +- .../discovery/dao/JPAServiceDao.java | 5 +- .../discovery/dao/JPAZoneDao.java | 4 +- .../discovery/dao/PortDao.java | 4 +- .../discovery/dao/ServiceDao.java | 4 +- .../discovery/dao/ZoneDao.java | 4 +- .../{dao => module}/discovery/model/Host.java | 2 +- .../{dao => module}/discovery/model/Port.java | 4 +- .../discovery/model/Service.java | 4 +- .../{dao => module}/discovery/model/Zone.java | 2 +- .../discovery/type/DirectionType.java | 2 +- .../discovery/type/PortType.java | 2 +- .../email/dao/EmailAuthDAO.java | 4 +- .../email/dao/JPAEmailAuthDAO.java | 4 +- .../email/model/EmailAuth.java | 4 +- .../TblInfra.java => module/infra/Infra.java} | 6 +- .../infra/InfraHost.java} | 6 +- .../infra/InfraMachine.java} | 6 +- .../infra/InfraOs.java} | 6 +- .../infra/InfraOsApplication.java} | 6 +- .../infra/InfraOsDaemon.java} | 6 +- .../infra/InfraOsPort.java} | 6 +- .../infra/InfraService.java} | 6 +- .../member/dao/JPAMemberDAO.java | 4 +- .../{dao => module}/member/dao/MemberDAO.java | 4 +- .../{dao => module}/member/model/Member.java | 2 +- .../noauthagent/dao/JPANoAuthAgentDAO.java | 4 +- .../noauthagent/dao/NoAuthAgentDao.java | 4 +- .../noauthagent/model/NoAuthAgent.java | 4 +- .../noauthagent/type/AuthType.java | 2 +- .../sensor/dao/JPASensorDao.java | 4 +- .../sensor/dao/JPASensorItemCategoryDao.java | 3 +- .../sensor/dao/JPASensorItemDao.java | 5 +- .../sensor/dao/JPASensorItemMappingDao.java | 4 +- .../{dao => module}/sensor/dao/SensorDao.java | 4 +- .../sensor/dao/SensorItemCategoryDao.java | 3 +- .../sensor/dao/SensorItemDao.java | 5 +- .../sensor/dao/SensorItemMappingDao.java | 4 +- .../sensor/model/Sensor.java} | 6 +- .../sensor/model/SensorItem.java} | 6 +- src/test/java/com/loafle/TestClient.java | 4 +- .../overflow/agent/dao/JPAAgentDAOTest.java | 6 +- .../overflow/apikey/dao/JPAApiKeyDaoTest.java | 8 +- .../crawler/dao/JPACrawlerDAOTest.java | 6 +- .../dao/JPACrawlerInputItemDAOTest.java | 6 +- .../JPACrawlerInputItemMappingDAOTest.java | 10 +- .../email/dao/JPAEmailAuthDAOTest.java | 6 +- .../overflow/member/dao/JPAMemberDAOTest.java | 6 +- .../dao/JPANoAuthAgentDAOTest.java | 9 +- .../overflow/sensor/dao/JPASensorDaoTest.java | 10 +- .../dao/JPASensorItemCategoryDaoTest.java | 7 +- .../sensor/dao/JPASensorItemDaoTest.java | 10 +- .../dao/JPASensorItemMappingDaoTest.java | 9 +- 97 files changed, 202 insertions(+), 833 deletions(-) delete mode 100644 src/main/java/com/loafle/overflow/dao/discovery/dao/HostDao.java delete mode 100644 src/main/java/com/loafle/overflow/dao/sensor/model/Sensor.java delete mode 100644 src/main/java/com/loafle/overflow/dao/sensor/model/SensorItem.java delete mode 100644 src/main/java/com/loafle/overflow/dao/sensor/model/SensorItemCategory.java delete mode 100644 src/main/java/com/loafle/overflow/dao/sensor/model/SensorItemMapping.java delete mode 100644 src/main/java/com/loafle/overflow/dao/target/dao/JPATargetDao.java delete mode 100644 src/main/java/com/loafle/overflow/dao/target/dao/TargetDao.java delete mode 100644 src/main/java/com/loafle/overflow/dao/target/model/Target.java delete mode 100644 src/main/java/com/loafle/overflow/dao/target/type/PortType.java delete mode 100644 src/main/java/com/loafle/overflow/dao/target/type/TargetType.java rename src/main/java/com/loafle/overflow/{models/TblMetaCrawler.java => meta/MetaCrawler.java} (94%) rename src/main/java/com/loafle/overflow/{models/TblMetaCrawlerInputItem.java => meta/MetaCrawlerInputItem.java} (97%) rename src/main/java/com/loafle/overflow/{models/TblMetaInfraType.java => meta/MetaInfraType.java} (92%) rename src/main/java/com/loafle/overflow/{models/TblMetaInfraVendor.java => meta/MetaInfraVendor.java} (93%) rename src/main/java/com/loafle/overflow/{models/TblMetaInputType.java => meta/MetaInputType.java} (94%) rename src/main/java/com/loafle/overflow/{models/TblMetaMemberStatus.java => meta/MetaMemberStatus.java} (89%) rename src/main/java/com/loafle/overflow/{models/TblMetaNotification.java => meta/MetaNotification.java} (93%) rename src/main/java/com/loafle/overflow/{models/TblMetaProbeArchitecture.java => meta/MetaProbeArchitecture.java} (91%) rename src/main/java/com/loafle/overflow/{models/TblMetaProbeOs.java => meta/MetaProbeOs.java} (92%) rename src/main/java/com/loafle/overflow/{models/TblMetaProbePackage.java => meta/MetaProbePackage.java} (94%) rename src/main/java/com/loafle/overflow/{models/TblMetaProbeTaskType.java => meta/MetaProbeTaskType.java} (93%) rename src/main/java/com/loafle/overflow/{models/TblMetaProbeVersion.java => meta/MetaProbeVersion.java} (92%) rename src/main/java/com/loafle/overflow/{models/TblMetaSensorItem.java => meta/MetaSensorItem.java} (94%) rename src/main/java/com/loafle/overflow/{models/TblMetaSensorItemType.java => meta/MetaSensorItemType.java} (93%) rename src/main/java/com/loafle/overflow/{models/TblMetaVendorCrawler.java => meta/MetaVendorCrawler.java} (93%) rename src/main/java/com/loafle/overflow/{models/TblMetaVendorCrawlerSensorItem.java => meta/MetaVendorCrawlerSensorItem.java} (95%) delete mode 100644 src/main/java/com/loafle/overflow/models/TblTarget.java rename src/main/java/com/loafle/overflow/{dao => module}/agent/dao/AgentDAO.java (60%) rename src/main/java/com/loafle/overflow/{dao => module}/agent/dao/JPAAgentDAO.java (83%) rename src/main/java/com/loafle/overflow/{dao => module}/agent/model/Agent.java (93%) rename src/main/java/com/loafle/overflow/{dao => module}/apikey/dao/ApiKeyDao.java (64%) rename src/main/java/com/loafle/overflow/{dao => module}/apikey/dao/JPAApiKeyDao.java (86%) rename src/main/java/com/loafle/overflow/{dao => module}/apikey/model/Apikey.java (91%) rename src/main/java/com/loafle/overflow/{dao => module}/crawler/dao/CrawlerDAO.java (67%) rename src/main/java/com/loafle/overflow/{dao => module}/crawler/dao/CrawlerInputItemDAO.java (60%) rename src/main/java/com/loafle/overflow/{dao => module}/crawler/dao/CrawlerInputItemMappingDAO.java (61%) rename src/main/java/com/loafle/overflow/{dao => module}/crawler/dao/JPACrawlerDAO.java (85%) rename src/main/java/com/loafle/overflow/{dao => module}/crawler/dao/JPACrawlerInputItemDAO.java (65%) rename src/main/java/com/loafle/overflow/{dao => module}/crawler/dao/JPACrawlerInputItemMappingDAO.java (83%) rename src/main/java/com/loafle/overflow/{dao => module}/crawler/model/Crawler.java (96%) rename src/main/java/com/loafle/overflow/{dao => module}/crawler/model/CrawlerInputItem.java (96%) rename src/main/java/com/loafle/overflow/{dao => module}/crawler/model/CrawlerInputItemMapping.java (97%) create mode 100644 src/main/java/com/loafle/overflow/module/discovery/dao/HostDao.java rename src/main/java/com/loafle/overflow/{dao => module}/discovery/dao/JPAHostDao.java (60%) rename src/main/java/com/loafle/overflow/{dao => module}/discovery/dao/JPAPortDao.java (52%) rename src/main/java/com/loafle/overflow/{dao => module}/discovery/dao/JPAServiceDao.java (53%) rename src/main/java/com/loafle/overflow/{dao => module}/discovery/dao/JPAZoneDao.java (61%) rename src/main/java/com/loafle/overflow/{dao => module}/discovery/dao/PortDao.java (57%) rename src/main/java/com/loafle/overflow/{dao => module}/discovery/dao/ServiceDao.java (57%) rename src/main/java/com/loafle/overflow/{dao => module}/discovery/dao/ZoneDao.java (57%) rename src/main/java/com/loafle/overflow/{dao => module}/discovery/model/Host.java (97%) rename src/main/java/com/loafle/overflow/{dao => module}/discovery/model/Port.java (95%) rename src/main/java/com/loafle/overflow/{dao => module}/discovery/model/Service.java (94%) rename src/main/java/com/loafle/overflow/{dao => module}/discovery/model/Zone.java (97%) rename src/main/java/com/loafle/overflow/{dao => module}/discovery/type/DirectionType.java (85%) rename src/main/java/com/loafle/overflow/{dao => module}/discovery/type/PortType.java (84%) rename src/main/java/com/loafle/overflow/{dao => module}/email/dao/EmailAuthDAO.java (78%) rename src/main/java/com/loafle/overflow/{dao => module}/email/dao/JPAEmailAuthDAO.java (94%) rename src/main/java/com/loafle/overflow/{dao => module}/email/model/EmailAuth.java (95%) rename src/main/java/com/loafle/overflow/{models/TblInfra.java => module/infra/Infra.java} (94%) rename src/main/java/com/loafle/overflow/{models/TblInfraHost.java => module/infra/InfraHost.java} (94%) rename src/main/java/com/loafle/overflow/{models/TblInfraMachine.java => module/infra/InfraMachine.java} (94%) rename src/main/java/com/loafle/overflow/{models/TblInfraOs.java => module/infra/InfraOs.java} (95%) rename src/main/java/com/loafle/overflow/{models/TblInfraOsApplication.java => module/infra/InfraOsApplication.java} (93%) rename src/main/java/com/loafle/overflow/{models/TblInfraOsDaemon.java => module/infra/InfraOsDaemon.java} (93%) rename src/main/java/com/loafle/overflow/{models/TblInfraOsPort.java => module/infra/InfraOsPort.java} (96%) rename src/main/java/com/loafle/overflow/{models/TblInfraService.java => module/infra/InfraService.java} (96%) rename src/main/java/com/loafle/overflow/{dao => module}/member/dao/JPAMemberDAO.java (86%) rename src/main/java/com/loafle/overflow/{dao => module}/member/dao/MemberDAO.java (65%) rename src/main/java/com/loafle/overflow/{dao => module}/member/model/Member.java (97%) rename src/main/java/com/loafle/overflow/{dao => module}/noauthagent/dao/JPANoAuthAgentDAO.java (91%) rename src/main/java/com/loafle/overflow/{dao => module}/noauthagent/dao/NoAuthAgentDao.java (71%) rename src/main/java/com/loafle/overflow/{dao => module}/noauthagent/model/NoAuthAgent.java (93%) rename src/main/java/com/loafle/overflow/{dao => module}/noauthagent/type/AuthType.java (84%) rename src/main/java/com/loafle/overflow/{dao => module}/sensor/dao/JPASensorDao.java (82%) rename src/main/java/com/loafle/overflow/{dao => module}/sensor/dao/JPASensorItemCategoryDao.java (65%) rename src/main/java/com/loafle/overflow/{dao => module}/sensor/dao/JPASensorItemDao.java (83%) rename src/main/java/com/loafle/overflow/{dao => module}/sensor/dao/JPASensorItemMappingDao.java (84%) rename src/main/java/com/loafle/overflow/{dao => module}/sensor/dao/SensorDao.java (60%) rename src/main/java/com/loafle/overflow/{dao => module}/sensor/dao/SensorItemCategoryDao.java (61%) rename src/main/java/com/loafle/overflow/{dao => module}/sensor/dao/SensorItemDao.java (60%) rename src/main/java/com/loafle/overflow/{dao => module}/sensor/dao/SensorItemMappingDao.java (61%) rename src/main/java/com/loafle/overflow/{models/TblSensor.java => module/sensor/model/Sensor.java} (96%) rename src/main/java/com/loafle/overflow/{models/TblSensorItem.java => module/sensor/model/SensorItem.java} (94%) diff --git a/src/main/java/com/loafle/overflow/dao/discovery/dao/HostDao.java b/src/main/java/com/loafle/overflow/dao/discovery/dao/HostDao.java deleted file mode 100644 index 2db7de4..0000000 --- a/src/main/java/com/loafle/overflow/dao/discovery/dao/HostDao.java +++ /dev/null @@ -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 { -} diff --git a/src/main/java/com/loafle/overflow/dao/sensor/model/Sensor.java b/src/main/java/com/loafle/overflow/dao/sensor/model/Sensor.java deleted file mode 100644 index 0545235..0000000 --- a/src/main/java/com/loafle/overflow/dao/sensor/model/Sensor.java +++ /dev/null @@ -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; - } -} diff --git a/src/main/java/com/loafle/overflow/dao/sensor/model/SensorItem.java b/src/main/java/com/loafle/overflow/dao/sensor/model/SensorItem.java deleted file mode 100644 index dddcb8d..0000000 --- a/src/main/java/com/loafle/overflow/dao/sensor/model/SensorItem.java +++ /dev/null @@ -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; - } -} diff --git a/src/main/java/com/loafle/overflow/dao/sensor/model/SensorItemCategory.java b/src/main/java/com/loafle/overflow/dao/sensor/model/SensorItemCategory.java deleted file mode 100644 index 0f492af..0000000 --- a/src/main/java/com/loafle/overflow/dao/sensor/model/SensorItemCategory.java +++ /dev/null @@ -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; - } -} diff --git a/src/main/java/com/loafle/overflow/dao/sensor/model/SensorItemMapping.java b/src/main/java/com/loafle/overflow/dao/sensor/model/SensorItemMapping.java deleted file mode 100644 index 0deec8b..0000000 --- a/src/main/java/com/loafle/overflow/dao/sensor/model/SensorItemMapping.java +++ /dev/null @@ -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; - } -} diff --git a/src/main/java/com/loafle/overflow/dao/target/dao/JPATargetDao.java b/src/main/java/com/loafle/overflow/dao/target/dao/JPATargetDao.java deleted file mode 100644 index 0f177b7..0000000 --- a/src/main/java/com/loafle/overflow/dao/target/dao/JPATargetDao.java +++ /dev/null @@ -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 implements TargetDao { - - public List 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 targets = null; - try { - targets = (List)query.getResultList(); - }catch(Exception e) { - e.printStackTrace(); - }finally { - return targets; - } - - - } -} diff --git a/src/main/java/com/loafle/overflow/dao/target/dao/TargetDao.java b/src/main/java/com/loafle/overflow/dao/target/dao/TargetDao.java deleted file mode 100644 index ec92e13..0000000 --- a/src/main/java/com/loafle/overflow/dao/target/dao/TargetDao.java +++ /dev/null @@ -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 { - - List findAll(Target target); -} diff --git a/src/main/java/com/loafle/overflow/dao/target/model/Target.java b/src/main/java/com/loafle/overflow/dao/target/model/Target.java deleted file mode 100644 index 7908060..0000000 --- a/src/main/java/com/loafle/overflow/dao/target/model/Target.java +++ /dev/null @@ -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; - } -} diff --git a/src/main/java/com/loafle/overflow/dao/target/type/PortType.java b/src/main/java/com/loafle/overflow/dao/target/type/PortType.java deleted file mode 100644 index fd5d019..0000000 --- a/src/main/java/com/loafle/overflow/dao/target/type/PortType.java +++ /dev/null @@ -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; - } -} diff --git a/src/main/java/com/loafle/overflow/dao/target/type/TargetType.java b/src/main/java/com/loafle/overflow/dao/target/type/TargetType.java deleted file mode 100644 index d8a45cc..0000000 --- a/src/main/java/com/loafle/overflow/dao/target/type/TargetType.java +++ /dev/null @@ -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; - } - -} diff --git a/src/main/java/com/loafle/overflow/models/TblMetaCrawler.java b/src/main/java/com/loafle/overflow/meta/MetaCrawler.java similarity index 94% rename from src/main/java/com/loafle/overflow/models/TblMetaCrawler.java rename to src/main/java/com/loafle/overflow/meta/MetaCrawler.java index 2efea1a..e883cb0 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaCrawler.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblMetaCrawlerInputItem.java b/src/main/java/com/loafle/overflow/meta/MetaCrawlerInputItem.java similarity index 97% rename from src/main/java/com/loafle/overflow/models/TblMetaCrawlerInputItem.java rename to src/main/java/com/loafle/overflow/meta/MetaCrawlerInputItem.java index ff4b084..430f42d 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaCrawlerInputItem.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblMetaInfraType.java b/src/main/java/com/loafle/overflow/meta/MetaInfraType.java similarity index 92% rename from src/main/java/com/loafle/overflow/models/TblMetaInfraType.java rename to src/main/java/com/loafle/overflow/meta/MetaInfraType.java index a290c6f..22cb803 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaInfraType.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblMetaInfraVendor.java b/src/main/java/com/loafle/overflow/meta/MetaInfraVendor.java similarity index 93% rename from src/main/java/com/loafle/overflow/models/TblMetaInfraVendor.java rename to src/main/java/com/loafle/overflow/meta/MetaInfraVendor.java index 2a6f374..7cb779c 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaInfraVendor.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblMetaInputType.java b/src/main/java/com/loafle/overflow/meta/MetaInputType.java similarity index 94% rename from src/main/java/com/loafle/overflow/models/TblMetaInputType.java rename to src/main/java/com/loafle/overflow/meta/MetaInputType.java index eb7231d..274f620 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaInputType.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblMetaMemberStatus.java b/src/main/java/com/loafle/overflow/meta/MetaMemberStatus.java similarity index 89% rename from src/main/java/com/loafle/overflow/models/TblMetaMemberStatus.java rename to src/main/java/com/loafle/overflow/meta/MetaMemberStatus.java index 2a94f64..8487ff6 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaMemberStatus.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblMetaNotification.java b/src/main/java/com/loafle/overflow/meta/MetaNotification.java similarity index 93% rename from src/main/java/com/loafle/overflow/models/TblMetaNotification.java rename to src/main/java/com/loafle/overflow/meta/MetaNotification.java index e8400fa..2a1a406 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaNotification.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblMetaProbeArchitecture.java b/src/main/java/com/loafle/overflow/meta/MetaProbeArchitecture.java similarity index 91% rename from src/main/java/com/loafle/overflow/models/TblMetaProbeArchitecture.java rename to src/main/java/com/loafle/overflow/meta/MetaProbeArchitecture.java index d80f393..fccd22f 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaProbeArchitecture.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblMetaProbeOs.java b/src/main/java/com/loafle/overflow/meta/MetaProbeOs.java similarity index 92% rename from src/main/java/com/loafle/overflow/models/TblMetaProbeOs.java rename to src/main/java/com/loafle/overflow/meta/MetaProbeOs.java index 15037e1..33ebdc1 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaProbeOs.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblMetaProbePackage.java b/src/main/java/com/loafle/overflow/meta/MetaProbePackage.java similarity index 94% rename from src/main/java/com/loafle/overflow/models/TblMetaProbePackage.java rename to src/main/java/com/loafle/overflow/meta/MetaProbePackage.java index 2aa671c..c3f6ba0 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaProbePackage.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblMetaProbeTaskType.java b/src/main/java/com/loafle/overflow/meta/MetaProbeTaskType.java similarity index 93% rename from src/main/java/com/loafle/overflow/models/TblMetaProbeTaskType.java rename to src/main/java/com/loafle/overflow/meta/MetaProbeTaskType.java index c98ccaa..2d8da6c 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaProbeTaskType.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblMetaProbeVersion.java b/src/main/java/com/loafle/overflow/meta/MetaProbeVersion.java similarity index 92% rename from src/main/java/com/loafle/overflow/models/TblMetaProbeVersion.java rename to src/main/java/com/loafle/overflow/meta/MetaProbeVersion.java index 662ca66..4a5e609 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaProbeVersion.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblMetaSensorItem.java b/src/main/java/com/loafle/overflow/meta/MetaSensorItem.java similarity index 94% rename from src/main/java/com/loafle/overflow/models/TblMetaSensorItem.java rename to src/main/java/com/loafle/overflow/meta/MetaSensorItem.java index 6b43048..c0e2f87 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaSensorItem.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblMetaSensorItemType.java b/src/main/java/com/loafle/overflow/meta/MetaSensorItemType.java similarity index 93% rename from src/main/java/com/loafle/overflow/models/TblMetaSensorItemType.java rename to src/main/java/com/loafle/overflow/meta/MetaSensorItemType.java index 451fdee..a4977d9 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaSensorItemType.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblMetaVendorCrawler.java b/src/main/java/com/loafle/overflow/meta/MetaVendorCrawler.java similarity index 93% rename from src/main/java/com/loafle/overflow/models/TblMetaVendorCrawler.java rename to src/main/java/com/loafle/overflow/meta/MetaVendorCrawler.java index a7d86c5..62d79ab 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaVendorCrawler.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblMetaVendorCrawlerSensorItem.java b/src/main/java/com/loafle/overflow/meta/MetaVendorCrawlerSensorItem.java similarity index 95% rename from src/main/java/com/loafle/overflow/models/TblMetaVendorCrawlerSensorItem.java rename to src/main/java/com/loafle/overflow/meta/MetaVendorCrawlerSensorItem.java index 9076948..964a255 100644 --- a/src/main/java/com/loafle/overflow/models/TblMetaVendorCrawlerSensorItem.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblTarget.java b/src/main/java/com/loafle/overflow/models/TblTarget.java deleted file mode 100644 index 61ba15e..0000000 --- a/src/main/java/com/loafle/overflow/models/TblTarget.java +++ /dev/null @@ -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; - } -} diff --git a/src/main/java/com/loafle/overflow/dao/agent/dao/AgentDAO.java b/src/main/java/com/loafle/overflow/module/agent/dao/AgentDAO.java similarity index 60% rename from src/main/java/com/loafle/overflow/dao/agent/dao/AgentDAO.java rename to src/main/java/com/loafle/overflow/module/agent/dao/AgentDAO.java index f724662..ae60601 100644 --- a/src/main/java/com/loafle/overflow/dao/agent/dao/AgentDAO.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/agent/dao/JPAAgentDAO.java b/src/main/java/com/loafle/overflow/module/agent/dao/JPAAgentDAO.java similarity index 83% rename from src/main/java/com/loafle/overflow/dao/agent/dao/JPAAgentDAO.java rename to src/main/java/com/loafle/overflow/module/agent/dao/JPAAgentDAO.java index 19f7fd9..7ef6926 100644 --- a/src/main/java/com/loafle/overflow/dao/agent/dao/JPAAgentDAO.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/agent/model/Agent.java b/src/main/java/com/loafle/overflow/module/agent/model/Agent.java similarity index 93% rename from src/main/java/com/loafle/overflow/dao/agent/model/Agent.java rename to src/main/java/com/loafle/overflow/module/agent/model/Agent.java index 7e3842a..04f30da 100644 --- a/src/main/java/com/loafle/overflow/dao/agent/model/Agent.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/apikey/dao/ApiKeyDao.java b/src/main/java/com/loafle/overflow/module/apikey/dao/ApiKeyDao.java similarity index 64% rename from src/main/java/com/loafle/overflow/dao/apikey/dao/ApiKeyDao.java rename to src/main/java/com/loafle/overflow/module/apikey/dao/ApiKeyDao.java index 760862e..2202d28 100644 --- a/src/main/java/com/loafle/overflow/dao/apikey/dao/ApiKeyDao.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/apikey/dao/JPAApiKeyDao.java b/src/main/java/com/loafle/overflow/module/apikey/dao/JPAApiKeyDao.java similarity index 86% rename from src/main/java/com/loafle/overflow/dao/apikey/dao/JPAApiKeyDao.java rename to src/main/java/com/loafle/overflow/module/apikey/dao/JPAApiKeyDao.java index 54b4d71..d9e073b 100644 --- a/src/main/java/com/loafle/overflow/dao/apikey/dao/JPAApiKeyDao.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/apikey/model/Apikey.java b/src/main/java/com/loafle/overflow/module/apikey/model/Apikey.java similarity index 91% rename from src/main/java/com/loafle/overflow/dao/apikey/model/Apikey.java rename to src/main/java/com/loafle/overflow/module/apikey/model/Apikey.java index 4306b9b..19507b1 100644 --- a/src/main/java/com/loafle/overflow/dao/apikey/model/Apikey.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/crawler/dao/CrawlerDAO.java b/src/main/java/com/loafle/overflow/module/crawler/dao/CrawlerDAO.java similarity index 67% rename from src/main/java/com/loafle/overflow/dao/crawler/dao/CrawlerDAO.java rename to src/main/java/com/loafle/overflow/module/crawler/dao/CrawlerDAO.java index b50f4ac..9347e13 100644 --- a/src/main/java/com/loafle/overflow/dao/crawler/dao/CrawlerDAO.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/crawler/dao/CrawlerInputItemDAO.java b/src/main/java/com/loafle/overflow/module/crawler/dao/CrawlerInputItemDAO.java similarity index 60% rename from src/main/java/com/loafle/overflow/dao/crawler/dao/CrawlerInputItemDAO.java rename to src/main/java/com/loafle/overflow/module/crawler/dao/CrawlerInputItemDAO.java index f1aefb4..2e609b0 100644 --- a/src/main/java/com/loafle/overflow/dao/crawler/dao/CrawlerInputItemDAO.java +++ b/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. diff --git a/src/main/java/com/loafle/overflow/dao/crawler/dao/CrawlerInputItemMappingDAO.java b/src/main/java/com/loafle/overflow/module/crawler/dao/CrawlerInputItemMappingDAO.java similarity index 61% rename from src/main/java/com/loafle/overflow/dao/crawler/dao/CrawlerInputItemMappingDAO.java rename to src/main/java/com/loafle/overflow/module/crawler/dao/CrawlerInputItemMappingDAO.java index f8e60ed..2e911ba 100644 --- a/src/main/java/com/loafle/overflow/dao/crawler/dao/CrawlerInputItemMappingDAO.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/crawler/dao/JPACrawlerDAO.java b/src/main/java/com/loafle/overflow/module/crawler/dao/JPACrawlerDAO.java similarity index 85% rename from src/main/java/com/loafle/overflow/dao/crawler/dao/JPACrawlerDAO.java rename to src/main/java/com/loafle/overflow/module/crawler/dao/JPACrawlerDAO.java index 2e4adb7..8991eaf 100644 --- a/src/main/java/com/loafle/overflow/dao/crawler/dao/JPACrawlerDAO.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/crawler/dao/JPACrawlerInputItemDAO.java b/src/main/java/com/loafle/overflow/module/crawler/dao/JPACrawlerInputItemDAO.java similarity index 65% rename from src/main/java/com/loafle/overflow/dao/crawler/dao/JPACrawlerInputItemDAO.java rename to src/main/java/com/loafle/overflow/module/crawler/dao/JPACrawlerInputItemDAO.java index 6ec961d..d0483d3 100644 --- a/src/main/java/com/loafle/overflow/dao/crawler/dao/JPACrawlerInputItemDAO.java +++ b/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. diff --git a/src/main/java/com/loafle/overflow/dao/crawler/dao/JPACrawlerInputItemMappingDAO.java b/src/main/java/com/loafle/overflow/module/crawler/dao/JPACrawlerInputItemMappingDAO.java similarity index 83% rename from src/main/java/com/loafle/overflow/dao/crawler/dao/JPACrawlerInputItemMappingDAO.java rename to src/main/java/com/loafle/overflow/module/crawler/dao/JPACrawlerInputItemMappingDAO.java index d436ce3..f434a96 100644 --- a/src/main/java/com/loafle/overflow/dao/crawler/dao/JPACrawlerInputItemMappingDAO.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/crawler/model/Crawler.java b/src/main/java/com/loafle/overflow/module/crawler/model/Crawler.java similarity index 96% rename from src/main/java/com/loafle/overflow/dao/crawler/model/Crawler.java rename to src/main/java/com/loafle/overflow/module/crawler/model/Crawler.java index 17c6b2c..40ad2cc 100644 --- a/src/main/java/com/loafle/overflow/dao/crawler/model/Crawler.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/crawler/model/CrawlerInputItem.java b/src/main/java/com/loafle/overflow/module/crawler/model/CrawlerInputItem.java similarity index 96% rename from src/main/java/com/loafle/overflow/dao/crawler/model/CrawlerInputItem.java rename to src/main/java/com/loafle/overflow/module/crawler/model/CrawlerInputItem.java index d09839d..c14b8e7 100644 --- a/src/main/java/com/loafle/overflow/dao/crawler/model/CrawlerInputItem.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/crawler/model/CrawlerInputItemMapping.java b/src/main/java/com/loafle/overflow/module/crawler/model/CrawlerInputItemMapping.java similarity index 97% rename from src/main/java/com/loafle/overflow/dao/crawler/model/CrawlerInputItemMapping.java rename to src/main/java/com/loafle/overflow/module/crawler/model/CrawlerInputItemMapping.java index 52a9c30..b0c36d6 100644 --- a/src/main/java/com/loafle/overflow/dao/crawler/model/CrawlerInputItemMapping.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/module/discovery/dao/HostDao.java b/src/main/java/com/loafle/overflow/module/discovery/dao/HostDao.java new file mode 100644 index 0000000..7aaf782 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/loafle/overflow/dao/discovery/dao/JPAHostDao.java b/src/main/java/com/loafle/overflow/module/discovery/dao/JPAHostDao.java similarity index 60% rename from src/main/java/com/loafle/overflow/dao/discovery/dao/JPAHostDao.java rename to src/main/java/com/loafle/overflow/module/discovery/dao/JPAHostDao.java index 173b656..fb5acf7 100644 --- a/src/main/java/com/loafle/overflow/dao/discovery/dao/JPAHostDao.java +++ b/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. diff --git a/src/main/java/com/loafle/overflow/dao/discovery/dao/JPAPortDao.java b/src/main/java/com/loafle/overflow/module/discovery/dao/JPAPortDao.java similarity index 52% rename from src/main/java/com/loafle/overflow/dao/discovery/dao/JPAPortDao.java rename to src/main/java/com/loafle/overflow/module/discovery/dao/JPAPortDao.java index f7d05cc..eab935b 100644 --- a/src/main/java/com/loafle/overflow/dao/discovery/dao/JPAPortDao.java +++ b/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. diff --git a/src/main/java/com/loafle/overflow/dao/discovery/dao/JPAServiceDao.java b/src/main/java/com/loafle/overflow/module/discovery/dao/JPAServiceDao.java similarity index 53% rename from src/main/java/com/loafle/overflow/dao/discovery/dao/JPAServiceDao.java rename to src/main/java/com/loafle/overflow/module/discovery/dao/JPAServiceDao.java index 1fecca2..b3407d8 100644 --- a/src/main/java/com/loafle/overflow/dao/discovery/dao/JPAServiceDao.java +++ b/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. diff --git a/src/main/java/com/loafle/overflow/dao/discovery/dao/JPAZoneDao.java b/src/main/java/com/loafle/overflow/module/discovery/dao/JPAZoneDao.java similarity index 61% rename from src/main/java/com/loafle/overflow/dao/discovery/dao/JPAZoneDao.java rename to src/main/java/com/loafle/overflow/module/discovery/dao/JPAZoneDao.java index 6139cb1..7a26f33 100644 --- a/src/main/java/com/loafle/overflow/dao/discovery/dao/JPAZoneDao.java +++ b/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. diff --git a/src/main/java/com/loafle/overflow/dao/discovery/dao/PortDao.java b/src/main/java/com/loafle/overflow/module/discovery/dao/PortDao.java similarity index 57% rename from src/main/java/com/loafle/overflow/dao/discovery/dao/PortDao.java rename to src/main/java/com/loafle/overflow/module/discovery/dao/PortDao.java index 2c3c3fe..63806b1 100644 --- a/src/main/java/com/loafle/overflow/dao/discovery/dao/PortDao.java +++ b/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. diff --git a/src/main/java/com/loafle/overflow/dao/discovery/dao/ServiceDao.java b/src/main/java/com/loafle/overflow/module/discovery/dao/ServiceDao.java similarity index 57% rename from src/main/java/com/loafle/overflow/dao/discovery/dao/ServiceDao.java rename to src/main/java/com/loafle/overflow/module/discovery/dao/ServiceDao.java index 3162cfd..e12f810 100644 --- a/src/main/java/com/loafle/overflow/dao/discovery/dao/ServiceDao.java +++ b/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. diff --git a/src/main/java/com/loafle/overflow/dao/discovery/dao/ZoneDao.java b/src/main/java/com/loafle/overflow/module/discovery/dao/ZoneDao.java similarity index 57% rename from src/main/java/com/loafle/overflow/dao/discovery/dao/ZoneDao.java rename to src/main/java/com/loafle/overflow/module/discovery/dao/ZoneDao.java index 7412a3e..4124296 100644 --- a/src/main/java/com/loafle/overflow/dao/discovery/dao/ZoneDao.java +++ b/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. diff --git a/src/main/java/com/loafle/overflow/dao/discovery/model/Host.java b/src/main/java/com/loafle/overflow/module/discovery/model/Host.java similarity index 97% rename from src/main/java/com/loafle/overflow/dao/discovery/model/Host.java rename to src/main/java/com/loafle/overflow/module/discovery/model/Host.java index c7c94c9..0ab41c7 100644 --- a/src/main/java/com/loafle/overflow/dao/discovery/model/Host.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/discovery/model/Port.java b/src/main/java/com/loafle/overflow/module/discovery/model/Port.java similarity index 95% rename from src/main/java/com/loafle/overflow/dao/discovery/model/Port.java rename to src/main/java/com/loafle/overflow/module/discovery/model/Port.java index 792d1a1..2cb0f74 100644 --- a/src/main/java/com/loafle/overflow/dao/discovery/model/Port.java +++ b/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.*; diff --git a/src/main/java/com/loafle/overflow/dao/discovery/model/Service.java b/src/main/java/com/loafle/overflow/module/discovery/model/Service.java similarity index 94% rename from src/main/java/com/loafle/overflow/dao/discovery/model/Service.java rename to src/main/java/com/loafle/overflow/module/discovery/model/Service.java index 17401cf..e3856cf 100644 --- a/src/main/java/com/loafle/overflow/dao/discovery/model/Service.java +++ b/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.*; diff --git a/src/main/java/com/loafle/overflow/dao/discovery/model/Zone.java b/src/main/java/com/loafle/overflow/module/discovery/model/Zone.java similarity index 97% rename from src/main/java/com/loafle/overflow/dao/discovery/model/Zone.java rename to src/main/java/com/loafle/overflow/module/discovery/model/Zone.java index 18a56d8..3249202 100644 --- a/src/main/java/com/loafle/overflow/dao/discovery/model/Zone.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/discovery/type/DirectionType.java b/src/main/java/com/loafle/overflow/module/discovery/type/DirectionType.java similarity index 85% rename from src/main/java/com/loafle/overflow/dao/discovery/type/DirectionType.java rename to src/main/java/com/loafle/overflow/module/discovery/type/DirectionType.java index 0771f36..6f900df 100644 --- a/src/main/java/com/loafle/overflow/dao/discovery/type/DirectionType.java +++ b/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. diff --git a/src/main/java/com/loafle/overflow/dao/discovery/type/PortType.java b/src/main/java/com/loafle/overflow/module/discovery/type/PortType.java similarity index 84% rename from src/main/java/com/loafle/overflow/dao/discovery/type/PortType.java rename to src/main/java/com/loafle/overflow/module/discovery/type/PortType.java index d43c970..58dea4d 100644 --- a/src/main/java/com/loafle/overflow/dao/discovery/type/PortType.java +++ b/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. diff --git a/src/main/java/com/loafle/overflow/dao/email/dao/EmailAuthDAO.java b/src/main/java/com/loafle/overflow/module/email/dao/EmailAuthDAO.java similarity index 78% rename from src/main/java/com/loafle/overflow/dao/email/dao/EmailAuthDAO.java rename to src/main/java/com/loafle/overflow/module/email/dao/EmailAuthDAO.java index c9cb974..0dc49ab 100644 --- a/src/main/java/com/loafle/overflow/dao/email/dao/EmailAuthDAO.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/email/dao/JPAEmailAuthDAO.java b/src/main/java/com/loafle/overflow/module/email/dao/JPAEmailAuthDAO.java similarity index 94% rename from src/main/java/com/loafle/overflow/dao/email/dao/JPAEmailAuthDAO.java rename to src/main/java/com/loafle/overflow/module/email/dao/JPAEmailAuthDAO.java index 000a53e..ecb10c0 100644 --- a/src/main/java/com/loafle/overflow/dao/email/dao/JPAEmailAuthDAO.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/email/model/EmailAuth.java b/src/main/java/com/loafle/overflow/module/email/model/EmailAuth.java similarity index 95% rename from src/main/java/com/loafle/overflow/dao/email/model/EmailAuth.java rename to src/main/java/com/loafle/overflow/module/email/model/EmailAuth.java index 077eeec..e4eaa39 100644 --- a/src/main/java/com/loafle/overflow/dao/email/model/EmailAuth.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblInfra.java b/src/main/java/com/loafle/overflow/module/infra/Infra.java similarity index 94% rename from src/main/java/com/loafle/overflow/models/TblInfra.java rename to src/main/java/com/loafle/overflow/module/infra/Infra.java index 49a2a89..c9021d3 100644 --- a/src/main/java/com/loafle/overflow/models/TblInfra.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblInfraHost.java b/src/main/java/com/loafle/overflow/module/infra/InfraHost.java similarity index 94% rename from src/main/java/com/loafle/overflow/models/TblInfraHost.java rename to src/main/java/com/loafle/overflow/module/infra/InfraHost.java index 2da64ce..48d1e09 100644 --- a/src/main/java/com/loafle/overflow/models/TblInfraHost.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblInfraMachine.java b/src/main/java/com/loafle/overflow/module/infra/InfraMachine.java similarity index 94% rename from src/main/java/com/loafle/overflow/models/TblInfraMachine.java rename to src/main/java/com/loafle/overflow/module/infra/InfraMachine.java index 98ea403..e06fa7a 100644 --- a/src/main/java/com/loafle/overflow/models/TblInfraMachine.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblInfraOs.java b/src/main/java/com/loafle/overflow/module/infra/InfraOs.java similarity index 95% rename from src/main/java/com/loafle/overflow/models/TblInfraOs.java rename to src/main/java/com/loafle/overflow/module/infra/InfraOs.java index 3bfcfb0..1e5a6cc 100644 --- a/src/main/java/com/loafle/overflow/models/TblInfraOs.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblInfraOsApplication.java b/src/main/java/com/loafle/overflow/module/infra/InfraOsApplication.java similarity index 93% rename from src/main/java/com/loafle/overflow/models/TblInfraOsApplication.java rename to src/main/java/com/loafle/overflow/module/infra/InfraOsApplication.java index 147c671..4b4b94b 100644 --- a/src/main/java/com/loafle/overflow/models/TblInfraOsApplication.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblInfraOsDaemon.java b/src/main/java/com/loafle/overflow/module/infra/InfraOsDaemon.java similarity index 93% rename from src/main/java/com/loafle/overflow/models/TblInfraOsDaemon.java rename to src/main/java/com/loafle/overflow/module/infra/InfraOsDaemon.java index 65ba238..2e51959 100644 --- a/src/main/java/com/loafle/overflow/models/TblInfraOsDaemon.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblInfraOsPort.java b/src/main/java/com/loafle/overflow/module/infra/InfraOsPort.java similarity index 96% rename from src/main/java/com/loafle/overflow/models/TblInfraOsPort.java rename to src/main/java/com/loafle/overflow/module/infra/InfraOsPort.java index 52afb88..3de6cc4 100644 --- a/src/main/java/com/loafle/overflow/models/TblInfraOsPort.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblInfraService.java b/src/main/java/com/loafle/overflow/module/infra/InfraService.java similarity index 96% rename from src/main/java/com/loafle/overflow/models/TblInfraService.java rename to src/main/java/com/loafle/overflow/module/infra/InfraService.java index 6b65fb8..44eb3b1 100644 --- a/src/main/java/com/loafle/overflow/models/TblInfraService.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/member/dao/JPAMemberDAO.java b/src/main/java/com/loafle/overflow/module/member/dao/JPAMemberDAO.java similarity index 86% rename from src/main/java/com/loafle/overflow/dao/member/dao/JPAMemberDAO.java rename to src/main/java/com/loafle/overflow/module/member/dao/JPAMemberDAO.java index 5a9820d..91edc26 100644 --- a/src/main/java/com/loafle/overflow/dao/member/dao/JPAMemberDAO.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/member/dao/MemberDAO.java b/src/main/java/com/loafle/overflow/module/member/dao/MemberDAO.java similarity index 65% rename from src/main/java/com/loafle/overflow/dao/member/dao/MemberDAO.java rename to src/main/java/com/loafle/overflow/module/member/dao/MemberDAO.java index 226c9fa..6dd4bb9 100644 --- a/src/main/java/com/loafle/overflow/dao/member/dao/MemberDAO.java +++ b/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. diff --git a/src/main/java/com/loafle/overflow/dao/member/model/Member.java b/src/main/java/com/loafle/overflow/module/member/model/Member.java similarity index 97% rename from src/main/java/com/loafle/overflow/dao/member/model/Member.java rename to src/main/java/com/loafle/overflow/module/member/model/Member.java index e57b566..435df24 100644 --- a/src/main/java/com/loafle/overflow/dao/member/model/Member.java +++ b/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.*; diff --git a/src/main/java/com/loafle/overflow/dao/noauthagent/dao/JPANoAuthAgentDAO.java b/src/main/java/com/loafle/overflow/module/noauthagent/dao/JPANoAuthAgentDAO.java similarity index 91% rename from src/main/java/com/loafle/overflow/dao/noauthagent/dao/JPANoAuthAgentDAO.java rename to src/main/java/com/loafle/overflow/module/noauthagent/dao/JPANoAuthAgentDAO.java index 51cc5ef..6a19216 100644 --- a/src/main/java/com/loafle/overflow/dao/noauthagent/dao/JPANoAuthAgentDAO.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/noauthagent/dao/NoAuthAgentDao.java b/src/main/java/com/loafle/overflow/module/noauthagent/dao/NoAuthAgentDao.java similarity index 71% rename from src/main/java/com/loafle/overflow/dao/noauthagent/dao/NoAuthAgentDao.java rename to src/main/java/com/loafle/overflow/module/noauthagent/dao/NoAuthAgentDao.java index f6e65f1..e94838f 100644 --- a/src/main/java/com/loafle/overflow/dao/noauthagent/dao/NoAuthAgentDao.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/noauthagent/model/NoAuthAgent.java b/src/main/java/com/loafle/overflow/module/noauthagent/model/NoAuthAgent.java similarity index 93% rename from src/main/java/com/loafle/overflow/dao/noauthagent/model/NoAuthAgent.java rename to src/main/java/com/loafle/overflow/module/noauthagent/model/NoAuthAgent.java index 6bcbdef..ae10b47 100644 --- a/src/main/java/com/loafle/overflow/dao/noauthagent/model/NoAuthAgent.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/noauthagent/type/AuthType.java b/src/main/java/com/loafle/overflow/module/noauthagent/type/AuthType.java similarity index 84% rename from src/main/java/com/loafle/overflow/dao/noauthagent/type/AuthType.java rename to src/main/java/com/loafle/overflow/module/noauthagent/type/AuthType.java index 227339b..38318a0 100644 --- a/src/main/java/com/loafle/overflow/dao/noauthagent/type/AuthType.java +++ b/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. diff --git a/src/main/java/com/loafle/overflow/dao/sensor/dao/JPASensorDao.java b/src/main/java/com/loafle/overflow/module/sensor/dao/JPASensorDao.java similarity index 82% rename from src/main/java/com/loafle/overflow/dao/sensor/dao/JPASensorDao.java rename to src/main/java/com/loafle/overflow/module/sensor/dao/JPASensorDao.java index a250f2d..b7adb7d 100644 --- a/src/main/java/com/loafle/overflow/dao/sensor/dao/JPASensorDao.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/sensor/dao/JPASensorItemCategoryDao.java b/src/main/java/com/loafle/overflow/module/sensor/dao/JPASensorItemCategoryDao.java similarity index 65% rename from src/main/java/com/loafle/overflow/dao/sensor/dao/JPASensorItemCategoryDao.java rename to src/main/java/com/loafle/overflow/module/sensor/dao/JPASensorItemCategoryDao.java index 1a0fd48..fc055a7 100644 --- a/src/main/java/com/loafle/overflow/dao/sensor/dao/JPASensorItemCategoryDao.java +++ b/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. diff --git a/src/main/java/com/loafle/overflow/dao/sensor/dao/JPASensorItemDao.java b/src/main/java/com/loafle/overflow/module/sensor/dao/JPASensorItemDao.java similarity index 83% rename from src/main/java/com/loafle/overflow/dao/sensor/dao/JPASensorItemDao.java rename to src/main/java/com/loafle/overflow/module/sensor/dao/JPASensorItemDao.java index 94d648d..700297c 100644 --- a/src/main/java/com/loafle/overflow/dao/sensor/dao/JPASensorItemDao.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/sensor/dao/JPASensorItemMappingDao.java b/src/main/java/com/loafle/overflow/module/sensor/dao/JPASensorItemMappingDao.java similarity index 84% rename from src/main/java/com/loafle/overflow/dao/sensor/dao/JPASensorItemMappingDao.java rename to src/main/java/com/loafle/overflow/module/sensor/dao/JPASensorItemMappingDao.java index 0d610a4..d650315 100644 --- a/src/main/java/com/loafle/overflow/dao/sensor/dao/JPASensorItemMappingDao.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/sensor/dao/SensorDao.java b/src/main/java/com/loafle/overflow/module/sensor/dao/SensorDao.java similarity index 60% rename from src/main/java/com/loafle/overflow/dao/sensor/dao/SensorDao.java rename to src/main/java/com/loafle/overflow/module/sensor/dao/SensorDao.java index adc41e2..e5f7767 100644 --- a/src/main/java/com/loafle/overflow/dao/sensor/dao/SensorDao.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/sensor/dao/SensorItemCategoryDao.java b/src/main/java/com/loafle/overflow/module/sensor/dao/SensorItemCategoryDao.java similarity index 61% rename from src/main/java/com/loafle/overflow/dao/sensor/dao/SensorItemCategoryDao.java rename to src/main/java/com/loafle/overflow/module/sensor/dao/SensorItemCategoryDao.java index 678a693..07b0c26 100644 --- a/src/main/java/com/loafle/overflow/dao/sensor/dao/SensorItemCategoryDao.java +++ b/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. diff --git a/src/main/java/com/loafle/overflow/dao/sensor/dao/SensorItemDao.java b/src/main/java/com/loafle/overflow/module/sensor/dao/SensorItemDao.java similarity index 60% rename from src/main/java/com/loafle/overflow/dao/sensor/dao/SensorItemDao.java rename to src/main/java/com/loafle/overflow/module/sensor/dao/SensorItemDao.java index b08f88d..b773a66 100644 --- a/src/main/java/com/loafle/overflow/dao/sensor/dao/SensorItemDao.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/dao/sensor/dao/SensorItemMappingDao.java b/src/main/java/com/loafle/overflow/module/sensor/dao/SensorItemMappingDao.java similarity index 61% rename from src/main/java/com/loafle/overflow/dao/sensor/dao/SensorItemMappingDao.java rename to src/main/java/com/loafle/overflow/module/sensor/dao/SensorItemMappingDao.java index dd82f14..4dc4190 100644 --- a/src/main/java/com/loafle/overflow/dao/sensor/dao/SensorItemMappingDao.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblSensor.java b/src/main/java/com/loafle/overflow/module/sensor/model/Sensor.java similarity index 96% rename from src/main/java/com/loafle/overflow/models/TblSensor.java rename to src/main/java/com/loafle/overflow/module/sensor/model/Sensor.java index 436267d..8f69636 100644 --- a/src/main/java/com/loafle/overflow/models/TblSensor.java +++ b/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; diff --git a/src/main/java/com/loafle/overflow/models/TblSensorItem.java b/src/main/java/com/loafle/overflow/module/sensor/model/SensorItem.java similarity index 94% rename from src/main/java/com/loafle/overflow/models/TblSensorItem.java rename to src/main/java/com/loafle/overflow/module/sensor/model/SensorItem.java index a08e867..0c341dc 100644 --- a/src/main/java/com/loafle/overflow/models/TblSensorItem.java +++ b/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; diff --git a/src/test/java/com/loafle/TestClient.java b/src/test/java/com/loafle/TestClient.java index 5b97925..232e5fb 100644 --- a/src/test/java/com/loafle/TestClient.java +++ b/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; diff --git a/src/test/java/com/loafle/overflow/agent/dao/JPAAgentDAOTest.java b/src/test/java/com/loafle/overflow/agent/dao/JPAAgentDAOTest.java index 7ee9b82..979b604 100644 --- a/src/test/java/com/loafle/overflow/agent/dao/JPAAgentDAOTest.java +++ b/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; diff --git a/src/test/java/com/loafle/overflow/apikey/dao/JPAApiKeyDaoTest.java b/src/test/java/com/loafle/overflow/apikey/dao/JPAApiKeyDaoTest.java index e48b331..203a220 100644 --- a/src/test/java/com/loafle/overflow/apikey/dao/JPAApiKeyDaoTest.java +++ b/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. */ diff --git a/src/test/java/com/loafle/overflow/crawler/dao/JPACrawlerDAOTest.java b/src/test/java/com/loafle/overflow/crawler/dao/JPACrawlerDAOTest.java index 91a7c57..3c1d5d1 100644 --- a/src/test/java/com/loafle/overflow/crawler/dao/JPACrawlerDAOTest.java +++ b/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. */ diff --git a/src/test/java/com/loafle/overflow/crawler/dao/JPACrawlerInputItemDAOTest.java b/src/test/java/com/loafle/overflow/crawler/dao/JPACrawlerInputItemDAOTest.java index 997868a..16e9388 100644 --- a/src/test/java/com/loafle/overflow/crawler/dao/JPACrawlerInputItemDAOTest.java +++ b/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. */ diff --git a/src/test/java/com/loafle/overflow/crawler/dao/JPACrawlerInputItemMappingDAOTest.java b/src/test/java/com/loafle/overflow/crawler/dao/JPACrawlerInputItemMappingDAOTest.java index d42d23b..1a5ffa3 100644 --- a/src/test/java/com/loafle/overflow/crawler/dao/JPACrawlerInputItemMappingDAOTest.java +++ b/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. */ diff --git a/src/test/java/com/loafle/overflow/email/dao/JPAEmailAuthDAOTest.java b/src/test/java/com/loafle/overflow/email/dao/JPAEmailAuthDAOTest.java index 45134f9..36e9511 100644 --- a/src/test/java/com/loafle/overflow/email/dao/JPAEmailAuthDAOTest.java +++ b/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; diff --git a/src/test/java/com/loafle/overflow/member/dao/JPAMemberDAOTest.java b/src/test/java/com/loafle/overflow/member/dao/JPAMemberDAOTest.java index e63376e..37d1861 100644 --- a/src/test/java/com/loafle/overflow/member/dao/JPAMemberDAOTest.java +++ b/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. */ diff --git a/src/test/java/com/loafle/overflow/noauthagent/dao/JPANoAuthAgentDAOTest.java b/src/test/java/com/loafle/overflow/noauthagent/dao/JPANoAuthAgentDAOTest.java index e001e7d..11bab5b 100644 --- a/src/test/java/com/loafle/overflow/noauthagent/dao/JPANoAuthAgentDAOTest.java +++ b/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. */ diff --git a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorDaoTest.java b/src/test/java/com/loafle/overflow/sensor/dao/JPASensorDaoTest.java index 94c5f00..d42c783 100644 --- a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorDaoTest.java +++ b/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. */ diff --git a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemCategoryDaoTest.java b/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemCategoryDaoTest.java index 095897a..8d30f26 100644 --- a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemCategoryDaoTest.java +++ b/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. */ diff --git a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemDaoTest.java b/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemDaoTest.java index ce8a42b..2be4f9c 100644 --- a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemDaoTest.java +++ b/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. */ diff --git a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemMappingDaoTest.java b/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemMappingDaoTest.java index 8b56cd0..3581885 100644 --- a/src/test/java/com/loafle/overflow/sensor/dao/JPASensorItemMappingDaoTest.java +++ b/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. */