[kylin] 25/35: KYLIN-5643 add public api for batch delete index, fix response message

[xxyu]

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

xxyu pushed a commit to branch kylin5_beta
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 97cce97124830eb7c55fbc8701feafc19c451062
Author: Liang.Hua <36814772+jacob...@users.noreply.github.com>
AuthorDate: Fri Apr 28 10:55:30 2023 +0800

    KYLIN-5643 add public api for batch delete index, fix response message
    
    Co-authored-by: liang.hua <liang....@kyligence.io>
---
 .../apache/kylin/rest/controller/open/OpenIndexPlanController.java  | 6 +-----
 .../kylin/rest/controller/open/OpenIndexPlanControllerTest.java     | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git 
a/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenIndexPlanController.java
 
b/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenIndexPlanController.java
index ec2bf2b7c3..af1576f062 100644
--- 
a/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenIndexPlanController.java
+++ 
b/src/metadata-server/src/main/java/org/apache/kylin/rest/controller/open/OpenIndexPlanController.java
@@ -19,12 +19,10 @@
 package org.apache.kylin.rest.controller.open;
 
 import static 
org.apache.kylin.common.constant.HttpConstant.HTTP_VND_APACHE_KYLIN_V4_PUBLIC_JSON;
-import static 
org.apache.kylin.common.exception.code.ErrorCodeServer.LAYOUT_LIST_EMPTY;
 import static 
org.apache.kylin.common.exception.code.ErrorCodeServer.MODEL_NOT_EXIST;
 
 import java.util.Set;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.kylin.common.KylinConfig;
 import org.apache.kylin.common.exception.KylinException;
 import org.apache.kylin.metadata.cube.model.IndexEntity;
@@ -92,6 +90,7 @@ public class OpenIndexPlanController extends NBasicController 
{
             @RequestParam(value = "index_range", required = false) 
IndexEntity.Range indexRange) {
         checkProjectName(project);
         checkRequiredArg(MODEL_NAME, modelName);
+        checkCollectionRequiredArg("index_ids", layoutIds);
         if (null == indexRange) {
             indexRange = IndexEntity.Range.BATCH;
         }
@@ -100,9 +99,6 @@ public class OpenIndexPlanController extends 
NBasicController {
         if (null == dataModel) {
             throw new KylinException(MODEL_NOT_EXIST);
         }
-        if (CollectionUtils.isEmpty(layoutIds)) {
-            throw new KylinException(LAYOUT_LIST_EMPTY);
-        }
         fusionIndexService.batchRemoveIndex(project, dataModel.getUuid(), 
layoutIds, indexRange);
         return new EnvelopeResponse<>(KylinException.CODE_SUCCESS, "", "");
     }
diff --git 
a/src/metadata-server/src/test/java/org/apache/kylin/rest/controller/open/OpenIndexPlanControllerTest.java
 
b/src/metadata-server/src/test/java/org/apache/kylin/rest/controller/open/OpenIndexPlanControllerTest.java
index 6d43a7828b..2fca7252aa 100644
--- 
a/src/metadata-server/src/test/java/org/apache/kylin/rest/controller/open/OpenIndexPlanControllerTest.java
+++ 
b/src/metadata-server/src/test/java/org/apache/kylin/rest/controller/open/OpenIndexPlanControllerTest.java
@@ -182,6 +182,6 @@ public class OpenIndexPlanControllerTest extends 
NLocalFileMetadataTestCase {
                         .param("project", project).param("model_name", 
modelName).param("index_ids", "")
                         
.accept(MediaType.parseMediaType(HTTP_VND_APACHE_KYLIN_V4_PUBLIC_JSON)))
                 
.andExpect(MockMvcResultMatchers.status().is5xxServerError()).andReturn();
-        
Assert.assertTrue(mvcResult.getResponse().getContentAsString().contains("KE-010043212"));
+        
Assert.assertTrue(mvcResult.getResponse().getContentAsString().contains("KE-010043201"));
     }
 }