From 847300b3b07199a13fb46dc8168cdd4c66c68a7c Mon Sep 17 00:00:00 2001 From: insanity Date: Mon, 11 Jun 2018 19:52:27 +0900 Subject: [PATCH] test --- pom.xml | 2 +- .../service/CentralNoAuthProbeService.java | 2 +- .../central/module/target/dao/TargetDAO.java | 5 - .../target/service/CentralTargetService.java | 138 ++---------------- 4 files changed, 14 insertions(+), 133 deletions(-) diff --git a/pom.xml b/pom.xml index 26d3670..1cae308 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ com.loafle.overflow commons-java - 1.0.30-SNAPSHOT + 1.0.33-SNAPSHOT diff --git a/src/main/java/com/loafle/overflow/central/module/noauthprobe/service/CentralNoAuthProbeService.java b/src/main/java/com/loafle/overflow/central/module/noauthprobe/service/CentralNoAuthProbeService.java index 746c984..06cbbc0 100644 --- a/src/main/java/com/loafle/overflow/central/module/noauthprobe/service/CentralNoAuthProbeService.java +++ b/src/main/java/com/loafle/overflow/central/module/noauthprobe/service/CentralNoAuthProbeService.java @@ -103,7 +103,7 @@ public class CentralNoAuthProbeService implements NoAuthProbeService { } Probe probe = this.newProbe(noAuthProbe, noAuthProbeDescription); - InfraHost host = this.infraService.regist(probe.getId(), noAuthProbeDescription); + InfraHost host = this.infraService.registByNoAuthProbe(probe.getId(), noAuthProbeDescription); this.newProbeHost(host, probe); noAuthProbe.setMetaNoAuthProbeStatus(new MetaNoAuthProbeStatus((short) 1)); diff --git a/src/main/java/com/loafle/overflow/central/module/target/dao/TargetDAO.java b/src/main/java/com/loafle/overflow/central/module/target/dao/TargetDAO.java index 261baab..c59dacc 100644 --- a/src/main/java/com/loafle/overflow/central/module/target/dao/TargetDAO.java +++ b/src/main/java/com/loafle/overflow/central/module/target/dao/TargetDAO.java @@ -12,10 +12,5 @@ import org.springframework.stereotype.Repository; @Repository public interface TargetDAO extends JpaRepository { Target findByInfraId(Long infraId); - - // @Query("select t.infra from target t where t.infra.probe.id = :probeId") - // Page findForProbeId(@Param("probeId") Long probeId, Pageable - // pageRequest); - Page findAllByInfraProbeId(Long probeId, Pageable pageRequest); } diff --git a/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java b/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java index 99b371a..b8f2fa3 100644 --- a/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java +++ b/src/main/java/com/loafle/overflow/central/module/target/service/CentralTargetService.java @@ -1,6 +1,5 @@ package com.loafle.overflow.central.module.target.service; -import java.util.ArrayList; import java.util.List; import com.loafle.overflow.central.commons.utils.PageUtil; @@ -8,15 +7,8 @@ import com.loafle.overflow.central.module.probe.service.CentralProbeService; import com.loafle.overflow.central.module.target.dao.TargetDAO; import com.loafle.overflow.core.exception.OverflowException; import com.loafle.overflow.core.model.PageParams; -import com.loafle.overflow.core.type.CryptoType; -import com.loafle.overflow.model.discovery.Host; -import com.loafle.overflow.model.discovery.Service; -import com.loafle.overflow.model.infra.Infra; -import com.loafle.overflow.model.infra.InfraHost; -import com.loafle.overflow.model.meta.MetaInfraType; import com.loafle.overflow.model.probe.Probe; import com.loafle.overflow.model.target.Target; -import com.loafle.overflow.service.central.infra.InfraService; import com.loafle.overflow.service.central.target.TargetService; import org.springframework.beans.factory.annotation.Autowired; @@ -33,12 +25,6 @@ public class CentralTargetService implements TargetService { private TargetDAO targetDAO; @Autowired private CentralProbeService probeService; - // @Autowired - // private CentralInfraHostService infraHostService; - // @Autowired - // private CentralInfraServiceService infraServiceService; - @Autowired - private InfraService infraService; @Transactional public Target regist(Target target, Long probeID) throws OverflowException { @@ -75,126 +61,26 @@ public class CentralTargetService implements TargetService { return this.targetDAO.save(t); } - public Target readExistHostTarget(Long probeId, String ip) throws OverflowException { - // InfraHost infraHost = this.infraHostService.readByProbeIdAndIpv4(probeId, - // ip); - // if (null == infraHost) - // return null; - // return this.targetDAO.findByInfraId(infraHost.getId()); - return null; - } - - public Target readExistServiceTarget(Long hostId, int portNumber, String portType) throws OverflowException { - // InfraService infraService = - // this.infraServiceService.readByInfraHostIDAndPortAndPortType(hostId, - // portNumber, - // portType); - // if (null == infraService) - // return null; - // return this.targetDAO.findByInfraId(infraService.getId()); - return null; - } - public Page readAllByProbeID(Long probeID, PageParams pageParams) throws OverflowException { return this.targetDAO.findAllByInfraProbeId(probeID, PageUtil.getPageRequest(pageParams)); } @Transactional - public List registDiscoveredTargets(Long probeID, List hosts, List services) - throws OverflowException { - List targets = new ArrayList(); - for (Host host : hosts) { - InfraHost infraHost = this.infraService.regist(probeID, host); - String displayName = (host.getIpv6() == null || host.getIpv6().trim().isEmpty()) ? host.getIpv6() - : host.getIpv4(); - Target target = new Target(); - target.setInfra(infraHost); - target.setSensorCount(0); - target.setName(displayName); - targets.add(target); - } - for (Service service : services) { - com.loafle.overflow.model.infra.InfraService infraService = this.infraService.regist(probeID, service); - Target target = new Target(); - target.setInfra(infraService); - target.setSensorCount(0); - target.setName(infraService.getMetaInfraType().getName()); - targets.add(target); + public List registAll(List targets, Long probeID) throws OverflowException { + List registered = this.targetDAO.saveAll(targets); + Probe probe = this.probeService.read(probeID); + if (null == probe) { + throw new OverflowException(String.format("ID[%d] of Probe is not valid", probeID)); } + Integer targetCount = probe.getTargetCount() + registered.size(); + probe.setTargetCount(targetCount); + this.probeService.modify(probe); - return this.targetDAO.saveAll(targets); + return registered; } - // private List registDiscoveredHostTargets(Long probeId, List - // hosts) throws OverflowException { - // List targets = new ArrayList<>(); - // if (null == hosts) - // return targets; - // for (Host host : hosts) { - // InfraHost infraHost = this.registInfraHostByDiscoveredHost(host, probeId); - // Target target = new Target(); - // target.setInfra(infraHost); - // String displayName = (host.getIpv6() == null || - // host.getIpv6().trim().isEmpty()) ? host.getIpv6() - // : host.getIpv4(); - // target.setDisplayName(displayName); - // targets.add(this.targetDAO.save(target)); - // } - // return targets; - // return null; - // } - - // private List registDiscoveredServiceTargets(Long probeId, - // List services) throws OverflowException { - // List targets = new ArrayList<>(); - // if (null == services) - // return targets; - // for (Service service : services) { - // Host host = service.getPort().getHost(); - // InfraHost infraHost = null; - // InfraHost existInfraHost = - // this.infraHostService.readByProbeIdAndIpv4(probeId, host.getIpv4()); - // InfraService infraService = null; - // if (null != existInfraHost) { - // infraHost = existInfraHost; - // } else { - // infraHost = this.registInfraHostByDiscoveredHost(host, probeId); - // infraService = this.registInfraServiceByDiscoveredService(infraHost, service, - // probeId); - // } - - // Target target = new Target(); - // target.setInfra(infraService); - // String displayName = service.getServiceName(); - // target.setDisplayName(displayName); - // targets.add(this.targetDAO.save(target)); - // } - // return targets; - // } - - // private InfraHost registInfraHostByDiscoveredHost(Host host, Long probeId) - // throws OverflowException { - // InfraHost infraHost = new InfraHost(); - // infraHost.setMetaInfraType(new MetaInfraType(2)); - // infraHost.setProbe(new Probe(probeId)); - // // infraHost.setIpv4(host.getIpv4()); - // // infraHost.setIpv6(host.getIpv6()); - // // infraHost.setMac(host.getMac()); - // return this.infraHostService.regist(infraHost); - // } - - // private InfraService registInfraServiceByDiscoveredService(InfraHost - // infraHost, Service service, Long probeId) - // throws OverflowException { - // InfraService infraService = new InfraService(); - // infraHost.setMetaInfraType(new MetaInfraType(7)); - // // infraService.setInfraHost(infraHost); - // // infraService.setPort(service.getPort().getPortNumber()); - // // infraService.setPortType(service.getPort().getPortType().toString()); - // // infraService.setTlsType(service.getCryptoType() == CryptoType.TLS); - // // - // infraService.setMetaInfraVendor(MetaInfraVendor.CreateInfraVendorByService(service.getServiceName())); - // return this.infraServiceService.regist(infraService); - // } + public List readAllByZoneID() throws OverflowException { + return null; + } }