[type:fix]fix delete namespace (apache#5964)

* fix

* fix

* fix

* fix cr

---------

Co-authored-by: ‘xcsnx’ <‘[email protected]’>
Co-authored-by: xcsnx <[email protected]>

Author: 3 people

shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/PluginDO.java

@@ -245,7 +245,7 @@ public static PluginDO buildPluginDO(final NamespacePluginVO namespacePluginVO)
                 pluginDO.setId(UUIDUtils.getInstance().generateShortUuid());
                 pluginDO.setDateCreated(currentTime);
             } else {
-                pluginDO.setId(item.getId());
+                pluginDO.setId(item.getPluginId());
             }
             if (Objects.nonNull(item.getFile())) {
                 pluginDO.setPluginJar(Base64.decode(item.getFile()));

shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/NamespaceServiceImpl.java

@@ -21,17 +21,16 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shenyu.admin.exception.ShenyuAdminException;
+import org.apache.shenyu.admin.mapper.AppAuthMapper;
 import org.apache.shenyu.admin.mapper.AuthPathMapper;
 import org.apache.shenyu.admin.mapper.DiscoveryMapper;
 import org.apache.shenyu.admin.mapper.MetaDataMapper;
 import org.apache.shenyu.admin.mapper.NamespaceMapper;
-import org.apache.shenyu.admin.mapper.AppAuthMapper;
 import org.apache.shenyu.admin.mapper.NamespacePluginRelMapper;
 import org.apache.shenyu.admin.mapper.RuleMapper;
 import org.apache.shenyu.admin.mapper.SelectorMapper;
 import org.apache.shenyu.admin.model.dto.NamespaceDTO;
 import org.apache.shenyu.admin.model.entity.AppAuthDO;
-import org.apache.shenyu.admin.model.entity.DiscoveryDO;
 import org.apache.shenyu.admin.model.entity.MetaDataDO;
 import org.apache.shenyu.admin.model.entity.NamespaceDO;
 import org.apache.shenyu.admin.model.entity.RuleDO;
@@ -141,17 +140,17 @@ public String delete(final List<String> ids) {
         if (CollectionUtils.isEmpty(namespaceIdList)) {
             throw new ShenyuAdminException(AdminConstants.SYS_NAMESPACE_ID_NOT_EXIST);
         }
-        List<NamespacePluginVO> namespacePluginVOS = namespacePluginRelMapper.selectAllByNamespaceIds(namespaceIdList);
-        if (CollectionUtils.isNotEmpty(namespacePluginVOS)) {
-            throw new ShenyuAdminException("Plugins exist under those namespace!");
+        List<RuleDO> ruleDOList = ruleMapper.selectAllByNamespaceIds(namespaceIdList);
+        if (CollectionUtils.isNotEmpty(ruleDOList)) {
+            throw new ShenyuAdminException("rule exist under those namespace!");
         }
         List<SelectorDO> selectorDOS = selectorMapper.selectAllByNamespaceIds(namespaceIdList);
         if (CollectionUtils.isNotEmpty(selectorDOS)) {
             throw new ShenyuAdminException("selector exist under those namespace!");
         }
-        List<RuleDO> ruleDOList = ruleMapper.selectAllByNamespaceIds(namespaceIdList);
-        if (CollectionUtils.isNotEmpty(ruleDOList)) {
-            throw new ShenyuAdminException("rule exist under those namespace!");
+        List<NamespacePluginVO> namespacePluginVOS = namespacePluginRelMapper.selectAllByNamespaceIds(namespaceIdList);
+        if (CollectionUtils.isNotEmpty(namespacePluginVOS)) {
+            throw new ShenyuAdminException("Plugins exist under those namespace!");
         }
         List<MetaDataDO> metaDataDOList = metaDataMapper.findAllByNamespaceIds(namespaceIdList);
         if (CollectionUtils.isNotEmpty(metaDataDOList)) {
@@ -161,10 +160,6 @@ public String delete(final List<String> ids) {
         if (CollectionUtils.isNotEmpty(appPathDOList)) {
             throw new ShenyuAdminException("appPath exist under those namespace!");
         }
-        List<DiscoveryDO> discoveryDOList = discoveryMapper.selectAllByNamespaceIds(namespaceIdList);
-        if (CollectionUtils.isNotEmpty(discoveryDOList)) {
-            throw new ShenyuAdminException("discovery exist under those namespace!");
-        }
         namespaceMapper.deleteByIds(ids);
         return ShenyuResultMessage.DELETE_SUCCESS;
     }