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.

Sign up for GitHub

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

Jump to bottom

#894 Enable TaggedFieldSerializer to skip null fields (only works wit… #896

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#894 Enable TaggedFieldSerializer to skip null fields (only works wit… #896

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 37 additions & 3 deletions src/com/esotericsoftware/kryo/serializers/TaggedFieldSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
import java.lang.annotation.Target;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

/** Serializes objects using direct field assignment for fields that have a <code>@Tag(int)</code> annotation, providing backward
* compatibility and optional forward compatibility. This means fields can be added or renamed and optionally removed without
Expand Down Expand Up @@ -118,12 +121,24 @@ public void write (Kryo kryo, Output output, T object) {
}

int pop = pushTypeVariables();

CachedField[] writeTags = this.writeTags;

boolean chunked = config.chunked, readUnknownTagData = config.readUnknownTagData, skipNullFields = config.skipNullFields;

if (chunked && skipNullFields) {
//filter fields with null values
List<CachedField> list = Arrays.stream(writeTags)
.filter(field -> !isNullField(field,object)).collect(Collectors.toList());
writeTags = new CachedField[list.size()];
for (int i = 0; i < list.size(); i++) {
writeTags[i] = list.get(i);
}
}

output.writeVarInt(writeTags.length + 1, true);

writeHeader(kryo, output, object);

boolean chunked = config.chunked, readUnknownTagData = config.readUnknownTagData;
Output fieldOutput;
OutputChunked outputChunked = null;
if (chunked)
Expand Down Expand Up @@ -163,6 +178,17 @@ public void write (Kryo kryo, Output output, T object) {
popTypeVariables(pop);
}

private boolean isNullField(CachedField cachedField, Object target) {
try {
if (cachedField.getField().get(target) != null) {
return false;
}
} catch (Exception e) {
//this should not happen because the fields should be accessible
}
return true;
}

/** Can be overidden to write data needed for {@link #create(Kryo, Input, Class)}. The default implementation does nothing. */
protected void writeHeader (Kryo kryo, Output output, T object) {
}
Expand Down Expand Up @@ -252,7 +278,7 @@ public TaggedFieldSerializerConfig getTaggedFieldSerializerConfig () {

/** Configuration for TaggedFieldSerializer instances. */
public static class TaggedFieldSerializerConfig extends FieldSerializerConfig {
boolean readUnknownTagData, chunked;
boolean readUnknownTagData, chunked, skipNullFields;
int chunkSize = 1024;

public TaggedFieldSerializerConfig clone () {
Expand Down Expand Up @@ -291,6 +317,14 @@ public boolean getChunkedEncoding () {
return chunked;
}

public boolean isSkipNullFields() {
return skipNullFields;
}

public void setSkipNullFields(boolean skipNullFields) {
this.skipNullFields = skipNullFields;
}

/** The maximum size of each chunk for chunked encoding. Default is 1024. */
public void setChunkSize (int chunkSize) {
this.chunkSize = chunkSize;
Expand Down