You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/03/05 01:59:06 UTC
[incubator-linkis] 01/03: fix:no converter for [class org.apache.linkis.server.Message] with preset Content-Type 'application/x-msdownload'
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.0-datasource
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit d240b4299a09f9a1d19fd5091fe9c5259974e5d8
Author: casionone <ca...@gmail.com>
AuthorDate: Fri Mar 4 20:37:44 2022 +0800
fix:no converter for [class org.apache.linkis.server.Message] with preset Content-Type 'application/x-msdownload'
---
.../linkis/bml/restful/BmlProjectRestful.java | 16 ++------
.../apache/linkis/bml/restful/BmlRestfulApi.java | 44 ++++++++--------------
2 files changed, 19 insertions(+), 41 deletions(-)
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
index abf061f..0311a05 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
@@ -20,6 +20,7 @@ package org.apache.linkis.bml.restful;
import org.apache.linkis.bml.Entity.DownloadModel;
import org.apache.linkis.bml.Entity.ResourceTask;
import org.apache.linkis.bml.common.BmlProjectNoEditException;
+import org.apache.linkis.bml.common.BmlQueryFailException;
import org.apache.linkis.bml.common.BmlServerParaErrorException;
import org.apache.linkis.bml.conf.BmlServerConfiguration;
import org.apache.linkis.bml.service.*;
@@ -49,8 +50,6 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.*;
-import static org.apache.linkis.bml.restful.BmlRestfulApi.URL_PREFIX;
-
@RequestMapping(path = "/bml")
@RestController
public class BmlProjectRestful {
@@ -262,7 +261,7 @@ public class BmlProjectRestful {
}
@RequestMapping(path = "downloadShareResource", method = RequestMethod.GET)
- public Message downloadShareResource(
+ public void downloadShareResource(
@RequestParam(value = "resourceId", required = false) String resourceId,
@RequestParam(value = "version", required = false) String version,
HttpServletResponse resp,
@@ -309,11 +308,7 @@ public class BmlProjectRestful {
properties);
downloadModel.setEndTime(new Date(System.currentTimeMillis()));
downloadModel.setState(0);
- if (downloadResult) {
- message = Message.ok("Download resource successfully(下载资源成功)");
- message.setStatus(0);
- message.setMethod(URL_PREFIX + "download");
- } else {
+ if (!downloadResult) {
LOGGER.warn(
"ResourceId :{}, version:{} has a problem when user {} downloads the resource. The copied size is less than 0 (用户 {} 下载资源 resourceId: {}, version:{} 出现问题,复制的size小于0)",
user,
@@ -323,9 +318,7 @@ public class BmlProjectRestful {
resourceId,
version);
downloadModel.setState(1);
- message = Message.error("Failed to download the resource(下载资源失败)");
- message.setStatus(1);
- message.setMethod(URL_PREFIX + "download");
+ throw new BmlQueryFailException("Failed to download the resource(下载资源失败)");
}
downloadService.addDownloadRecord(downloadModel);
LOGGER.info(
@@ -373,7 +366,6 @@ public class BmlProjectRestful {
resourceId,
user,
resourceId);
- return message;
}
@RequestMapping(path = "getProjectInfo", method = RequestMethod.GET)
diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java
index b3ffd0f..068714a 100644
--- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java
+++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java
@@ -494,12 +494,12 @@ public class BmlRestfulApi {
* @param version 资源版本，如果不指定，默认为最新
* @param resp httpServletResponse
* @param request httpServletRequest
- * @return Message
+ * @return void
* @throws IOException
* @throws ErrorException
*/
@RequestMapping(path = "download", method = RequestMethod.GET)
- public Message download(
+ public void download(
@RequestParam(value = "resourceId", required = false) String resourceId,
@RequestParam(value = "version", required = false) String version,
HttpServletResponse resp,
@@ -508,35 +508,28 @@ public class BmlRestfulApi {
String user = RestfulUtils.getUserName(request);
if (StringUtils.isBlank(resourceId) || !resourceService.checkResourceId(resourceId)) {
- Message message =
- Message.error(
- "ResourceID :"
- + resourceId
- + " is empty, illegal or has been deleted (resourceId:"
- + resourceId
- + "为空,非法或者已被删除!)");
- message.setMethod(URL_PREFIX + "download");
- message.setStatus(1);
- return message;
+ throw new BmlQueryFailException(
+ "ResourceID :"
+ + resourceId
+ + " is empty, illegal or has been deleted (resourceId:"
+ + resourceId
+ + "为空,非法或者已被删除!)");
}
if (!resourceService.checkAuthority(user, resourceId)) {
throw new BmlPermissionDeniedException(
"You do not have permission to download this resource (您没有权限下载此资源)");
}
- // 判version空,返回最新版本
+ // version is null get NewestVersion
if (StringUtils.isBlank(version)) {
version = versionService.getNewestVersion(resourceId);
}
- // 判version不存在或者非法
+ // check version
if (!versionService.checkVersion(resourceId, version)) {
- Message message =
- Message.error("version:" + version + "is empty, illegal or has been deleted");
- message.setMethod(URL_PREFIX + "download");
- message.setStatus(1);
- return message;
+ throw new BmlQueryFailException(
+ "version:" + version + "is empty, illegal or has been deleted");
}
- // 判resourceId和version是否过期
+ // checkExpire
if (!resourceService.checkExpire(resourceId, version)) {
throw new BmlResourceExpiredException(resourceId);
}
@@ -559,11 +552,7 @@ public class BmlRestfulApi {
user, resourceId, version, resp.getOutputStream(), properties);
downloadModel.setEndTime(new Date(System.currentTimeMillis()));
downloadModel.setState(0);
- if (downloadResult) {
- message = Message.ok("Download resource successfully (下载资源成功)");
- message.setStatus(0);
- message.setMethod(URL_PREFIX + "download");
- } else {
+ if (!downloadResult) {
logger.warn(
"ResourceId :{}, version:{} has a problem when user {} downloads the resource. The copied size is less than 0(用户 {} 下载资源 resourceId: {}, version:{} 出现问题,复制的size小于0)",
resourceId,
@@ -573,9 +562,7 @@ public class BmlRestfulApi {
resourceId,
version);
downloadModel.setState(1);
- message = Message.error("Failed to download the resource(下载资源失败)");
- message.setStatus(1);
- message.setMethod(URL_PREFIX + "download");
+ throw new BmlQueryFailException("Failed to download the resource(下载资源失败)");
}
downloadService.addDownloadRecord(downloadModel);
logger.info(
@@ -624,7 +611,6 @@ public class BmlRestfulApi {
resourceId,
user,
resourceId);
- return message;
}
@RequestMapping(path = "upload", method = RequestMethod.POST)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org