Unverified Commit 0744d407 authored by Yichao Yang's avatar Yichao Yang Committed by GitHub
Browse files

[Hotfix-2922][common] Fix Jackson UDde error (#2922) (#2926) 



Co-authored-by: default avatardailidong <dailidong66@gmail.com>
parent 8031c162

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java

+26 −7
Original line number Diff line number Diff line
@@ -16,19 +16,34 @@ 
 */

package org.apache.dolphinscheduler.common.utils;



import java.io.IOException;

import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Map;

import java.util.TimeZone;



import org.apache.commons.lang.StringUtils;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



import com.fasterxml.jackson.core.JsonGenerator;

import com.fasterxml.jackson.core.JsonParser;

import com.fasterxml.jackson.core.type.TypeReference;

import com.fasterxml.jackson.databind.*;

import com.fasterxml.jackson.databind.DeserializationContext;

import com.fasterxml.jackson.databind.DeserializationFeature;

import com.fasterxml.jackson.databind.JsonDeserializer;

import com.fasterxml.jackson.databind.JsonNode;

import com.fasterxml.jackson.databind.JsonSerializer;

import com.fasterxml.jackson.databind.ObjectMapper;

import com.fasterxml.jackson.databind.ObjectWriter;

import com.fasterxml.jackson.databind.SerializationFeature;

import com.fasterxml.jackson.databind.SerializerProvider;

import com.fasterxml.jackson.databind.node.ArrayNode;

import com.fasterxml.jackson.databind.node.ObjectNode;

import com.fasterxml.jackson.databind.node.TextNode;

import com.fasterxml.jackson.databind.type.CollectionType;

import org.apache.commons.lang.StringUtils;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



import java.io.IOException;

import java.util.*;



/**

 * json utils
@@ -275,8 +290,12 @@ public class JSONUtils { 
        @Override

        public String deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {

            JsonNode node = p.getCodec().readTree(p);

            if (node instanceof TextNode) {

                return node.asText();

            } else {

                return node.toString();

            }

        }



    }

}

dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java

+23 −2
Original line number Diff line number Diff line
@@ -21,14 +21,20 @@ import com.fasterxml.jackson.databind.SerializationFeature; 
import com.fasterxml.jackson.databind.node.ArrayNode;

import com.fasterxml.jackson.databind.node.JsonNodeFactory;

import com.fasterxml.jackson.databind.node.ObjectNode;



import java.util.ArrayList;

import java.util.HashMap;

import java.util.LinkedHashMap;

import java.util.List;

import java.util.Map;



import org.apache.dolphinscheduler.common.enums.DataType;

import org.apache.dolphinscheduler.common.enums.Direct;

import org.apache.dolphinscheduler.common.model.TaskNode;

import org.apache.dolphinscheduler.common.process.Property;

import org.junit.Assert;

import org.junit.Test;



import java.util.*;



public class JSONUtilsTest {



    @Test
@@ -216,4 +222,19 @@ public class JSONUtilsTest { 
        Assert.assertEquals("yellow", node.path(0).path("color").asText());

    }



    @Test

    public void jsonDataDeserializerTest() {

        String a = "{\"conditionResult\":\"{\\\"successNode\\\":[\\\"\\\"],\\\"failedNode\\\":[\\\"\\\"]}\","

                + "\"conditionsTask\":false,\"depList\":[],\"dependence\":\"{}\",\"forbidden\":false,"

                + "\"id\":\"tasks-86823\",\"maxRetryTimes\":1,\"name\":\"shell test\","

                + "\"params\":\"{\\\"resourceList\\\":[],\\\"localParams\\\":[],\\\"rawScript\\\":\\\"echo "

                + "'yyc'\\\"}\",\"preTasks\":\"[]\",\"retryInterval\":1,\"runFlag\":\"NORMAL\","

                + "\"taskInstancePriority\":\"HIGHEST\",\"taskTimeoutParameter\":{\"enable\":false,\"interval\":0},"

                + "\"timeout\":\"{}\",\"type\":\"SHELL\",\"workerGroup\":\"default\"}";



        TaskNode taskNode = JSONUtils.parseObject(a, TaskNode.class);



        Assert.assertTrue(true);

    }



}