[type:fix] Fix : selector logic refactoring#6081

shenyu-common/src/main/java/org/apache/shenyu/common/dto/PluginData.java

@@ -180,24 +180,14 @@ public int hashCode() {
         return Objects.hash(getId(), getName(), config, role, getEnabled(), getSort(), pluginJar, getNamespaceId());
     }
 
-    public static final class Builder {
-
-        private String id;
-
-        private String name;
+    public static final class Builder extends BaseData {
 
         private String config;
 
         private String role;
 
-        private Boolean enabled;
-
-        private Integer sort;
-
         private String pluginJar;
 
-        private String namespaceId;
-
         /**
          * no args constructor.
          */
@@ -220,7 +210,7 @@ public static Builder builder() {
          * @return this
          */
         public Builder id(final String id) {
-            this.id = id;
+            setId(id);
             return this;
         }
 
@@ -231,7 +221,7 @@ public Builder id(final String id) {
          * @return this
          */
         public Builder name(final String name) {
-            this.name = name;
+            setName(name);
             return this;
         }
 
@@ -264,7 +254,7 @@ public Builder role(final String role) {
          * @return this
          */
         public Builder enabled(final Boolean enabled) {
-            this.enabled = enabled;
+            setEnabled(enabled);
             return this;
         }
 
@@ -275,7 +265,7 @@ public Builder enabled(final Boolean enabled) {
          * @return this
          */
         public Builder sort(final Integer sort) {
-            this.sort = sort;
+            setSort(sort);
             return this;
         }
 
@@ -297,7 +287,7 @@ public Builder pluginJar(final String pluginJar) {
          * @return this
          */
         public Builder namespaceId(final String namespaceId) {
-            this.namespaceId = namespaceId;
+            setNamespaceId(namespaceId);
             return this;
         }
 
@@ -308,14 +298,14 @@ public Builder namespaceId(final String namespaceId) {
          */
         public PluginData build() {
             PluginData pluginData = new PluginData();
-            pluginData.setId(id);
-            pluginData.setName(name);
+            pluginData.setId(getId());
+            pluginData.setName(getName());
             pluginData.setConfig(config);
             pluginData.setRole(role);
-            pluginData.setEnabled(enabled);
-            pluginData.setSort(sort);
+            pluginData.setEnabled(getEnabled());
+            pluginData.setSort(getSort());
             pluginData.setPluginJar(pluginJar);
-            pluginData.setNamespaceId(namespaceId);
+            pluginData.setNamespaceId(getNamespaceId());
             return pluginData;
         }
     }

shenyu-common/src/main/java/org/apache/shenyu/common/dto/RuleData.java

@@ -64,19 +64,19 @@ public RuleData() {
      * @param builder builder
      */
     private RuleData(final Builder builder) {
-        this.setId(builder.id);
-        this.setName(builder.name);
+        this.setId(builder.getId());
+        this.setName(builder.getName());
         this.pluginName = builder.pluginName;
         this.selectorId = builder.selectorId;
         this.matchMode = builder.matchMode;
-        this.setSort(builder.sort);
-        this.setEnabled(builder.enabled);
+        this.setSort(builder.getSort());
+        this.setEnabled(builder.getEnabled());
         this.loged = builder.loged;
         this.handle = builder.handle;
         this.conditionDataList = builder.conditionDataList;
         this.beforeConditionDataList = builder.beforeConditionDataList;
         this.matchRestful = builder.matchRestful;
-        this.setNamespaceId(builder.namespaceId);
+        this.setNamespaceId(builder.getNamespaceId());
     }
 
     /**
@@ -298,7 +298,7 @@ public Boolean getMatchRestful() {
     public void setMatchRestful(final Boolean matchRestful) {
         this.matchRestful = matchRestful;
     }
-    
+
     @Override
     public boolean equals(final Object o) {
         if (this == o) {
@@ -365,33 +365,23 @@ public String toString() {
     /**
      * class builder.
      */
-    public static final class Builder {
-
-        private String id;
-
-        private String name;
+    public static final class Builder extends BaseData {
 
         private String pluginName;
 
         private String selectorId;
 
         private Integer matchMode;
 
-        private Integer sort;
-
-        private Boolean enabled;
-
         private Boolean loged;
 
         private String handle;
 
         private List<ConditionData> conditionDataList;
 
         private List<ConditionData> beforeConditionDataList;
-        
+
         private Boolean matchRestful;
-
-        private String namespaceId;
 
         /**
          * no args constructor.
@@ -415,7 +405,7 @@ public RuleData build() {
          * @return this
          */
         public Builder id(final String id) {
-            this.id = id;
+            setId(id);
             return this;
         }
 
@@ -426,7 +416,7 @@ public Builder id(final String id) {
          * @return this
          */
         public Builder name(final String name) {
-            this.name = name;
+            setName(name);
             return this;
         }
 
@@ -470,7 +460,7 @@ public Builder matchMode(final Integer matchMode) {
          * @return this
          */
         public Builder sort(final Integer sort) {
-            this.sort = sort;
+            setSort(sort);
             return this;
         }
 
@@ -481,7 +471,7 @@ public Builder sort(final Integer sort) {
          * @return this
          */
         public Builder enabled(final Boolean enabled) {
-            this.enabled = enabled;
+            setEnabled(enabled);
             return this;
         }
 
@@ -528,7 +518,7 @@ public Builder beforeConditionDataList(final List<ConditionData> beforeCondition
             this.beforeConditionDataList = beforeConditionDataList;
             return this;
         }
-    
+
         /**
          * build match restful.
          *
@@ -539,15 +529,15 @@ public Builder matchRestful(final Boolean matchRestful) {
             this.matchRestful = matchRestful;
             return this;
         }
-        
+
         /**
          * build namespaceId.
          *
          * @param namespaceId namespaceId
          * @return this
          */
         public Builder namespaceId(final String namespaceId) {
-            this.namespaceId = namespaceId;
+            setNamespaceId(namespaceId);
             return this;
         }
     }

shenyu-common/src/main/java/org/apache/shenyu/common/dto/SelectorData.java

@@ -71,21 +71,21 @@ public SelectorData() {
      * @param builder builder
      */
     private SelectorData(final Builder builder) {
-        this.setId(builder.id);
+        this.setId(builder.getId());
         this.pluginId = builder.pluginId;
         this.pluginName = builder.pluginName;
-        this.setName(builder.name);
+        this.setName(builder.getName());
         this.matchMode = builder.matchMode;
         this.type = builder.type;
-        this.setSort(builder.sort);
-        this.setEnabled(builder.enabled);
+        this.setSort(builder.getSort());
+        this.setEnabled(builder.getEnabled());
         this.logged = builder.logged;
         this.continued = builder.continued;
         this.handle = builder.handle;
         this.conditionList = builder.conditionList;
         this.matchRestful = builder.matchRestful;
         this.beforeConditionList = builder.beforeConditionList;
-        this.setNamespaceId(builder.namespaceId);
+        this.setNamespaceId(builder.getNamespaceId());
     }
 
     /**
@@ -345,11 +345,7 @@ public String toString() {
     /**
      * class builder.
      */
-    public static final class Builder {
-
-        private String id;
-
-        private String name;
+    public static final class Builder extends BaseData {
 
         private String pluginId;
 
@@ -359,10 +355,6 @@ public static final class Builder {
 
         private Integer type;
 
-        private Integer sort;
-
-        private Boolean enabled;
-
         private Boolean logged;
 
         private Boolean continued;
@@ -375,8 +367,6 @@ public static final class Builder {
 
         private List<ConditionData> beforeConditionList;
 
-        private String namespaceId;
-
         /**
          * no args constructor.
          */
@@ -399,7 +389,7 @@ public SelectorData build() {
          * @return this
          */
         public Builder id(final String id) {
-            this.id = id;
+            setId(id);
             return this;
         }
 
@@ -432,7 +422,7 @@ public Builder pluginName(final String pluginName) {
          * @return this
          */
         public Builder name(final String name) {
-            this.name = name;
+            setName(name);
             return this;
         }
 
@@ -465,7 +455,7 @@ public Builder type(final Integer type) {
          * @return this
          */
         public Builder sort(final Integer sort) {
-            this.sort = sort;
+            setSort(sort);
             return this;
         }
 
@@ -476,7 +466,7 @@ public Builder sort(final Integer sort) {
          * @return this
          */
         public Builder enabled(final Boolean enabled) {
-            this.enabled = enabled;
+            setEnabled(enabled);
             return this;
         }
 
@@ -553,7 +543,7 @@ public Builder beforeConditionList(final List<ConditionData> beforeConditionList
          * @return this
          */
         public Builder namespaceId(final String namespaceId) {
-            this.namespaceId = namespaceId;
+            setNamespaceId(namespaceId);
             return this;
         }
     }