[#1788] ignore bindings file on schemaLocation=* + test case

Author: laurentschoelens

jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/internalizer/Internalizer.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 1997, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation. 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
@@ -171,9 +172,14 @@ private void buildTargetNodeMap( Element bindings, @NotNull Node inheritedTarget
             String schemaLocation = bindings.getAttribute("schemaLocation");
 
             // enhancement - schemaLocation="*" = bind to all schemas..
-            if(schemaLocation.equals("*")) {
+            if("*".equals(schemaLocation)) {
                 for(String systemId : forest.listSystemIDs()) {
                     result.computeIfAbsent(bindings, k -> new ArrayList<>());
+                    Element doc = forest.get(systemId).getDocumentElement();
+                    if (Const.JAXB_NSURI.equals(doc.getNamespaceURI())) {
+                        // this isn't a schema, so do apply bindings here or that will fail
+                        continue;
+                    }
                     result.get(bindings).add(forest.get(systemId).getDocumentElement());
 
                     Element[] children = DOMUtils.getChildElements(bindings, Const.JAXB_NSURI, "bindings");

jaxb-ri/xjc/src/test/java/com/sun/tools/xjc/CodeGenTest.java

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2021, 2024 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2025 Contributors to the Eclipse Foundation. 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
@@ -184,6 +185,44 @@ public void testIssue1785() throws FileNotFoundException, URISyntaxException, IO
         assertNonEmptyJavadocBlocks(cmString);
     }
 
+    /**
+     * Test issues #1788 for ignoring bindings files in schemaLocation="*"
+     *
+     * @throws FileNotFoundException When the test schema or binding file cannot be read.
+     * @throws URISyntaxException When the test {@link InputSource} cannot be parsed.
+     *
+     * @see <a href="https://github.com/eclipse-ee4j/jaxb-ri/issues/1788">Issue #1788</a>
+     */
+    public void testIssue1788() throws FileNotFoundException, URISyntaxException {
+        String schemaFileName = "/schemas/issue1788/schema.xsd";
+        String bindingFileName = "/schemas/issue1788/binding.xjb";
+        String packageName = "org.example.issue1788";
+        String someClassName = packageName + ".MyGh1788TypeDto";
+
+        ErrorListener errorListener = new ConsoleErrorReporter();
+
+        // Parse the XML schema.
+        SchemaCompiler sc = XJC.createSchemaCompiler();
+        sc.setErrorListener(errorListener);
+        sc.getOptions().addBindFile(getInputSource(bindingFileName));
+        sc.forcePackageName(packageName);
+        sc.parseSchema(getInputSource(schemaFileName));
+
+        // Generate the defined class.
+        S2JJAXBModel model = sc.bind();
+        Plugin[] extensions = null;
+        JCodeModel cm = model.generateCode(extensions, errorListener);
+        JDefinedClass dc = cm._getClass(someClassName);
+        assertNotNull(someClassName, dc);
+
+        // Assert Class includes narrow type
+        Iterator<JMethod> conIter = dc.constructors();
+        while (conIter.hasNext()) {
+            JMethod con = conIter.next();
+            assertTrue(toString(con).contains("java.lang.Class<java.lang.String>"));
+        }
+    }
+
     private void assertNonEmptyJavadocBlocks(String cmString) throws IOException {
         int lineNo = 0;
         try ( LineNumberReader lnr = new LineNumberReader(new StringReader(cmString)) ) {

jaxb-ri/xjc/src/test/resources/schemas/issue1788/binding.xjb

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+    Copyright (c) 2025 Contributors to the Eclipse Foundation. 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
+    http://www.eclipse.org/org/documents/edl-v10.php.
+
+    SPDX-License-Identifier: BSD-3-Clause
+
+-->
+
+<!-- See https://github.com/eclipse-ee4j/jaxb-ri/issues/1785 -->
+<jaxb:bindings xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" version="3.0">
+    <jaxb:bindings schemaLocation="*">
+        <jaxb:schemaBindings>
+            <jaxb:nameXmlTransform>
+                <jaxb:elementName prefix="My" suffix="Dto"/>
+                <jaxb:typeName prefix="My" suffix="Dto"/>
+            </jaxb:nameXmlTransform>
+        </jaxb:schemaBindings>
+    </jaxb:bindings>
+</jaxb:bindings>

jaxb-ri/xjc/src/test/resources/schemas/issue1788/schema.xsd

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+    Copyright (c) 2025 Contributors to the Eclipse Foundation. 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
+    http://www.eclipse.org/org/documents/edl-v10.php.
+
+    SPDX-License-Identifier: BSD-3-Clause
+
+-->
+
+<!-- See https://github.com/eclipse-ee4j/jaxb-ri/issues/1788 -->
+<xs:schema
+    targetNamespace="http://example.org/document"
+    xmlns:tns="http://example.org/document"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+>
+
+    <xs:complexType name="gh1788Type">
+        <xs:sequence>
+            <xs:element name="StringAttr" type="xs:string" minOccurs="0" nillable="true" />
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:element name="gh1788" type="tns:gh1788Type"/>
+
+</xs:schema>