From 06bc172f2f008d7e75c9d6bb5e3aae65ead18dff Mon Sep 17 00:00:00 2001 From: insanity Date: Fri, 23 Jun 2017 12:33:44 +0900 Subject: [PATCH] meta arrange --- .../java/com/loafle/overflow/meta/dao/MetaCrawlerDAO.java | 2 +- .../com/loafle/overflow/meta/dao/MetaCrawlerInputItemDAO.java | 2 +- .../java/com/loafle/overflow/meta/dao/MetaInfraTypeDAO.java | 2 +- .../java/com/loafle/overflow/meta/dao/MetaInfraVendorDAO.java | 2 +- .../java/com/loafle/overflow/meta/dao/MetaInputTypeDAO.java | 2 +- .../com/loafle/overflow/meta/dao/MetaMemberStatusDAO.java | 2 +- .../com/loafle/overflow/meta/dao/MetaNotificationDAO.java | 2 +- .../loafle/overflow/meta/dao/MetaProbeArchitectureDAO.java | 2 +- .../java/com/loafle/overflow/meta/dao/MetaProbeOsDAO.java | 2 +- .../com/loafle/overflow/meta/dao/MetaProbePackageDAO.java | 2 +- .../com/loafle/overflow/meta/dao/MetaProbeTaskTypeDAO.java | 2 +- .../com/loafle/overflow/meta/dao/MetaProbeVersionDAO.java | 2 +- .../java/com/loafle/overflow/meta/dao/MetaSensorItemDAO.java | 2 +- .../com/loafle/overflow/meta/dao/MetaSensorItemTypeDAO.java | 2 +- .../com/loafle/overflow/meta/dao/MetaVendorCrawlerDAO.java | 2 +- .../overflow/meta/dao/MetaVendorCrawlerSensorItemDAO.java | 2 +- .../com/loafle/overflow/meta/{ => model}/MetaCrawler.java | 3 +-- .../overflow/meta/{ => model}/MetaCrawlerInputItem.java | 3 +-- .../com/loafle/overflow/meta/{ => model}/MetaInfraType.java | 3 +-- .../com/loafle/overflow/meta/{ => model}/MetaInfraVendor.java | 3 +-- .../com/loafle/overflow/meta/{ => model}/MetaInputType.java | 3 +-- .../loafle/overflow/meta/{ => model}/MetaMemberStatus.java | 2 +- .../loafle/overflow/meta/{ => model}/MetaNotification.java | 3 +-- .../overflow/meta/{ => model}/MetaProbeArchitecture.java | 3 +-- .../com/loafle/overflow/meta/{ => model}/MetaProbeOs.java | 3 +-- .../loafle/overflow/meta/{ => model}/MetaProbePackage.java | 3 +-- .../loafle/overflow/meta/{ => model}/MetaProbeTaskType.java | 3 +-- .../loafle/overflow/meta/{ => model}/MetaProbeVersion.java | 3 +-- .../com/loafle/overflow/meta/{ => model}/MetaSensorItem.java | 3 +-- .../loafle/overflow/meta/{ => model}/MetaSensorItemType.java | 3 +-- .../loafle/overflow/meta/{ => model}/MetaVendorCrawler.java | 3 +-- .../meta/{ => model}/MetaVendorCrawlerSensorItem.java | 3 +-- src/main/java/com/loafle/overflow/module/infra/Infra.java | 2 +- .../java/com/loafle/overflow/module/member/model/Member.java | 3 +-- .../com/loafle/overflow/module/probe/model/ProbeTask.java | 4 +--- .../java/com/loafle/overflow/module/sensor/model/Sensor.java | 3 +-- .../com/loafle/overflow/module/sensor/model/SensorItem.java | 3 +-- .../com/loafle/overflow/module/member/dao/MemberDAOTest.java | 2 +- .../dao/{JPATargetDaoTest.java => JPATargetDAOTest.java} | 4 ++-- 39 files changed, 40 insertions(+), 60 deletions(-) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaCrawler.java (95%) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaCrawlerInputItem.java (98%) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaInfraType.java (93%) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaInfraVendor.java (97%) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaInputType.java (95%) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaMemberStatus.java (93%) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaNotification.java (95%) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaProbeArchitecture.java (94%) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaProbeOs.java (93%) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaProbePackage.java (96%) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaProbeTaskType.java (95%) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaProbeVersion.java (93%) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaSensorItem.java (96%) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaSensorItemType.java (95%) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaVendorCrawler.java (96%) rename src/main/java/com/loafle/overflow/meta/{ => model}/MetaVendorCrawlerSensorItem.java (97%) rename src/test/java/com/loafle/overflow/target/dao/{JPATargetDaoTest.java => JPATargetDAOTest.java} (97%) diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaCrawlerDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaCrawlerDAO.java index 9dfeb17..6f8e9a7 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaCrawlerDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaCrawlerDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaCrawler; +import com.loafle.overflow.meta.model.MetaCrawler; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaCrawlerInputItemDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaCrawlerInputItemDAO.java index 78cdf40..0c92f23 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaCrawlerInputItemDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaCrawlerInputItemDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaCrawlerInputItem; +import com.loafle.overflow.meta.model.MetaCrawlerInputItem; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaInfraTypeDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaInfraTypeDAO.java index 9499f44..7ca2aed 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaInfraTypeDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaInfraTypeDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaInfraType; +import com.loafle.overflow.meta.model.MetaInfraType; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaInfraVendorDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaInfraVendorDAO.java index b45173e..28fb871 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaInfraVendorDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaInfraVendorDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaInfraVendor; +import com.loafle.overflow.meta.model.MetaInfraVendor; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaInputTypeDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaInputTypeDAO.java index 4b1710b..453e146 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaInputTypeDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaInputTypeDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaInputType; +import com.loafle.overflow.meta.model.MetaInputType; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaMemberStatusDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaMemberStatusDAO.java index fa003f1..4b146f4 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaMemberStatusDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaMemberStatusDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaMemberStatus; +import com.loafle.overflow.meta.model.MetaMemberStatus; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaNotificationDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaNotificationDAO.java index 4539ce8..75eb6e4 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaNotificationDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaNotificationDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaNotification; +import com.loafle.overflow.meta.model.MetaNotification; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaProbeArchitectureDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaProbeArchitectureDAO.java index 6e6a05f..4ad11c7 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaProbeArchitectureDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaProbeArchitectureDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaProbeArchitecture; +import com.loafle.overflow.meta.model.MetaProbeArchitecture; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaProbeOsDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaProbeOsDAO.java index 1288b6f..e27f7a5 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaProbeOsDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaProbeOsDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaProbeOs; +import com.loafle.overflow.meta.model.MetaProbeOs; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaProbePackageDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaProbePackageDAO.java index 50da3d2..4fbb1e7 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaProbePackageDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaProbePackageDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaProbePackage; +import com.loafle.overflow.meta.model.MetaProbePackage; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaProbeTaskTypeDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaProbeTaskTypeDAO.java index cefe220..17c5838 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaProbeTaskTypeDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaProbeTaskTypeDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaProbeTaskType; +import com.loafle.overflow.meta.model.MetaProbeTaskType; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaProbeVersionDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaProbeVersionDAO.java index 7aec81b..d57c55c 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaProbeVersionDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaProbeVersionDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaProbeVersion; +import com.loafle.overflow.meta.model.MetaProbeVersion; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaSensorItemDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaSensorItemDAO.java index 682df17..0c53746 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaSensorItemDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaSensorItemDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaSensorItem; +import com.loafle.overflow.meta.model.MetaSensorItem; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaSensorItemTypeDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaSensorItemTypeDAO.java index f94014a..4e729ec 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaSensorItemTypeDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaSensorItemTypeDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaSensorItemType; +import com.loafle.overflow.meta.model.MetaSensorItemType; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaVendorCrawlerDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaVendorCrawlerDAO.java index eb6e2aa..39cbe84 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaVendorCrawlerDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaVendorCrawlerDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaVendorCrawler; +import com.loafle.overflow.meta.model.MetaVendorCrawler; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/dao/MetaVendorCrawlerSensorItemDAO.java b/src/main/java/com/loafle/overflow/meta/dao/MetaVendorCrawlerSensorItemDAO.java index 7a95076..bb5bdda 100644 --- a/src/main/java/com/loafle/overflow/meta/dao/MetaVendorCrawlerSensorItemDAO.java +++ b/src/main/java/com/loafle/overflow/meta/dao/MetaVendorCrawlerSensorItemDAO.java @@ -1,6 +1,6 @@ package com.loafle.overflow.meta.dao; -import com.loafle.overflow.meta.MetaVendorCrawlerSensorItem; +import com.loafle.overflow.meta.model.MetaVendorCrawlerSensorItem; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/loafle/overflow/meta/MetaCrawler.java b/src/main/java/com/loafle/overflow/meta/model/MetaCrawler.java similarity index 95% rename from src/main/java/com/loafle/overflow/meta/MetaCrawler.java rename to src/main/java/com/loafle/overflow/meta/model/MetaCrawler.java index 3a02ed1..bdd15f5 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaCrawler.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaCrawler.java @@ -1,7 +1,6 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/meta/MetaCrawlerInputItem.java b/src/main/java/com/loafle/overflow/meta/model/MetaCrawlerInputItem.java similarity index 98% rename from src/main/java/com/loafle/overflow/meta/MetaCrawlerInputItem.java rename to src/main/java/com/loafle/overflow/meta/model/MetaCrawlerInputItem.java index 4dbf35b..432595a 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaCrawlerInputItem.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaCrawlerInputItem.java @@ -1,7 +1,6 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/meta/MetaInfraType.java b/src/main/java/com/loafle/overflow/meta/model/MetaInfraType.java similarity index 93% rename from src/main/java/com/loafle/overflow/meta/MetaInfraType.java rename to src/main/java/com/loafle/overflow/meta/model/MetaInfraType.java index 18182ef..a642ed9 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaInfraType.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaInfraType.java @@ -1,7 +1,6 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/meta/MetaInfraVendor.java b/src/main/java/com/loafle/overflow/meta/model/MetaInfraVendor.java similarity index 97% rename from src/main/java/com/loafle/overflow/meta/MetaInfraVendor.java rename to src/main/java/com/loafle/overflow/meta/model/MetaInfraVendor.java index e9ecd43..9c8999b 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaInfraVendor.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaInfraVendor.java @@ -1,7 +1,6 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/meta/MetaInputType.java b/src/main/java/com/loafle/overflow/meta/model/MetaInputType.java similarity index 95% rename from src/main/java/com/loafle/overflow/meta/MetaInputType.java rename to src/main/java/com/loafle/overflow/meta/model/MetaInputType.java index c1a5225..6c8b6c6 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaInputType.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaInputType.java @@ -1,7 +1,6 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/meta/MetaMemberStatus.java b/src/main/java/com/loafle/overflow/meta/model/MetaMemberStatus.java similarity index 93% rename from src/main/java/com/loafle/overflow/meta/MetaMemberStatus.java rename to src/main/java/com/loafle/overflow/meta/model/MetaMemberStatus.java index 4410d0d..6a8a63e 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaMemberStatus.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaMemberStatus.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; diff --git a/src/main/java/com/loafle/overflow/meta/MetaNotification.java b/src/main/java/com/loafle/overflow/meta/model/MetaNotification.java similarity index 95% rename from src/main/java/com/loafle/overflow/meta/MetaNotification.java rename to src/main/java/com/loafle/overflow/meta/model/MetaNotification.java index 6d21562..ee3393f 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaNotification.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaNotification.java @@ -1,7 +1,6 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/meta/MetaProbeArchitecture.java b/src/main/java/com/loafle/overflow/meta/model/MetaProbeArchitecture.java similarity index 94% rename from src/main/java/com/loafle/overflow/meta/MetaProbeArchitecture.java rename to src/main/java/com/loafle/overflow/meta/model/MetaProbeArchitecture.java index f6c3206..b4b0483 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaProbeArchitecture.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaProbeArchitecture.java @@ -1,7 +1,6 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/meta/MetaProbeOs.java b/src/main/java/com/loafle/overflow/meta/model/MetaProbeOs.java similarity index 93% rename from src/main/java/com/loafle/overflow/meta/MetaProbeOs.java rename to src/main/java/com/loafle/overflow/meta/model/MetaProbeOs.java index 747d22d..63b46c0 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaProbeOs.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaProbeOs.java @@ -1,7 +1,6 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/meta/MetaProbePackage.java b/src/main/java/com/loafle/overflow/meta/model/MetaProbePackage.java similarity index 96% rename from src/main/java/com/loafle/overflow/meta/MetaProbePackage.java rename to src/main/java/com/loafle/overflow/meta/model/MetaProbePackage.java index 1beb2a0..8e506c8 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaProbePackage.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaProbePackage.java @@ -1,7 +1,6 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/meta/MetaProbeTaskType.java b/src/main/java/com/loafle/overflow/meta/model/MetaProbeTaskType.java similarity index 95% rename from src/main/java/com/loafle/overflow/meta/MetaProbeTaskType.java rename to src/main/java/com/loafle/overflow/meta/model/MetaProbeTaskType.java index 9aa2004..517fa67 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaProbeTaskType.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaProbeTaskType.java @@ -1,7 +1,6 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/meta/MetaProbeVersion.java b/src/main/java/com/loafle/overflow/meta/model/MetaProbeVersion.java similarity index 93% rename from src/main/java/com/loafle/overflow/meta/MetaProbeVersion.java rename to src/main/java/com/loafle/overflow/meta/model/MetaProbeVersion.java index fff6c65..c162936 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaProbeVersion.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaProbeVersion.java @@ -1,7 +1,6 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/meta/MetaSensorItem.java b/src/main/java/com/loafle/overflow/meta/model/MetaSensorItem.java similarity index 96% rename from src/main/java/com/loafle/overflow/meta/MetaSensorItem.java rename to src/main/java/com/loafle/overflow/meta/model/MetaSensorItem.java index 316967f..90e303d 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaSensorItem.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaSensorItem.java @@ -1,7 +1,6 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/meta/MetaSensorItemType.java b/src/main/java/com/loafle/overflow/meta/model/MetaSensorItemType.java similarity index 95% rename from src/main/java/com/loafle/overflow/meta/MetaSensorItemType.java rename to src/main/java/com/loafle/overflow/meta/model/MetaSensorItemType.java index 6b33660..2548ed5 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaSensorItemType.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaSensorItemType.java @@ -1,7 +1,6 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/meta/MetaVendorCrawler.java b/src/main/java/com/loafle/overflow/meta/model/MetaVendorCrawler.java similarity index 96% rename from src/main/java/com/loafle/overflow/meta/MetaVendorCrawler.java rename to src/main/java/com/loafle/overflow/meta/model/MetaVendorCrawler.java index 2af8287..ea3bf90 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaVendorCrawler.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaVendorCrawler.java @@ -1,7 +1,6 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/meta/MetaVendorCrawlerSensorItem.java b/src/main/java/com/loafle/overflow/meta/model/MetaVendorCrawlerSensorItem.java similarity index 97% rename from src/main/java/com/loafle/overflow/meta/MetaVendorCrawlerSensorItem.java rename to src/main/java/com/loafle/overflow/meta/model/MetaVendorCrawlerSensorItem.java index d4808ab..70757c9 100644 --- a/src/main/java/com/loafle/overflow/meta/MetaVendorCrawlerSensorItem.java +++ b/src/main/java/com/loafle/overflow/meta/model/MetaVendorCrawlerSensorItem.java @@ -1,7 +1,6 @@ -package com.loafle.overflow.meta; +package com.loafle.overflow.meta.model; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/module/infra/Infra.java b/src/main/java/com/loafle/overflow/module/infra/Infra.java index 17f9c5a..e52a0a7 100644 --- a/src/main/java/com/loafle/overflow/module/infra/Infra.java +++ b/src/main/java/com/loafle/overflow/module/infra/Infra.java @@ -1,6 +1,6 @@ package com.loafle.overflow.module.infra; -import com.loafle.overflow.meta.MetaInfraType; +import com.loafle.overflow.meta.model.MetaInfraType; import javax.persistence.*; import java.sql.Timestamp; diff --git a/src/main/java/com/loafle/overflow/module/member/model/Member.java b/src/main/java/com/loafle/overflow/module/member/model/Member.java index 9131ee5..0f66849 100644 --- a/src/main/java/com/loafle/overflow/module/member/model/Member.java +++ b/src/main/java/com/loafle/overflow/module/member/model/Member.java @@ -1,9 +1,8 @@ package com.loafle.overflow.module.member.model; -import com.loafle.overflow.meta.MetaMemberStatus; +import com.loafle.overflow.meta.model.MetaMemberStatus; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/module/probe/model/ProbeTask.java b/src/main/java/com/loafle/overflow/module/probe/model/ProbeTask.java index f0eae7b..54658be 100644 --- a/src/main/java/com/loafle/overflow/module/probe/model/ProbeTask.java +++ b/src/main/java/com/loafle/overflow/module/probe/model/ProbeTask.java @@ -1,10 +1,8 @@ package com.loafle.overflow.module.probe.model; -import com.loafle.overflow.meta.MetaProbeTaskType; -import com.loafle.overflow.module.probe.model.Probe; +import com.loafle.overflow.meta.model.MetaProbeTaskType; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/module/sensor/model/Sensor.java b/src/main/java/com/loafle/overflow/module/sensor/model/Sensor.java index 045f6f2..ff149a4 100644 --- a/src/main/java/com/loafle/overflow/module/sensor/model/Sensor.java +++ b/src/main/java/com/loafle/overflow/module/sensor/model/Sensor.java @@ -1,10 +1,9 @@ package com.loafle.overflow.module.sensor.model; -import com.loafle.overflow.meta.MetaCrawler; +import com.loafle.overflow.meta.model.MetaCrawler; import com.loafle.overflow.module.target.model.Target; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/main/java/com/loafle/overflow/module/sensor/model/SensorItem.java b/src/main/java/com/loafle/overflow/module/sensor/model/SensorItem.java index 7eeb87a..e6a5ae8 100644 --- a/src/main/java/com/loafle/overflow/module/sensor/model/SensorItem.java +++ b/src/main/java/com/loafle/overflow/module/sensor/model/SensorItem.java @@ -1,9 +1,8 @@ package com.loafle.overflow.module.sensor.model; -import com.loafle.overflow.meta.MetaSensorItem; +import com.loafle.overflow.meta.model.MetaSensorItem; import javax.persistence.*; -import java.sql.Timestamp; import java.util.Date; /** diff --git a/src/test/java/com/loafle/overflow/module/member/dao/MemberDAOTest.java b/src/test/java/com/loafle/overflow/module/member/dao/MemberDAOTest.java index c8b871c..17ca511 100644 --- a/src/test/java/com/loafle/overflow/module/member/dao/MemberDAOTest.java +++ b/src/test/java/com/loafle/overflow/module/member/dao/MemberDAOTest.java @@ -2,7 +2,7 @@ package com.loafle.overflow.module.member.dao; import com.loafle.overflow.AppConfig; import com.loafle.overflow.JdbcConfiguration; -import com.loafle.overflow.meta.MetaMemberStatus; +import com.loafle.overflow.meta.model.MetaMemberStatus; import com.loafle.overflow.module.member.model.Member; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/src/test/java/com/loafle/overflow/target/dao/JPATargetDaoTest.java b/src/test/java/com/loafle/overflow/target/dao/JPATargetDAOTest.java similarity index 97% rename from src/test/java/com/loafle/overflow/target/dao/JPATargetDaoTest.java rename to src/test/java/com/loafle/overflow/target/dao/JPATargetDAOTest.java index 8ec423e..219a0d4 100644 --- a/src/test/java/com/loafle/overflow/target/dao/JPATargetDaoTest.java +++ b/src/test/java/com/loafle/overflow/target/dao/JPATargetDAOTest.java @@ -3,9 +3,9 @@ package com.loafle.overflow.target.dao; import com.loafle.overflow.AppConfig; import com.loafle.overflow.JdbcConfiguration; import com.loafle.overflow.module.infra.Infra; +import com.loafle.overflow.module.probe.model.Probe; import com.loafle.overflow.module.target.dao.TargetDAO; import com.loafle.overflow.module.target.model.Target; -import com.loafle.overflow.module.probe.model.Probe; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -17,7 +17,7 @@ import java.util.Date; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {AppConfig.class, JdbcConfiguration.class}) -public class JPATargetDaoTest { +public class JPATargetDAOTest { @Autowired private TargetDAO repo;