This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 17964abae code format for code review (#4049)
17964abae is described below
commit 17964abaeff4c40f6eae99e086d21aaba88d1aa0
Author: huangKai-2323 <[email protected]>
AuthorDate: Mon Dec 26 11:23:53 2022 +0800
code format for code review (#4049)
---
.../org/apache/linkis/udf/api/UDFRestfulApi.java | 36 +++++++++++-----------
.../linkis/udf/service/impl/UDFServiceImpl.java | 9 +++---
2 files changed, 22 insertions(+), 23 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java
b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java
index 2637091eb..1fe6f4659 100644
---
a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java
+++
b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java
@@ -170,7 +170,7 @@ public class UDFRestfulApi {
UDFTree udfTree = udfTreeService.getTreeById(treeId, userName, type,
category);
message = Message.ok();
message.data("udfTree", udfTree);
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to list Tree: ", e);
message = Message.error(e.getMessage());
}
@@ -296,7 +296,7 @@ public class UDFRestfulApi {
verifyOperationUser(userName, id);
udfService.deleteUDF(id, userName);
message = Message.ok();
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to delete UDF: ", e);
message = Message.error(e.getMessage());
}
@@ -322,7 +322,7 @@ public class UDFRestfulApi {
udfService.deleteLoadInfo(udfId, userName);
}
message = Message.ok();
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to isLoad UDF: ", e);
message = Message.error(e.getMessage());
}
@@ -355,7 +355,7 @@ public class UDFRestfulApi {
udfTree = udfTreeService.addTree(udfTree, userName);
message = Message.ok();
message.data("udfTree", udfTree);
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to add Tree: ", e);
message = Message.error(e.getMessage());
}
@@ -388,7 +388,7 @@ public class UDFRestfulApi {
udfTree = udfTreeService.updateTree(udfTree, userName);
message = Message.ok();
message.data("udfTree", udfTree);
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to update Tree: ", e);
message = Message.error(e.getMessage());
}
@@ -407,7 +407,7 @@ public class UDFRestfulApi {
try {
udfTreeService.deleteTree(id, userName);
message = Message.ok();
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to delete Tree: ", e);
message = Message.error(e.getMessage());
}
@@ -426,7 +426,7 @@ public class UDFRestfulApi {
Boolean boo = udfService.isUDFManager(userName);
message = Message.ok();
message.data("isUDFManager", boo);
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to authenticate identification: ", e);
message = Message.error(e.getMessage());
}
@@ -456,7 +456,7 @@ public class UDFRestfulApi {
verifyOperationUser(userName, udfId);
udfService.setUdfExpire(udfId, userName);
message = Message.ok();
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to setExpire: ", e);
message = Message.error(e.getMessage());
}
@@ -521,7 +521,7 @@ public class UDFRestfulApi {
}
udfService.setUDFSharedInfo(true, udfInfo.getId());
message = Message.ok();
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to share: ", e);
message = Message.error(e.getMessage());
}
@@ -549,7 +549,7 @@ public class UDFRestfulApi {
List<String> shareUsers = udfService.getAllSharedUsersByUdfId(userName,
udfId);
message = Message.ok();
message.data("sharedUsers", shareUsers);
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to setExpire: ", e);
message = Message.error(e.getMessage());
}
@@ -602,7 +602,7 @@ public class UDFRestfulApi {
}
udfService.handoverUdf(udfId, handoverUser);
message = Message.ok();
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to handover udf: ", e);
message = Message.error(e.getMessage());
}
@@ -650,7 +650,7 @@ public class UDFRestfulApi {
verifyOperationUser(userName, udfId);
udfService.publishUdf(udfId, version);
message = Message.ok();
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to publish udf: ", e);
message = Message.error(e.getMessage());
}
@@ -688,7 +688,7 @@ public class UDFRestfulApi {
verifyOperationUser(userName, udfId);
udfService.rollbackUDF(udfId, version, userName);
message = Message.ok();
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to rollback udf: ", e);
message = Message.error(e.getMessage());
}
@@ -710,7 +710,7 @@ public class UDFRestfulApi {
List<UDFVersionVo> versionList = udfService.getUdfVersionList(udfId);
message = Message.ok();
message.data("versionList", versionList);
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to get udf versionList: ", e);
message = Message.error(e.getMessage());
}
@@ -771,7 +771,7 @@ public class UDFRestfulApi {
message.data("infoList", pageInfo.getList());
message.data("totalPage", pageInfo.getPages());
message.data("total", pageInfo.getTotal());
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to get udf infoList: ", e);
message = Message.error(e.getMessage());
}
@@ -810,7 +810,7 @@ public class UDFRestfulApi {
String content = udfService.downLoadUDF(udfId, version, userName);
message = Message.ok();
message.data("content", content);
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to download udf: ", e);
message = Message.error(e.getMessage());
}
@@ -900,7 +900,7 @@ public class UDFRestfulApi {
List<String> udfUsers = udfService.allUdfUsers();
message = Message.ok();
message.data("udfUsers", udfUsers);
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to get udf users: ", e);
message = Message.error(e.getMessage());
}
@@ -924,7 +924,7 @@ public class UDFRestfulApi {
List<String> userDirectory = udfService.getUserDirectory(userName,
category);
message = Message.ok();
message.data("userDirectory", userDirectory);
- } catch (Throwable e) {
+ } catch (Exception e) {
logger.error("Failed to get user directory: ", e);
message = Message.error(e.getMessage());
}
diff --git
a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java
b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java
index 5446d9148..7ca1cc611 100644
---
a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java
+++
b/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java
@@ -1052,18 +1052,17 @@ public class UDFServiceImpl implements UDFService {
@Override
public List<UDFAddVo> getUdfByNameList(List<String> udfNameList, String
creator) {
- logger.info("begin to get managerPages.");
List<UDFAddVo> retList = new ArrayList<>();
retList = udfDao.getUdfInfoByNameList(udfNameList, creator);
+ boolean ismanager = isUDFManager(creator);
+ List<Long> loadedUdf = udfDao.getLoadedUDFIds(creator);
retList.forEach(
udfInfo -> {
- String createUser = udfInfo.getCreateUser();
- boolean ismanager = isUDFManager(createUser);
- List<Long> loadedUdf = udfDao.getLoadedUDFIds(createUser);
udfInfo.setLoad(loadedUdf.contains(udfInfo.getId()));
boolean canExpire = false;
if (Boolean.TRUE.equals(udfInfo.getShared())) {
- long loadCount = udfDao.getUserLoadCountByUdfId(udfInfo.getId(),
createUser);
+ long loadCount =
+ udfDao.getUserLoadCountByUdfId(udfInfo.getId(),
udfInfo.getCreateUser());
if (loadCount > 0) {
canExpire = true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
