This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 88495b9758 [INLONG-9062][Manager] Add default values for stream
related interface parameters (#9063)
88495b9758 is described below
commit 88495b975814431079384ea4273a8f1bdab342f8
Author: fuweng11 <[email protected]>
AuthorDate: Wed Oct 18 09:47:29 2023 +0800
[INLONG-9062][Manager] Add default values for stream related interface
parameters (#9063)
---
.../api/inner/client/InlongStreamClient.java | 23 ++++++++++++++--------
.../client/api/service/InlongStreamApi.java | 12 +++++++----
.../web/controller/InlongStreamController.java | 8 ++++----
.../openapi/OpenInLongStreamController.java | 2 +-
4 files changed, 28 insertions(+), 17 deletions(-)
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongStreamClient.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongStreamClient.java
index 1709bee418..8085362d41 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongStreamClient.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/client/InlongStreamClient.java
@@ -164,12 +164,13 @@ public class InlongStreamClient {
*
* @param groupId inlong group id
* @param streamId inlong stream id
+ * @param sync Create stream in synchronous/asynchronous way.
* @return whether succeed
*/
- public boolean startProcess(String groupId, String streamId) {
+ public boolean startProcess(String groupId, String streamId, boolean sync)
{
Preconditions.expectNotBlank(groupId, ErrorCodeEnum.GROUP_ID_IS_EMPTY);
Preconditions.expectNotBlank(streamId,
ErrorCodeEnum.STREAM_ID_IS_EMPTY);
- Response<Boolean> response =
ClientUtils.executeHttpCall(inlongStreamApi.startProcess(groupId, streamId));
+ Response<Boolean> response =
ClientUtils.executeHttpCall(inlongStreamApi.startProcess(groupId, streamId,
sync));
ClientUtils.assertRespSuccess(response);
return response.getData();
}
@@ -179,12 +180,14 @@ public class InlongStreamClient {
*
* @param groupId inlong group id
* @param streamId inlong stream id
+ * @param sync Suspend stream in synchronous/asynchronous way.
* @return whether succeed
*/
- public boolean suspendProcess(String groupId, String streamId) {
+ public boolean suspendProcess(String groupId, String streamId, boolean
sync) {
Preconditions.expectNotBlank(groupId, ErrorCodeEnum.GROUP_ID_IS_EMPTY);
Preconditions.expectNotBlank(streamId,
ErrorCodeEnum.STREAM_ID_IS_EMPTY);
- Response<Boolean> response =
ClientUtils.executeHttpCall(inlongStreamApi.suspendProcess(groupId, streamId));
+ Response<Boolean> response =
+
ClientUtils.executeHttpCall(inlongStreamApi.suspendProcess(groupId, streamId,
sync));
ClientUtils.assertRespSuccess(response);
return response.getData();
}
@@ -194,12 +197,14 @@ public class InlongStreamClient {
*
* @param groupId inlong group id
* @param streamId inlong stream id
+ * @param sync Restart stream in synchronous/asynchronous way.
* @return whether succeed
*/
- public boolean restartProcess(String groupId, String streamId) {
+ public boolean restartProcess(String groupId, String streamId, boolean
sync) {
Preconditions.expectNotBlank(groupId, ErrorCodeEnum.GROUP_ID_IS_EMPTY);
Preconditions.expectNotBlank(streamId,
ErrorCodeEnum.STREAM_ID_IS_EMPTY);
- Response<Boolean> response =
ClientUtils.executeHttpCall(inlongStreamApi.restartProcess(groupId, streamId));
+ Response<Boolean> response =
+
ClientUtils.executeHttpCall(inlongStreamApi.restartProcess(groupId, streamId,
sync));
ClientUtils.assertRespSuccess(response);
return response.getData();
}
@@ -209,12 +214,14 @@ public class InlongStreamClient {
*
* @param groupId inlong group id
* @param streamId inlong stream id
+ * @param sync Delete stream in synchronous/asynchronous way.
* @return whether succeed
*/
- public boolean deleteProcess(String groupId, String streamId) {
+ public boolean deleteProcess(String groupId, String streamId, boolean
sync) {
Preconditions.expectNotBlank(groupId, ErrorCodeEnum.GROUP_ID_IS_EMPTY);
Preconditions.expectNotBlank(streamId,
ErrorCodeEnum.STREAM_ID_IS_EMPTY);
- Response<Boolean> response =
ClientUtils.executeHttpCall(inlongStreamApi.deleteProcess(groupId, streamId));
+ Response<Boolean> response =
+
ClientUtils.executeHttpCall(inlongStreamApi.deleteProcess(groupId, streamId,
sync));
ClientUtils.assertRespSuccess(response);
return response.getData();
}
diff --git
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongStreamApi.java
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongStreamApi.java
index e23e6bc5bc..fc3f4a2fe8 100644
---
a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongStreamApi.java
+++
b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/service/InlongStreamApi.java
@@ -58,16 +58,20 @@ public interface InlongStreamApi {
Call<Response<PageResult<InlongStreamInfo>>> listStream(@Body
InlongStreamPageRequest request);
@POST("stream/startProcess/{groupId}/{streamId}")
- Call<Response<Boolean>> startProcess(@Path("groupId") String groupId,
@Path("streamId") String streamId);
+ Call<Response<Boolean>> startProcess(@Path("groupId") String groupId,
@Path("streamId") String streamId,
+ @Query("sync") boolean sync);
@POST("stream/suspendProcess/{groupId}/{streamId}")
- Call<Response<Boolean>> suspendProcess(@Path("groupId") String groupId,
@Path("streamId") String streamId);
+ Call<Response<Boolean>> suspendProcess(@Path("groupId") String groupId,
@Path("streamId") String streamId,
+ @Query("sync") boolean sync);
@POST("stream/restartProcess/{groupId}/{streamId}")
- Call<Response<Boolean>> restartProcess(@Path("groupId") String groupId,
@Path("streamId") String streamId);
+ Call<Response<Boolean>> restartProcess(@Path("groupId") String groupId,
@Path("streamId") String streamId,
+ @Query("sync") boolean sync);
@POST("stream/deleteProcess/{groupId}/{streamId}")
- Call<Response<Boolean>> deleteProcess(@Path("groupId") String groupId,
@Path("streamId") String streamId);
+ Call<Response<Boolean>> deleteProcess(@Path("groupId") String groupId,
@Path("streamId") String streamId,
+ @Query("sync") boolean sync);
@DELETE("stream/delete")
Call<Response<Boolean>> delete(@Query("groupId") String groupId,
@Query("streamId") String streamId);
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongStreamController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongStreamController.java
index 2407cdd283..2d21e84fe2 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongStreamController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongStreamController.java
@@ -147,7 +147,7 @@ public class InlongStreamController {
@ApiImplicitParam(name = "streamId", dataTypeClass = String.class,
required = true)
})
public Response<Boolean> startProcess(@PathVariable String groupId,
@PathVariable String streamId,
- @RequestParam boolean sync) {
+ @RequestParam(required = false, defaultValue = "false") boolean
sync) {
String operator = LoginUserUtils.getLoginUser().getName();
return Response.success(streamProcessOperation.startProcess(groupId,
streamId, operator, sync));
}
@@ -159,7 +159,7 @@ public class InlongStreamController {
@ApiImplicitParam(name = "streamId", dataTypeClass = String.class,
required = true)
})
public Response<Boolean> suspendProcess(@PathVariable String groupId,
@PathVariable String streamId,
- @RequestParam boolean sync) {
+ @RequestParam(required = false, defaultValue = "false") boolean
sync) {
String operator = LoginUserUtils.getLoginUser().getName();
return Response.success(streamProcessOperation.suspendProcess(groupId,
streamId, operator, sync));
}
@@ -171,7 +171,7 @@ public class InlongStreamController {
@ApiImplicitParam(name = "streamId", dataTypeClass = String.class,
required = true)
})
public Response<Boolean> restartProcess(@PathVariable String groupId,
@PathVariable String streamId,
- @RequestParam boolean sync) {
+ @RequestParam(required = false, defaultValue = "false") boolean
sync) {
String operator = LoginUserUtils.getLoginUser().getName();
return Response.success(streamProcessOperation.restartProcess(groupId,
streamId, operator, sync));
}
@@ -183,7 +183,7 @@ public class InlongStreamController {
@ApiImplicitParam(name = "streamId", dataTypeClass = String.class,
required = true)
})
public Response<Boolean> deleteProcess(@PathVariable String groupId,
@PathVariable String streamId,
- @RequestParam boolean sync) {
+ @RequestParam(required = false, defaultValue = "false") boolean
sync) {
String operator = LoginUserUtils.getLoginUser().getName();
return Response.success(streamProcessOperation.deleteProcess(groupId,
streamId, operator, sync));
}
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/OpenInLongStreamController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/OpenInLongStreamController.java
index 864b278851..7115132581 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/OpenInLongStreamController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/OpenInLongStreamController.java
@@ -134,7 +134,7 @@ public class OpenInLongStreamController {
@ApiImplicitParam(name = "streamId", dataTypeClass = String.class,
required = true)
})
public Response<Boolean> startProcess(@PathVariable String groupId,
@PathVariable String streamId,
- @RequestParam boolean sync) {
+ @RequestParam(required = false, defaultValue = "false") boolean
sync) {
String operator = LoginUserUtils.getLoginUser().getName();
return Response.success(streamProcessOperation.startProcess(groupId,
streamId, operator, sync));
}
