Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix fastjson serialize type #3767

Merged
merged 4 commits into from
Mar 29, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package com.alibaba.dubbo.common.serialize.fastjson;

import com.alibaba.dubbo.common.serialize.ObjectInput;
import com.alibaba.dubbo.common.utils.PojoUtils;
import com.alibaba.fastjson.JSON;

import java.io.BufferedReader;
Expand Down Expand Up @@ -99,8 +98,8 @@ public <T> T readObject(Class<T> cls) throws IOException, ClassNotFoundException
@Override
@SuppressWarnings("unchecked")
public <T> T readObject(Class<T> cls, Type type) throws IOException, ClassNotFoundException {
Object value = readObject(cls);
return (T) PojoUtils.realize(value, cls, type);
String json = readLine();
return (T) JSON.parseObject(json, type);
}

private String readLine() throws IOException, EOFException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,25 @@
*/
package com.alibaba.dubbo.common.serialize.fastjson;

import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;

import com.alibaba.dubbo.common.serialize.fastjson.model.Organization;
import com.alibaba.dubbo.common.serialize.fastjson.model.Person;
import com.alibaba.fastjson.JSONObject;
import org.junit.Test;

import java.io.ByteArrayInputStream;
import java.io.EOFException;
import java.io.IOException;
import java.io.StringReader;

import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.List;
import javax.lang.model.util.Types;
import org.junit.Test;

public class FastJsonObjectInputTest {
private FastJsonObjectInput fastJsonObjectInput;
Expand Down Expand Up @@ -144,4 +150,43 @@ public void testReadObjectWithoutClass() throws IOException, ClassNotFoundExcept
assertThat(readObject.getString("name"), is("John"));
assertThat(readObject.getInteger("age"), is(30));
}
}

@Test
public void testReadObjectWithTowType() throws Exception {
fastJsonObjectInput = new FastJsonObjectInput(new StringReader("[{\"name\":\"John\",\"age\":30},{\"name\":\"Born\",\"age\":24}]"));

Method methodReturnType = getClass().getMethod("towLayer");
Type type = methodReturnType.getGenericReturnType();
List<Person> o = fastJsonObjectInput.readObject(List.class, type);

assertTrue(o instanceof List);
assertTrue(o.get(0) instanceof Person);

assertThat(o.size(), is(2));
assertThat(o.get(1).getName(), is("Born"));
}

@Test
public void testReadObjectWithThreeType() throws Exception {
fastJsonObjectInput = new FastJsonObjectInput(new StringReader("{\"data\":[{\"name\":\"John\",\"age\":30},{\"name\":\"Born\",\"age\":24}]}"));

Method methodReturnType = getClass().getMethod("threeLayer");
Type type = methodReturnType.getGenericReturnType();
Organization<List<Person>> o = fastJsonObjectInput.readObject(Organization.class, type);

assertTrue(o instanceof Organization);
assertTrue(o.getData() instanceof List);
assertTrue(o.getData().get(0) instanceof Person);

assertThat(o.getData().size(), is(2));
assertThat(o.getData().get(1).getName(), is("Born"));
}

public List<Person> towLayer() {
return null;
}

public Organization<List<Person>> threeLayer() {
return null;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.alibaba.dubbo.common.serialize.fastjson.model;
cyejing marked this conversation as resolved.
Show resolved Hide resolved

/**
* @author Born
cyejing marked this conversation as resolved.
Show resolved Hide resolved
*/
public class Organization<T> {

private T data;

public T getData() {
return data;
}

public void setData(T data) {
this.data = data;
}
}