You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/02/23 02:53:13 UTC
[incubator-inlong] branch master updated: [INLONG-2574][Manager] Defined source config response for Sort (#2637)
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 87a3ba2 [INLONG-2574][Manager] Defined source config response for Sort (#2637)
87a3ba2 is described below
commit 87a3ba2831616bcf6878f2a1108fad4c694fcc9b
Author: imvan <de...@pku.edu.cn>
AuthorDate: Wed Feb 23 10:53:08 2022 +0800
[INLONG-2574][Manager] Defined source config response for Sort (#2637)
---
.../common/pojo/sort/SortSourceConfigResponse.java | 64 ++++++++++++++++++++++
.../inlong/manager/service/core/SortService.java | 17 ++++++
.../manager/service/core/impl/SortServiceImpl.java | 6 ++
.../web/controller/openapi/SortController.java | 11 ++++
4 files changed, 98 insertions(+)
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sort/SortSourceConfigResponse.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sort/SortSourceConfigResponse.java
new file mode 100644
index 0000000..faff9f3
--- /dev/null
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/sort/SortSourceConfigResponse.java
@@ -0,0 +1,64 @@
+/*
+ * 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.common.pojo.sort;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+@Builder
+@ApiModel("Sort source sdk config")
+public class SortSourceConfigResponse {
+ String msg;
+ int code;
+ String md5;
+ SortSourceConfig data;
+
+ @Data
+ @Builder
+ public static class SortSourceConfig {
+ String sortClusterName;
+ String sortId;
+ Map<String, CacheZone> cacheZones;
+ }
+
+ @Data
+ @Builder
+ public static class CacheZone {
+ String zoneName;
+ String serviceUrl;
+ String authentication;
+ List<Topic> topics;
+ Map<String, String> cacheZoneProperties;
+ String zoneType;
+ }
+
+ @Data
+ @Builder
+ public static class Topic {
+ String topic;
+ int partitionCnt;
+ Map<String, String> topicProperties;
+ }
+}
+
+
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/SortService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/SortService.java
index 6542e6d..40a5421 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/SortService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/SortService.java
@@ -18,6 +18,7 @@
package org.apache.inlong.manager.service.core;
import org.apache.inlong.manager.common.pojo.sort.SortClusterConfigResponse;
+import org.apache.inlong.manager.common.pojo.sort.SortSourceConfigResponse;
/**
* Sort Service
@@ -38,4 +39,20 @@ public interface SortService {
* @return Response of sort cluster config {@link SortClusterConfigResponse}
*/
SortClusterConfigResponse getClusterConfig(String clusterName, String md5);
+
+ /**
+ * Get sort source config.
+ *
+ * <p>Interface that acquires the config source SDK for a specific task.
+ *
+ * <p>The param of md5 represents the md5 value of last update response. * if the md5 is same
+ * with the newest one, which means all configs are not updated, * the detailed config in
+ * response will be <b>NULL</b>.
+ *
+ * @param clusterName Name of sort cluster.
+ * @param sortTaskId Task id.
+ * @param md5 Last update md5.
+ * @return Response of sort cluster config
+ */
+ SortSourceConfigResponse getSourceConfig(String clusterName, String sortTaskId, String md5);
}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortServiceImpl.java
index 852763d..121259e 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/SortServiceImpl.java
@@ -19,6 +19,7 @@ package org.apache.inlong.manager.service.core.impl;
import org.apache.commons.lang3.StringUtils;
import org.apache.inlong.manager.common.pojo.sort.SortClusterConfigResponse;
+import org.apache.inlong.manager.common.pojo.sort.SortSourceConfigResponse;
import org.apache.inlong.manager.dao.entity.SortClusterConfigEntity;
import org.apache.inlong.manager.common.pojo.sort.SortClusterConfigResponse.SinkType;
import org.apache.inlong.manager.common.pojo.sort.SortClusterConfigResponse.SortTaskConfig;
@@ -80,6 +81,11 @@ public class SortServiceImpl implements SortService {
return SortClusterConfigResponse.builder().tasks(taskConfigs).msg("success").build();
}
+ @Override
+ public SortSourceConfigResponse getSourceConfig(String clusterName, String sortTaskId, String md5) {
+ return null;
+ }
+
private SortTaskConfig getTaskConfig(SortClusterConfigEntity clusterConfig) {
SinkType sinkType = SinkType.valueOf(clusterConfig.getSinkType().toUpperCase());
List<Map<String, String>> idParams =
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/SortController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/SortController.java
index fd1655e..2d6f4d6 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/SortController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/SortController.java
@@ -20,6 +20,7 @@ package org.apache.inlong.manager.web.controller.openapi;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.inlong.manager.common.pojo.sort.SortClusterConfigResponse;
+import org.apache.inlong.manager.common.pojo.sort.SortSourceConfigResponse;
import org.apache.inlong.manager.service.core.SortService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -42,4 +43,14 @@ public class SortController {
@RequestParam String md5) {
return sortService.getClusterConfig(clusterName, md5);
}
+
+ @GetMapping("/getSortSource")
+ @ApiOperation(value = "get sort sdk cnfig")
+ public SortSourceConfigResponse getSortSourceConfig(
+ @RequestParam String clusterName,
+ @RequestParam String sortTaskId,
+ @RequestParam String md5) {
+ return null;
+ }
+
}