Merge branch 'master' into 4932

apache · Aug 1, 2023 · 30c97bf · 30c97bf
2 parents 16b9d25 + fc2bc20
commit 30c97bf
Show file tree

Hide file tree

Showing 15 changed files with 93 additions and 77 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -19,7 +19,7 @@
 15. Add naocs discovery sync
 16. Add apollo discovery sync
 17. Add HttpLongPolling discovery sync
-18. Add consul discove sync
+18. Add consul discovery sync
 19. Add huawei cloud lts loging plugin
 20. Support openGauss database for shenyu admin
 21. Support polaris config sync and register center
@@ -64,7 +64,11 @@
 34. Update apollo client register repository active offline
 35. Storage adjustment for swagger type API documents, change from local cache to database
 36. Support nacos client offline
-37. Add e2e alibaba dubbo case
+37. Add e2e alibaba dubbo test case
+38. Add e2e apache dubbo test case
+39. Add shenyu-spring-sdk test cases
+40. Add e2e sofa test cases
+41. Add apollo config sync test case
 
 ### Refactor
 
@@ -119,7 +123,7 @@
 49. Refactor shenyu log observability
 50. Add bootstrap start log
 51. Refactor api document for swagger
-52. Upgrade grpc version to 1.48.0
+52. Upgrade grpc version to 1.53.0
 
 ### Bug Fix
 
@@ -175,6 +179,7 @@
 50. Fix http registration metadata
 51. Fix websocket lost the user-defined clost status
 52. Fix consul register lose the prop of meta-path when special symbol
+53. Fix etcd sync error
 
 ## 2.5.1
 

diff --git a/pom.xml b/pom.xml
@@ -81,6 +81,25 @@
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <!-- maven plugin version start -->
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+        <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
+        <nexus-staging-maven-plugin.version>1.6.3</nexus-staging-maven-plugin.version>
+        <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+        <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
+        <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
+        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
+        <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
+        <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
+        <versions-maven-plugin.version>2.5</versions-maven-plugin.version>
+        <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
+        <apache-rat-plugin.version>0.13</apache-rat-plugin.version>
+        <frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
+        <frontend-maven-plugin.node.version>v12.14.1</frontend-maven-plugin.node.version>
+        <!-- maven plugin version end -->
+
+        <!-- dependency version start -->
         <jasypt.version>1.9.2</jasypt.version>
         <springfox.version>2.6.1</springfox.version>
         <mybatis.starter.version>2.2.2</mybatis.starter.version>
@@ -139,22 +158,6 @@
         <javatuples.version>1.2</javatuples.version>
         <k8s-client.version>17.0.2</k8s-client.version>
         <polaris.version>1.13.0</polaris.version>
-        <!--maven plugin version-->
-        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
-        <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
-        <nexus-staging-maven-plugin.version>1.6.3</nexus-staging-maven-plugin.version>
-        <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
-        <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
-        <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
-        <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
-        <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
-        <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
-        <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
-        <versions-maven-plugin.version>2.5</versions-maven-plugin.version>
-        <maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
-        <apache-rat-plugin.version>0.13</apache-rat-plugin.version>
-        <frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
-        <frontend-maven-plugin.node.version>v12.14.1</frontend-maven-plugin.node.version>
         <bytebuddy.version>1.12.6</bytebuddy.version>
         <spring-ldap.version>2.3.4.RELEASE</spring-ldap.version>
         <jaxb.api.version>2.3.1</jaxb.api.version>
@@ -180,6 +183,8 @@
         <jsonpath.version>2.4.0</jsonpath.version>
         <casdoor-java-sdk.version>1.9.0</casdoor-java-sdk.version>
         <huawei-log-sdk.version>1.0.1</huawei-log-sdk.version>
+        <opengauss-jdbc.version>5.0.0-og</opengauss-jdbc.version>
+        <!-- dependency version end -->
     </properties>
 
     <dependencyManagement>
@@ -340,12 +345,6 @@
                 <scope>provided</scope>
             </dependency>
 
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>druid</artifactId>
-                <version>${druid.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>

diff --git a/shenyu-admin/pom.xml b/shenyu-admin/pom.xml
@@ -257,7 +257,8 @@
         <dependency>
             <groupId>org.opengauss</groupId>
             <artifactId>opengauss-jdbc</artifactId>
-            <version>5.0.0-og</version>
+            <version>${opengauss-jdbc.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

diff --git a/...ava/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImpl.java b/...ava/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImpl.java
@@ -224,6 +224,9 @@ public ApplicationEventPublisher getEventPublisher() {
      */
     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/main/resources/mybatis/mybatis-config.xml b/shenyu-admin/src/main/resources/mybatis/mybatis-config.xml
@@ -43,7 +43,6 @@
         <setting name="defaultExecutorType" value="SIMPLE"/>
         <!-- Sets the number of seconds the driver will wait for a response from the database. -->
         <setting name="defaultStatementTimeout" value="25000"/>
-        <setting name="logImpl" value="STDOUT_LOGGING"/>
     </settings>
 
     <typeAliases>

diff --git a/shenyu-admin/src/main/resources/static/index.1d4bace6.js b/shenyu-admin/src/main/resources/static/index.1d4bace6.js
diff --git a/.../main/resources/static/index.12253d98.css → .../main/resources/static/index.3b6d8134.css b/.../main/resources/static/index.12253d98.css → .../main/resources/static/index.3b6d8134.css
diff --git a/shenyu-admin/src/main/resources/static/index.6586d671.js b/shenyu-admin/src/main/resources/static/index.6586d671.js
diff --git a/shenyu-admin/src/main/resources/static/index.html b/shenyu-admin/src/main/resources/static/index.html
@@ -24,11 +24,11 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>Apache ShenYu Gateway</title>
   <link rel="icon" href="/favicon.ico" type="image/x-icon">
-<link href="/index.12253d98.css" rel="stylesheet"></head>
+<link href="/index.3b6d8134.css" rel="stylesheet"></head>
 
 <body>
   <div id="httpPath" style="display: none" th:text="${domain}"></div>
   <div id="root"></div>
-<script type="text/javascript" src="/index.6586d671.js"></script></body>
+<script type="text/javascript" src="/index.1d4bace6.js"></script></body>
 
 </html>
diff --git a/...org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImplTest.java b/...org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImplTest.java
@@ -49,7 +49,6 @@
 
 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 void testGetRuleService() {
 
     @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/...main/java/org/apache/shenyu/client/core/client/AbstractContextRefreshedEventListener.java b/...main/java/org/apache/shenyu/client/core/client/AbstractContextRefreshedEventListener.java
@@ -203,7 +203,7 @@ private List<ApiDocRegisterDTO> buildApiDocDTO(final Object bean, final Method m
                         .tags(pairs.getRight())
                         .apiPath(apiPath)
                         .apiSource(ApiSourceEnum.ANNOTATION_GENERATION.getValue())
-                        .state(ApiStateEnum.PUBLISHED.getState())
+                        .state(ApiStateEnum.UNPUBLISHED.getState())
                         .apiOwner("admin")
                         .eventType(EventType.REGISTER)
                         .build();

diff --git a/shenyu-dist/shenyu-admin-dist/src/main/release-docs/LICENSE b/shenyu-dist/shenyu-admin-dist/src/main/release-docs/LICENSE
@@ -217,6 +217,7 @@ The text of each license is the standard Apache 2.0 license.
 
     accessors-smart 2.4.11: https://www.minidev.net, Apache 2.0
     annotations 13.0: http://source.android.com, Apache 2.0
+    annotations 4.1.1.4: http://source.android.com, Apache 2.0
     attoparser 2.0.5.RELEASE: http://www.attoparser.org, Apache 2.0
     audience-annotations 0.5.0: https://yetus.apache.org/audience-annotations, Apache 2.0
     byte-buddy 1.12.6: https://bytebuddy.net/byte-buddy, Apache 2.0
@@ -232,14 +233,15 @@ The text of each license is the standard Apache 2.0 license.
     error_prone_annotations 2.11.0: https://github.com/google/error-prone, Apache 2.0
     failsafe 2.4.4: https://github.com/jhalterman/failsafe, Apache 2.0
     failureaccess 1.0.1:https://github.com/google/guava, Apache 2.0
-    grpc-api 1.48.0: https://github.com/grpc/grpc, Apache 2.0
-    grpc-context 1.48.0: https://github.com/grpc/grpc, Apache 2.0
-    grpc-core 1.48.0: https://github.com/grpc/grpc, Apache 2.0
+    grpc-api 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+    grpc-context 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+    grpc-core 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+    grpc-grpclb 1.53.0: https://github.com/grpc/grpc, Apache 2.0
     grpc-grpclb 1.48.0: https://github.com/grpc/grpc, Apache 2.0
-    grpc-netty 1.48.0: https://github.com/grpc/grpc, Apache 2.0
-    grpc-protobuf 1.48.0: https://github.com/grpc/grpc, Apache 2.0
-    grpc-protobuf-lite 1.48.0: https://github.com/grpc/grpc, Apache 2.0
-    grpc-stub 1.48.0: https://github.com/grpc/grpc, Apache 2.0
+    grpc-netty 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+    grpc-protobuf 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+    grpc-protobuf-lite 1.53.0: https://github.com/grpc/grpc, Apache 2.0
+    grpc-stub 1.53.0: https://github.com/grpc/grpc, Apache 2.0
     gson 2.9.0: https://github.com/google/gson, Apache 2.0
     guava 31.1-jre: https://github.com/google/guava, Apache 2.0
     hessian 4.0.38: http://github.com/alipay/sofa-hessian, Apache 2.0
@@ -265,7 +267,7 @@ The text of each license is the standard Apache 2.0 license.
     jetcd-grpc 0.7.3: https://github.com/etcd-io/jetcd, Apache 2.0
     json-path 2.7.0: https://github.com/jayway/JsonPath, Apache 2.0
     json-smart 2.4.11: https://www.minidev.net/, Apache 2.0
-    jsqlparser 4.2: https://github.com/JSQLParser/JSqlParser, Apache 2.0
+    jsqlparser 4.5: https://github.com/JSQLParser/JSqlParser, Apache 2.0
     jsr305 3.0.2: http://findbugs.sourceforge.net/, Apache 2.0
     listenablefuture 9999.0-empty-to-avoid-conflict-with-guava: https://github.com/google/guava, Apache 2.0
     log4j-api 2.17.2: https://logging.apache.org/log4j/2.x/log4j-api, Apache 2.0
@@ -300,7 +302,7 @@ The text of each license is the standard Apache 2.0 license.
     okhttp 4.9.3: https://github.com/square/okhttp, Apache 2.0
     okio 2.8.0: https://github.com/square/okio, Apache 2.0
     perfmark-api 0.25.0: https://github.com/perfmark/perfmark, Apache 2.0
-    proto-google-common-protos 1.17.0: https://github.com/googleapis/common-protos-java, Apache 2.0
+    proto-google-common-protos 2.9.0: https://github.com/googleapis/common-protos-java, Apache 2.0
     protostuff-core 1.0.8: https://github.com/protostuff/protostuff/protostuff-core, Apache-2.0
     protostuff-runtime 1.0.8: https://github.com/protostuff/protostuff/protostuff-core, Apache-2.0
     protostuff-api 1.0.8: https://github.com/protostuff/protostuff/protostuff-api, Apache-2.0
@@ -392,7 +394,7 @@ The text of each license is the standard Apache 2.0 license.
     kotlin-stdlib 1.6.21 https://kotlinlang.org, Apache 2.0
     kotlin-stdlib-common 1.6.21 https://kotlinlang.org, Apache 2.0
     reactor-core 3.4.30 https://github.com/reactor/reactor-core/blob/main/LICENSE, Apache 2.0
-    simpleclient_common 0.12.0 https://github.com/micrometer-metrics/micrometer/blob/main/LICENSE, Apache 2.0
+    simpleclient_common 0.15.0 https://github.com/micrometer-metrics/micrometer/blob/main/LICENSE, Apache 2.0
     guice 5.0.1 https://github.com/google/guice/blob/master/COPYING, Apache 2.0
 
 ========================================================================
@@ -412,7 +414,6 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
     postgresql 42.3.8: https://github.com/pgjdbc/pgjdbc, BSD 2-Clause
     protobuf-java 3.21.12: https://github.com/protocolbuffers/protobuf/, BSD 3-Clause
     protobuf-java-util 3.21.1: https://github.com/protocolbuffers/protobuf/, BSD 3-Clause
-    openGauss-connector-jdbc 5.0.0-og https://github.com/opengauss-mirror/openGauss-connector-jdbc
     polaris-all 1.13.0: https://github.com/polarismesh/polaris-java, BSD 3-Clause
 
 ========================================================================
@@ -445,7 +446,7 @@ MIT licenses
 The following components are provided under the MIT License. See project link for details.
 The text of each license is also included at licenses/LICENSE-[project].txt.
 
-    animal-sniffer-annotations 1.18: https://github.com/mojohaus/animal-sniffer, MIT
+    animal-sniffer-annotations 1.21: https://github.com/mojohaus/animal-sniffer, MIT
     checker-qual 3.12.0: https://github.com/typetools/checker-framework/blob/master/checker-qual, MIT
     java-jwt 3.12.0: https://mvnrepository.com/artifact/com.auth0/java-jwt, MIT
     jcl-over-slf4j 1.7.36: https://www.slf4j.org, MIT
@@ -565,4 +566,10 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
 
     jaxb-api 2.3.1: https://javaee.github.io/jaxb-v2, CDDL 1.1 and GPLv2
     javax.activation-api 1.2.0: https://github.com/slcorp/javax.activation-api-1.2.0-sources, CDDL and GPL 2.0
-    javax.annotation-api 1.3.2: https://github.com/javaee/javax.annotation, CDDL and GPL 2.0
+    javax.annotation-api 1.3.2: https://github.com/javaee/javax.annotation, CDDL and GPL 2.0
+
+========================================================================
+Public Domain licenses
+========================================================================
+
+    aopalliance 1.0: https://mvnrepository.com/artifact/aopalliance/aopalliance, Public Domain