[Java] Upgrade janino version to fix package name conflict with classname (#1006)

* upgrade janino version

* fix non-public class literal

* add test

* fix private class load

* add missing header

* refine test

Author: chaokunyang

integration_tests/latest_jdk_tests/src/test/java/io/fury/integration_tests/RecordSerializersTest.java

@@ -20,8 +20,8 @@
 import static io.fury.collection.Collections.ofHashMap;
 
 import io.fury.Fury;
-import io.fury.resolver.MetaContext;
 import io.fury.config.CompatibleMode;
+import io.fury.resolver.MetaContext;
 import io.fury.test.bean.Struct;
 import io.fury.util.record.RecordComponent;
 import io.fury.util.record.RecordUtils;
@@ -229,6 +229,5 @@ public void testPrivateRecord(boolean codegen) {
     System.out.println(deserialized);
   }
 
-  private record PrivateRecord(String foo) {
-  }
+  private record PrivateRecord(String foo) {}
 }

java/fury-core/src/main/java/io/fury/builder/BaseObjectCodecBuilder.java

@@ -560,7 +560,7 @@ protected Tuple2<Reference, Boolean> addClassInfoField(Class<?> cls) {
       return classInfoRef;
     }
     if (!needUpdate) {
-      Expression clsExpr = new Literal(cls, CLASS_TYPE);
+      Expression clsExpr = getClassExpr(cls);
       classInfoExpr = inlineInvoke(classResolverRef, "getClassInfo", classInfoTypeToken, clsExpr);
       // Use `ctx.freshName(cls)` to avoid wrong name for arr type.
       String name = ctx.newName(ctx.newName(cls) + "ClassInfo");

java/fury-core/src/main/java/io/fury/builder/CompatibleCodecBuilder.java

@@ -116,7 +116,7 @@ public CompatibleCodecBuilder(
             classResolverRef,
             "getFieldResolver",
             fieldResolverTypeToken,
-            Literal.ofClass(getRawType(beanType)));
+            getClassExpr(getRawType(beanType)));
     ctx.addField(ctx.type(fieldResolverTypeToken), FIELD_RESOLVER_NAME, fieldResolverExpr);
     if (isRecord) {
       buildRecordComponentDefaultValues();

java/fury-core/src/main/java/io/fury/codegen/JaninoUtils.java

@@ -36,13 +36,13 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import org.codehaus.janino.ByteArrayClassLoader;
+import org.codehaus.commons.compiler.util.reflect.ByteArrayClassLoader;
+import org.codehaus.commons.compiler.util.resource.MapResourceCreator;
+import org.codehaus.commons.compiler.util.resource.MapResourceFinder;
+import org.codehaus.commons.compiler.util.resource.Resource;
 import org.codehaus.janino.ClassLoaderIClassLoader;
 import org.codehaus.janino.Compiler;
 import org.codehaus.janino.util.ClassFile;
-import org.codehaus.janino.util.resource.MapResourceCreator;
-import org.codehaus.janino.util.resource.MapResourceFinder;
-import org.codehaus.janino.util.resource.Resource;
 import org.slf4j.Logger;
 
 /**

java/fury-core/src/main/java/io/fury/util/ReflectionUtils.java

@@ -21,6 +21,7 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.reflect.TypeToken;
+import io.fury.annotation.CodegenInvoke;
 import io.fury.annotation.Internal;
 import io.fury.collection.Tuple3;
 import io.fury.util.function.Functions;
@@ -412,10 +413,18 @@ public static String getPackage(Class<?> cls) {
     return pkg;
   }
 
-  // Invoked by JIT.
+  @CodegenInvoke
   public static Class<?> loadClass(Class<?> neighbor, String className) {
     try {
-      return neighbor.getClassLoader().loadClass(className);
+      if (className.equals(neighbor.getName())) {
+        return neighbor;
+      }
+      ClassLoader classLoader = neighbor.getClassLoader();
+      if (classLoader == null) {
+        // jdk class are loaded by bootstrap class loader, which will return null.
+        classLoader = Thread.currentThread().getContextClassLoader();
+      }
+      return classLoader.loadClass(className);
     } catch (ClassNotFoundException e) {
       throw new RuntimeException(e);
     }

java/fury-core/src/test/java/io/fury/builder/ObjectCodecBuilderTest.java

@@ -42,7 +42,7 @@
 import java.util.Map;
 import java.util.Set;
 import lombok.Data;
-import org.codehaus.janino.ByteArrayClassLoader;
+import org.codehaus.commons.compiler.util.reflect.ByteArrayClassLoader;
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;

java/fury-core/src/test/java/io/fury/codegen/JaninoUtilsTest.java

@@ -27,15 +27,15 @@
 import java.util.Map;
 import java.util.function.Function;
 import org.codehaus.commons.compiler.CompileException;
-import org.codehaus.janino.ByteArrayClassLoader;
+import org.codehaus.commons.compiler.util.reflect.ByteArrayClassLoader;
+import org.codehaus.commons.compiler.util.resource.MapResourceCreator;
+import org.codehaus.commons.compiler.util.resource.MapResourceFinder;
+import org.codehaus.commons.compiler.util.resource.Resource;
 import org.codehaus.janino.ClassBodyEvaluator;
 import org.codehaus.janino.ClassLoaderIClassLoader;
 import org.codehaus.janino.Compiler;
 import org.codehaus.janino.ScriptEvaluator;
 import org.codehaus.janino.SimpleCompiler;
-import org.codehaus.janino.util.resource.MapResourceCreator;
-import org.codehaus.janino.util.resource.MapResourceFinder;
-import org.codehaus.janino.util.resource.Resource;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 

java/fury-testsuite/src/test/java/org/test/Org.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2023 The Fury Authors
+ *
+ * Licensed 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.test;
+
+import io.fury.Fury;
+import io.fury.config.CompatibleMode;
+import io.fury.config.Language;
+import java.io.Serializable;
+import java.util.List;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+public class Org implements Serializable {
+  private static final long serialVersionUID = 1L;
+  // constructor
+  public Org() {}
+
+  List<Org> children;
+
+  public List<Org> getChildren() {
+    return children;
+  }
+
+  public void setChildren(List<Org> children) {
+    this.children = children;
+  }
+
+  // test for class name same with package name:
+  // https://github.com/janino-compiler/janino/issues/165
+  @Test
+  public void testOrgPackage() {
+    Fury fury =
+        Fury.builder()
+            .withLanguage(Language.JAVA)
+            .withRefTracking(true)
+            // Allow to deserialize objects unknown types,more flexible but less secure.
+            .requireClassRegistration(false)
+            .withDeserializeUnexistedClass(true)
+            .withCompatibleMode(CompatibleMode.COMPATIBLE)
+            .withRefTracking(true)
+            .build();
+
+    // If the class name is not Org, it can be serialized normally
+    byte[] bytes = fury.serialize(new Org());
+    Object o = fury.deserialize(bytes);
+    Assert.assertEquals(o.getClass(), Org.class);
+  }
+}

java/pom.xml

@@ -72,7 +72,7 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <guava.version>32.1.2-jre</guava.version>
-    <janino.version>3.0.11</janino.version>
+    <janino.version>3.1.10</janino.version>
     <arrow.version>5.0.0</arrow.version>
     <jackson-bom.version>2.13.2.20220328</jackson-bom.version>
     <commons_codec.version>1.13</commons_codec.version>