feat(java): support Ignore inconsistent types deserialize #1737
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
weijiang157152688
changed the title
weijiang157152688
changed the title
weijiang157152688
changed the title
chaokunyang
reviewed
Jul 18, 2024
| } | ||
| // Make DescriptorGrouper have consistent order whether field exist or not | ||
| // type is inconsistent use serialize type, except enum | ||
| if (!newDesc.getRawType().isAssignableFrom(descriptor.getRawType()) |
There was a problem hiding this comment.
Suggested change
| if (!newDesc.getRawType().isAssignableFrom(descriptor.getRawType()) | |
| if (!descriptor.getRawType().isAssignableFrom(newDesc.getRawType()) |
chaokunyang
reviewed
Jul 18, 2024
| descriptors.add(newDesc); | ||
| continue; |
chaokunyang
reviewed
Jul 18, 2024
| // Make DescriptorGrouper have consistent order whether field exist or not | ||
| // type is inconsistent use serialize type, except enum | ||
| if (!newDesc.getRawType().isAssignableFrom(descriptor.getRawType()) | ||
| && !descriptor.getRawType().isEnum()) { |
There was a problem hiding this comment.
move this check first
chaokunyang
reviewed
Jul 18, 2024
| } | ||
| descriptor = descriptor.copyWithTypeName(newDesc.getTypeName()); |
chaokunyang
reviewed
Jul 18, 2024
| @@ -160,4 +163,53 @@ public void testEmptyObject() { | |||
| Fury fury = Fury.builder().requireClassRegistration(true).build(); | |||
| assertSame(serDe(fury, new Object()).getClass(), Object.class); | |||
| } | |||
|
|
|||
| @Test | |||
| public void testIgnoreTypeInconsistentSerializer() | |||
There was a problem hiding this comment.
Put this to MetaSharedObjectSerializerTest
chaokunyang
reviewed
Jul 19, 2024
java/fury-core/src/main/java/org/apache/fury/meta/ClassDef.java
Outdated
Show resolved
Hide resolved
chaokunyang
reviewed
Jul 23, 2024
| descriptor = descriptor.copyWithTypeName(newDesc.getTypeName()); | ||
| descriptors.add(descriptor); | ||
| // fury builtin types skip | ||
| if (newDesc.getRawType().getTypeName().contains("apache.fury") |
There was a problem hiding this comment.
newDesc.getRawType().getTypeName().contains("apache.fury") looks too hack, this should be removed
chaokunyang
reviewed
Jul 24, 2024
| || newDesc.getRawType().isAssignableFrom(descriptor.getRawType())) { | ||
| if (newDesc.getRawType().isEnum() | ||
| || newDesc.getRawType().isAssignableFrom(descriptor.getRawType()) | ||
| || newDesc.getRawType().isAssignableFrom(NonexistentClass.NonexistentEnum.class) |
There was a problem hiding this comment.
You can use org.apache.fury.serializer.NonexistentClass#isNonexistent instead
chaokunyang
reviewed
Jul 24, 2024
| descriptor = descriptor.copyWithTypeName(newDesc.getTypeName()); | ||
| descriptors.add(descriptor); | ||
| // fury builtin types skip | ||
| if (newDesc.getRawType().isEnum() |
There was a problem hiding this comment.
Could you make newDesc.getRawType() as a local variable?
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Related issues
Does this PR introduce any user-facing change?
Benchmark