Merge branch 'master' into eclipse-ee4jgh-1730

laurentschoelens · Feb 9, 2024 · 76c495b · 76c495b
2 parents d60e9b9 + dde82c2
commit 76c495b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/jaxb-ri/docs/release-documentation/src/docbook/jaxb-changelog.xml b/jaxb-ri/docs/release-documentation/src/docbook/jaxb-changelog.xml
@@ -29,6 +29,12 @@
         <itemizedlist>
             <listitem><para>Bug fixes:
                 <itemizedlist>
+                    <listitem><para>
+                        <link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/209">#209</link>: Schema-driven XmlAdapter using xjc:javaType
+                    </para></listitem>
+                    <listitem><para>
+                        <link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/737">#737</link>: xjc:javaType does not handle generic types
+                    </para></listitem>
                     <listitem><para>
                         <link xlink:href="https://github.com/eclipse-ee4j/jaxb-ri/issues/1730">#1730</link>: Error while parsing rnc
                     </para></listitem>

diff --git a/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIConversion.java b/jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/xmlschema/bindinfo/BIConversion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2024 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -322,13 +322,13 @@ public TypeUse getTypeUse(XSSimpleType owner) {
                 return typeUse;
 
             JCodeModel cm = getCodeModel();
+            JClass classType = computeClassType(type);
 
             JDefinedClass a;
             try {
                 a = cm._class(adapter);
                 a.hide();   // we assume this is given by the user
-                a._extends(cm.ref(XmlAdapter.class).narrow(String.class).narrow(
-                        cm.ref(type)));
+                a._extends(cm.ref(XmlAdapter.class).narrow(String.class).narrow(classType));
             } catch (JClassAlreadyExistsException e) {
                 a = e.getExistingClass();
             }
@@ -341,6 +341,26 @@ public TypeUse getTypeUse(XSSimpleType owner) {
 
             return typeUse;
         }
+
+        private JClass computeClassType(String type) {
+            if (type.indexOf('<') < 0) {
+                return getCodeModel().ref(type);
+            }
+
+            // We do assume that if type contains <, the wanted class with generics is well formed
+            JCodeModel cm = getCodeModel();
+            // Get the main class (part before the <)
+            String mainType = type.substring(0, type.indexOf('<'));
+            JClass classType = cm.ref(mainType);
+
+            // Get the narrowed class (part between < and >)
+            String subTypes = type.substring(type.indexOf('<') + 1, type.indexOf('>'));
+            for (String subType : subTypes.split(",")) {
+                JClass subClassType = computeClassType(subType.trim());
+                classType = classType.narrow(subClassType);
+            }
+            return classType;
+        }
     }
 }