This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.3.2
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.3.2 by this push:
new 5bb601553 fix(ps): linkis cs server create contextID not null bug
(#4116)
5bb601553 is described below
commit 5bb601553752ef74afb35b492d3463305deef539
Author: Jack Xu <[email protected]>
AuthorDate: Sun Jan 15 16:24:21 2023 +0800
fix(ps): linkis cs server create contextID not null bug (#4116)
---
.../scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala | 2 +-
.../java/org/apache/linkis/cs/client/http/HttpContextClient.java | 1 +
.../common/serialize/impl/value/LinkisBMLResourceSerializer.java | 5 +----
.../common/serialize/impl/value/data/CSResultDataSerializer.java | 5 +----
.../common/serialize/impl/value/data/LinkisJobDataSerializer.java | 5 +----
.../cs/common/serialize/impl/value/metadata/CSTableSerializer.java | 5 +----
.../common/serialize/impl/value/object/CSFlowInfosSerializer.java | 2 +-
.../serialize/impl/value/object/LinkisVariableSerializer.java | 5 +----
.../org/apache/linkis/cs/server/restful/ContextIDRestfulApi.java | 7 +++----
.../java/org/apache/linkis/cs/server/restful/CsRestfulParent.java | 5 +++++
10 files changed, 16 insertions(+), 26 deletions(-)
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala
b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala
index e71ddb464..be251d3b2 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala
@@ -463,7 +463,7 @@ class HttpBmlClient(
val result = dwsClient.execute(deleteAction)
result match {
case bmlDeleteResult: BmlDeleteResult =>
- val isSuccess = if (bmlDeleteResult.getStatus == 0) true else false
+ val isSuccess = (bmlDeleteResult.getStatus == 0)
if (isSuccess) {
BmlDeleteResponse(isSuccess)
} else {
diff --git
a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java
b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java
index f32bad39e..fffae20f3 100644
---
a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java
+++
b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java
@@ -155,6 +155,7 @@ public class HttpContextClient extends
AbstractContextClient {
public Context createContext(ContextID contextID) throws ErrorException {
ContextCreateAction contextCreateAction = new ContextCreateAction();
String contextIDStr = SerializeHelper.serializeContextID(contextID);
+ LOGGER.info("contextIDStr: {}", contextIDStr);
contextCreateAction.addHeader(ContextHTTPConstant.CONTEXT_ID_STR,
contextIDStr);
contextCreateAction.getRequestPayloads().put(ContextHTTPConstant.CONTEXT_ID_STR,
contextIDStr);
Result result = null;
diff --git
a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java
b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java
index 9ab9319fe..0fab839cd 100644
---
a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java
+++
b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java
@@ -35,9 +35,6 @@ public class LinkisBMLResourceSerializer extends
AbstractSerializer<LinkisBMLRes
@Override
public boolean accepts(Object obj) {
- if (null != obj && obj instanceof LinkisBMLResource) {
- return true;
- }
- return false;
+ return obj instanceof LinkisBMLResource;
}
}
diff --git
a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java
b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java
index 8c9def349..6212b602f 100644
---
a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java
+++
b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java
@@ -35,9 +35,6 @@ public class CSResultDataSerializer extends
AbstractSerializer<CSResultData> {
@Override
public boolean accepts(Object obj) {
- if (null != obj &&
obj.getClass().getName().equals(CSResultData.class.getName())) {
- return true;
- }
- return false;
+ return obj instanceof CSResultData;
}
}
diff --git
a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java
b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java
index 022ea7e76..7558023bd 100644
---
a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java
+++
b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java
@@ -36,9 +36,6 @@ public class LinkisJobDataSerializer extends
AbstractSerializer<LinkisJobData> {
@Override
public boolean accepts(Object obj) {
- if (null != obj &&
obj.getClass().getName().equals(LinkisJobData.class.getName())) {
- return true;
- }
- return false;
+ return obj instanceof LinkisJobData;
}
}
diff --git
a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java
b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java
index f460d1477..3607412df 100644
---
a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java
+++
b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java
@@ -36,9 +36,6 @@ public class CSTableSerializer extends
AbstractSerializer<CSTable> {
@Override
public boolean accepts(Object obj) {
- if (null != obj &&
obj.getClass().getName().equals(CSTable.class.getName())) {
- return true;
- }
- return false;
+ return obj instanceof CSTable;
}
}
diff --git
a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java
b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java
index 6e4247a5c..820c90594 100644
---
a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java
+++
b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java
@@ -35,6 +35,6 @@ public class CSFlowInfosSerializer extends
AbstractSerializer<CSFlowInfos> {
@Override
public boolean accepts(Object obj) {
- return null != obj && CSFlowInfos.class.isAssignableFrom(obj.getClass());
+ return obj instanceof CSFlowInfos;
}
}
diff --git
a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java
b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java
index da03a8d8f..e92af9e34 100644
---
a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java
+++
b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java
@@ -35,9 +35,6 @@ public class LinkisVariableSerializer extends
AbstractSerializer<LinkisVariable>
@Override
public boolean accepts(Object obj) {
- if (null != obj &&
obj.getClass().getName().equals(LinkisVariable.class.getName())) {
- return true;
- }
- return false;
+ return obj instanceof LinkisVariable;
}
}
diff --git
a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextIDRestfulApi.java
b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextIDRestfulApi.java
index 277aa73d6..6245c05d2 100644
---
a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextIDRestfulApi.java
+++
b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextIDRestfulApi.java
@@ -72,11 +72,10 @@ public class ContextIDRestfulApi implements CsRestfulParent
{
public Message createContextID(HttpServletRequest req, @RequestBody JsonNode
jsonNode)
throws InterruptedException, ClassNotFoundException, IOException,
CSErrorException {
ContextID contextID = getContextIDFromJsonNode(jsonNode);
- if (StringUtils.isEmpty(contextID.getContextId())) {
- throw new CSErrorException(97000, "contextId cannot be empty");
- }
- ModuleUserUtils.getOperationUser(req, "createContextID,contextID:" +
contextID.getContextId());
+ ModuleUserUtils.getOperationUser(
+ req, "createContextID,contextIDType: " + contextID.getContextIDType());
HttpAnswerJob answerJob = submitRestJob(req, ServiceMethod.CREATE,
contextID);
+
return generateResponse(answerJob, "contextId");
}
diff --git
a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/CsRestfulParent.java
b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/CsRestfulParent.java
index 20b50f305..0faa79ae3 100644
---
a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/CsRestfulParent.java
+++
b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/CsRestfulParent.java
@@ -42,9 +42,13 @@ import java.util.ArrayList;
import java.util.List;
import com.fasterxml.jackson.databind.JsonNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public interface CsRestfulParent {
+ Logger logger = LoggerFactory.getLogger(CsRestfulParent.class);
+
default HttpAnswerJob submitRestJob(
HttpServletRequest req, ServiceMethod method, Object... objects) throws
InterruptedException {
// TODO: 2020/3/3 单例
@@ -102,6 +106,7 @@ public interface CsRestfulParent {
default <T> T deserialize(JsonNode jsonNode, String key) throws
CSErrorException {
String str = jsonNode.get(key).textValue();
+ logger.info("the contextID: {}", str);
return (T) CsUtils.SERIALIZE.deserialize(str);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
