This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.4.0
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/dev-1.4.0 by this push:
new 3b41d3445 avoid unnecessary json exception (#4567)
3b41d3445 is described below
commit 3b41d344586c1841081e3f5b9034b06bd0b57997
Author: GuoPhilipse <[email protected]>
AuthorDate: Sat May 20 21:53:58 2023 +0800
avoid unnecessary json exception (#4567)
---
.../manager/label/entity/engine/EngineTypeLabel.java | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java
index d588515b9..6e2715113 100644
---
a/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java
+++
b/linkis-computation-governance/linkis-manager/linkis-label-common/src/main/java/org/apache/linkis/manager/label/entity/engine/EngineTypeLabel.java
@@ -17,18 +17,20 @@
package org.apache.linkis.manager.label.entity.engine;
+import org.apache.linkis.common.utils.JsonUtils;
import org.apache.linkis.manager.label.constant.LabelKeyConstant;
import org.apache.linkis.manager.label.entity.EMNodeLabel;
import org.apache.linkis.manager.label.entity.EngineNodeLabel;
import org.apache.linkis.manager.label.entity.Feature;
import org.apache.linkis.manager.label.entity.GenericLabel;
import org.apache.linkis.manager.label.entity.annon.ValueSerialNum;
-import org.apache.linkis.manager.label.utils.LabelUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
+import com.fasterxml.jackson.core.JsonProcessingException;
+
public class EngineTypeLabel extends GenericLabel implements EngineNodeLabel,
EMNodeLabel {
public EngineTypeLabel() {
@@ -79,8 +81,12 @@ public class EngineTypeLabel extends GenericLabel implements
EngineNodeLabel, EM
@Override
protected void setStringValue(String stringValue) {
if (StringUtils.isNotBlank(stringValue)) {
- HashMap<String, String> valueMap =
LabelUtils.Jackson.fromJson(stringValue, HashMap.class);
- if (valueMap == null) {
+ try {
+ HashMap<String, String> valueMap =
+ JsonUtils.jackson().readValue(stringValue, HashMap.class);
+ setEngineType(valueMap.get("engineType"));
+ setVersion(valueMap.get("version"));
+ } catch (JsonProcessingException e) {
String version;
String engineType = stringValue.split("-")[0];
@@ -92,9 +98,6 @@ public class EngineTypeLabel extends GenericLabel implements
EngineNodeLabel, EM
setEngineType(engineType);
setVersion(version);
- } else {
- setEngineType(valueMap.get("engineType"));
- setVersion(valueMap.get("version"));
}
} else {
setEngineType("*");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
