This is an automated email from the ASF dual-hosted git repository.
chaokunyang pushed a commit to branch releases-0.11
in repository https://gitbox.apache.org/repos/asf/fury.git
The following commit(s) were added to refs/heads/releases-0.11 by this push:
new 41eb3abb chore: cherry pick commits for 0.11.0 (#2147)
41eb3abb is described below
commit 41eb3abb6de2c4810abd3ee25526f3736f472232
Author: Shawn Yang <[email protected]>
AuthorDate: Tue Apr 15 11:00:56 2025 +0800
chore: cherry pick commits for 0.11.0 (#2147)
<!--
**Thanks for contributing to Fury.**
**If this is your first time opening a PR on fury, you can refer to
[CONTRIBUTING.md](https://github.com/apache/fury/blob/main/CONTRIBUTING.md).**
Contribution Checklist
- The **Apache Fury (incubating)** community has restrictions on the
naming of pr titles. You can also find instructions in
[CONTRIBUTING.md](https://github.com/apache/fury/blob/main/CONTRIBUTING.md).
- Fury has a strong focus on performance. If the PR you submit will have
an impact on performance, please benchmark it first and provide the
benchmark result here.
-->
## 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.
-->
- [ ] Does this PR introduce any public API change?
- [ ] 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.
-->
---------
Signed-off-by: Liangliang Sui <[email protected]>
Co-authored-by: monk <[email protected]>
Co-authored-by: LiangliangSui
<[email protected]>
---
LICENSE | 8 +++-----
NOTICE | 12 +++++------
docs/cpp_debug.md | 22 ++++++++++++++++++++-
docs/guide/DEVELOPMENT.md | 15 ++++++++++++++
docs/guide/graalvm_guide.md | 15 ++++++++++++++
docs/guide/java_serialization_guide.md | 15 ++++++++++++++
docs/guide/row_format_guide.md | 15 ++++++++++++++
docs/guide/scala_guide.md | 15 ++++++++++++++
docs/guide/xlang_serialization_guide.md | 15 ++++++++++++++
docs/guide/xlang_type_mapping.md | 15 ++++++++++++++
docs/specification/java_serialization_spec.md | 15 ++++++++++++++
docs/specification/row_format_spec.md | 15 ++++++++++++++
docs/specification/xlang_serialization_spec.md | 15 ++++++++++++++
.../org/apache/fury/reflect/ReflectionUtils.java | 10 ++++++++++
.../org/apache/fury/resolver/DisallowedList.java | 8 ++++----
.../collection/AbstractMapSerializer.java | 3 +++
.../org/apache/fury/type/DescriptorGrouper.java | 20 ++++++++++---------
java/fury-core/src/main/resources/META-INF/NOTICE | 9 ++++-----
.../apache/fury/resolver/DisallowedListTest.java | 12 +++++++++--
.../serializer/collection/MapSerializersTest.java | 14 +++++++++++++
.../fury-format/src/main/resources/META-INF/NOTICE | 3 ---
licenserc.toml | 1 -
platform-buffer.jpg | Bin 37116 -> 0 bytes
23 files changed, 236 insertions(+), 36 deletions(-)
diff --git a/LICENSE b/LICENSE
index ce70ac93..d08726ba 100644
--- a/LICENSE
+++ b/LICENSE
@@ -231,6 +231,9 @@ The text of each license is the standard Apache 2.0 license.
Files:
java/fury-core/src/main/java/org/apache/fury/io/ClassLoaderObjectInputStream.java
+* common-lang3 (https://github.com/apache/commons-lang)
+ Files:
+ java/fury-core/src/main/java/org/apache/fury/util/StringUtils.java
* fast-serialization (https://github.com/RuedigerMoeller/fast-serialization)
Files:
@@ -272,11 +275,6 @@ The text of each license is also included in
licenses/LICENSE-[project].txt.
java/fury-core/src/main/java/org/apache/fury/type/Generics.java
java/fury-core/src/test/java/org/apache/fury/type/GenericsTest.java
-* v8 (https://chromium.googlesource.com/v8/v8.git)
- Files:
- javascript/packages/hps/src/v8-fast-api-calls.h
-
-
================================================================
MIT licenses
================================================================
diff --git a/NOTICE b/NOTICE
index 1071d373..9fd21913 100644
--- a/NOTICE
+++ b/NOTICE
@@ -15,15 +15,15 @@ conditions of the following licenses.
Apache Spark (https://github.com/apache/spark)
Copyright 2014 and onwards The Apache Software Foundation.
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
================================================================
Apache Commons IO (https://github.com/apache/commons-io)
-Copyright 2002-2024 The Apache Software Foundation
+Copyright 2002-2025 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (https://www.apache.org/).
+================================================================
+
+Apache Commons Lang (https://github.com/apache/commons-lang)
+Copyright 2002-2025 The Apache Software Foundation
================================================================
+
diff --git a/docs/cpp_debug.md b/docs/cpp_debug.md
index e408a1bc..8c12f178 100644
--- a/docs/cpp_debug.md
+++ b/docs/cpp_debug.md
@@ -1,4 +1,24 @@
-# Debugging C++
+---
+layout: global
+title: Debugging C++
+license: |
+ 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.
+---
+
+## Debugging C++
Debug C++ is tricky and binary protocol bug is hard to locate without
debugging support, but setup
debugging support for bazel project is not easy.
diff --git a/docs/guide/DEVELOPMENT.md b/docs/guide/DEVELOPMENT.md
index e00ff31c..013811fa 100644
--- a/docs/guide/DEVELOPMENT.md
+++ b/docs/guide/DEVELOPMENT.md
@@ -2,6 +2,21 @@
title: Development
sidebar_position: 7
id: development
+license: |
+ 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.
---
## How to build Fury
diff --git a/docs/guide/graalvm_guide.md b/docs/guide/graalvm_guide.md
index afaaa15f..e55bcb6a 100644
--- a/docs/guide/graalvm_guide.md
+++ b/docs/guide/graalvm_guide.md
@@ -2,6 +2,21 @@
title: GraalVM Guide
sidebar_position: 6
id: graalvm_guide
+license: |
+ 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.
---
## GraalVM Native Image
diff --git a/docs/guide/java_serialization_guide.md
b/docs/guide/java_serialization_guide.md
index be477b06..b9ece7e9 100644
--- a/docs/guide/java_serialization_guide.md
+++ b/docs/guide/java_serialization_guide.md
@@ -2,6 +2,21 @@
title: Java Serialization Guide
sidebar_position: 0
id: java_object_graph_guide
+license: |
+ 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.
---
## Java object graph serialization
diff --git a/docs/guide/row_format_guide.md b/docs/guide/row_format_guide.md
index 10832972..e8de148f 100644
--- a/docs/guide/row_format_guide.md
+++ b/docs/guide/row_format_guide.md
@@ -2,6 +2,21 @@
title: Row Format Guide
sidebar_position: 1
id: row_format_guide
+license: |
+ 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.
---
## Row format protocol
diff --git a/docs/guide/scala_guide.md b/docs/guide/scala_guide.md
index 8e98e1f7..373fbd92 100644
--- a/docs/guide/scala_guide.md
+++ b/docs/guide/scala_guide.md
@@ -2,6 +2,21 @@
title: Scala Serialization Guide
sidebar_position: 4
id: scala_guide
+license: |
+ 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.
---
Fury supports all scala object serialization:
diff --git a/docs/guide/xlang_serialization_guide.md
b/docs/guide/xlang_serialization_guide.md
index 60fb7290..99bd4d1a 100644
--- a/docs/guide/xlang_serialization_guide.md
+++ b/docs/guide/xlang_serialization_guide.md
@@ -2,6 +2,21 @@
title: Xlang Serialization Guide
sidebar_position: 2
id: xlang_object_graph_guide
+license: |
+ 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.
---
## Cross-language object graph serialization
diff --git a/docs/guide/xlang_type_mapping.md b/docs/guide/xlang_type_mapping.md
index 93898456..b6acb9a9 100644
--- a/docs/guide/xlang_type_mapping.md
+++ b/docs/guide/xlang_type_mapping.md
@@ -2,6 +2,21 @@
title: Type Mapping of Xlang Serialization
sidebar_position: 3
id: xlang_type_mapping
+license: |
+ 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.
---
Note:
diff --git a/docs/specification/java_serialization_spec.md
b/docs/specification/java_serialization_spec.md
index 958baffa..82709374 100644
--- a/docs/specification/java_serialization_spec.md
+++ b/docs/specification/java_serialization_spec.md
@@ -2,6 +2,21 @@
title: Fury Java Serialization Format
sidebar_position: 1
id: fury_java_serialization_spec
+license: |
+ 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.
---
## Spec overview
diff --git a/docs/specification/row_format_spec.md
b/docs/specification/row_format_spec.md
index f368eb75..eefd9d97 100644
--- a/docs/specification/row_format_spec.md
+++ b/docs/specification/row_format_spec.md
@@ -2,6 +2,21 @@
title: Fury Row Format
sidebar_position: 2
id: fury_row_format_spec
+license: |
+ 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.
---
## Row Format
diff --git a/docs/specification/xlang_serialization_spec.md
b/docs/specification/xlang_serialization_spec.md
index 5d5f710f..d15a3da9 100644
--- a/docs/specification/xlang_serialization_spec.md
+++ b/docs/specification/xlang_serialization_spec.md
@@ -2,6 +2,21 @@
title: Fury Xlang Serialization Format
sidebar_position: 0
id: fury_xlang_serialization_spec
+license: |
+ 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.
---
## Cross-language Serialization Specification
diff --git
a/java/fury-core/src/main/java/org/apache/fury/reflect/ReflectionUtils.java
b/java/fury-core/src/main/java/org/apache/fury/reflect/ReflectionUtils.java
index f039e1fb..2676f274 100644
--- a/java/fury-core/src/main/java/org/apache/fury/reflect/ReflectionUtils.java
+++ b/java/fury-core/src/main/java/org/apache/fury/reflect/ReflectionUtils.java
@@ -292,6 +292,16 @@ public class ReflectionUtils {
}
}
+ public static Object getDeclaredStaticFieldValue(Class<?> cls, String
fieldName) {
+ try {
+ Field declaredField = getDeclaredField(cls, fieldName);
+ declaredField.setAccessible(true);
+ return declaredField.get(null);
+ } catch (IllegalAccessException e) {
+ throw new IllegalStateException("Unreachable");
+ }
+ }
+
/**
* Return a field named <code>fieldName</code> from <code>cls</code>. Search
parent class if not
* found.
diff --git
a/java/fury-core/src/main/java/org/apache/fury/resolver/DisallowedList.java
b/java/fury-core/src/main/java/org/apache/fury/resolver/DisallowedList.java
index b4808726..5f907a84 100644
--- a/java/fury-core/src/main/java/org/apache/fury/resolver/DisallowedList.java
+++ b/java/fury-core/src/main/java/org/apache/fury/resolver/DisallowedList.java
@@ -19,13 +19,14 @@
package org.apache.fury.resolver;
+import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
import java.util.Set;
import java.util.TreeSet;
import java.util.stream.Collectors;
@@ -47,10 +48,9 @@ class DisallowedList {
try (InputStream is =
DisallowedList.class.getClassLoader().getResourceAsStream(DISALLOWED_LIST_TXT_PATH))
{
if (is != null) {
- byte[] fileBytes = readAllBytes(is);
DEFAULT_DISALLOWED_LIST_SET =
- Arrays.stream(
- new String(fileBytes,
StandardCharsets.UTF_8).split(System.lineSeparator()))
+ new BufferedReader(new InputStreamReader(is,
StandardCharsets.UTF_8))
+ .lines()
.filter(line -> !line.isEmpty() && !line.startsWith("#"))
.collect(Collectors.toSet());
String calculatedHash = calculateSHA256(new
TreeSet<>(DEFAULT_DISALLOWED_LIST_SET));
diff --git
a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractMapSerializer.java
b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractMapSerializer.java
index d9741139..da8f7a3d 100644
---
a/java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractMapSerializer.java
+++
b/java/fury-core/src/main/java/org/apache/fury/serializer/collection/AbstractMapSerializer.java
@@ -767,9 +767,12 @@ public abstract class AbstractMapSerializer<T> extends
Serializer<T> {
classResolver.readClassInfo(buffer,
valueClassInfoReadCache).getSerializer();
}
for (int i = 0; i < chunkSize; i++) {
+ // increase depth to avoid read wrong outer generic type
+ fury.incDepth(1);
Object key = trackKeyRef ? fury.readRef(buffer, keySerializer) :
keySerializer.read(buffer);
Object value =
trackValueRef ? fury.readRef(buffer, valueSerializer) :
valueSerializer.read(buffer);
+ fury.incDepth(-1);
map.put(key, value);
size--;
}
diff --git
a/java/fury-core/src/main/java/org/apache/fury/type/DescriptorGrouper.java
b/java/fury-core/src/main/java/org/apache/fury/type/DescriptorGrouper.java
index ca9d8a19..20dc11c3 100644
--- a/java/fury-core/src/main/java/org/apache/fury/type/DescriptorGrouper.java
+++ b/java/fury-core/src/main/java/org/apache/fury/type/DescriptorGrouper.java
@@ -131,8 +131,10 @@ public class DescriptorGrouper {
/**
* Create a descriptor grouper.
*
+ * @param isMonomorphic whether the class is monomorphic.
* @param descriptors descriptors may have field with same name.
- * @param descriptorUpdator create a new descriptor from original one.
+ * @param descriptorsGroupedOrdered whether the descriptors are grouped and
ordered.
+ * @param descriptorUpdater create a new descriptor from original one.
* @param primitiveComparator comparator for primitive/boxed fields.
* @param comparator comparator for non-primitive fields.
*/
@@ -140,7 +142,7 @@ public class DescriptorGrouper {
Predicate<Class<?>> isMonomorphic,
Collection<Descriptor> descriptors,
boolean descriptorsGroupedOrdered,
- Function<Descriptor, Descriptor> descriptorUpdator,
+ Function<Descriptor, Descriptor> descriptorUpdater,
Comparator<Descriptor> primitiveComparator,
Comparator<Descriptor> comparator) {
this.primitiveDescriptors =
@@ -155,18 +157,18 @@ public class DescriptorGrouper {
this.otherDescriptors =
descriptorsGroupedOrdered ? new ArrayList<>() : new
TreeSet<>(comparator);
for (Descriptor descriptor : descriptors) {
- if (descriptor.getRawType().isPrimitive()) {
- primitiveDescriptors.add(descriptorUpdator.apply(descriptor));
+ if (TypeUtils.isPrimitive(descriptor.getRawType())) {
+ primitiveDescriptors.add(descriptorUpdater.apply(descriptor));
} else if (TypeUtils.isBoxed(descriptor.getRawType())) {
- boxedDescriptors.add(descriptorUpdator.apply(descriptor));
+ boxedDescriptors.add(descriptorUpdater.apply(descriptor));
} else if (TypeUtils.isCollection(descriptor.getRawType())) {
- collectionDescriptors.add(descriptorUpdator.apply(descriptor));
+ collectionDescriptors.add(descriptorUpdater.apply(descriptor));
} else if (TypeUtils.isMap(descriptor.getRawType())) {
- mapDescriptors.add(descriptorUpdator.apply(descriptor));
+ mapDescriptors.add(descriptorUpdater.apply(descriptor));
} else if (isMonomorphic.test(descriptor.getRawType())) {
- finalDescriptors.add(descriptorUpdator.apply(descriptor));
+ finalDescriptors.add(descriptorUpdater.apply(descriptor));
} else {
- otherDescriptors.add(descriptorUpdator.apply(descriptor));
+ otherDescriptors.add(descriptorUpdater.apply(descriptor));
}
}
}
diff --git a/java/fury-core/src/main/resources/META-INF/NOTICE
b/java/fury-core/src/main/resources/META-INF/NOTICE
index 1071d373..d7e54367 100644
--- a/java/fury-core/src/main/resources/META-INF/NOTICE
+++ b/java/fury-core/src/main/resources/META-INF/NOTICE
@@ -15,15 +15,14 @@ conditions of the following licenses.
Apache Spark (https://github.com/apache/spark)
Copyright 2014 and onwards The Apache Software Foundation.
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
================================================================
Apache Commons IO (https://github.com/apache/commons-io)
Copyright 2002-2024 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (https://www.apache.org/).
+================================================================
+
+Apache Commons Lang (https://github.com/apache/commons-lang)
+Copyright 2002-2025 The Apache Software Foundation
================================================================
diff --git
a/java/fury-core/src/test/java/org/apache/fury/resolver/DisallowedListTest.java
b/java/fury-core/src/test/java/org/apache/fury/resolver/DisallowedListTest.java
index 09cd6059..e2d645c2 100644
---
a/java/fury-core/src/test/java/org/apache/fury/resolver/DisallowedListTest.java
+++
b/java/fury-core/src/test/java/org/apache/fury/resolver/DisallowedListTest.java
@@ -33,6 +33,7 @@ import org.apache.fury.FuryTestBase;
import org.apache.fury.config.Language;
import org.apache.fury.exception.InsecureException;
import org.apache.fury.memory.Platform;
+import org.apache.fury.reflect.ReflectionUtils;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -40,8 +41,12 @@ public class DisallowedListTest extends FuryTestBase {
@Test
public void testCalculateSHA256() throws Exception {
+ final String disallowedListTxtPath =
+ (String)
+ ReflectionUtils.getDeclaredStaticFieldValue(
+ DisallowedList.class, "DISALLOWED_LIST_TXT_PATH");
try (InputStream is =
-
DisallowedList.class.getClassLoader().getResourceAsStream("fury/disallowed.txt"))
{
+
DisallowedList.class.getClassLoader().getResourceAsStream(disallowedListTxtPath))
{
assert is != null;
Set<String> set =
new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))
@@ -60,8 +65,11 @@ public class DisallowedListTest extends FuryTestBase {
hexString.append(hex);
}
System.out.println("SHA256 HASH for disallowed.txt is " + hexString);
+
Assert.assertEquals(
- hexString.toString(),
"53ecb405085d795d45ce033cd4f1055ae06247a5dbaa617ecd20e4aac4303f60");
+ hexString.toString(),
+ ReflectionUtils.getDeclaredStaticFieldValue(DisallowedList.class,
"SHA256_HASH"),
+ "Please update `DisallowedList#SHA256_HASH` with the above output
hash value.");
}
}
diff --git
a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/MapSerializersTest.java
b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/MapSerializersTest.java
index a7cd8965..f05de4e7 100644
---
a/java/fury-core/src/test/java/org/apache/fury/serializer/collection/MapSerializersTest.java
+++
b/java/fury-core/src/test/java/org/apache/fury/serializer/collection/MapSerializersTest.java
@@ -990,4 +990,18 @@ public class MapSerializersTest extends FuryTestBase {
o.map2 = ofArrayList(ofHashMap("k2", "2"));
serDeCheck(fury, o);
}
+
+ @Data
+ public static class NestedMapCollectionGenericTestClass {
+ public Map<String, Object> map = new HashMap<>();
+ }
+
+ @Test(dataProvider = "enableCodegen")
+ public void testNestedMapCollectionGeneric(boolean enableCodegen) {
+ NestedMapCollectionGenericTestClass obj = new
NestedMapCollectionGenericTestClass();
+ obj.map = new LinkedHashMap<>();
+ obj.map.put("obj", ofHashMap("obj", 1, "b", ofArrayList(10)));
+ Fury fury =
Fury.builder().requireClassRegistration(false).withCodegen(enableCodegen).build();
+ fury.deserialize(fury.serialize(obj));
+ }
}
diff --git a/java/fury-format/src/main/resources/META-INF/NOTICE
b/java/fury-format/src/main/resources/META-INF/NOTICE
index fd687ca7..d208b443 100644
--- a/java/fury-format/src/main/resources/META-INF/NOTICE
+++ b/java/fury-format/src/main/resources/META-INF/NOTICE
@@ -15,7 +15,4 @@ conditions of the following licenses.
Apache Spark (https://github.com/apache/spark)
Copyright 2014 and onwards The Apache Software Foundation.
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
================================================================
diff --git a/licenserc.toml b/licenserc.toml
index 39821976..534f81a2 100644
--- a/licenserc.toml
+++ b/licenserc.toml
@@ -54,7 +54,6 @@ excludes = [
"java/fury-core/src/main/java/org/apache/fury/util/Preconditions.java",
"java/fury-core/src/test/java/org/apache/fury/type/GenericsTest.java",
"java/fury-format/src/main/java/org/apache/fury/format/vectorized/ArrowWriter.java",
- "javascript/packages/hps/src/v8-fast-api-calls.h",
"javascript/packages/fury/lib/murmurHash3.ts",
"cpp/fury/thirdparty/MurmurHash3.*",
]
diff --git a/platform-buffer.jpg b/platform-buffer.jpg
deleted file mode 100644
index 0b69b424..00000000
Binary files a/platform-buffer.jpg and /dev/null differ
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
