fix e2e checkstyle

apache · Jul 2, 2024 · 94b28d4 · 94b28d4
1 parent 660c096
commit 94b28d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 30 deletions.
diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/PluginNamespaceController.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/controller/PluginNamespaceController.java
@@ -146,7 +146,7 @@ public ShenyuAdminResult updatePlugin(
             @PathVariable("namespaceId")
             @Existed(message = "namespace is not existed", provider = NamespaceMapper.class) final String namespaceId,
             @PathVariable("pluginId")
-            @Existed(message = "pluginNamespace is not existed",
+            @Existed(message = "PluginMapper is not existed",
                     provider = PluginMapper.class) final String pluginId,
             @Valid @ModelAttribute final PluginNamespaceDTO pluginNamespaceDTO) {
         pluginNamespaceDTO.setPluginId(pluginId);

diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/PluginNamespaceDTO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/PluginNamespaceDTO.java
@@ -19,7 +19,6 @@
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shenyu.admin.mapper.PluginMapper;
-import org.apache.shenyu.admin.mapper.PluginNsRelMapper;
 import org.apache.shenyu.admin.validation.annotation.Existed;
 
 import javax.validation.constraints.Min;
@@ -34,12 +33,6 @@
  */
 public class PluginNamespaceDTO implements Serializable {
 
-    /**
-     * primary key.
-     */
-    @Existed(provider = PluginNsRelMapper.class, nullOfIgnore = true, message = "the pluginNamespace is not exited")
-    private String id;
-
     /**
      * primary key.
      */
@@ -83,25 +76,6 @@ public class PluginNamespaceDTO implements Serializable {
      */
     private String namespaceId;
 
-
-    /**
-     * Gets the value of id.
-     *
-     * @return the value of id
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the id.
-     *
-     * @param id id
-     */
-    public void setId(final String id) {
-        this.id = id;
-    }
-
     /**
      * Gets the value of name.
      *
@@ -242,15 +216,14 @@ public boolean equals(final Object o) {
             return false;
         }
         PluginNamespaceDTO that = (PluginNamespaceDTO) o;
-        return Objects.equals(id, that.id) && Objects.equals(pluginId, that.pluginId)
-                && Objects.equals(name, that.name) && Objects.equals(config, that.config)
+        return Objects.equals(name, that.name) && Objects.equals(config, that.config)
                 && Objects.equals(sort, that.sort) && Objects.equals(enabled, that.enabled)
                 && Objects.equals(pluginHandleList, that.pluginHandleList)
                 && Objects.equals(namespaceId, that.namespaceId);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(id, pluginId, name, config, sort, enabled, pluginHandleList, namespaceId);
+        return Objects.hash(pluginId, name, config, sort, enabled, pluginHandleList, namespaceId);
     }
 }