From 0eda0683defe7445bb3a0129ce30dd123ea60b09 Mon Sep 17 00:00:00 2001 From: insanity Date: Tue, 24 Apr 2018 20:41:46 +0900 Subject: [PATCH] remodeling is in progress --- .../discovery/service/CentralDiscoveryService.java | 3 +-- .../module/infra/service/CentralInfraService.java | 1 + .../central/proxy/ProxyServerInterceptor.java | 3 ++- .../overflow/central/proxy/ServiceInvoker.java | 2 -- .../loafle/overflow/central/proxy/ServiceProxy.java | 2 -- .../central/redis/service/RedisMessagePublisher.java | 12 +++++++----- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/loafle/overflow/central/module/discovery/service/CentralDiscoveryService.java b/src/main/java/com/loafle/overflow/central/module/discovery/service/CentralDiscoveryService.java index 2214e14..d08d622 100644 --- a/src/main/java/com/loafle/overflow/central/module/discovery/service/CentralDiscoveryService.java +++ b/src/main/java/com/loafle/overflow/central/module/discovery/service/CentralDiscoveryService.java @@ -2,9 +2,8 @@ package com.loafle.overflow.central.module.discovery.service; -import com.loafle.overflow.central.commons.model.SessionMetadata; import com.loafle.overflow.central.commons.service.MessagePublisher; - +import com.loafle.overflow.central.commons.utils.SessionMetadata; import com.loafle.overflow.core.annotation.ProbeAPI; import com.loafle.overflow.core.annotation.WebappAPI; import com.loafle.overflow.core.exception.OverflowException; diff --git a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraService.java b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraService.java index a7eecc9..da6b4d1 100644 --- a/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraService.java +++ b/src/main/java/com/loafle/overflow/central/module/infra/service/CentralInfraService.java @@ -1,5 +1,6 @@ package com.loafle.overflow.central.module.infra.service; +import com.loafle.overflow.central.commons.utils.PageUtil; import com.loafle.overflow.central.module.infra.dao.InfraDAO; import com.loafle.overflow.core.model.PageParams; import com.loafle.overflow.model.domain.Domain; diff --git a/src/main/java/com/loafle/overflow/central/proxy/ProxyServerInterceptor.java b/src/main/java/com/loafle/overflow/central/proxy/ProxyServerInterceptor.java index a553cc2..4fd50a0 100644 --- a/src/main/java/com/loafle/overflow/central/proxy/ProxyServerInterceptor.java +++ b/src/main/java/com/loafle/overflow/central/proxy/ProxyServerInterceptor.java @@ -1,6 +1,7 @@ package com.loafle.overflow.central.proxy; -import com.loafle.overflow.central.commons.model.SessionMetadata; +import com.loafle.overflow.central.commons.utils.SessionMetadata; + import io.grpc.*; public class ProxyServerInterceptor implements ServerInterceptor { diff --git a/src/main/java/com/loafle/overflow/central/proxy/ServiceInvoker.java b/src/main/java/com/loafle/overflow/central/proxy/ServiceInvoker.java index 5bfd1e5..0cdfb78 100644 --- a/src/main/java/com/loafle/overflow/central/proxy/ServiceInvoker.java +++ b/src/main/java/com/loafle/overflow/central/proxy/ServiceInvoker.java @@ -2,8 +2,6 @@ package com.loafle.overflow.central.proxy; import com.google.gson.internal.Primitives; import com.google.protobuf.ByteString; -import com.loafle.overflow.central.commons.exception.OverflowException; -import com.loafle.overflow.central.commons.exception.OverflowRuntimeException; import com.loafle.overflow.central.proxy.exception.InvalidParameterException; import com.loafle.overflow.central.proxy.exception.InvalidRequestException; import com.loafle.overflow.central.proxy.exception.NoSuchMethodException; diff --git a/src/main/java/com/loafle/overflow/central/proxy/ServiceProxy.java b/src/main/java/com/loafle/overflow/central/proxy/ServiceProxy.java index 0c47be9..385f40c 100644 --- a/src/main/java/com/loafle/overflow/central/proxy/ServiceProxy.java +++ b/src/main/java/com/loafle/overflow/central/proxy/ServiceProxy.java @@ -3,8 +3,6 @@ package com.loafle.overflow.central.proxy; import com.loafle.overflow.api.OverflowApiServerGrpc; import com.loafle.overflow.api.ServerInput; import com.loafle.overflow.api.ServerOutput; -import com.loafle.overflow.central.commons.exception.OverflowException; -import com.loafle.overflow.central.commons.exception.OverflowRuntimeException; import io.grpc.*; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/src/main/java/com/loafle/overflow/central/redis/service/RedisMessagePublisher.java b/src/main/java/com/loafle/overflow/central/redis/service/RedisMessagePublisher.java index 0ec9ea5..6100ad8 100644 --- a/src/main/java/com/loafle/overflow/central/redis/service/RedisMessagePublisher.java +++ b/src/main/java/com/loafle/overflow/central/redis/service/RedisMessagePublisher.java @@ -1,9 +1,11 @@ package com.loafle.overflow.central.redis.service; -import com.loafle.overflow.central.commons.model.PublishMessage; import com.loafle.overflow.central.commons.service.MessagePublisher; -import com.loafle.overflow.central.module.member.model.Member; -import com.loafle.overflow.central.module.member.service.MemberService; +import com.loafle.overflow.core.exception.OverflowException; +import com.loafle.overflow.core.model.PublishMessage; +import com.loafle.overflow.model.member.Member; +import com.loafle.overflow.service.central.member.MemberService; + import org.codehaus.jackson.map.ObjectMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; @@ -81,12 +83,12 @@ public class RedisMessagePublisher implements MessagePublisher { @Cacheable("memberListByDomain") - protected List getMemberListByDomainID(final long domainID) { + protected List getMemberListByDomainID(final long domainID) throws OverflowException { return this.getMemberList(memberService.readAllByDomainID(domainID)); } @Cacheable("memberListByProbeKey") - protected List getMemberListByProbeKey(final String probeKey) { + protected List getMemberListByProbeKey(final String probeKey) throws OverflowException { return this.getMemberList(memberService.readAllByProbeKey(probeKey)); }