[shenyu] branch master updated: [ISSUE #4182] optimization global plugin sort. (#4429)

[likeguo]

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

likeguo 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 3d8798be9 [ISSUE #4182] optimization global plugin sort. (#4429)
3d8798be9 is described below

commit 3d8798be91e4af7648f538ca5fc52e7b65454e6a
Author: iwangjie <345127...@qq.com>
AuthorDate: Wed Mar 29 20:59:07 2023 +0800

    [ISSUE #4182] optimization global plugin sort. (#4429)
    
    * fix #4182
    
    * fix ci.
    
    ---------
    
    Co-authored-by: dragon-zhang <zhangzich...@apache.org>
    Co-authored-by: xiaoyu <xia...@apache.org>
---
 .../java/org/apache/shenyu/admin/model/dto/PluginDTO.java |  2 ++
 .../java/org/apache/shenyu/common/enums/PluginEnum.java   | 15 ++++++++-------
 .../org/apache/shenyu/plugin/global/GlobalPluginTest.java |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git 
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/PluginDTO.java 
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/PluginDTO.java
index b1eb01c9c..86f425f1b 100644
--- 
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/PluginDTO.java
+++ 
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/PluginDTO.java
@@ -22,6 +22,7 @@ import org.apache.shenyu.admin.mapper.PluginMapper;
 import org.apache.shenyu.admin.validation.annotation.Existed;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
@@ -61,6 +62,7 @@ public class PluginDTO implements Serializable {
      * plugin sort.
      */
     @NotNull
+    @Min(0)
     private Integer sort;
 
     /**
diff --git 
a/shenyu-common/src/main/java/org/apache/shenyu/common/enums/PluginEnum.java 
b/shenyu-common/src/main/java/org/apache/shenyu/common/enums/PluginEnum.java
index 05a0c8b41..8e28218de 100644
--- a/shenyu-common/src/main/java/org/apache/shenyu/common/enums/PluginEnum.java
+++ b/shenyu-common/src/main/java/org/apache/shenyu/common/enums/PluginEnum.java
@@ -26,17 +26,16 @@ import java.util.stream.Collectors;
  * PluginEnum.
  */
 public enum PluginEnum {
-    
+
     /**
-     * Mqtt plugin enum.
+     * Global plugin enum.
      */
-    MQTT(0, 0, "mqtt"),
-    
+    GLOBAL(-1, 0, "global"),
     /**
-     * Global plugin enum.
+     * Mqtt plugin enum.
      */
-    GLOBAL(5, 0, "global"),
-    
+    MQTT(0, 0, "mqtt"),
+
     /**
      * the mock plugin enum.
      */
@@ -111,6 +110,8 @@ public enum PluginEnum {
      * Request plugin enum.
      */
     REQUEST(120, 0, "request"),
+
+
     
     /**
      * GeneralContext plugin enum.
diff --git 
a/shenyu-plugin/shenyu-plugin-global/src/test/java/org/apache/shenyu/plugin/global/GlobalPluginTest.java
 
b/shenyu-plugin/shenyu-plugin-global/src/test/java/org/apache/shenyu/plugin/global/GlobalPluginTest.java
index 83dee5f3c..7b8fe190f 100644
--- 
a/shenyu-plugin/shenyu-plugin-global/src/test/java/org/apache/shenyu/plugin/global/GlobalPluginTest.java
+++ 
b/shenyu-plugin/shenyu-plugin-global/src/test/java/org/apache/shenyu/plugin/global/GlobalPluginTest.java
@@ -82,7 +82,7 @@ public final class GlobalPluginTest {
 
     @Test
     public void testGetOrder() {
-        assertEquals(5, globalPlugin.getOrder());
+        assertEquals(-1, globalPlugin.getOrder());
     }
 
     @Test