This is an automated email from the ASF dual-hosted git repository.
chaokunyang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-fury.git
The following commit(s) were added to refs/heads/main by this push:
new a9166cf5 fix(java): fix javax package for accessor codegen (#1388)
a9166cf5 is described below
commit a9166cf5a6206e08c96d21dcac3c388a64138352
Author: Shawn Yang <[email protected]>
AuthorDate: Wed Feb 28 11:53:11 2024 +0800
fix(java): fix javax package for accessor codegen (#1388)
Closes #1387
---
.../org/apache/fury/codegen/CodeGenerator.java | 2 +-
.../src/test/java/javax/fury/test/Accessor.java | 24 ++++++++++++++++++++++
.../apache/fury/builder/AccessorHelperTest.java | 6 ++++++
.../org/apache/fury/serializer/ScalaTest.scala | 2 +-
4 files changed, 32 insertions(+), 2 deletions(-)
diff --git
a/java/fury-core/src/main/java/org/apache/fury/codegen/CodeGenerator.java
b/java/fury-core/src/main/java/org/apache/fury/codegen/CodeGenerator.java
index ef1f7c3e..c6be7358 100644
--- a/java/fury-core/src/main/java/org/apache/fury/codegen/CodeGenerator.java
+++ b/java/fury-core/src/main/java/org/apache/fury/codegen/CodeGenerator.java
@@ -331,7 +331,7 @@ public class CodeGenerator {
*/
public static String getPackage(Class<?> cls) {
String pkg = ReflectionUtils.getPackage(cls);
- if (pkg.startsWith("java")) {
+ if (pkg.startsWith("java.")) {
return FALLBACK_PACKAGE;
} else {
return pkg;
diff --git a/java/fury-core/src/test/java/javax/fury/test/Accessor.java
b/java/fury-core/src/test/java/javax/fury/test/Accessor.java
new file mode 100644
index 00000000..68fbe6bf
--- /dev/null
+++ b/java/fury-core/src/test/java/javax/fury/test/Accessor.java
@@ -0,0 +1,24 @@
+/*
+ * 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 javax.fury.test;
+
+public class Accessor {
+ int f1;
+}
diff --git
a/java/fury-core/src/test/java/org/apache/fury/builder/AccessorHelperTest.java
b/java/fury-core/src/test/java/org/apache/fury/builder/AccessorHelperTest.java
index dc224ef6..65ff105c 100644
---
a/java/fury-core/src/test/java/org/apache/fury/builder/AccessorHelperTest.java
+++
b/java/fury-core/src/test/java/org/apache/fury/builder/AccessorHelperTest.java
@@ -30,6 +30,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import javax.fury.test.Accessor;
import lombok.Data;
import org.apache.fury.TestUtils;
import org.apache.fury.builder.pkg.AccessLevelClass;
@@ -70,6 +71,11 @@ public class AccessorHelperTest {
assertSame(AccessorHelper.getAccessorClass(A.class), accessorClass);
}
+ @Test
+ public void testJavaxPackage() {
+ assertTrue(AccessorHelper.defineAccessorClass(Accessor.class));
+ }
+
@Data
static class PkgAccessAccessorClass {
protected String f1;
diff --git a/scala/src/test/scala/org/apache/fury/serializer/ScalaTest.scala
b/scala/src/test/scala/org/apache/fury/serializer/ScalaTest.scala
index 150c3173..52061243 100644
--- a/scala/src/test/scala/org/apache/fury/serializer/ScalaTest.scala
+++ b/scala/src/test/scala/org/apache/fury/serializer/ScalaTest.scala
@@ -88,4 +88,4 @@ object PkgObjectMain2 extends App {
case class SomeClass(v: List[IdAnyVal])
val p = SomeClass(List.empty)
println(fury.deserialize(fury.serialize(p)))
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
