From 8ca180c1eb48c1ee7583a745630faa073c19e8a1 Mon Sep 17 00:00:00 2001 From: geek Date: Tue, 24 Apr 2018 16:13:04 +0900 Subject: [PATCH] ing --- .../apikey/model => model/apikey}/ApiKey.java | 4 +- .../model => model/auth}/AuthCrawler.java | 6 +- .../discovery}/DiscoverHost.java | 2 +- .../discovery}/DiscoverPort.java | 2 +- .../discovery}/DiscoverService.java | 2 +- .../discovery}/DiscoverZone.java | 2 +- .../model => model/discovery}/Host.java | 2 +- .../model => model/discovery}/Port.java | 4 +- .../model => model/discovery}/Service.java | 4 +- .../model => model/discovery}/Zone.java | 2 +- .../domain/model => model/domain}/Domain.java | 2 +- .../model => model/domain}/DomainMember.java | 4 +- .../model => model/email}/EmailAuth.java | 4 +- .../model => model/history}/History.java | 10 +- .../infra/model => model/infra}/Infra.java | 8 +- .../model => model/infra}/InfraHost.java | 2 +- .../model => model/infra}/InfraMachine.java | 2 +- .../infra/model => model/infra}/InfraOS.java | 4 +- .../infra}/InfraOSApplication.java | 2 +- .../model => model/infra}/InfraOSDaemon.java | 2 +- .../model => model/infra}/InfraOSPort.java | 4 +- .../model => model/infra}/InfraService.java | 4 +- .../member/model => model/member}/Member.java | 4 +- .../model => model/member}/MemberTotp.java | 2 +- .../model => model/meta}/MetaCrawler.java | 2 +- .../meta}/MetaCrawlerInputItem.java | 2 +- .../model => model/meta}/MetaHistoryType.java | 2 +- .../model => model/meta}/MetaInfraType.java | 2 +- .../model => model/meta}/MetaInfraVendor.java | 2 +- .../model => model/meta}/MetaInputType.java | 2 +- .../meta}/MetaMemberStatus.java | 2 +- .../meta}/MetaNoAuthProbeStatus.java | 2 +- .../meta}/MetaNotification.java | 2 +- .../meta}/MetaProbeArchitecture.java | 2 +- .../model => model/meta}/MetaProbeOs.java | 2 +- .../meta}/MetaProbePackage.java | 2 +- .../model => model/meta}/MetaProbeStatus.java | 2 +- .../meta}/MetaProbeTaskType.java | 2 +- .../meta}/MetaProbeVersion.java | 2 +- .../meta}/MetaSensorDisplayItem.java | 2 +- .../meta}/MetaSensorDisplayMapping.java | 2 +- .../model => model/meta}/MetaSensorItem.java | 2 +- .../meta}/MetaSensorItemKey.java | 2 +- .../meta}/MetaSensorItemType.java | 2 +- .../meta}/MetaSensorItemUnit.java | 2 +- .../meta}/MetaSensorStatus.java | 2 +- .../meta}/MetaVendorCrawler.java | 2 +- .../meta}/MetaVendorCrawlerSensorItem.java | 2 +- .../meta/type/MetaCrawlerEnum.java | 2 +- .../noauthprobe}/NoAuthProbe.java | 8 +- .../notification}/Notification.java | 4 +- .../probe/model => model/probe}/Probe.java | 8 +- .../model => model/probe}/ProbeHost.java | 4 +- .../model => model/probe}/ProbeTask.java | 4 +- .../sensor/model => model/sensor}/Sensor.java | 8 +- .../model => model/sensor}/SensorItem.java | 4 +- .../sensor}/SensorItemDependency.java | 6 +- .../sensorconfig}/Connection.java | 4 +- .../model => model/sensorconfig}/Crawler.java | 2 +- .../model => model/sensorconfig}/Item.java | 2 +- .../model => model/sensorconfig}/Keys.java | 2 +- .../sensorconfig}/MappingInfo.java | 2 +- .../sensorconfig}/QueryInfo.java | 2 +- .../sensorconfig}/ResultSet.java | 2 +- .../sensorconfig}/ResultSetCol.java | 2 +- .../sensorconfig}/ResultSetRow.java | 2 +- .../sensorconfig}/Schedule.java | 2 +- .../sensorconfig}/SensorConfig.java | 2 +- .../model => model/sensorconfig}/Target.java | 2 +- .../target/model => model/target}/Target.java | 4 +- .../websocket}/UiWebsocket.java | 2 +- .../module/core/annotation/ProbeAPI.java | 11 -- .../module/core/annotation/RPCService.java | 17 --- .../module/core/annotation/WebappAPI.java | 11 -- .../core/exception/OverflowException.java | 7 - .../module/core/interfaces/Service.java | 11 -- .../overflow/module/core/model/Mail.java | 108 ---------------- .../module/core/model/PageParams.java | 44 ------- .../module/core/model/PublishMessage.java | 122 ------------------ .../overflow/module/core/type/CryptoType.java | 16 --- .../overflow/module/core/type/PortType.java | 18 --- .../module/domain/service/DomainService.java | 13 -- .../service/MetaCrawlerInputItemService.java | 17 --- .../meta/service/MetaCrawlerService.java | 16 --- .../meta/service/MetaInfraTypeService.java | 16 --- .../meta/service/MetaInfraVendorService.java | 16 --- .../meta/service/MetaInputTypeService.java | 15 --- .../meta/service/MetaMemberStatusService.java | 15 --- .../service/MetaNoAuthProbeStatusService.java | 15 --- .../service/MetaProbeArchitectureService.java | 15 --- .../meta/service/MetaProbeOsService.java | 15 --- .../meta/service/MetaProbePackageService.java | 16 --- .../meta/service/MetaProbeStatusService.java | 16 --- .../service/MetaProbeTaskTypeService.java | 15 --- .../meta/service/MetaProbeVersionService.java | 15 --- .../MetaSensorDisplayMappingService.java | 20 --- .../meta/service/MetaSensorItemService.java | 17 --- .../service/MetaSensorItemUnitService.java | 14 -- .../meta/service/MetaSensorStatusService.java | 17 --- .../probe/service/ProbeHostService.java | 15 --- .../probe/service/ProbeTaskService.java | 18 --- .../service/TargetDiscoveryService.java | 18 --- .../central/apikey}/ApiKeyService.java | 2 +- .../central/auth}/AuthCrawlerService.java | 12 +- .../central/discovery}/DiscoveryService.java | 24 ++-- .../central/domain}/DomainMemberService.java | 12 +- .../service/central/domain/DomainService.java | 13 ++ .../central/history}/HistoryService.java | 14 +- .../central/infra}/InfraHostService.java | 6 +- .../central/infra}/InfraMachineService.java | 6 +- .../infra}/InfraOSApplicationService.java | 6 +- .../central/infra}/InfraOSDaemonService.java | 6 +- .../central/infra}/InfraOSPortService.java | 6 +- .../central/infra}/InfraOSService.java | 6 +- .../central/infra}/InfraService.java | 10 +- .../central/infra}/InfraServiceService.java | 2 +- .../central/member}/MemberService.java | 12 +- .../central/member}/MemberTotpService.java | 10 +- .../meta/MetaCrawlerInputItemService.java | 17 +++ .../central/meta/MetaCrawlerService.java | 16 +++ .../central/meta}/MetaHistoryTypeService.java | 8 +- .../central/meta/MetaInfraTypeService.java | 16 +++ .../central/meta/MetaInfraVendorService.java | 16 +++ .../central/meta/MetaInputTypeService.java | 15 +++ .../central/meta/MetaMemberStatusService.java | 15 +++ .../meta/MetaNoAuthProbeStatusService.java | 15 +++ .../meta/MetaProbeArchitectureService.java | 15 +++ .../central/meta/MetaProbeOsService.java | 15 +++ .../central/meta/MetaProbePackageService.java | 16 +++ .../central/meta/MetaProbeStatusService.java | 16 +++ .../meta/MetaProbeTaskTypeService.java | 15 +++ .../central/meta/MetaProbeVersionService.java | 15 +++ .../meta}/MetaSensorDisplayItemService.java | 10 +- .../meta/MetaSensorDisplayMappingService.java | 20 +++ .../meta}/MetaSensorItemKeyService.java | 10 +- .../central/meta/MetaSensorItemService.java | 17 +++ .../meta}/MetaSensorItemTypeService.java | 8 +- .../meta/MetaSensorItemUnitService.java | 14 ++ .../central/meta/MetaSensorStatusService.java | 17 +++ .../MetaVendorCrawlerSensorItemService.java | 2 +- .../meta}/MetaVendorCrawlerService.java | 10 +- .../noauthprobe}/NoAuthProbeService.java | 12 +- .../notification}/NotificationService.java | 12 +- .../central/probe/ProbeHostService.java | 15 +++ .../central/probe}/ProbeService.java | 12 +- .../central/probe/ProbeTaskService.java | 18 +++ .../sensor}/SensorItemDependencyService.java | 12 +- .../central/sensor}/SensorItemService.java | 12 +- .../central/sensor}/SensorService.java | 16 +-- .../target/TargetDiscoveryService.java | 17 +++ .../central/target}/TargetService.java | 8 +- 151 files changed, 568 insertions(+), 942 deletions(-) rename src/main/java/com/loafle/overflow/{module/apikey/model => model/apikey}/ApiKey.java (95%) rename src/main/java/com/loafle/overflow/{module/auth/model => model/auth}/AuthCrawler.java (91%) rename src/main/java/com/loafle/overflow/{module/discovery/model => model/discovery}/DiscoverHost.java (81%) rename src/main/java/com/loafle/overflow/{module/discovery/model => model/discovery}/DiscoverPort.java (82%) rename src/main/java/com/loafle/overflow/{module/discovery/model => model/discovery}/DiscoverService.java (65%) rename src/main/java/com/loafle/overflow/{module/discovery/model => model/discovery}/DiscoverZone.java (70%) rename src/main/java/com/loafle/overflow/{module/discovery/model => model/discovery}/Host.java (82%) rename src/main/java/com/loafle/overflow/{module/discovery/model => model/discovery}/Port.java (68%) rename src/main/java/com/loafle/overflow/{module/discovery/model => model/discovery}/Service.java (68%) rename src/main/java/com/loafle/overflow/{module/discovery/model => model/discovery}/Zone.java (81%) rename src/main/java/com/loafle/overflow/{module/domain/model => model/domain}/Domain.java (95%) rename src/main/java/com/loafle/overflow/{module/domain/model => model/domain}/DomainMember.java (92%) rename src/main/java/com/loafle/overflow/{module/email/model => model/email}/EmailAuth.java (93%) rename src/main/java/com/loafle/overflow/{module/history/model => model/history}/History.java (90%) rename src/main/java/com/loafle/overflow/{module/infra/model => model/infra}/Infra.java (95%) rename src/main/java/com/loafle/overflow/{module/infra/model => model/infra}/InfraHost.java (96%) rename src/main/java/com/loafle/overflow/{module/infra/model => model/infra}/InfraMachine.java (96%) rename src/main/java/com/loafle/overflow/{module/infra/model => model/infra}/InfraOS.java (93%) rename src/main/java/com/loafle/overflow/{module/infra/model => model/infra}/InfraOSApplication.java (96%) rename src/main/java/com/loafle/overflow/{module/infra/model => model/infra}/InfraOSDaemon.java (96%) rename src/main/java/com/loafle/overflow/{module/infra/model => model/infra}/InfraOSPort.java (94%) rename src/main/java/com/loafle/overflow/{module/infra/model => model/infra}/InfraService.java (94%) rename src/main/java/com/loafle/overflow/{module/member/model => model/member}/Member.java (96%) rename src/main/java/com/loafle/overflow/{module/member/model => model/member}/MemberTotp.java (97%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaCrawler.java (96%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaCrawlerInputItem.java (99%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaHistoryType.java (95%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaInfraType.java (94%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaInfraVendor.java (98%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaInputType.java (96%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaMemberStatus.java (94%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaNoAuthProbeStatus.java (94%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaNotification.java (95%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaProbeArchitecture.java (95%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaProbeOs.java (95%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaProbePackage.java (97%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaProbeStatus.java (93%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaProbeTaskType.java (96%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaProbeVersion.java (95%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaSensorDisplayItem.java (97%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaSensorDisplayMapping.java (95%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaSensorItem.java (96%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaSensorItemKey.java (97%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaSensorItemType.java (96%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaSensorItemUnit.java (95%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaSensorStatus.java (94%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaVendorCrawler.java (97%) rename src/main/java/com/loafle/overflow/{module/meta/model => model/meta}/MetaVendorCrawlerSensorItem.java (97%) rename src/main/java/com/loafle/overflow/{module => model}/meta/type/MetaCrawlerEnum.java (95%) rename src/main/java/com/loafle/overflow/{module/noauthprobe/model => model/noauthprobe}/NoAuthProbe.java (94%) rename src/main/java/com/loafle/overflow/{module/notification/model => model/notification}/Notification.java (94%) rename src/main/java/com/loafle/overflow/{module/probe/model => model/probe}/Probe.java (94%) rename src/main/java/com/loafle/overflow/{module/probe/model => model/probe}/ProbeHost.java (88%) rename src/main/java/com/loafle/overflow/{module/probe/model => model/probe}/ProbeTask.java (97%) rename src/main/java/com/loafle/overflow/{module/sensor/model => model/sensor}/Sensor.java (90%) rename src/main/java/com/loafle/overflow/{module/sensor/model => model/sensor}/SensorItem.java (92%) rename src/main/java/com/loafle/overflow/{module/sensor/model => model/sensor}/SensorItemDependency.java (84%) rename src/main/java/com/loafle/overflow/{module/sensorconfig/model => model/sensorconfig}/Connection.java (84%) rename src/main/java/com/loafle/overflow/{module/sensorconfig/model => model/sensorconfig}/Crawler.java (86%) rename src/main/java/com/loafle/overflow/{module/sensorconfig/model => model/sensorconfig}/Item.java (91%) rename src/main/java/com/loafle/overflow/{module/sensorconfig/model => model/sensorconfig}/Keys.java (91%) rename src/main/java/com/loafle/overflow/{module/sensorconfig/model => model/sensorconfig}/MappingInfo.java (94%) rename src/main/java/com/loafle/overflow/{module/sensorconfig/model => model/sensorconfig}/QueryInfo.java (88%) rename src/main/java/com/loafle/overflow/{module/sensorconfig/model => model/sensorconfig}/ResultSet.java (96%) rename src/main/java/com/loafle/overflow/{module/sensorconfig/model => model/sensorconfig}/ResultSetCol.java (97%) rename src/main/java/com/loafle/overflow/{module/sensorconfig/model => model/sensorconfig}/ResultSetRow.java (97%) rename src/main/java/com/loafle/overflow/{module/sensorconfig/model => model/sensorconfig}/Schedule.java (79%) rename src/main/java/com/loafle/overflow/{module/sensorconfig/model => model/sensorconfig}/SensorConfig.java (94%) rename src/main/java/com/loafle/overflow/{module/sensorconfig/model => model/sensorconfig}/Target.java (88%) rename src/main/java/com/loafle/overflow/{module/target/model => model/target}/Target.java (95%) rename src/main/java/com/loafle/overflow/{module/websocket/model => model/websocket}/UiWebsocket.java (92%) delete mode 100644 src/main/java/com/loafle/overflow/module/core/annotation/ProbeAPI.java delete mode 100644 src/main/java/com/loafle/overflow/module/core/annotation/RPCService.java delete mode 100644 src/main/java/com/loafle/overflow/module/core/annotation/WebappAPI.java delete mode 100644 src/main/java/com/loafle/overflow/module/core/exception/OverflowException.java delete mode 100644 src/main/java/com/loafle/overflow/module/core/interfaces/Service.java delete mode 100644 src/main/java/com/loafle/overflow/module/core/model/Mail.java delete mode 100644 src/main/java/com/loafle/overflow/module/core/model/PageParams.java delete mode 100644 src/main/java/com/loafle/overflow/module/core/model/PublishMessage.java delete mode 100644 src/main/java/com/loafle/overflow/module/core/type/CryptoType.java delete mode 100644 src/main/java/com/loafle/overflow/module/core/type/PortType.java delete mode 100644 src/main/java/com/loafle/overflow/module/domain/service/DomainService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaCrawlerInputItemService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaCrawlerService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaInfraTypeService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaInfraVendorService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaInputTypeService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaMemberStatusService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaNoAuthProbeStatusService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaProbeArchitectureService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaProbeOsService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaProbePackageService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaProbeStatusService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaProbeTaskTypeService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaProbeVersionService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaSensorDisplayMappingService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaSensorItemService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaSensorItemUnitService.java delete mode 100644 src/main/java/com/loafle/overflow/module/meta/service/MetaSensorStatusService.java delete mode 100644 src/main/java/com/loafle/overflow/module/probe/service/ProbeHostService.java delete mode 100644 src/main/java/com/loafle/overflow/module/probe/service/ProbeTaskService.java delete mode 100644 src/main/java/com/loafle/overflow/module/target/service/TargetDiscoveryService.java rename src/main/java/com/loafle/overflow/{module/apikey/service => service/central/apikey}/ApiKeyService.java (59%) rename src/main/java/com/loafle/overflow/{module/auth/service => service/central/auth}/AuthCrawlerService.java (53%) rename src/main/java/com/loafle/overflow/{module/discovery/service => service/central/discovery}/DiscoveryService.java (61%) rename src/main/java/com/loafle/overflow/{module/domain/service => service/central/domain}/DomainMemberService.java (60%) create mode 100644 src/main/java/com/loafle/overflow/service/central/domain/DomainService.java rename src/main/java/com/loafle/overflow/{module/history/service => service/central/history}/HistoryService.java (57%) rename src/main/java/com/loafle/overflow/{module/infra/service => service/central/infra}/InfraHostService.java (59%) rename src/main/java/com/loafle/overflow/{module/infra/service => service/central/infra}/InfraMachineService.java (52%) rename src/main/java/com/loafle/overflow/{module/infra/service => service/central/infra}/InfraOSApplicationService.java (57%) rename src/main/java/com/loafle/overflow/{module/infra/service => service/central/infra}/InfraOSDaemonService.java (55%) rename src/main/java/com/loafle/overflow/{module/infra/service => service/central/infra}/InfraOSPortService.java (63%) rename src/main/java/com/loafle/overflow/{module/infra/service => service/central/infra}/InfraOSService.java (52%) rename src/main/java/com/loafle/overflow/{module/infra/service => service/central/infra}/InfraService.java (60%) rename src/main/java/com/loafle/overflow/{module/infra/service => service/central/infra}/InfraServiceService.java (63%) rename src/main/java/com/loafle/overflow/{module/member/service => service/central/member}/MemberService.java (76%) rename src/main/java/com/loafle/overflow/{module/member/service => service/central/member}/MemberTotpService.java (70%) create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaCrawlerInputItemService.java create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaCrawlerService.java rename src/main/java/com/loafle/overflow/{module/meta/service => service/central/meta}/MetaHistoryTypeService.java (61%) create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaInfraTypeService.java create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaInfraVendorService.java create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaInputTypeService.java create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaMemberStatusService.java create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaNoAuthProbeStatusService.java create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaProbeArchitectureService.java create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaProbeOsService.java create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaProbePackageService.java create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaProbeStatusService.java create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaProbeTaskTypeService.java create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaProbeVersionService.java rename src/main/java/com/loafle/overflow/{module/meta/service => service/central/meta}/MetaSensorDisplayItemService.java (57%) create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaSensorDisplayMappingService.java rename src/main/java/com/loafle/overflow/{module/meta/service => service/central/meta}/MetaSensorItemKeyService.java (55%) create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaSensorItemService.java rename src/main/java/com/loafle/overflow/{module/meta/service => service/central/meta}/MetaSensorItemTypeService.java (62%) create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaSensorItemUnitService.java create mode 100644 src/main/java/com/loafle/overflow/service/central/meta/MetaSensorStatusService.java rename src/main/java/com/loafle/overflow/{module/meta/service => service/central/meta}/MetaVendorCrawlerSensorItemService.java (66%) rename src/main/java/com/loafle/overflow/{module/meta/service => service/central/meta}/MetaVendorCrawlerService.java (52%) rename src/main/java/com/loafle/overflow/{module/noauthprobe/service => service/central/noauthprobe}/NoAuthProbeService.java (57%) rename src/main/java/com/loafle/overflow/{module/notification/service => service/central/notification}/NotificationService.java (70%) create mode 100644 src/main/java/com/loafle/overflow/service/central/probe/ProbeHostService.java rename src/main/java/com/loafle/overflow/{module/probe/service => service/central/probe}/ProbeService.java (64%) create mode 100644 src/main/java/com/loafle/overflow/service/central/probe/ProbeTaskService.java rename src/main/java/com/loafle/overflow/{module/sensor/service => service/central/sensor}/SensorItemDependencyService.java (57%) rename src/main/java/com/loafle/overflow/{module/sensor/service => service/central/sensor}/SensorItemService.java (63%) rename src/main/java/com/loafle/overflow/{module/sensor/service => service/central/sensor}/SensorService.java (69%) create mode 100644 src/main/java/com/loafle/overflow/service/central/target/TargetDiscoveryService.java rename src/main/java/com/loafle/overflow/{module/target/service => service/central/target}/TargetService.java (55%) diff --git a/src/main/java/com/loafle/overflow/module/apikey/model/ApiKey.java b/src/main/java/com/loafle/overflow/model/apikey/ApiKey.java similarity index 95% rename from src/main/java/com/loafle/overflow/module/apikey/model/ApiKey.java rename to src/main/java/com/loafle/overflow/model/apikey/ApiKey.java index 96fd58b..a99cb1d 100644 --- a/src/main/java/com/loafle/overflow/module/apikey/model/ApiKey.java +++ b/src/main/java/com/loafle/overflow/model/apikey/ApiKey.java @@ -1,6 +1,6 @@ -package com.loafle.overflow.module.apikey.model; +package com.loafle.overflow.model.apikey; -import com.loafle.overflow.module.domain.model.Domain; +import com.loafle.overflow.model.domain.Domain; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/auth/model/AuthCrawler.java b/src/main/java/com/loafle/overflow/model/auth/AuthCrawler.java similarity index 91% rename from src/main/java/com/loafle/overflow/module/auth/model/AuthCrawler.java rename to src/main/java/com/loafle/overflow/model/auth/AuthCrawler.java index ef4802d..0b1a254 100644 --- a/src/main/java/com/loafle/overflow/module/auth/model/AuthCrawler.java +++ b/src/main/java/com/loafle/overflow/model/auth/AuthCrawler.java @@ -1,7 +1,7 @@ -package com.loafle.overflow.module.auth.model; +package com.loafle.overflow.model.auth; -import com.loafle.overflow.module.meta.model.MetaCrawler; -import com.loafle.overflow.module.target.model.Target; +import com.loafle.overflow.model.meta.MetaCrawler; +import com.loafle.overflow.model.target.Target; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; diff --git a/src/main/java/com/loafle/overflow/module/discovery/model/DiscoverHost.java b/src/main/java/com/loafle/overflow/model/discovery/DiscoverHost.java similarity index 81% rename from src/main/java/com/loafle/overflow/module/discovery/model/DiscoverHost.java rename to src/main/java/com/loafle/overflow/model/discovery/DiscoverHost.java index 8e3713e..3989085 100644 --- a/src/main/java/com/loafle/overflow/module/discovery/model/DiscoverHost.java +++ b/src/main/java/com/loafle/overflow/model/discovery/DiscoverHost.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.discovery.model; +package com.loafle.overflow.model.discovery; /** * DiscoveryHost diff --git a/src/main/java/com/loafle/overflow/module/discovery/model/DiscoverPort.java b/src/main/java/com/loafle/overflow/model/discovery/DiscoverPort.java similarity index 82% rename from src/main/java/com/loafle/overflow/module/discovery/model/DiscoverPort.java rename to src/main/java/com/loafle/overflow/model/discovery/DiscoverPort.java index 536487c..933fe4d 100644 --- a/src/main/java/com/loafle/overflow/module/discovery/model/DiscoverPort.java +++ b/src/main/java/com/loafle/overflow/model/discovery/DiscoverPort.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.discovery.model; +package com.loafle.overflow.model.discovery; /** * DiscoveryPort diff --git a/src/main/java/com/loafle/overflow/module/discovery/model/DiscoverService.java b/src/main/java/com/loafle/overflow/model/discovery/DiscoverService.java similarity index 65% rename from src/main/java/com/loafle/overflow/module/discovery/model/DiscoverService.java rename to src/main/java/com/loafle/overflow/model/discovery/DiscoverService.java index 3f78e85..b20201c 100644 --- a/src/main/java/com/loafle/overflow/module/discovery/model/DiscoverService.java +++ b/src/main/java/com/loafle/overflow/model/discovery/DiscoverService.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.discovery.model; +package com.loafle.overflow.model.discovery; /** * DiscoveryService diff --git a/src/main/java/com/loafle/overflow/module/discovery/model/DiscoverZone.java b/src/main/java/com/loafle/overflow/model/discovery/DiscoverZone.java similarity index 70% rename from src/main/java/com/loafle/overflow/module/discovery/model/DiscoverZone.java rename to src/main/java/com/loafle/overflow/model/discovery/DiscoverZone.java index e370fcd..5fcb755 100644 --- a/src/main/java/com/loafle/overflow/module/discovery/model/DiscoverZone.java +++ b/src/main/java/com/loafle/overflow/model/discovery/DiscoverZone.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.discovery.model; +package com.loafle.overflow.model.discovery; /** * DiscoveryZone diff --git a/src/main/java/com/loafle/overflow/module/discovery/model/Host.java b/src/main/java/com/loafle/overflow/model/discovery/Host.java similarity index 82% rename from src/main/java/com/loafle/overflow/module/discovery/model/Host.java rename to src/main/java/com/loafle/overflow/model/discovery/Host.java index f58152b..e9574e7 100644 --- a/src/main/java/com/loafle/overflow/module/discovery/model/Host.java +++ b/src/main/java/com/loafle/overflow/model/discovery/Host.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.discovery.model; +package com.loafle.overflow.model.discovery; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/discovery/model/Port.java b/src/main/java/com/loafle/overflow/model/discovery/Port.java similarity index 68% rename from src/main/java/com/loafle/overflow/module/discovery/model/Port.java rename to src/main/java/com/loafle/overflow/model/discovery/Port.java index 3ee3e9b..38808da 100644 --- a/src/main/java/com/loafle/overflow/module/discovery/model/Port.java +++ b/src/main/java/com/loafle/overflow/model/discovery/Port.java @@ -1,6 +1,6 @@ -package com.loafle.overflow.module.discovery.model; +package com.loafle.overflow.model.discovery; -import com.loafle.overflow.module.core.type.PortType; +import com.loafle.overflow.core.type.PortType; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/discovery/model/Service.java b/src/main/java/com/loafle/overflow/model/discovery/Service.java similarity index 68% rename from src/main/java/com/loafle/overflow/module/discovery/model/Service.java rename to src/main/java/com/loafle/overflow/model/discovery/Service.java index 46bb3cc..673f714 100644 --- a/src/main/java/com/loafle/overflow/module/discovery/model/Service.java +++ b/src/main/java/com/loafle/overflow/model/discovery/Service.java @@ -1,9 +1,9 @@ -package com.loafle.overflow.module.discovery.model; +package com.loafle.overflow.model.discovery; import java.util.Date; -import com.loafle.overflow.module.core.type.CryptoType; +import com.loafle.overflow.core.type.CryptoType; /** * Created by root on 17. 6. 4. diff --git a/src/main/java/com/loafle/overflow/module/discovery/model/Zone.java b/src/main/java/com/loafle/overflow/model/discovery/Zone.java similarity index 81% rename from src/main/java/com/loafle/overflow/module/discovery/model/Zone.java rename to src/main/java/com/loafle/overflow/model/discovery/Zone.java index 7aa0666..df311ee 100644 --- a/src/main/java/com/loafle/overflow/module/discovery/model/Zone.java +++ b/src/main/java/com/loafle/overflow/model/discovery/Zone.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.discovery.model; +package com.loafle.overflow.model.discovery; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/domain/model/Domain.java b/src/main/java/com/loafle/overflow/model/domain/Domain.java similarity index 95% rename from src/main/java/com/loafle/overflow/module/domain/model/Domain.java rename to src/main/java/com/loafle/overflow/model/domain/Domain.java index 6bac704..d6ed74f 100644 --- a/src/main/java/com/loafle/overflow/module/domain/model/Domain.java +++ b/src/main/java/com/loafle/overflow/model/domain/Domain.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.domain.model; +package com.loafle.overflow.model.domain; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/domain/model/DomainMember.java b/src/main/java/com/loafle/overflow/model/domain/DomainMember.java similarity index 92% rename from src/main/java/com/loafle/overflow/module/domain/model/DomainMember.java rename to src/main/java/com/loafle/overflow/model/domain/DomainMember.java index 0f3d74f..ed33e41 100644 --- a/src/main/java/com/loafle/overflow/module/domain/model/DomainMember.java +++ b/src/main/java/com/loafle/overflow/model/domain/DomainMember.java @@ -1,6 +1,6 @@ -package com.loafle.overflow.module.domain.model; +package com.loafle.overflow.model.domain; -import com.loafle.overflow.module.member.model.Member; +import com.loafle.overflow.model.member.Member; import javax.persistence.*; import java.sql.Timestamp; diff --git a/src/main/java/com/loafle/overflow/module/email/model/EmailAuth.java b/src/main/java/com/loafle/overflow/model/email/EmailAuth.java similarity index 93% rename from src/main/java/com/loafle/overflow/module/email/model/EmailAuth.java rename to src/main/java/com/loafle/overflow/model/email/EmailAuth.java index d782613..4741a0d 100644 --- a/src/main/java/com/loafle/overflow/module/email/model/EmailAuth.java +++ b/src/main/java/com/loafle/overflow/model/email/EmailAuth.java @@ -1,6 +1,6 @@ -package com.loafle.overflow.module.email.model; +package com.loafle.overflow.model.email; -import com.loafle.overflow.module.member.model.Member; +import com.loafle.overflow.model.member.Member; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/history/model/History.java b/src/main/java/com/loafle/overflow/model/history/History.java similarity index 90% rename from src/main/java/com/loafle/overflow/module/history/model/History.java rename to src/main/java/com/loafle/overflow/model/history/History.java index 3bd3408..d8fd3f0 100644 --- a/src/main/java/com/loafle/overflow/module/history/model/History.java +++ b/src/main/java/com/loafle/overflow/model/history/History.java @@ -1,9 +1,9 @@ -package com.loafle.overflow.module.history.model; +package com.loafle.overflow.model.history; -import com.loafle.overflow.module.domain.model.Domain; -import com.loafle.overflow.module.member.model.Member; -import com.loafle.overflow.module.meta.model.MetaHistoryType; -import com.loafle.overflow.module.probe.model.Probe; +import com.loafle.overflow.model.domain.Domain; +import com.loafle.overflow.model.member.Member; +import com.loafle.overflow.model.meta.MetaHistoryType; +import com.loafle.overflow.model.probe.Probe; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/infra/model/Infra.java b/src/main/java/com/loafle/overflow/model/infra/Infra.java similarity index 95% rename from src/main/java/com/loafle/overflow/module/infra/model/Infra.java rename to src/main/java/com/loafle/overflow/model/infra/Infra.java index 6ab1032..c0c61c4 100644 --- a/src/main/java/com/loafle/overflow/module/infra/model/Infra.java +++ b/src/main/java/com/loafle/overflow/model/infra/Infra.java @@ -1,9 +1,9 @@ -package com.loafle.overflow.module.infra.model; +package com.loafle.overflow.model.infra; -import com.loafle.overflow.module.meta.model.MetaInfraType; -import com.loafle.overflow.module.probe.model.Probe; -import com.loafle.overflow.module.target.model.Target; +import com.loafle.overflow.model.meta.MetaInfraType; +import com.loafle.overflow.model.probe.Probe; +import com.loafle.overflow.model.target.Target; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/infra/model/InfraHost.java b/src/main/java/com/loafle/overflow/model/infra/InfraHost.java similarity index 96% rename from src/main/java/com/loafle/overflow/module/infra/model/InfraHost.java rename to src/main/java/com/loafle/overflow/model/infra/InfraHost.java index 3f1ae5b..71980da 100644 --- a/src/main/java/com/loafle/overflow/module/infra/model/InfraHost.java +++ b/src/main/java/com/loafle/overflow/model/infra/InfraHost.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.infra.model; +package com.loafle.overflow.model.infra; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/infra/model/InfraMachine.java b/src/main/java/com/loafle/overflow/model/infra/InfraMachine.java similarity index 96% rename from src/main/java/com/loafle/overflow/module/infra/model/InfraMachine.java rename to src/main/java/com/loafle/overflow/model/infra/InfraMachine.java index 3516fb4..9281972 100644 --- a/src/main/java/com/loafle/overflow/module/infra/model/InfraMachine.java +++ b/src/main/java/com/loafle/overflow/model/infra/InfraMachine.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.infra.model; +package com.loafle.overflow.model.infra; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/infra/model/InfraOS.java b/src/main/java/com/loafle/overflow/model/infra/InfraOS.java similarity index 93% rename from src/main/java/com/loafle/overflow/module/infra/model/InfraOS.java rename to src/main/java/com/loafle/overflow/model/infra/InfraOS.java index c06086c..8dc9809 100644 --- a/src/main/java/com/loafle/overflow/module/infra/model/InfraOS.java +++ b/src/main/java/com/loafle/overflow/model/infra/InfraOS.java @@ -1,7 +1,7 @@ -package com.loafle.overflow.module.infra.model; +package com.loafle.overflow.model.infra; -import com.loafle.overflow.module.meta.model.MetaInfraVendor; +import com.loafle.overflow.model.meta.MetaInfraVendor; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/infra/model/InfraOSApplication.java b/src/main/java/com/loafle/overflow/model/infra/InfraOSApplication.java similarity index 96% rename from src/main/java/com/loafle/overflow/module/infra/model/InfraOSApplication.java rename to src/main/java/com/loafle/overflow/model/infra/InfraOSApplication.java index 0790b23..29178f1 100644 --- a/src/main/java/com/loafle/overflow/module/infra/model/InfraOSApplication.java +++ b/src/main/java/com/loafle/overflow/model/infra/InfraOSApplication.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.infra.model; +package com.loafle.overflow.model.infra; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/infra/model/InfraOSDaemon.java b/src/main/java/com/loafle/overflow/model/infra/InfraOSDaemon.java similarity index 96% rename from src/main/java/com/loafle/overflow/module/infra/model/InfraOSDaemon.java rename to src/main/java/com/loafle/overflow/model/infra/InfraOSDaemon.java index 834c547..840a66f 100644 --- a/src/main/java/com/loafle/overflow/module/infra/model/InfraOSDaemon.java +++ b/src/main/java/com/loafle/overflow/model/infra/InfraOSDaemon.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.infra.model; +package com.loafle.overflow.model.infra; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/infra/model/InfraOSPort.java b/src/main/java/com/loafle/overflow/model/infra/InfraOSPort.java similarity index 94% rename from src/main/java/com/loafle/overflow/module/infra/model/InfraOSPort.java rename to src/main/java/com/loafle/overflow/model/infra/InfraOSPort.java index c368dba..02221dd 100644 --- a/src/main/java/com/loafle/overflow/module/infra/model/InfraOSPort.java +++ b/src/main/java/com/loafle/overflow/model/infra/InfraOSPort.java @@ -1,7 +1,7 @@ -package com.loafle.overflow.module.infra.model; +package com.loafle.overflow.model.infra; -import com.loafle.overflow.module.meta.model.MetaInfraVendor; +import com.loafle.overflow.model.meta.MetaInfraVendor; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/infra/model/InfraService.java b/src/main/java/com/loafle/overflow/model/infra/InfraService.java similarity index 94% rename from src/main/java/com/loafle/overflow/module/infra/model/InfraService.java rename to src/main/java/com/loafle/overflow/model/infra/InfraService.java index f1fce56..0d0af1e 100644 --- a/src/main/java/com/loafle/overflow/module/infra/model/InfraService.java +++ b/src/main/java/com/loafle/overflow/model/infra/InfraService.java @@ -1,7 +1,7 @@ -package com.loafle.overflow.module.infra.model; +package com.loafle.overflow.model.infra; -import com.loafle.overflow.module.meta.model.MetaInfraVendor; +import com.loafle.overflow.model.meta.MetaInfraVendor; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/member/model/Member.java b/src/main/java/com/loafle/overflow/model/member/Member.java similarity index 96% rename from src/main/java/com/loafle/overflow/module/member/model/Member.java rename to src/main/java/com/loafle/overflow/model/member/Member.java index 676ad8d..b9d6686 100644 --- a/src/main/java/com/loafle/overflow/module/member/model/Member.java +++ b/src/main/java/com/loafle/overflow/model/member/Member.java @@ -1,6 +1,6 @@ -package com.loafle.overflow.module.member.model; +package com.loafle.overflow.model.member; -import com.loafle.overflow.module.meta.model.MetaMemberStatus; +import com.loafle.overflow.model.meta.MetaMemberStatus; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/member/model/MemberTotp.java b/src/main/java/com/loafle/overflow/model/member/MemberTotp.java similarity index 97% rename from src/main/java/com/loafle/overflow/module/member/model/MemberTotp.java rename to src/main/java/com/loafle/overflow/model/member/MemberTotp.java index d23bd21..f94acce 100644 --- a/src/main/java/com/loafle/overflow/module/member/model/MemberTotp.java +++ b/src/main/java/com/loafle/overflow/model/member/MemberTotp.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.member.model; +package com.loafle.overflow.model.member; import javax.persistence.*; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaCrawler.java b/src/main/java/com/loafle/overflow/model/meta/MetaCrawler.java similarity index 96% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaCrawler.java rename to src/main/java/com/loafle/overflow/model/meta/MetaCrawler.java index 573d9a9..8dd85be 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaCrawler.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaCrawler.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaCrawlerInputItem.java b/src/main/java/com/loafle/overflow/model/meta/MetaCrawlerInputItem.java similarity index 99% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaCrawlerInputItem.java rename to src/main/java/com/loafle/overflow/model/meta/MetaCrawlerInputItem.java index 67a6974..2660d76 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaCrawlerInputItem.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaCrawlerInputItem.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaHistoryType.java b/src/main/java/com/loafle/overflow/model/meta/MetaHistoryType.java similarity index 95% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaHistoryType.java rename to src/main/java/com/loafle/overflow/model/meta/MetaHistoryType.java index d619f79..389e188 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaHistoryType.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaHistoryType.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaInfraType.java b/src/main/java/com/loafle/overflow/model/meta/MetaInfraType.java similarity index 94% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaInfraType.java rename to src/main/java/com/loafle/overflow/model/meta/MetaInfraType.java index f0029a6..759032a 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaInfraType.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaInfraType.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaInfraVendor.java b/src/main/java/com/loafle/overflow/model/meta/MetaInfraVendor.java similarity index 98% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaInfraVendor.java rename to src/main/java/com/loafle/overflow/model/meta/MetaInfraVendor.java index b786c78..08ec927 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaInfraVendor.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaInfraVendor.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaInputType.java b/src/main/java/com/loafle/overflow/model/meta/MetaInputType.java similarity index 96% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaInputType.java rename to src/main/java/com/loafle/overflow/model/meta/MetaInputType.java index 8ad2b41..fed261b 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaInputType.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaInputType.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaMemberStatus.java b/src/main/java/com/loafle/overflow/model/meta/MetaMemberStatus.java similarity index 94% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaMemberStatus.java rename to src/main/java/com/loafle/overflow/model/meta/MetaMemberStatus.java index 1074a1d..acac181 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaMemberStatus.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaMemberStatus.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaNoAuthProbeStatus.java b/src/main/java/com/loafle/overflow/model/meta/MetaNoAuthProbeStatus.java similarity index 94% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaNoAuthProbeStatus.java rename to src/main/java/com/loafle/overflow/model/meta/MetaNoAuthProbeStatus.java index 60f1639..961ecdb 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaNoAuthProbeStatus.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaNoAuthProbeStatus.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaNotification.java b/src/main/java/com/loafle/overflow/model/meta/MetaNotification.java similarity index 95% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaNotification.java rename to src/main/java/com/loafle/overflow/model/meta/MetaNotification.java index b2276a8..4d35143 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaNotification.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaNotification.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaProbeArchitecture.java b/src/main/java/com/loafle/overflow/model/meta/MetaProbeArchitecture.java similarity index 95% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaProbeArchitecture.java rename to src/main/java/com/loafle/overflow/model/meta/MetaProbeArchitecture.java index e6f8f4f..95694bf 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaProbeArchitecture.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaProbeArchitecture.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaProbeOs.java b/src/main/java/com/loafle/overflow/model/meta/MetaProbeOs.java similarity index 95% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaProbeOs.java rename to src/main/java/com/loafle/overflow/model/meta/MetaProbeOs.java index 5d3de03..511ef3d 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaProbeOs.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaProbeOs.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaProbePackage.java b/src/main/java/com/loafle/overflow/model/meta/MetaProbePackage.java similarity index 97% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaProbePackage.java rename to src/main/java/com/loafle/overflow/model/meta/MetaProbePackage.java index 0fa7481..0b43fcc 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaProbePackage.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaProbePackage.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaProbeStatus.java b/src/main/java/com/loafle/overflow/model/meta/MetaProbeStatus.java similarity index 93% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaProbeStatus.java rename to src/main/java/com/loafle/overflow/model/meta/MetaProbeStatus.java index 7bb87f6..f36fd6d 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaProbeStatus.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaProbeStatus.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaProbeTaskType.java b/src/main/java/com/loafle/overflow/model/meta/MetaProbeTaskType.java similarity index 96% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaProbeTaskType.java rename to src/main/java/com/loafle/overflow/model/meta/MetaProbeTaskType.java index afdbe47..daa87f8 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaProbeTaskType.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaProbeTaskType.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaProbeVersion.java b/src/main/java/com/loafle/overflow/model/meta/MetaProbeVersion.java similarity index 95% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaProbeVersion.java rename to src/main/java/com/loafle/overflow/model/meta/MetaProbeVersion.java index 0b6bbdc..24a842d 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaProbeVersion.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaProbeVersion.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaSensorDisplayItem.java b/src/main/java/com/loafle/overflow/model/meta/MetaSensorDisplayItem.java similarity index 97% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaSensorDisplayItem.java rename to src/main/java/com/loafle/overflow/model/meta/MetaSensorDisplayItem.java index abac127..0cf9168 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaSensorDisplayItem.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaSensorDisplayItem.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaSensorDisplayMapping.java b/src/main/java/com/loafle/overflow/model/meta/MetaSensorDisplayMapping.java similarity index 95% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaSensorDisplayMapping.java rename to src/main/java/com/loafle/overflow/model/meta/MetaSensorDisplayMapping.java index 75473a6..86d5402 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaSensorDisplayMapping.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaSensorDisplayMapping.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaSensorItem.java b/src/main/java/com/loafle/overflow/model/meta/MetaSensorItem.java similarity index 96% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaSensorItem.java rename to src/main/java/com/loafle/overflow/model/meta/MetaSensorItem.java index a76208c..f481799 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaSensorItem.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaSensorItem.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaSensorItemKey.java b/src/main/java/com/loafle/overflow/model/meta/MetaSensorItemKey.java similarity index 97% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaSensorItemKey.java rename to src/main/java/com/loafle/overflow/model/meta/MetaSensorItemKey.java index d3455fb..f20421b 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaSensorItemKey.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaSensorItemKey.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaSensorItemType.java b/src/main/java/com/loafle/overflow/model/meta/MetaSensorItemType.java similarity index 96% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaSensorItemType.java rename to src/main/java/com/loafle/overflow/model/meta/MetaSensorItemType.java index abab0f5..520e9ab 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaSensorItemType.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaSensorItemType.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaSensorItemUnit.java b/src/main/java/com/loafle/overflow/model/meta/MetaSensorItemUnit.java similarity index 95% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaSensorItemUnit.java rename to src/main/java/com/loafle/overflow/model/meta/MetaSensorItemUnit.java index e92ddd4..258661d 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaSensorItemUnit.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaSensorItemUnit.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaSensorStatus.java b/src/main/java/com/loafle/overflow/model/meta/MetaSensorStatus.java similarity index 94% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaSensorStatus.java rename to src/main/java/com/loafle/overflow/model/meta/MetaSensorStatus.java index fd0623a..729dcaf 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaSensorStatus.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaSensorStatus.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.Column; import javax.persistence.Entity; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaVendorCrawler.java b/src/main/java/com/loafle/overflow/model/meta/MetaVendorCrawler.java similarity index 97% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaVendorCrawler.java rename to src/main/java/com/loafle/overflow/model/meta/MetaVendorCrawler.java index 3c9d8cd..7db9759 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaVendorCrawler.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaVendorCrawler.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/model/MetaVendorCrawlerSensorItem.java b/src/main/java/com/loafle/overflow/model/meta/MetaVendorCrawlerSensorItem.java similarity index 97% rename from src/main/java/com/loafle/overflow/module/meta/model/MetaVendorCrawlerSensorItem.java rename to src/main/java/com/loafle/overflow/model/meta/MetaVendorCrawlerSensorItem.java index f8b3908..ed9b81f 100644 --- a/src/main/java/com/loafle/overflow/module/meta/model/MetaVendorCrawlerSensorItem.java +++ b/src/main/java/com/loafle/overflow/model/meta/MetaVendorCrawlerSensorItem.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.model; +package com.loafle.overflow.model.meta; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/meta/type/MetaCrawlerEnum.java b/src/main/java/com/loafle/overflow/model/meta/type/MetaCrawlerEnum.java similarity index 95% rename from src/main/java/com/loafle/overflow/module/meta/type/MetaCrawlerEnum.java rename to src/main/java/com/loafle/overflow/model/meta/type/MetaCrawlerEnum.java index 008e87a..eb2d8d6 100644 --- a/src/main/java/com/loafle/overflow/module/meta/type/MetaCrawlerEnum.java +++ b/src/main/java/com/loafle/overflow/model/meta/type/MetaCrawlerEnum.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.type; +package com.loafle.overflow.model.meta.type; /** * Created by snoop on 17. 9. 8. diff --git a/src/main/java/com/loafle/overflow/module/noauthprobe/model/NoAuthProbe.java b/src/main/java/com/loafle/overflow/model/noauthprobe/NoAuthProbe.java similarity index 94% rename from src/main/java/com/loafle/overflow/module/noauthprobe/model/NoAuthProbe.java rename to src/main/java/com/loafle/overflow/model/noauthprobe/NoAuthProbe.java index df60d33..4f7c8c9 100644 --- a/src/main/java/com/loafle/overflow/module/noauthprobe/model/NoAuthProbe.java +++ b/src/main/java/com/loafle/overflow/model/noauthprobe/NoAuthProbe.java @@ -1,9 +1,9 @@ -package com.loafle.overflow.module.noauthprobe.model; +package com.loafle.overflow.model.noauthprobe; -import com.loafle.overflow.module.domain.model.Domain; -import com.loafle.overflow.module.meta.model.MetaNoAuthProbeStatus; -import com.loafle.overflow.module.probe.model.Probe; +import com.loafle.overflow.model.domain.Domain; +import com.loafle.overflow.model.meta.MetaNoAuthProbeStatus; +import com.loafle.overflow.model.probe.Probe; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/notification/model/Notification.java b/src/main/java/com/loafle/overflow/model/notification/Notification.java similarity index 94% rename from src/main/java/com/loafle/overflow/module/notification/model/Notification.java rename to src/main/java/com/loafle/overflow/model/notification/Notification.java index 8ce3b80..8420f76 100644 --- a/src/main/java/com/loafle/overflow/module/notification/model/Notification.java +++ b/src/main/java/com/loafle/overflow/model/notification/Notification.java @@ -1,6 +1,6 @@ -package com.loafle.overflow.module.notification.model; +package com.loafle.overflow.model.notification; -import com.loafle.overflow.module.member.model.Member; +import com.loafle.overflow.model.member.Member; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/probe/model/Probe.java b/src/main/java/com/loafle/overflow/model/probe/Probe.java similarity index 94% rename from src/main/java/com/loafle/overflow/module/probe/model/Probe.java rename to src/main/java/com/loafle/overflow/model/probe/Probe.java index 59c84d8..d8265e0 100644 --- a/src/main/java/com/loafle/overflow/module/probe/model/Probe.java +++ b/src/main/java/com/loafle/overflow/model/probe/Probe.java @@ -1,8 +1,8 @@ -package com.loafle.overflow.module.probe.model; +package com.loafle.overflow.model.probe; -import com.loafle.overflow.module.domain.model.Domain; -import com.loafle.overflow.module.member.model.Member; -import com.loafle.overflow.module.meta.model.MetaProbeStatus; +import com.loafle.overflow.model.domain.Domain; +import com.loafle.overflow.model.member.Member; +import com.loafle.overflow.model.meta.MetaProbeStatus; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/probe/model/ProbeHost.java b/src/main/java/com/loafle/overflow/model/probe/ProbeHost.java similarity index 88% rename from src/main/java/com/loafle/overflow/module/probe/model/ProbeHost.java rename to src/main/java/com/loafle/overflow/model/probe/ProbeHost.java index ecbc688..1833072 100644 --- a/src/main/java/com/loafle/overflow/module/probe/model/ProbeHost.java +++ b/src/main/java/com/loafle/overflow/model/probe/ProbeHost.java @@ -1,6 +1,6 @@ -package com.loafle.overflow.module.probe.model; +package com.loafle.overflow.model.probe; -import com.loafle.overflow.module.infra.model.InfraHost; +import com.loafle.overflow.model.infra.InfraHost; import javax.persistence.*; diff --git a/src/main/java/com/loafle/overflow/module/probe/model/ProbeTask.java b/src/main/java/com/loafle/overflow/model/probe/ProbeTask.java similarity index 97% rename from src/main/java/com/loafle/overflow/module/probe/model/ProbeTask.java rename to src/main/java/com/loafle/overflow/model/probe/ProbeTask.java index 754b366..6f55676 100644 --- a/src/main/java/com/loafle/overflow/module/probe/model/ProbeTask.java +++ b/src/main/java/com/loafle/overflow/model/probe/ProbeTask.java @@ -1,7 +1,7 @@ -package com.loafle.overflow.module.probe.model; +package com.loafle.overflow.model.probe; -import com.loafle.overflow.module.meta.model.MetaProbeTaskType; +import com.loafle.overflow.model.meta.MetaProbeTaskType; import javax.persistence.*; 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/model/sensor/Sensor.java similarity index 90% rename from src/main/java/com/loafle/overflow/module/sensor/model/Sensor.java rename to src/main/java/com/loafle/overflow/model/sensor/Sensor.java index 176a9f8..25683e3 100644 --- a/src/main/java/com/loafle/overflow/module/sensor/model/Sensor.java +++ b/src/main/java/com/loafle/overflow/model/sensor/Sensor.java @@ -1,8 +1,8 @@ -package com.loafle.overflow.module.sensor.model; +package com.loafle.overflow.model.sensor; -import com.loafle.overflow.module.meta.model.MetaCrawler; -import com.loafle.overflow.module.meta.model.MetaSensorStatus; -import com.loafle.overflow.module.target.model.Target; +import com.loafle.overflow.model.meta.MetaCrawler; +import com.loafle.overflow.model.meta.MetaSensorStatus; +import com.loafle.overflow.model.target.Target; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; diff --git a/src/main/java/com/loafle/overflow/module/sensor/model/SensorItem.java b/src/main/java/com/loafle/overflow/model/sensor/SensorItem.java similarity index 92% rename from src/main/java/com/loafle/overflow/module/sensor/model/SensorItem.java rename to src/main/java/com/loafle/overflow/model/sensor/SensorItem.java index c15c4a5..eb0bbb8 100644 --- a/src/main/java/com/loafle/overflow/module/sensor/model/SensorItem.java +++ b/src/main/java/com/loafle/overflow/model/sensor/SensorItem.java @@ -1,6 +1,6 @@ -package com.loafle.overflow.module.sensor.model; +package com.loafle.overflow.model.sensor; -import com.loafle.overflow.module.meta.model.MetaSensorDisplayItem; +import com.loafle.overflow.model.meta.MetaSensorDisplayItem; import org.hibernate.annotations.OnDelete; import org.hibernate.annotations.OnDeleteAction; diff --git a/src/main/java/com/loafle/overflow/module/sensor/model/SensorItemDependency.java b/src/main/java/com/loafle/overflow/model/sensor/SensorItemDependency.java similarity index 84% rename from src/main/java/com/loafle/overflow/module/sensor/model/SensorItemDependency.java rename to src/main/java/com/loafle/overflow/model/sensor/SensorItemDependency.java index 6226f6b..81e76b7 100644 --- a/src/main/java/com/loafle/overflow/module/sensor/model/SensorItemDependency.java +++ b/src/main/java/com/loafle/overflow/model/sensor/SensorItemDependency.java @@ -1,7 +1,7 @@ -package com.loafle.overflow.module.sensor.model; +package com.loafle.overflow.model.sensor; -import com.loafle.overflow.module.meta.model.MetaSensorDisplayItem; -import com.loafle.overflow.module.meta.model.MetaSensorItemKey; +import com.loafle.overflow.model.meta.MetaSensorDisplayItem; +import com.loafle.overflow.model.meta.MetaSensorItemKey; import javax.persistence.*; diff --git a/src/main/java/com/loafle/overflow/module/sensorconfig/model/Connection.java b/src/main/java/com/loafle/overflow/model/sensorconfig/Connection.java similarity index 84% rename from src/main/java/com/loafle/overflow/module/sensorconfig/model/Connection.java rename to src/main/java/com/loafle/overflow/model/sensorconfig/Connection.java index 0913527..ad5fd26 100644 --- a/src/main/java/com/loafle/overflow/module/sensorconfig/model/Connection.java +++ b/src/main/java/com/loafle/overflow/model/sensorconfig/Connection.java @@ -1,6 +1,6 @@ -package com.loafle.overflow.module.sensorconfig.model; +package com.loafle.overflow.model.sensorconfig; -import com.loafle.overflow.module.core.type.PortType; +import com.loafle.overflow.core.type.PortType; /** * Connection diff --git a/src/main/java/com/loafle/overflow/module/sensorconfig/model/Crawler.java b/src/main/java/com/loafle/overflow/model/sensorconfig/Crawler.java similarity index 86% rename from src/main/java/com/loafle/overflow/module/sensorconfig/model/Crawler.java rename to src/main/java/com/loafle/overflow/model/sensorconfig/Crawler.java index 92fad2d..1a25634 100644 --- a/src/main/java/com/loafle/overflow/module/sensorconfig/model/Crawler.java +++ b/src/main/java/com/loafle/overflow/model/sensorconfig/Crawler.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.sensorconfig.model; +package com.loafle.overflow.model.sensorconfig; /** * Crawler diff --git a/src/main/java/com/loafle/overflow/module/sensorconfig/model/Item.java b/src/main/java/com/loafle/overflow/model/sensorconfig/Item.java similarity index 91% rename from src/main/java/com/loafle/overflow/module/sensorconfig/model/Item.java rename to src/main/java/com/loafle/overflow/model/sensorconfig/Item.java index d15d184..e3582fd 100644 --- a/src/main/java/com/loafle/overflow/module/sensorconfig/model/Item.java +++ b/src/main/java/com/loafle/overflow/model/sensorconfig/Item.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.sensorconfig.model; +package com.loafle.overflow.model.sensorconfig; import java.util.List; diff --git a/src/main/java/com/loafle/overflow/module/sensorconfig/model/Keys.java b/src/main/java/com/loafle/overflow/model/sensorconfig/Keys.java similarity index 91% rename from src/main/java/com/loafle/overflow/module/sensorconfig/model/Keys.java rename to src/main/java/com/loafle/overflow/model/sensorconfig/Keys.java index a67fece..7aa036f 100644 --- a/src/main/java/com/loafle/overflow/module/sensorconfig/model/Keys.java +++ b/src/main/java/com/loafle/overflow/model/sensorconfig/Keys.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.sensorconfig.model; +package com.loafle.overflow.model.sensorconfig; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/loafle/overflow/module/sensorconfig/model/MappingInfo.java b/src/main/java/com/loafle/overflow/model/sensorconfig/MappingInfo.java similarity index 94% rename from src/main/java/com/loafle/overflow/module/sensorconfig/model/MappingInfo.java rename to src/main/java/com/loafle/overflow/model/sensorconfig/MappingInfo.java index 724bfa7..29f3fee 100644 --- a/src/main/java/com/loafle/overflow/module/sensorconfig/model/MappingInfo.java +++ b/src/main/java/com/loafle/overflow/model/sensorconfig/MappingInfo.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.sensorconfig.model; +package com.loafle.overflow.model.sensorconfig; import java.util.List; diff --git a/src/main/java/com/loafle/overflow/module/sensorconfig/model/QueryInfo.java b/src/main/java/com/loafle/overflow/model/sensorconfig/QueryInfo.java similarity index 88% rename from src/main/java/com/loafle/overflow/module/sensorconfig/model/QueryInfo.java rename to src/main/java/com/loafle/overflow/model/sensorconfig/QueryInfo.java index 0ce6c53..786c74e 100644 --- a/src/main/java/com/loafle/overflow/module/sensorconfig/model/QueryInfo.java +++ b/src/main/java/com/loafle/overflow/model/sensorconfig/QueryInfo.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.sensorconfig.model; +package com.loafle.overflow.model.sensorconfig; import java.util.Map; diff --git a/src/main/java/com/loafle/overflow/module/sensorconfig/model/ResultSet.java b/src/main/java/com/loafle/overflow/model/sensorconfig/ResultSet.java similarity index 96% rename from src/main/java/com/loafle/overflow/module/sensorconfig/model/ResultSet.java rename to src/main/java/com/loafle/overflow/model/sensorconfig/ResultSet.java index 59ec408..d20b029 100644 --- a/src/main/java/com/loafle/overflow/module/sensorconfig/model/ResultSet.java +++ b/src/main/java/com/loafle/overflow/model/sensorconfig/ResultSet.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.sensorconfig.model; +package com.loafle.overflow.model.sensorconfig; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/loafle/overflow/module/sensorconfig/model/ResultSetCol.java b/src/main/java/com/loafle/overflow/model/sensorconfig/ResultSetCol.java similarity index 97% rename from src/main/java/com/loafle/overflow/module/sensorconfig/model/ResultSetCol.java rename to src/main/java/com/loafle/overflow/model/sensorconfig/ResultSetCol.java index 7e75e01..91d9782 100644 --- a/src/main/java/com/loafle/overflow/module/sensorconfig/model/ResultSetCol.java +++ b/src/main/java/com/loafle/overflow/model/sensorconfig/ResultSetCol.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.sensorconfig.model; +package com.loafle.overflow.model.sensorconfig; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/loafle/overflow/module/sensorconfig/model/ResultSetRow.java b/src/main/java/com/loafle/overflow/model/sensorconfig/ResultSetRow.java similarity index 97% rename from src/main/java/com/loafle/overflow/module/sensorconfig/model/ResultSetRow.java rename to src/main/java/com/loafle/overflow/model/sensorconfig/ResultSetRow.java index 92ee92b..f5619a4 100644 --- a/src/main/java/com/loafle/overflow/module/sensorconfig/model/ResultSetRow.java +++ b/src/main/java/com/loafle/overflow/model/sensorconfig/ResultSetRow.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.sensorconfig.model; +package com.loafle.overflow.model.sensorconfig; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/loafle/overflow/module/sensorconfig/model/Schedule.java b/src/main/java/com/loafle/overflow/model/sensorconfig/Schedule.java similarity index 79% rename from src/main/java/com/loafle/overflow/module/sensorconfig/model/Schedule.java rename to src/main/java/com/loafle/overflow/model/sensorconfig/Schedule.java index c355c9f..75e3e6c 100644 --- a/src/main/java/com/loafle/overflow/module/sensorconfig/model/Schedule.java +++ b/src/main/java/com/loafle/overflow/model/sensorconfig/Schedule.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.sensorconfig.model; +package com.loafle.overflow.model.sensorconfig; /** * Schedule diff --git a/src/main/java/com/loafle/overflow/module/sensorconfig/model/SensorConfig.java b/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfig.java similarity index 94% rename from src/main/java/com/loafle/overflow/module/sensorconfig/model/SensorConfig.java rename to src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfig.java index 1e6df66..c4d8c03 100644 --- a/src/main/java/com/loafle/overflow/module/sensorconfig/model/SensorConfig.java +++ b/src/main/java/com/loafle/overflow/model/sensorconfig/SensorConfig.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.sensorconfig.model; +package com.loafle.overflow.model.sensorconfig; import java.util.List; diff --git a/src/main/java/com/loafle/overflow/module/sensorconfig/model/Target.java b/src/main/java/com/loafle/overflow/model/sensorconfig/Target.java similarity index 88% rename from src/main/java/com/loafle/overflow/module/sensorconfig/model/Target.java rename to src/main/java/com/loafle/overflow/model/sensorconfig/Target.java index 96790e2..59cffed 100644 --- a/src/main/java/com/loafle/overflow/module/sensorconfig/model/Target.java +++ b/src/main/java/com/loafle/overflow/model/sensorconfig/Target.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.sensorconfig.model; +package com.loafle.overflow.model.sensorconfig; import java.util.Map; diff --git a/src/main/java/com/loafle/overflow/module/target/model/Target.java b/src/main/java/com/loafle/overflow/model/target/Target.java similarity index 95% rename from src/main/java/com/loafle/overflow/module/target/model/Target.java rename to src/main/java/com/loafle/overflow/model/target/Target.java index 052f168..7d86a79 100644 --- a/src/main/java/com/loafle/overflow/module/target/model/Target.java +++ b/src/main/java/com/loafle/overflow/model/target/Target.java @@ -1,6 +1,6 @@ -package com.loafle.overflow.module.target.model; +package com.loafle.overflow.model.target; -import com.loafle.overflow.module.sensor.model.Sensor; +import com.loafle.overflow.model.sensor.Sensor; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/websocket/model/UiWebsocket.java b/src/main/java/com/loafle/overflow/model/websocket/UiWebsocket.java similarity index 92% rename from src/main/java/com/loafle/overflow/module/websocket/model/UiWebsocket.java rename to src/main/java/com/loafle/overflow/model/websocket/UiWebsocket.java index 09733fa..0a04c77 100644 --- a/src/main/java/com/loafle/overflow/module/websocket/model/UiWebsocket.java +++ b/src/main/java/com/loafle/overflow/model/websocket/UiWebsocket.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.websocket.model; +package com.loafle.overflow.model.websocket; import javax.persistence.*; import java.util.Date; diff --git a/src/main/java/com/loafle/overflow/module/core/annotation/ProbeAPI.java b/src/main/java/com/loafle/overflow/module/core/annotation/ProbeAPI.java deleted file mode 100644 index 7708660..0000000 --- a/src/main/java/com/loafle/overflow/module/core/annotation/ProbeAPI.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.loafle.overflow.module.core.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target({ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -public @interface ProbeAPI { -} \ No newline at end of file diff --git a/src/main/java/com/loafle/overflow/module/core/annotation/RPCService.java b/src/main/java/com/loafle/overflow/module/core/annotation/RPCService.java deleted file mode 100644 index 82842f1..0000000 --- a/src/main/java/com/loafle/overflow/module/core/annotation/RPCService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.loafle.overflow.module.core.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.springframework.core.annotation.AliasFor; -import org.springframework.stereotype.Component; - -@Target({ElementType.TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Component -public @interface RPCService { - @AliasFor(annotation = Component.class) - String value() default ""; -} diff --git a/src/main/java/com/loafle/overflow/module/core/annotation/WebappAPI.java b/src/main/java/com/loafle/overflow/module/core/annotation/WebappAPI.java deleted file mode 100644 index 6ec56bd..0000000 --- a/src/main/java/com/loafle/overflow/module/core/annotation/WebappAPI.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.loafle.overflow.module.core.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target({ElementType.METHOD}) -@Retention(RetentionPolicy.RUNTIME) -public @interface WebappAPI { -} \ No newline at end of file diff --git a/src/main/java/com/loafle/overflow/module/core/exception/OverflowException.java b/src/main/java/com/loafle/overflow/module/core/exception/OverflowException.java deleted file mode 100644 index 8e1b4c7..0000000 --- a/src/main/java/com/loafle/overflow/module/core/exception/OverflowException.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.loafle.overflow.module.core.exception; - -public class OverflowException extends Exception { - public OverflowException(String s, Throwable throwable) { - super(s, throwable); - } -} diff --git a/src/main/java/com/loafle/overflow/module/core/interfaces/Service.java b/src/main/java/com/loafle/overflow/module/core/interfaces/Service.java deleted file mode 100644 index f9c05d6..0000000 --- a/src/main/java/com/loafle/overflow/module/core/interfaces/Service.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.loafle.overflow.module.core.interfaces; - -/** - * Service - */ -public interface Service { - void initService() throws Exception; - void startService() throws Exception; - void stopService(); - void destroyService(); -} \ No newline at end of file diff --git a/src/main/java/com/loafle/overflow/module/core/model/Mail.java b/src/main/java/com/loafle/overflow/module/core/model/Mail.java deleted file mode 100644 index c97b6a3..0000000 --- a/src/main/java/com/loafle/overflow/module/core/model/Mail.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.loafle.overflow.module.core.model; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * Created by geek on 18. 1. 3. - */ -public class Mail { - private String mailFrom; - - private String mailTo; - - private String mailCc; - - private String mailBcc; - - private String mailSubject; - - private String mailContent; - - private String contentType; - - private List< Object > attachments; - - private Map< String, Object > model; - - public Mail() { - contentType = "text/plain"; - } - - public String getContentType() { - return contentType; - } - - public void setContentType(String contentType) { - this.contentType = contentType; - } - - public String getMailBcc() { - return mailBcc; - } - - public void setMailBcc(String mailBcc) { - this.mailBcc = mailBcc; - } - - public String getMailCc() { - return mailCc; - } - - public void setMailCc(String mailCc) { - this.mailCc = mailCc; - } - - public String getMailFrom() { - return mailFrom; - } - - public void setMailFrom(String mailFrom) { - this.mailFrom = mailFrom; - } - - public String getMailSubject() { - return mailSubject; - } - - public void setMailSubject(String mailSubject) { - this.mailSubject = mailSubject; - } - - public String getMailTo() { - return mailTo; - } - - public void setMailTo(String mailTo) { - this.mailTo = mailTo; - } - - public Date getMailSendDate() { - return new Date(); - } - - public String getMailContent() { - return mailContent; - } - - public void setMailContent(String mailContent) { - this.mailContent = mailContent; - } - - public List< Object > getAttachments() { - return attachments; - } - - public void setAttachments(List < Object > attachments) { - this.attachments = attachments; - } - - public Map< String, Object > getModel() { - return model; - } - - public void setModel(Map < String, Object > model) { - this.model = model; - } -} diff --git a/src/main/java/com/loafle/overflow/module/core/model/PageParams.java b/src/main/java/com/loafle/overflow/module/core/model/PageParams.java deleted file mode 100644 index eb24cc5..0000000 --- a/src/main/java/com/loafle/overflow/module/core/model/PageParams.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.loafle.overflow.module.core.model; - -/** - * Created by insanity on 17. 8. 25. - */ -public class PageParams { - - private int pageNo; - private int countPerPage; - private String sortCol; - private String sortDirection; - - public int getPageNo() { - return pageNo; - } - - public void setPageNo(int pageNo) { - this.pageNo = pageNo; - } - - public int getCountPerPage() { - return countPerPage; - } - - public void setCountPerPage(int countPerPage) { - this.countPerPage = countPerPage; - } - - public String getSortCol() { - return sortCol; - } - - public void setSortCol(String sortCol) { - this.sortCol = sortCol; - } - - public String getSortDirection() { - return sortDirection; - } - - public void setSortDirection(String sortDirection) { - this.sortDirection = sortDirection; - } -} diff --git a/src/main/java/com/loafle/overflow/module/core/model/PublishMessage.java b/src/main/java/com/loafle/overflow/module/core/model/PublishMessage.java deleted file mode 100644 index 7070af3..0000000 --- a/src/main/java/com/loafle/overflow/module/core/model/PublishMessage.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.loafle.overflow.module.core.model; - -import java.util.ArrayList; -import java.util.List; - -public class PublishMessage { - private TargetType targetType; - private List targets; - private PublishMessageBody message; - - public void setTargetType(TargetType targetType) { - this.targetType = targetType; - } - - public TargetType getTargetType() { - return this.targetType; - } - - public void setTargets(List targets) { - this.targets = targets; - } - - public void addTarget(String target) { - if (null == targets) { - targets = new ArrayList<>(); - } - targets.add(target); - } - - public List getTargets() { - return targets; - } - - public void setMessage(PublishMessageBody message) { - this.message = message; - } - - public PublishMessageBody getMessage() { - return message; - } - - public static enum TargetType { - MEMBER_SESSION("MEMBER_SESSION"), - MEMBER("MEMBER"), - PROBE("PROBE"); - - final private String name; - - private TargetType(String name) { - this.name = name; - } - - public String toString() { - return name; - } - } - - public static class PublishMessageBody { - private String jsonrpc = "2.0"; - private PublishMessageBodyNotification result; - - public PublishMessageBody() { - this.result = new PublishMessageBodyNotification(); - - } - - public PublishMessageBody(String method) { - this(); - this.result.setMethod(method); - } - - public PublishMessageBody(String method, List params) { - this(method); - this.result.setParams(params); - } - - public String getJsonrpc() { - return jsonrpc; - } - - public void setJsonrpc(String jsonrpc) { - this.jsonrpc = jsonrpc; - } - - public PublishMessageBodyNotification getResult() { - return result; - } - - public void setResult(PublishMessageBodyNotification result) { - this.result = result; - } - } - - public static class PublishMessageBodyNotification { - private String method; - private List params; - - public String getMethod() { - return method; - } - - public void setMethod(String method) { - this.method = method; - } - - public List getParams() { - return params; - } - - public void setParams(List params) { - this.params = params; - } - - public void addParams(String param) { - if (null == this.params) { - this.params = new ArrayList<>(); - } - this.params.add(param); - } - - } -} diff --git a/src/main/java/com/loafle/overflow/module/core/type/CryptoType.java b/src/main/java/com/loafle/overflow/module/core/type/CryptoType.java deleted file mode 100644 index 89c9f11..0000000 --- a/src/main/java/com/loafle/overflow/module/core/type/CryptoType.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.loafle.overflow.module.core.type; - -/** - * Created by snoop on 17. 6. 27. - */ -public enum CryptoType { - TLS("TLS"); - - private String stringValue; - CryptoType(String string) {stringValue = string;} - - @Override - public String toString() { - return stringValue; - } -} \ No newline at end of file diff --git a/src/main/java/com/loafle/overflow/module/core/type/PortType.java b/src/main/java/com/loafle/overflow/module/core/type/PortType.java deleted file mode 100644 index 4965ba9..0000000 --- a/src/main/java/com/loafle/overflow/module/core/type/PortType.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.loafle.overflow.module.core.type; - -/** - * Created by snoop on 17. 6. 27. - */ -public enum PortType { - TCP("TCP"), - UDP("UDP"), - TLS("TLS"); - - private String stringValue; - PortType(String string) {stringValue = string;} - - @Override - public String toString() { - return stringValue; - } -} \ No newline at end of file diff --git a/src/main/java/com/loafle/overflow/module/domain/service/DomainService.java b/src/main/java/com/loafle/overflow/module/domain/service/DomainService.java deleted file mode 100644 index d8d4f17..0000000 --- a/src/main/java/com/loafle/overflow/module/domain/service/DomainService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.loafle.overflow.module.domain.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.domain.model.Domain; - -/** - * Created by snoop on 17. 6. 28. - */ -public interface DomainService { - @WebappAPI - void regist(Domain domain) throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaCrawlerInputItemService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaCrawlerInputItemService.java deleted file mode 100644 index eec1fcd..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaCrawlerInputItemService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaCrawler; -import com.loafle.overflow.module.meta.model.MetaCrawlerInputItem; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -public interface MetaCrawlerInputItemService { - - @WebappAPI - List readAllByMetaCrawler(MetaCrawler metaCrawler) throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaCrawlerService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaCrawlerService.java deleted file mode 100644 index e3f8852..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaCrawlerService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaCrawler; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -public interface MetaCrawlerService { - - @WebappAPI - List readAll() throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaInfraTypeService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaInfraTypeService.java deleted file mode 100644 index dd2dc90..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaInfraTypeService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaInfraType; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -public interface MetaInfraTypeService { - - @WebappAPI - List readAll() throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaInfraVendorService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaInfraVendorService.java deleted file mode 100644 index 6d3dfed..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaInfraVendorService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaInfraType; -import com.loafle.overflow.module.meta.model.MetaInfraVendor; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -public interface MetaInfraVendorService { - @WebappAPI - List readAllByMetaInfraType(MetaInfraType infraType) throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaInputTypeService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaInputTypeService.java deleted file mode 100644 index 4dc4204..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaInputTypeService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaInputType; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -public interface MetaInputTypeService { - @WebappAPI - List readAll() throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaMemberStatusService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaMemberStatusService.java deleted file mode 100644 index 38b6405..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaMemberStatusService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaMemberStatus; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -public interface MetaMemberStatusService { - @WebappAPI - List readAll() throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaNoAuthProbeStatusService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaNoAuthProbeStatusService.java deleted file mode 100644 index 163ce7d..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaNoAuthProbeStatusService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaNoAuthProbeStatus; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -public interface MetaNoAuthProbeStatusService { - @WebappAPI - List readAll() throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaProbeArchitectureService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaProbeArchitectureService.java deleted file mode 100644 index 495e754..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaProbeArchitectureService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaProbeArchitecture; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -public interface MetaProbeArchitectureService { - @WebappAPI - List readAll() throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaProbeOsService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaProbeOsService.java deleted file mode 100644 index ed793a2..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaProbeOsService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaProbeOs; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -public interface MetaProbeOsService { - @WebappAPI - List readAll() throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaProbePackageService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaProbePackageService.java deleted file mode 100644 index f0b8edd..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaProbePackageService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaProbeOs; -import com.loafle.overflow.module.meta.model.MetaProbePackage; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -public interface MetaProbePackageService { - @WebappAPI - List readAllByOs(MetaProbeOs metaProbeOs) throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaProbeStatusService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaProbeStatusService.java deleted file mode 100644 index 6d39502..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaProbeStatusService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaProbeStatus; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -public interface MetaProbeStatusService { - @WebappAPI - List readAll() throws OverflowException; - -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaProbeTaskTypeService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaProbeTaskTypeService.java deleted file mode 100644 index dcaa12e..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaProbeTaskTypeService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaProbeTaskType; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -public interface MetaProbeTaskTypeService { - @WebappAPI - List readAll() throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaProbeVersionService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaProbeVersionService.java deleted file mode 100644 index 0cf7d08..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaProbeVersionService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaProbeVersion; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -public interface MetaProbeVersionService { - @WebappAPI - List readAll() throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorDisplayMappingService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorDisplayMappingService.java deleted file mode 100644 index 6394a41..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorDisplayMappingService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaSensorDisplayItem; -import com.loafle.overflow.module.meta.model.MetaSensorDisplayMapping; -import com.loafle.overflow.module.meta.model.MetaSensorItemKey; - -import java.util.List; - -/** - * Created by snoop on 18. 4. 24. - */ -public interface MetaSensorDisplayMappingService { - @WebappAPI - MetaSensorDisplayMapping regist(MetaSensorDisplayMapping m) throws OverflowException; - - @WebappAPI - List findAllByDisplayItem(MetaSensorDisplayItem displayItem) throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorItemService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorItemService.java deleted file mode 100644 index 3ac0f2c..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorItemService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaSensorItem; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -public interface MetaSensorItemService { - - @WebappAPI - List readAll() throws OverflowException; - -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorItemUnitService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorItemUnitService.java deleted file mode 100644 index 4bf36ad..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorItemUnitService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaSensorItemUnit; - -/** - * Created by insanity on 17. 9. 20. - */ -public interface MetaSensorItemUnitService { - - @WebappAPI - MetaSensorItemUnit regist(MetaSensorItemUnit sensorItemUnit) throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorStatusService.java b/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorStatusService.java deleted file mode 100644 index fe8e14f..0000000 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorStatusService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.loafle.overflow.module.meta.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaSensorStatus; - -import java.util.List; - -/** - * Created by snoop on 17. 7. 27. - */ -public interface MetaSensorStatusService { - - @WebappAPI - List readAll() throws OverflowException; - -} diff --git a/src/main/java/com/loafle/overflow/module/probe/service/ProbeHostService.java b/src/main/java/com/loafle/overflow/module/probe/service/ProbeHostService.java deleted file mode 100644 index 4e985d5..0000000 --- a/src/main/java/com/loafle/overflow/module/probe/service/ProbeHostService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.loafle.overflow.module.probe.service; - -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.probe.model.Probe; -import com.loafle.overflow.module.probe.model.ProbeHost; - -/** - * Created by snoop on 17. 8. 21. - */ -public interface ProbeHostService { - //???? - ProbeHost readByProbe(Probe probe) throws OverflowException; - ProbeHost regist(ProbeHost probeHost) throws OverflowException; - -} diff --git a/src/main/java/com/loafle/overflow/module/probe/service/ProbeTaskService.java b/src/main/java/com/loafle/overflow/module/probe/service/ProbeTaskService.java deleted file mode 100644 index 4ae4487..0000000 --- a/src/main/java/com/loafle/overflow/module/probe/service/ProbeTaskService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.loafle.overflow.module.probe.service; - -import com.loafle.overflow.module.core.annotation.ProbeAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.probe.model.Probe; -import com.loafle.overflow.module.probe.model.ProbeTask; - -import java.util.List; - -/** - * Created by snoop on 17. 6. 28. - */ -public interface ProbeTaskService { - @ProbeAPI - ProbeTask regist(ProbeTask probeTask) throws OverflowException; - @ProbeAPI - List readAllByProbe(Probe probe) throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/target/service/TargetDiscoveryService.java b/src/main/java/com/loafle/overflow/module/target/service/TargetDiscoveryService.java deleted file mode 100644 index 607e9e9..0000000 --- a/src/main/java/com/loafle/overflow/module/target/service/TargetDiscoveryService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.loafle.overflow.module.target.service; - -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.discovery.model.Host; -import com.loafle.overflow.module.probe.model.Probe; -import com.loafle.overflow.module.target.model.Target; - -import java.util.List; - -/** - * Created by snoop on 17. 6. 28. - */ -public interface TargetDiscoveryService { - - @WebappAPI - boolean saveAllTarget(List hosts, Probe probe) throws OverflowException; -} diff --git a/src/main/java/com/loafle/overflow/module/apikey/service/ApiKeyService.java b/src/main/java/com/loafle/overflow/service/central/apikey/ApiKeyService.java similarity index 59% rename from src/main/java/com/loafle/overflow/module/apikey/service/ApiKeyService.java rename to src/main/java/com/loafle/overflow/service/central/apikey/ApiKeyService.java index 152f591..cb7c99d 100644 --- a/src/main/java/com/loafle/overflow/module/apikey/service/ApiKeyService.java +++ b/src/main/java/com/loafle/overflow/service/central/apikey/ApiKeyService.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.apikey.service; +package com.loafle.overflow.service.central.apikey; /** * Created by geek on 17. 11. 7. diff --git a/src/main/java/com/loafle/overflow/module/auth/service/AuthCrawlerService.java b/src/main/java/com/loafle/overflow/service/central/auth/AuthCrawlerService.java similarity index 53% rename from src/main/java/com/loafle/overflow/module/auth/service/AuthCrawlerService.java rename to src/main/java/com/loafle/overflow/service/central/auth/AuthCrawlerService.java index 58b0e47..e3e6db7 100644 --- a/src/main/java/com/loafle/overflow/module/auth/service/AuthCrawlerService.java +++ b/src/main/java/com/loafle/overflow/service/central/auth/AuthCrawlerService.java @@ -1,10 +1,10 @@ -package com.loafle.overflow.module.auth.service; +package com.loafle.overflow.service.central.auth; -import com.loafle.overflow.module.auth.model.AuthCrawler; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaCrawler; -import com.loafle.overflow.module.target.model.Target; +import com.loafle.overflow.model.auth.AuthCrawler; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaCrawler; +import com.loafle.overflow.model.target.Target; /** * Created by geek on 17. 11. 7. diff --git a/src/main/java/com/loafle/overflow/module/discovery/service/DiscoveryService.java b/src/main/java/com/loafle/overflow/service/central/discovery/DiscoveryService.java similarity index 61% rename from src/main/java/com/loafle/overflow/module/discovery/service/DiscoveryService.java rename to src/main/java/com/loafle/overflow/service/central/discovery/DiscoveryService.java index 06f6a21..9a88d27 100644 --- a/src/main/java/com/loafle/overflow/module/discovery/service/DiscoveryService.java +++ b/src/main/java/com/loafle/overflow/service/central/discovery/DiscoveryService.java @@ -1,18 +1,18 @@ -package com.loafle.overflow.module.discovery.service; +package com.loafle.overflow.service.central.discovery; import java.util.Date; -import com.loafle.overflow.module.core.annotation.ProbeAPI; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.discovery.model.DiscoverHost; -import com.loafle.overflow.module.discovery.model.DiscoverPort; -import com.loafle.overflow.module.discovery.model.DiscoverService; -import com.loafle.overflow.module.discovery.model.DiscoverZone; -import com.loafle.overflow.module.discovery.model.Host; -import com.loafle.overflow.module.discovery.model.Port; -import com.loafle.overflow.module.discovery.model.Service; -import com.loafle.overflow.module.discovery.model.Zone; +import com.loafle.overflow.core.annotation.ProbeAPI; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.discovery.DiscoverHost; +import com.loafle.overflow.model.discovery.DiscoverPort; +import com.loafle.overflow.model.discovery.DiscoverService; +import com.loafle.overflow.model.discovery.DiscoverZone; +import com.loafle.overflow.model.discovery.Host; +import com.loafle.overflow.model.discovery.Port; +import com.loafle.overflow.model.discovery.Service; +import com.loafle.overflow.model.discovery.Zone; /** * Created by snoop on 17. 9. 28. diff --git a/src/main/java/com/loafle/overflow/module/domain/service/DomainMemberService.java b/src/main/java/com/loafle/overflow/service/central/domain/DomainMemberService.java similarity index 60% rename from src/main/java/com/loafle/overflow/module/domain/service/DomainMemberService.java rename to src/main/java/com/loafle/overflow/service/central/domain/DomainMemberService.java index 792b0ca..78cc530 100644 --- a/src/main/java/com/loafle/overflow/module/domain/service/DomainMemberService.java +++ b/src/main/java/com/loafle/overflow/service/central/domain/DomainMemberService.java @@ -1,12 +1,12 @@ -package com.loafle.overflow.module.domain.service; +package com.loafle.overflow.service.central.domain; import java.util.List; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.domain.model.Domain; -import com.loafle.overflow.module.domain.model.DomainMember; -import com.loafle.overflow.module.member.model.Member; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.domain.Domain; +import com.loafle.overflow.model.domain.DomainMember; +import com.loafle.overflow.model.member.Member; /** * Created by snoop on 17. 6. 28. diff --git a/src/main/java/com/loafle/overflow/service/central/domain/DomainService.java b/src/main/java/com/loafle/overflow/service/central/domain/DomainService.java new file mode 100644 index 0000000..609d7d3 --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/domain/DomainService.java @@ -0,0 +1,13 @@ +package com.loafle.overflow.service.central.domain; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.domain.Domain; + +/** + * Created by snoop on 17. 6. 28. + */ +public interface DomainService { + @WebappAPI + void regist(Domain domain) throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/module/history/service/HistoryService.java b/src/main/java/com/loafle/overflow/service/central/history/HistoryService.java similarity index 57% rename from src/main/java/com/loafle/overflow/module/history/service/HistoryService.java rename to src/main/java/com/loafle/overflow/service/central/history/HistoryService.java index adc31dd..92bc5f8 100644 --- a/src/main/java/com/loafle/overflow/module/history/service/HistoryService.java +++ b/src/main/java/com/loafle/overflow/service/central/history/HistoryService.java @@ -1,12 +1,12 @@ -package com.loafle.overflow.module.history.service; +package com.loafle.overflow.service.central.history; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.model.PageParams; -import com.loafle.overflow.module.domain.model.Domain; -import com.loafle.overflow.module.history.model.History; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.model.PageParams; +import com.loafle.overflow.model.domain.Domain; +import com.loafle.overflow.model.history.History; -import com.loafle.overflow.module.meta.model.MetaHistoryType; -import com.loafle.overflow.module.probe.model.Probe; +import com.loafle.overflow.model.meta.MetaHistoryType; +import com.loafle.overflow.model.probe.Probe; import org.springframework.data.domain.Page; public interface HistoryService { diff --git a/src/main/java/com/loafle/overflow/module/infra/service/InfraHostService.java b/src/main/java/com/loafle/overflow/service/central/infra/InfraHostService.java similarity index 59% rename from src/main/java/com/loafle/overflow/module/infra/service/InfraHostService.java rename to src/main/java/com/loafle/overflow/service/central/infra/InfraHostService.java index 7ba31a0..35111a8 100644 --- a/src/main/java/com/loafle/overflow/module/infra/service/InfraHostService.java +++ b/src/main/java/com/loafle/overflow/service/central/infra/InfraHostService.java @@ -1,7 +1,7 @@ -package com.loafle.overflow.module.infra.service; +package com.loafle.overflow.service.central.infra; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.infra.model.InfraHost; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.infra.InfraHost; /** * Created by insanity on 17. 6. 28. diff --git a/src/main/java/com/loafle/overflow/module/infra/service/InfraMachineService.java b/src/main/java/com/loafle/overflow/service/central/infra/InfraMachineService.java similarity index 52% rename from src/main/java/com/loafle/overflow/module/infra/service/InfraMachineService.java rename to src/main/java/com/loafle/overflow/service/central/infra/InfraMachineService.java index 14c5069..b4666c3 100644 --- a/src/main/java/com/loafle/overflow/module/infra/service/InfraMachineService.java +++ b/src/main/java/com/loafle/overflow/service/central/infra/InfraMachineService.java @@ -1,7 +1,7 @@ -package com.loafle.overflow.module.infra.service; +package com.loafle.overflow.service.central.infra; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.infra.model.InfraMachine; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.infra.InfraMachine; /** * Created by insanity on 17. 6. 28. diff --git a/src/main/java/com/loafle/overflow/module/infra/service/InfraOSApplicationService.java b/src/main/java/com/loafle/overflow/service/central/infra/InfraOSApplicationService.java similarity index 57% rename from src/main/java/com/loafle/overflow/module/infra/service/InfraOSApplicationService.java rename to src/main/java/com/loafle/overflow/service/central/infra/InfraOSApplicationService.java index 8c85da9..0133222 100644 --- a/src/main/java/com/loafle/overflow/module/infra/service/InfraOSApplicationService.java +++ b/src/main/java/com/loafle/overflow/service/central/infra/InfraOSApplicationService.java @@ -1,7 +1,7 @@ -package com.loafle.overflow.module.infra.service; +package com.loafle.overflow.service.central.infra; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.infra.model.InfraOSApplication; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.infra.InfraOSApplication; /** * Created by insanity on 17. 6. 28. diff --git a/src/main/java/com/loafle/overflow/module/infra/service/InfraOSDaemonService.java b/src/main/java/com/loafle/overflow/service/central/infra/InfraOSDaemonService.java similarity index 55% rename from src/main/java/com/loafle/overflow/module/infra/service/InfraOSDaemonService.java rename to src/main/java/com/loafle/overflow/service/central/infra/InfraOSDaemonService.java index cd0f06b..bf3277b 100644 --- a/src/main/java/com/loafle/overflow/module/infra/service/InfraOSDaemonService.java +++ b/src/main/java/com/loafle/overflow/service/central/infra/InfraOSDaemonService.java @@ -1,7 +1,7 @@ -package com.loafle.overflow.module.infra.service; +package com.loafle.overflow.service.central.infra; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.infra.model.InfraOSDaemon; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.infra.InfraOSDaemon; /** * Created by insanity on 17. 6. 28. diff --git a/src/main/java/com/loafle/overflow/module/infra/service/InfraOSPortService.java b/src/main/java/com/loafle/overflow/service/central/infra/InfraOSPortService.java similarity index 63% rename from src/main/java/com/loafle/overflow/module/infra/service/InfraOSPortService.java rename to src/main/java/com/loafle/overflow/service/central/infra/InfraOSPortService.java index 969ed62..6372783 100644 --- a/src/main/java/com/loafle/overflow/module/infra/service/InfraOSPortService.java +++ b/src/main/java/com/loafle/overflow/service/central/infra/InfraOSPortService.java @@ -1,7 +1,7 @@ -package com.loafle.overflow.module.infra.service; +package com.loafle.overflow.service.central.infra; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.infra.model.InfraOSPort; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.infra.InfraOSPort; /** * Created by insanity on 17. 6. 28. diff --git a/src/main/java/com/loafle/overflow/module/infra/service/InfraOSService.java b/src/main/java/com/loafle/overflow/service/central/infra/InfraOSService.java similarity index 52% rename from src/main/java/com/loafle/overflow/module/infra/service/InfraOSService.java rename to src/main/java/com/loafle/overflow/service/central/infra/InfraOSService.java index b3cac1b..b697310 100644 --- a/src/main/java/com/loafle/overflow/module/infra/service/InfraOSService.java +++ b/src/main/java/com/loafle/overflow/service/central/infra/InfraOSService.java @@ -1,7 +1,7 @@ -package com.loafle.overflow.module.infra.service; +package com.loafle.overflow.service.central.infra; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.infra.model.InfraOS; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.infra.InfraOS; /** * Created by insanity on 17. 6. 28. diff --git a/src/main/java/com/loafle/overflow/module/infra/service/InfraService.java b/src/main/java/com/loafle/overflow/service/central/infra/InfraService.java similarity index 60% rename from src/main/java/com/loafle/overflow/module/infra/service/InfraService.java rename to src/main/java/com/loafle/overflow/service/central/infra/InfraService.java index 4ec817a..35a7619 100644 --- a/src/main/java/com/loafle/overflow/module/infra/service/InfraService.java +++ b/src/main/java/com/loafle/overflow/service/central/infra/InfraService.java @@ -1,12 +1,4 @@ -package com.loafle.overflow.module.infra.service; - -import java.util.List; - -import com.loafle.overflow.module.core.model.PageParams; -import com.loafle.overflow.module.domain.model.Domain; -import com.loafle.overflow.module.infra.model.Infra; - -import org.springframework.data.domain.Page; +package com.loafle.overflow.service.central.infra; /** * Created by insanity on 17. 6. 28. diff --git a/src/main/java/com/loafle/overflow/module/infra/service/InfraServiceService.java b/src/main/java/com/loafle/overflow/service/central/infra/InfraServiceService.java similarity index 63% rename from src/main/java/com/loafle/overflow/module/infra/service/InfraServiceService.java rename to src/main/java/com/loafle/overflow/service/central/infra/InfraServiceService.java index e946a13..eb54e5f 100644 --- a/src/main/java/com/loafle/overflow/module/infra/service/InfraServiceService.java +++ b/src/main/java/com/loafle/overflow/service/central/infra/InfraServiceService.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.infra.service; +package com.loafle.overflow.service.central.infra; /** * Created by insanity on 17. 6. 28. diff --git a/src/main/java/com/loafle/overflow/module/member/service/MemberService.java b/src/main/java/com/loafle/overflow/service/central/member/MemberService.java similarity index 76% rename from src/main/java/com/loafle/overflow/module/member/service/MemberService.java rename to src/main/java/com/loafle/overflow/service/central/member/MemberService.java index 004dc6e..1fbfecd 100644 --- a/src/main/java/com/loafle/overflow/module/member/service/MemberService.java +++ b/src/main/java/com/loafle/overflow/service/central/member/MemberService.java @@ -1,10 +1,10 @@ -package com.loafle.overflow.module.member.service; +package com.loafle.overflow.service.central.member; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.domain.model.Domain; -import com.loafle.overflow.module.domain.model.DomainMember; -import com.loafle.overflow.module.member.model.Member; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.domain.Domain; +import com.loafle.overflow.model.domain.DomainMember; +import com.loafle.overflow.model.member.Member; import java.util.List; diff --git a/src/main/java/com/loafle/overflow/module/member/service/MemberTotpService.java b/src/main/java/com/loafle/overflow/service/central/member/MemberTotpService.java similarity index 70% rename from src/main/java/com/loafle/overflow/module/member/service/MemberTotpService.java rename to src/main/java/com/loafle/overflow/service/central/member/MemberTotpService.java index a7e4418..c990784 100644 --- a/src/main/java/com/loafle/overflow/module/member/service/MemberTotpService.java +++ b/src/main/java/com/loafle/overflow/service/central/member/MemberTotpService.java @@ -1,9 +1,9 @@ -package com.loafle.overflow.module.member.service; +package com.loafle.overflow.service.central.member; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.member.model.Member; -import com.loafle.overflow.module.member.model.MemberTotp; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.member.Member; +import com.loafle.overflow.model.member.MemberTotp; import java.util.Map; /** diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaCrawlerInputItemService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaCrawlerInputItemService.java new file mode 100644 index 0000000..5a8b76e --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaCrawlerInputItemService.java @@ -0,0 +1,17 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaCrawler; +import com.loafle.overflow.model.meta.MetaCrawlerInputItem; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +public interface MetaCrawlerInputItemService { + + @WebappAPI + List readAllByMetaCrawler(MetaCrawler metaCrawler) throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaCrawlerService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaCrawlerService.java new file mode 100644 index 0000000..ff1be50 --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaCrawlerService.java @@ -0,0 +1,16 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaCrawler; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +public interface MetaCrawlerService { + + @WebappAPI + List readAll() throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaHistoryTypeService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaHistoryTypeService.java similarity index 61% rename from src/main/java/com/loafle/overflow/module/meta/service/MetaHistoryTypeService.java rename to src/main/java/com/loafle/overflow/service/central/meta/MetaHistoryTypeService.java index 536953e..6c9d8c7 100644 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaHistoryTypeService.java +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaHistoryTypeService.java @@ -1,9 +1,9 @@ -package com.loafle.overflow.module.meta.service; +package com.loafle.overflow.service.central.meta; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaHistoryType; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaHistoryType; import java.util.List; diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaInfraTypeService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaInfraTypeService.java new file mode 100644 index 0000000..e17372b --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaInfraTypeService.java @@ -0,0 +1,16 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaInfraType; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +public interface MetaInfraTypeService { + + @WebappAPI + List readAll() throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaInfraVendorService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaInfraVendorService.java new file mode 100644 index 0000000..f723d1c --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaInfraVendorService.java @@ -0,0 +1,16 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaInfraType; +import com.loafle.overflow.model.meta.MetaInfraVendor; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +public interface MetaInfraVendorService { + @WebappAPI + List readAllByMetaInfraType(MetaInfraType infraType) throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaInputTypeService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaInputTypeService.java new file mode 100644 index 0000000..9e4e3a9 --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaInputTypeService.java @@ -0,0 +1,15 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaInputType; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +public interface MetaInputTypeService { + @WebappAPI + List readAll() throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaMemberStatusService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaMemberStatusService.java new file mode 100644 index 0000000..b6a03cf --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaMemberStatusService.java @@ -0,0 +1,15 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaMemberStatus; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +public interface MetaMemberStatusService { + @WebappAPI + List readAll() throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaNoAuthProbeStatusService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaNoAuthProbeStatusService.java new file mode 100644 index 0000000..94bb70d --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaNoAuthProbeStatusService.java @@ -0,0 +1,15 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaNoAuthProbeStatus; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +public interface MetaNoAuthProbeStatusService { + @WebappAPI + List readAll() throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaProbeArchitectureService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaProbeArchitectureService.java new file mode 100644 index 0000000..99578b3 --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaProbeArchitectureService.java @@ -0,0 +1,15 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaProbeArchitecture; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +public interface MetaProbeArchitectureService { + @WebappAPI + List readAll() throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaProbeOsService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaProbeOsService.java new file mode 100644 index 0000000..b12d7fa --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaProbeOsService.java @@ -0,0 +1,15 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaProbeOs; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +public interface MetaProbeOsService { + @WebappAPI + List readAll() throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaProbePackageService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaProbePackageService.java new file mode 100644 index 0000000..5a13f31 --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaProbePackageService.java @@ -0,0 +1,16 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaProbeOs; +import com.loafle.overflow.model.meta.MetaProbePackage; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +public interface MetaProbePackageService { + @WebappAPI + List readAllByOs(MetaProbeOs metaProbeOs) throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaProbeStatusService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaProbeStatusService.java new file mode 100644 index 0000000..1c52ec8 --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaProbeStatusService.java @@ -0,0 +1,16 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaProbeStatus; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +public interface MetaProbeStatusService { + @WebappAPI + List readAll() throws OverflowException; + +} diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaProbeTaskTypeService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaProbeTaskTypeService.java new file mode 100644 index 0000000..c7e1097 --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaProbeTaskTypeService.java @@ -0,0 +1,15 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaProbeTaskType; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +public interface MetaProbeTaskTypeService { + @WebappAPI + List readAll() throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaProbeVersionService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaProbeVersionService.java new file mode 100644 index 0000000..e6e4ea9 --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaProbeVersionService.java @@ -0,0 +1,15 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaProbeVersion; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +public interface MetaProbeVersionService { + @WebappAPI + List readAll() throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorDisplayItemService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorDisplayItemService.java similarity index 57% rename from src/main/java/com/loafle/overflow/module/meta/service/MetaSensorDisplayItemService.java rename to src/main/java/com/loafle/overflow/service/central/meta/MetaSensorDisplayItemService.java index 6b5c4b8..5aff0ab 100644 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorDisplayItemService.java +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorDisplayItemService.java @@ -1,9 +1,9 @@ -package com.loafle.overflow.module.meta.service; +package com.loafle.overflow.service.central.meta; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaCrawler; -import com.loafle.overflow.module.meta.model.MetaSensorDisplayItem; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaCrawler; +import com.loafle.overflow.model.meta.MetaSensorDisplayItem; import java.util.List; diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorDisplayMappingService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorDisplayMappingService.java new file mode 100644 index 0000000..9c3e823 --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorDisplayMappingService.java @@ -0,0 +1,20 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaSensorDisplayItem; +import com.loafle.overflow.model.meta.MetaSensorDisplayMapping; +import com.loafle.overflow.model.meta.MetaSensorItemKey; + +import java.util.List; + +/** + * Created by snoop on 18. 4. 24. + */ +public interface MetaSensorDisplayMappingService { + @WebappAPI + MetaSensorDisplayMapping regist(MetaSensorDisplayMapping m) throws OverflowException; + + @WebappAPI + List findAllByDisplayItem(MetaSensorDisplayItem displayItem) throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorItemKeyService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorItemKeyService.java similarity index 55% rename from src/main/java/com/loafle/overflow/module/meta/service/MetaSensorItemKeyService.java rename to src/main/java/com/loafle/overflow/service/central/meta/MetaSensorItemKeyService.java index 25095cf..9129c13 100644 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorItemKeyService.java +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorItemKeyService.java @@ -1,9 +1,9 @@ -package com.loafle.overflow.module.meta.service; +package com.loafle.overflow.service.central.meta; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaCrawler; -import com.loafle.overflow.module.meta.model.MetaSensorItemKey; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaCrawler; +import com.loafle.overflow.model.meta.MetaSensorItemKey; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorItemService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorItemService.java new file mode 100644 index 0000000..349aaab --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorItemService.java @@ -0,0 +1,17 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaSensorItem; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +public interface MetaSensorItemService { + + @WebappAPI + List readAll() throws OverflowException; + +} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorItemTypeService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorItemTypeService.java similarity index 62% rename from src/main/java/com/loafle/overflow/module/meta/service/MetaSensorItemTypeService.java rename to src/main/java/com/loafle/overflow/service/central/meta/MetaSensorItemTypeService.java index 734e3be..0c19ba5 100644 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaSensorItemTypeService.java +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorItemTypeService.java @@ -1,8 +1,8 @@ -package com.loafle.overflow.module.meta.service; +package com.loafle.overflow.service.central.meta; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaSensorItemType; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaSensorItemType; import java.util.List; diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorItemUnitService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorItemUnitService.java new file mode 100644 index 0000000..7e1eda6 --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorItemUnitService.java @@ -0,0 +1,14 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaSensorItemUnit; + +/** + * Created by insanity on 17. 9. 20. + */ +public interface MetaSensorItemUnitService { + + @WebappAPI + MetaSensorItemUnit regist(MetaSensorItemUnit sensorItemUnit) throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorStatusService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorStatusService.java new file mode 100644 index 0000000..d767006 --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaSensorStatusService.java @@ -0,0 +1,17 @@ +package com.loafle.overflow.service.central.meta; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaSensorStatus; + +import java.util.List; + +/** + * Created by snoop on 17. 7. 27. + */ +public interface MetaSensorStatusService { + + @WebappAPI + List readAll() throws OverflowException; + +} diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaVendorCrawlerSensorItemService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaVendorCrawlerSensorItemService.java similarity index 66% rename from src/main/java/com/loafle/overflow/module/meta/service/MetaVendorCrawlerSensorItemService.java rename to src/main/java/com/loafle/overflow/service/central/meta/MetaVendorCrawlerSensorItemService.java index 4041324..3d21a04 100644 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaVendorCrawlerSensorItemService.java +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaVendorCrawlerSensorItemService.java @@ -1,4 +1,4 @@ -package com.loafle.overflow.module.meta.service; +package com.loafle.overflow.service.central.meta; /** * Created by snoop on 17. 7. 27. diff --git a/src/main/java/com/loafle/overflow/module/meta/service/MetaVendorCrawlerService.java b/src/main/java/com/loafle/overflow/service/central/meta/MetaVendorCrawlerService.java similarity index 52% rename from src/main/java/com/loafle/overflow/module/meta/service/MetaVendorCrawlerService.java rename to src/main/java/com/loafle/overflow/service/central/meta/MetaVendorCrawlerService.java index ae9e058..a6b8e15 100644 --- a/src/main/java/com/loafle/overflow/module/meta/service/MetaVendorCrawlerService.java +++ b/src/main/java/com/loafle/overflow/service/central/meta/MetaVendorCrawlerService.java @@ -1,9 +1,9 @@ -package com.loafle.overflow.module.meta.service; +package com.loafle.overflow.service.central.meta; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaInfraVendor; -import com.loafle.overflow.module.meta.model.MetaVendorCrawler; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaInfraVendor; +import com.loafle.overflow.model.meta.MetaVendorCrawler; import java.util.List; diff --git a/src/main/java/com/loafle/overflow/module/noauthprobe/service/NoAuthProbeService.java b/src/main/java/com/loafle/overflow/service/central/noauthprobe/NoAuthProbeService.java similarity index 57% rename from src/main/java/com/loafle/overflow/module/noauthprobe/service/NoAuthProbeService.java rename to src/main/java/com/loafle/overflow/service/central/noauthprobe/NoAuthProbeService.java index a2d3e27..16f92c8 100644 --- a/src/main/java/com/loafle/overflow/module/noauthprobe/service/NoAuthProbeService.java +++ b/src/main/java/com/loafle/overflow/service/central/noauthprobe/NoAuthProbeService.java @@ -1,10 +1,10 @@ -package com.loafle.overflow.module.noauthprobe.service; +package com.loafle.overflow.service.central.noauthprobe; -import com.loafle.overflow.module.core.annotation.ProbeAPI; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.domain.model.Domain; -import com.loafle.overflow.module.noauthprobe.model.NoAuthProbe; +import com.loafle.overflow.core.annotation.ProbeAPI; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.domain.Domain; +import com.loafle.overflow.model.noauthprobe.NoAuthProbe; import java.util.List; diff --git a/src/main/java/com/loafle/overflow/module/notification/service/NotificationService.java b/src/main/java/com/loafle/overflow/service/central/notification/NotificationService.java similarity index 70% rename from src/main/java/com/loafle/overflow/module/notification/service/NotificationService.java rename to src/main/java/com/loafle/overflow/service/central/notification/NotificationService.java index 6d85c12..9956467 100644 --- a/src/main/java/com/loafle/overflow/module/notification/service/NotificationService.java +++ b/src/main/java/com/loafle/overflow/service/central/notification/NotificationService.java @@ -1,10 +1,10 @@ -package com.loafle.overflow.module.notification.service; +package com.loafle.overflow.service.central.notification; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.core.model.PageParams; -import com.loafle.overflow.module.member.model.Member; -import com.loafle.overflow.module.notification.model.Notification; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.core.model.PageParams; +import com.loafle.overflow.model.member.Member; +import com.loafle.overflow.model.notification.Notification; import org.springframework.data.domain.Page; /** * Created by insanity on 17. 8. 25. diff --git a/src/main/java/com/loafle/overflow/service/central/probe/ProbeHostService.java b/src/main/java/com/loafle/overflow/service/central/probe/ProbeHostService.java new file mode 100644 index 0000000..2ad0e85 --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/probe/ProbeHostService.java @@ -0,0 +1,15 @@ +package com.loafle.overflow.service.central.probe; + +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.probe.Probe; +import com.loafle.overflow.model.probe.ProbeHost; + +/** + * Created by snoop on 17. 8. 21. + */ +public interface ProbeHostService { + //???? + ProbeHost readByProbe(Probe probe) throws OverflowException; + ProbeHost regist(ProbeHost probeHost) throws OverflowException; + +} diff --git a/src/main/java/com/loafle/overflow/module/probe/service/ProbeService.java b/src/main/java/com/loafle/overflow/service/central/probe/ProbeService.java similarity index 64% rename from src/main/java/com/loafle/overflow/module/probe/service/ProbeService.java rename to src/main/java/com/loafle/overflow/service/central/probe/ProbeService.java index 64574f3..3116f89 100644 --- a/src/main/java/com/loafle/overflow/module/probe/service/ProbeService.java +++ b/src/main/java/com/loafle/overflow/service/central/probe/ProbeService.java @@ -1,10 +1,10 @@ -package com.loafle.overflow.module.probe.service; +package com.loafle.overflow.service.central.probe; -import com.loafle.overflow.module.core.annotation.ProbeAPI; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.domain.model.Domain; -import com.loafle.overflow.module.probe.model.Probe; +import com.loafle.overflow.core.annotation.ProbeAPI; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.domain.Domain; +import com.loafle.overflow.model.probe.Probe; import java.util.List; diff --git a/src/main/java/com/loafle/overflow/service/central/probe/ProbeTaskService.java b/src/main/java/com/loafle/overflow/service/central/probe/ProbeTaskService.java new file mode 100644 index 0000000..d234b4f --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/probe/ProbeTaskService.java @@ -0,0 +1,18 @@ +package com.loafle.overflow.service.central.probe; + +import com.loafle.overflow.core.annotation.ProbeAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.probe.Probe; +import com.loafle.overflow.model.probe.ProbeTask; + +import java.util.List; + +/** + * Created by snoop on 17. 6. 28. + */ +public interface ProbeTaskService { + @ProbeAPI + ProbeTask regist(ProbeTask probeTask) throws OverflowException; + @ProbeAPI + List readAllByProbe(Probe probe) throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/module/sensor/service/SensorItemDependencyService.java b/src/main/java/com/loafle/overflow/service/central/sensor/SensorItemDependencyService.java similarity index 57% rename from src/main/java/com/loafle/overflow/module/sensor/service/SensorItemDependencyService.java rename to src/main/java/com/loafle/overflow/service/central/sensor/SensorItemDependencyService.java index 0bd615c..0724b19 100644 --- a/src/main/java/com/loafle/overflow/module/sensor/service/SensorItemDependencyService.java +++ b/src/main/java/com/loafle/overflow/service/central/sensor/SensorItemDependencyService.java @@ -1,10 +1,10 @@ -package com.loafle.overflow.module.sensor.service; +package com.loafle.overflow.service.central.sensor; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.meta.model.MetaSensorDisplayItem; -import com.loafle.overflow.module.meta.model.MetaSensorItemKey; -import com.loafle.overflow.module.sensor.model.SensorItemDependency; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.meta.MetaSensorDisplayItem; +import com.loafle.overflow.model.meta.MetaSensorItemKey; +import com.loafle.overflow.model.sensor.SensorItemDependency; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/loafle/overflow/module/sensor/service/SensorItemService.java b/src/main/java/com/loafle/overflow/service/central/sensor/SensorItemService.java similarity index 63% rename from src/main/java/com/loafle/overflow/module/sensor/service/SensorItemService.java rename to src/main/java/com/loafle/overflow/service/central/sensor/SensorItemService.java index bf7fc4f..12bb86a 100644 --- a/src/main/java/com/loafle/overflow/module/sensor/service/SensorItemService.java +++ b/src/main/java/com/loafle/overflow/service/central/sensor/SensorItemService.java @@ -1,10 +1,10 @@ -package com.loafle.overflow.module.sensor.service; +package com.loafle.overflow.service.central.sensor; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.core.model.PageParams; -import com.loafle.overflow.module.sensor.model.Sensor; -import com.loafle.overflow.module.sensor.model.SensorItem; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.core.model.PageParams; +import com.loafle.overflow.model.sensor.Sensor; +import com.loafle.overflow.model.sensor.SensorItem; import org.springframework.data.domain.Page; import java.util.List; diff --git a/src/main/java/com/loafle/overflow/module/sensor/service/SensorService.java b/src/main/java/com/loafle/overflow/service/central/sensor/SensorService.java similarity index 69% rename from src/main/java/com/loafle/overflow/module/sensor/service/SensorService.java rename to src/main/java/com/loafle/overflow/service/central/sensor/SensorService.java index b70adb0..901763f 100644 --- a/src/main/java/com/loafle/overflow/module/sensor/service/SensorService.java +++ b/src/main/java/com/loafle/overflow/service/central/sensor/SensorService.java @@ -1,12 +1,12 @@ -package com.loafle.overflow.module.sensor.service; +package com.loafle.overflow.service.central.sensor; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.core.model.PageParams; -import com.loafle.overflow.module.domain.model.Domain; -import com.loafle.overflow.module.sensor.model.Sensor; -import com.loafle.overflow.module.sensor.model.SensorItem; -import com.loafle.overflow.module.target.model.Target; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.core.model.PageParams; +import com.loafle.overflow.model.domain.Domain; +import com.loafle.overflow.model.sensor.Sensor; +import com.loafle.overflow.model.sensor.SensorItem; +import com.loafle.overflow.model.target.Target; import org.springframework.data.domain.Page; import java.util.List; diff --git a/src/main/java/com/loafle/overflow/service/central/target/TargetDiscoveryService.java b/src/main/java/com/loafle/overflow/service/central/target/TargetDiscoveryService.java new file mode 100644 index 0000000..9038fa6 --- /dev/null +++ b/src/main/java/com/loafle/overflow/service/central/target/TargetDiscoveryService.java @@ -0,0 +1,17 @@ +package com.loafle.overflow.service.central.target; + +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.discovery.Host; +import com.loafle.overflow.model.probe.Probe; + +import java.util.List; + +/** + * Created by snoop on 17. 6. 28. + */ +public interface TargetDiscoveryService { + + @WebappAPI + boolean saveAllTarget(List hosts, Probe probe) throws OverflowException; +} diff --git a/src/main/java/com/loafle/overflow/module/target/service/TargetService.java b/src/main/java/com/loafle/overflow/service/central/target/TargetService.java similarity index 55% rename from src/main/java/com/loafle/overflow/module/target/service/TargetService.java rename to src/main/java/com/loafle/overflow/service/central/target/TargetService.java index 3aa063a..9412c8f 100644 --- a/src/main/java/com/loafle/overflow/module/target/service/TargetService.java +++ b/src/main/java/com/loafle/overflow/service/central/target/TargetService.java @@ -1,8 +1,8 @@ -package com.loafle.overflow.module.target.service; +package com.loafle.overflow.service.central.target; -import com.loafle.overflow.module.core.annotation.WebappAPI; -import com.loafle.overflow.module.core.exception.OverflowException; -import com.loafle.overflow.module.target.model.Target; +import com.loafle.overflow.core.annotation.WebappAPI; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.model.target.Target; /** * Created by insanity on 17. 6. 28.