From 94b28d4014f1f736b11637ebc879c69f42963178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98xcsnx=E2=80=99?= <‘1192709687@qq.com’> Date: Tue, 2 Jul 2024 23:55:24 +0800 Subject: [PATCH] fix e2e checkstyle --- .../controller/PluginNamespaceController.java | 2 +- .../admin/model/dto/PluginNamespaceDTO.java | 31 ++----------------- 2 files changed, 3 insertions(+), 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 index 3861dec3ec78..7fac4765be00 100644 --- 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 index 686ee6605ef3..8f2a3aebc3f8 100644 --- 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,8 +216,7 @@ 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); @@ -251,6 +224,6 @@ public boolean equals(final Object o) { @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); } }