[J2KT] Extend annotation readable with generic class types.

PiperOrigin-RevId: 718390975
google · Jan 22, 2025 · 1bf4ca4 · 1bf4ca4
1 parent 877b4a4
commit 1bf4ca4
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 74 deletions.
diff --git a/transpiler/javatests/com/google/j2cl/readable/java/annotation/Main.java b/transpiler/javatests/com/google/j2cl/readable/java/annotation/Main.java
@@ -34,6 +34,10 @@ public class Main {
 
     Class<?> classValue();
 
+    Class<String> stringClassValue();
+
+    Class<? extends Class<?>> wildcardClassValue();
+
     SomeEnum enumValue();
 
     Zoo annotationValue();
@@ -84,6 +88,8 @@ static void test(Foo foo) {
   static void testClassValues(Foo foo) {
     Class<?> annotatationType = foo.annotationType();
     Class<?> classValue = foo.classValue();
+    Class<String> stringClassValue = foo.stringClassValue();
+    Class<? extends Class<?>> wildcardClassValue = foo.wildcardClassValue();
     Class<?>[] classArray = foo.classArray();
   }
 

diff --git a/...vatests/com/google/j2cl/readable/java/annotation/output_closure/Main$Foo.impl.java.js.txt b/...vatests/com/google/j2cl/readable/java/annotation/output_closure/Main$Foo.impl.java.js.txt
@@ -20,6 +20,10 @@ class Foo {
  m_stringValue__java_lang_String() {}
  /** @abstract @nodts @return {!Class<?>} */
  m_classValue__java_lang_Class() {}
+ /** @abstract @nodts @return {!Class<?string>} */
+ m_stringClassValue__java_lang_Class() {}
+ /** @abstract @nodts @return {!Class<?>} */
+ m_wildcardClassValue__java_lang_Class() {}
  /** @abstract @nodts @return {!SomeEnum} */
  m_enumValue__annotation_Main_SomeEnum() {}
  /** @abstract @nodts @return {!Zoo} */

diff --git a/...r/javatests/com/google/j2cl/readable/java/annotation/output_closure/Main.impl.java.js.txt b/...r/javatests/com/google/j2cl/readable/java/annotation/output_closure/Main.impl.java.js.txt
@@ -46,6 +46,8 @@ class Main extends j_l_Object {
   Main.$clinit();
   let annotatationType = foo.m_annotationType__java_lang_Class();
   let classValue = foo.m_classValue__java_lang_Class();
+  let stringClassValue = foo.m_stringClassValue__java_lang_Class();
+  let wildcardClassValue = foo.m_wildcardClassValue__java_lang_Class();
   let classArray = foo.m_classArray__arrayOf_java_lang_Class();
  }
  /** @nodts @return {Annotation} */

diff --git a/transpiler/javatests/com/google/j2cl/readable/java/annotation/output_kt/Main.kt.txt b/transpiler/javatests/com/google/j2cl/readable/java/annotation/output_kt/Main.kt.txt
@@ -82,6 +82,12 @@ open class Main {
   @ObjCName("classValue")
   val classValue: Class<*>
 
+  @ObjCName("stringClassValue")
+  val stringClassValue: Class<String>
+
+  @ObjCName("wildcardClassValue")
+  val wildcardClassValue: Class<out Class<*>>
+
   @ObjCName("enumValue")
   val enumValue: Main.SomeEnum