This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new b1a528660 [INLONG-4108][Manager] Merge InlongGroupState enum in
managerctl and manager-client (#4109)
b1a528660 is described below
commit b1a5286606e73a6c3ba3943af5b39cdae93f1214
Author: haifxu <[email protected]>
AuthorDate: Sun May 8 09:36:39 2022 +0800
[INLONG-4108][Manager] Merge InlongGroupState enum in managerctl and
manager-client (#4109)
---
.../inlong/manager/client/cli/CommandList.java | 4 +-
.../manager/client/cli/enums/InlongGroupState.java | 75 ----------------------
.../manager/client/api/InlongGroupContext.java | 53 ++++++++++++++-
3 files changed, 53 insertions(+), 79 deletions(-)
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CommandList.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CommandList.java
index e6b689227..60419753a 100644
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CommandList.java
+++
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/CommandList.java
@@ -20,8 +20,8 @@ package org.apache.inlong.manager.client.cli;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.Parameters;
import com.github.pagehelper.PageInfo;
+import
org.apache.inlong.manager.client.api.InlongGroupContext.InlongGroupState;
import org.apache.inlong.manager.client.api.inner.InnerInlongManagerClient;
-import org.apache.inlong.manager.client.cli.enums.InlongGroupState;
import org.apache.inlong.manager.client.cli.pojo.GroupInfo;
import org.apache.inlong.manager.client.cli.pojo.SinkInfo;
import org.apache.inlong.manager.client.cli.pojo.SourceInfo;
@@ -96,7 +96,7 @@ public class CommandList extends CommandBase {
InnerInlongManagerClient managerClient = new
InnerInlongManagerClient(connect().getConfiguration());
List<InlongGroupListResponse> groupList = new ArrayList<>();
if (status != null) {
- List<Integer> stateList =
InlongGroupState.parseStatus(status);
+ List<Integer> stateList =
InlongGroupState.parseStatusByStrState(status);
for (int state : stateList) {
PageInfo<InlongGroupListResponse> groupPageInfo =
managerClient.listGroups(group, state, 1,
pageSize);
diff --git
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/enums/InlongGroupState.java
b/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/enums/InlongGroupState.java
deleted file mode 100644
index 2f63ce53e..000000000
---
a/inlong-manager/manager-client-tools/src/main/java/org/apache/inlong/manager/client/cli/enums/InlongGroupState.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.inlong.manager.client.cli.enums;
-
-import org.apache.inlong.manager.common.enums.GroupStatus;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public enum InlongGroupState {
- CREATE, REJECTED, INITIALIZING, OPERATING, STARTED, FAILED, STOPPED,
FINISHED, DELETED;
-
- public static List<Integer> parseStatus(String state) {
-
- InlongGroupState groupState;
- try {
- groupState = InlongGroupState.valueOf(state);
- } catch (IllegalArgumentException e) {
- throw new IllegalArgumentException(String.format("Unsupported
status %s for group", state));
- }
-
- List<Integer> stateList = new ArrayList<>();
- switch (groupState) {
- case CREATE:
- stateList.add(GroupStatus.DRAFT.getCode());
- return stateList;
- case OPERATING:
- stateList.add(GroupStatus.DELETING.getCode());
- stateList.add(GroupStatus.SUSPENDING.getCode());
- stateList.add(GroupStatus.RESTARTING.getCode());
- return stateList;
- case REJECTED:
- stateList.add(GroupStatus.APPROVE_REJECTED.getCode());
- return stateList;
- case INITIALIZING:
- stateList.add(GroupStatus.TO_BE_APPROVAL.getCode());
- stateList.add(GroupStatus.APPROVE_PASSED.getCode());
- stateList.add(GroupStatus.CONFIG_ING.getCode());
- return stateList;
- case FAILED:
- stateList.add(GroupStatus.CONFIG_FAILED.getCode());
- return stateList;
- case STARTED:
- stateList.add(GroupStatus.RESTARTED.getCode());
- stateList.add(GroupStatus.CONFIG_SUCCESSFUL.getCode());
- return stateList;
- case STOPPED:
- stateList.add(GroupStatus.SUSPENDED.getCode());
- return stateList;
- case FINISHED:
- stateList.add(GroupStatus.FINISH.getCode());
- return stateList;
- case DELETED:
- stateList.add(GroupStatus.DELETED.getCode());
- return stateList;
- default:
- throw new IllegalArgumentException(String.format("Unsupported
status %s for group", state));
- }
- }
-}
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/InlongGroupContext.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/InlongGroupContext.java
index 7048d71bb..a90146901 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/InlongGroupContext.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/InlongGroupContext.java
@@ -23,16 +23,17 @@ import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
-import org.apache.inlong.manager.common.pojo.stream.StreamSource;
-import org.apache.inlong.manager.common.pojo.stream.StreamSource.State;
import org.apache.inlong.manager.client.api.inner.InnerGroupContext;
import org.apache.inlong.manager.client.api.util.AssertUtil;
import org.apache.inlong.manager.client.api.util.GsonUtil;
import org.apache.inlong.manager.common.enums.GroupStatus;
import org.apache.inlong.manager.common.pojo.group.InlongGroupExtInfo;
import org.apache.inlong.manager.common.pojo.group.InlongGroupInfo;
+import org.apache.inlong.manager.common.pojo.stream.StreamSource;
+import org.apache.inlong.manager.common.pojo.stream.StreamSource.State;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -181,6 +182,54 @@ public class InlongGroupContext implements Serializable {
throw new
IllegalArgumentException(String.format("Unsupported status %s for group",
bizCode));
}
}
+
+ public static List<Integer> parseStatusByStrState(String state) {
+
+ InlongGroupState groupState;
+ try {
+ groupState = InlongGroupState.valueOf(state);
+ } catch (IllegalArgumentException e) {
+ throw new IllegalArgumentException(String.format("Unsupported
status %s for group", state));
+ }
+
+ List<Integer> stateList = new ArrayList<>();
+ switch (groupState) {
+ case CREATE:
+ stateList.add(GroupStatus.DRAFT.getCode());
+ return stateList;
+ case OPERATING:
+ stateList.add(GroupStatus.DELETING.getCode());
+ stateList.add(GroupStatus.SUSPENDING.getCode());
+ stateList.add(GroupStatus.RESTARTING.getCode());
+ return stateList;
+ case REJECTED:
+ stateList.add(GroupStatus.APPROVE_REJECTED.getCode());
+ return stateList;
+ case INITIALIZING:
+ stateList.add(GroupStatus.TO_BE_APPROVAL.getCode());
+ stateList.add(GroupStatus.APPROVE_PASSED.getCode());
+ stateList.add(GroupStatus.CONFIG_ING.getCode());
+ return stateList;
+ case FAILED:
+ stateList.add(GroupStatus.CONFIG_FAILED.getCode());
+ return stateList;
+ case STARTED:
+ stateList.add(GroupStatus.RESTARTED.getCode());
+ stateList.add(GroupStatus.CONFIG_SUCCESSFUL.getCode());
+ return stateList;
+ case STOPPED:
+ stateList.add(GroupStatus.SUSPENDED.getCode());
+ return stateList;
+ case FINISHED:
+ stateList.add(GroupStatus.FINISH.getCode());
+ return stateList;
+ case DELETED:
+ stateList.add(GroupStatus.DELETED.getCode());
+ return stateList;
+ default:
+ throw new
IllegalArgumentException(String.format("Unsupported status %s for group",
state));
+ }
+ }
}
}
