Skip to content

Commit

Permalink
feat(java): support Ignore inconsistent types deserialize (#1737)
Browse files Browse the repository at this point in the history

## What does this PR do?

<!-- Describe the purpose of this PR. -->


## Related issues

<!--
Is there any related issue? Please attach here.

- #xxxx0
- #xxxx1
- #xxxx2
-->


## Does this PR introduce any user-facing change?

<!--
If any user-facing interface changes, please [open an
issue](https://github.com/apache/fury/issues/new/choose) describing the
need to do so and update the document if necessary.
-->

- [x] Does this PR introduce any public API change?
- [x] Does this PR introduce any binary protocol compatibility change?


## Benchmark

<!--
When the PR has an impact on performance (if you don't know whether the
PR will have an impact on performance, you can submit the PR first, and
if it will have impact on performance, the code reviewer will explain
it), be sure to attach a benchmark data here.
-->

---------

Co-authored-by: weijiang.wj <[email protected]>
Co-authored-by: Shawn Yang <[email protected]>
  • Loading branch information
3 people authored Jul 24, 2024
1 parent 8f2db2e commit 1a5c357
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 2 deletions.
13 changes: 11 additions & 2 deletions java/fury-core/src/main/java/org/apache/fury/meta/ClassDef.java
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,17 @@ public List<Descriptor> getDescriptors(ClassResolver resolver, Class<?> cls) {
Descriptor newDesc = fieldInfo.toDescriptor(resolver);
if (descriptor != null) {
// Make DescriptorGrouper have consistent order whether field exist or not
descriptor = descriptor.copyWithTypeName(newDesc.getTypeName());
descriptors.add(descriptor);
// fury builtin types skip
Class<?> rawType = newDesc.getRawType();
if (rawType.isEnum()
|| rawType.isAssignableFrom(descriptor.getRawType())
|| NonexistentClass.isNonexistent(rawType)
|| rawType.isAssignableFrom(FinalObjectTypeStub.class)) {
descriptor = descriptor.copyWithTypeName(newDesc.getTypeName());
descriptors.add(descriptor);
} else {
descriptors.add(newDesc);
}
} else {
descriptors.add(newDesc);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.apache.fury.serializer;

import org.apache.fury.Fury;
import org.apache.fury.FuryTestBase;
import org.apache.fury.ThreadSafeFury;
import org.apache.fury.codegen.JaninoUtils;
import org.apache.fury.config.CompatibleMode;
import org.testng.annotations.Test;

public class MetaSharedObjectSerializerTest extends FuryTestBase {

@Test
public void testIgnoreTypeInconsistentSerializer()
throws InstantiationException, IllegalAccessException {
String codeA =
"public class TestA {"
+ " private int a = 1;"
+ " private Long b = 2L;"
+ " private String c = \"test\";"
+ " private int d;"
+ "}";

String codeB =
"public class TestA {"
+ " private Integer a ;"
+ " private int b = 30;"
+ " private String c = \"test\";"
+ " private String d;"
+ "}";

Class<?> cls1 = JaninoUtils.compileClass(getClass().getClassLoader(), "", "TestA", codeA);
Class<?> cls2 = JaninoUtils.compileClass(getClass().getClassLoader(), "", "TestA", codeB);
ThreadSafeFury fury1 =
Fury.builder()
.withRefTracking(true)
.requireClassRegistration(false)
.withDeserializeNonexistentClass(true)
.withCompatibleMode(CompatibleMode.COMPATIBLE)
.deserializeNonexistentEnumValueAsNull(true)
.withScopedMetaShare(true)
.withCodegen(false)
.withClassLoader(cls1.getClassLoader())
.buildThreadSafeFury();
ThreadSafeFury fury2 =
Fury.builder()
.withRefTracking(true)
.requireClassRegistration(false)
.withDeserializeNonexistentClass(true)
.withCompatibleMode(CompatibleMode.COMPATIBLE)
.deserializeNonexistentEnumValueAsNull(true)
.withScopedMetaShare(true)
.withCodegen(false)
.withClassLoader(cls2.getClassLoader())
.buildThreadSafeFury();
Object data = cls1.newInstance();
System.out.println(fury2.deserialize(fury1.serialize(data)));
}
}

0 comments on commit 1a5c357

Please sign in to comment.