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

[Dubbo-4861] WIP: fix stackoverflow of protostuff and other errors #4862

Merged
merged 2 commits into from
Aug 22, 2019
Merged
Changes from all 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 @@ -23,9 +23,14 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.Serializable;
import java.sql.Timestamp;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import org.apache.dubbo.common.serialize.model.SerializablePerson;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -70,6 +75,75 @@ public void testSerializeSqlDate() throws IOException, ClassNotFoundException {
assertThat(serializedTime, is(originTime));
}

@Test
public void testObjectList() throws IOException, ClassNotFoundException {
List<SerializablePerson> args = new ArrayList<SerializablePerson>();
args.add(new SerializablePerson());

this.protostuffObjectOutput.writeObject(args);
this.flushToInput();

List<SerializablePerson> serializedTime = (List<SerializablePerson>) protostuffObjectInput.readObject();
assertThat(serializedTime, is(args));
}

@Test
public void testCustomizeDateList() throws IOException, ClassNotFoundException {
java.sql.Date originTime = new java.sql.Date(System.currentTimeMillis());
java.sql.Date yesterdayTime = new java.sql.Date(System.currentTimeMillis() + 30*60*1000);
java.sql.Date beforeTime = new java.sql.Date(System.currentTimeMillis() + 30*60*1000*4);
List<java.sql.Date> list = new ArrayList<>();

list.add(originTime);
list.add(yesterdayTime);
list.add(beforeTime);

this.protostuffObjectOutput.writeObject(list);
this.flushToInput();

List<java.sql.Date> serializedTimeList = (List<java.sql.Date>) protostuffObjectInput.readObject();
assertThat(serializedTimeList, is(list));
}

@Test
public void testCustomizeTimeList() throws IOException, ClassNotFoundException {

List<LocalTime> list = new ArrayList<LocalTime>();

LocalTime localTime = LocalTime.parse("12:00:00");
LocalTime localSecondTime = LocalTime.parse("13:00:00");
LocalTime localThirdTime = LocalTime.parse("14:00:00");
list.add(localTime);
list.add(localSecondTime);
list.add(localThirdTime);

LocalTimeList timeList = new LocalTimeList(list);
this.protostuffObjectOutput.writeObject(timeList);
this.flushToInput();

LocalTimeList serializedTime = protostuffObjectInput.readObject(LocalTimeList.class);
assertThat(serializedTime, is(timeList));
}

@Test
public void testListObject() throws IOException, ClassNotFoundException {

List<SerializablePerson> list = new ArrayList<SerializablePerson>();

list.add(new SerializablePerson());
list.add(new SerializablePerson());
list.add(new SerializablePerson());

SerializablePersonList personList = new SerializablePersonList(list);

this.protostuffObjectOutput.writeObject(personList);
this.flushToInput();

SerializablePersonList serializedTime = protostuffObjectInput.readObject(SerializablePersonList.class);
assertThat(serializedTime, is(personList));
}


@Test
public void testSerializeSqlTime() throws IOException, ClassNotFoundException {
java.sql.Time originTime = new java.sql.Time(System.currentTimeMillis());
Expand All @@ -95,4 +169,74 @@ private void flushToInput() throws IOException {
this.byteArrayInputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
this.protostuffObjectInput = new ProtostuffObjectInput(byteArrayInputStream);
}

private static class SerializablePersonList implements Serializable {
private static final long serialVersionUID = 1L;

public List<SerializablePerson> personList;

public SerializablePersonList() {}

public SerializablePersonList(List<SerializablePerson> list) {
this.personList = list;
}

@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;

SerializablePersonList list = (SerializablePersonList) obj;
if (list.personList == null && this.personList == null)
return true;
if (list.personList == null || this.personList == null)
return false;
if (list.personList.size() != this.personList.size())
return false;
for (int i =0; i < this.personList.size(); i++) {
if (!this.personList.get(i).equals(list.personList.get(i)))
return false;
}
return true;
}
}

private static class LocalTimeList implements Serializable {
private static final long serialVersionUID = 1L;

List<LocalTime> timeList;

public LocalTimeList() {}

public LocalTimeList(List<LocalTime> timeList) {
this.timeList = timeList;
}

@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;

LocalTimeList timeList = (LocalTimeList) obj;
if (timeList.timeList == null && this.timeList == null)
return true;
if (timeList.timeList == null || this.timeList == null)
return false;
if (timeList.timeList.size() != this.timeList.size())
return false;
for (int i =0; i < this.timeList.size(); i++) {
if (!this.timeList.get(i).equals(timeList.timeList.get(i)))
return false;
}
return true;
}
}
}