[shenyu] branch master updated: fix duplicate event (#4936)

[xiaoyu]

This is an automated email from the ASF dual-hosted git repository.

xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git


The following commit(s) were added to refs/heads/master by this push:
     new fc2bc20aa fix duplicate event (#4936)
fc2bc20aa is described below

commit fc2bc20aa989317fe34fb6d181b6f890a90f6b6d
Author: dragon-zhang <zhangzich...@apache.org>
AuthorDate: Tue Aug 1 11:58:17 2023 +0800

    fix duplicate event (#4936)
    
    * fix duplicate event
    
    * fix package
    
    * default UNPUBLISHED
    
    ---------
    
    Co-authored-by: moremind <hefen...@apache.org>
---
 .../service/register/AbstractShenyuClientRegisterServiceImpl.java      | 3 +++
 .../service/register/AbstractShenyuClientRegisterServiceImplTest.java  | 3 +--
 .../client/core/client/AbstractContextRefreshedEventListener.java      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImpl.java
 
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImpl.java
index 8fd025f75..aecb2888a 100644
--- 
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImpl.java
+++ 
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImpl.java
@@ -224,6 +224,9 @@ public abstract class 
AbstractShenyuClientRegisterServiceImpl extends FallbackSh
      */
     protected boolean doSubmit(final String selectorId, final List<? extends 
CommonUpstream> upstreamList) {
         List<CommonUpstream> commonUpstreamList = 
CommonUpstreamUtils.convertCommonUpstreamList(upstreamList);
+        if (CollectionUtils.isEmpty(upstreamList)) {
+            return true;
+        }
         return commonUpstreamList.stream().map(upstream -> 
upstreamCheckService.checkAndSubmit(selectorId, upstream))
                 .collect(Collectors.toList()).stream().findAny().orElse(false);
     }
diff --git 
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImplTest.java
 
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImplTest.java
index 9239a3294..12e99226a 100644
--- 
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImplTest.java
+++ 
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImplTest.java
@@ -49,7 +49,6 @@ import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
@@ -167,7 +166,7 @@ public final class 
AbstractShenyuClientRegisterServiceImplTest {
 
     @Test
     public void testDoSubmit() {
-        
assertFalse(abstractShenyuClientRegisterService.doSubmit("Selector_Id", new 
ArrayList<>()));
+        assertTrue(abstractShenyuClientRegisterService.doSubmit("Selector_Id", 
new ArrayList<>()));
 
         CommonUpstream commonUpstream = new CommonUpstream();
         when(upstreamCheckService.checkAndSubmit(any(), 
any())).thenReturn(true);
diff --git 
a/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/client/AbstractContextRefreshedEventListener.java
 
b/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/client/AbstractContextRefreshedEventListener.java
index bae61442e..7b0254535 100644
--- 
a/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/client/AbstractContextRefreshedEventListener.java
+++ 
b/shenyu-client/shenyu-client-core/src/main/java/org/apache/shenyu/client/core/client/AbstractContextRefreshedEventListener.java
@@ -203,7 +203,7 @@ public abstract class 
AbstractContextRefreshedEventListener<T, A extends Annotat
                         .tags(pairs.getRight())
                         .apiPath(apiPath)
                         
.apiSource(ApiSourceEnum.ANNOTATION_GENERATION.getValue())
-                        .state(ApiStateEnum.PUBLISHED.getState())
+                        .state(ApiStateEnum.UNPUBLISHED.getState())
                         .apiOwner("admin")
                         .eventType(EventType.REGISTER)
                         .build();