From 8ad8f747e96486b7849dfbb7614ac0d193c09e58 Mon Sep 17 00:00:00 2001 From: hezijian <510310243@qq.com> Date: Thu, 16 Mar 2023 23:31:00 +0800 Subject: [PATCH] fix:active empty --- .../support/BlockingQueueTypeEnumTest.java | 4 ++-- .../starter/core/ClientShutdown.java | 18 +++++++++++++++++- .../starter/core/DiscoveryClient.java | 1 - .../starter/remote/ServerHttpAgent.java | 1 - 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/hippo4j-common/src/test/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnumTest.java b/hippo4j-common/src/test/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnumTest.java index b823b87e..3ba148f8 100644 --- a/hippo4j-common/src/test/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnumTest.java +++ b/hippo4j-common/src/test/java/cn/hippo4j/common/executor/support/BlockingQueueTypeEnumTest.java @@ -111,7 +111,7 @@ public final class BlockingQueueTypeEnumTest { Assert.assertEquals("LinkedTransferQueue", BlockingQueueTypeEnum.getBlockingQueueNameByType(5)); Assert.assertEquals("PriorityBlockingQueue", BlockingQueueTypeEnum.getBlockingQueueNameByType(6)); Assert.assertEquals("ResizableCapacityLinkedBlockingQueue", BlockingQueueTypeEnum.getBlockingQueueNameByType(9)); - //check illegal range of type + // check illegal range of type Assert.assertEquals("", BlockingQueueTypeEnum.getBlockingQueueNameByType(0)); Assert.assertEquals("", BlockingQueueTypeEnum.getBlockingQueueNameByType(-1)); Assert.assertEquals("", BlockingQueueTypeEnum.getBlockingQueueNameByType(100)); @@ -127,7 +127,7 @@ public final class BlockingQueueTypeEnumTest { Assert.assertEquals(BlockingQueueTypeEnum.LINKED_TRANSFER_QUEUE, BlockingQueueTypeEnum.getBlockingQueueTypeEnumByName("LinkedTransferQueue")); Assert.assertEquals(BlockingQueueTypeEnum.PRIORITY_BLOCKING_QUEUE, BlockingQueueTypeEnum.getBlockingQueueTypeEnumByName("PriorityBlockingQueue")); Assert.assertEquals(BlockingQueueTypeEnum.RESIZABLE_LINKED_BLOCKING_QUEUE, BlockingQueueTypeEnum.getBlockingQueueTypeEnumByName("ResizableCapacityLinkedBlockingQueue")); - //check illegal range of name + // check illegal range of name Assert.assertEquals(BlockingQueueTypeEnum.LINKED_BLOCKING_QUEUE, BlockingQueueTypeEnum.getBlockingQueueTypeEnumByName("Hello")); Assert.assertEquals(BlockingQueueTypeEnum.LINKED_BLOCKING_QUEUE, BlockingQueueTypeEnum.getBlockingQueueTypeEnumByName(null)); } diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/ClientShutdown.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/ClientShutdown.java index ef1546f7..9837b816 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/ClientShutdown.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/ClientShutdown.java @@ -1,5 +1,21 @@ -package cn.hippo4j.springboot.starter.core; +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package cn.hippo4j.springboot.starter.core; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/DiscoveryClient.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/DiscoveryClient.java index c5908101..1cd6fe63 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/DiscoveryClient.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/DiscoveryClient.java @@ -54,7 +54,6 @@ public class DiscoveryClient implements DisposableBean { private final String appPathIdentifier; - public DiscoveryClient(HttpAgent httpAgent, InstanceInfo instanceInfo) { this.httpAgent = httpAgent; this.instanceInfo = instanceInfo; diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/remote/ServerHttpAgent.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/remote/ServerHttpAgent.java index 96c95a6a..feb5044b 100644 --- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/remote/ServerHttpAgent.java +++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/remote/ServerHttpAgent.java @@ -135,7 +135,6 @@ public class ServerHttpAgent implements HttpAgent { serverHealthCheck.isHealthStatus(); } - private boolean isPrepareClose() { if (clientShutdown == null) { clientShutdown = ApplicationContextHolder.getBean(ClientShutdown.class);