Skip to content

Move generated MaDs into modelgenerator/#21751

Open
jacknojo wants to merge 5 commits intomainfrom
jacknojo/move_java_generated_mads
Open

Move generated MaDs into modelgenerator/#21751
jacknojo wants to merge 5 commits intomainfrom
jacknojo/move_java_generated_mads

Conversation

@jacknojo
Copy link
Copy Markdown

In preparation for incoming MaDs generated by the mads-llm tool it makes sense to move the current generated MaDs into a subfolder of generated/: generated/modelgenerator/. When we start to add LLM-generated MaDs, we can place those in another folder and have a clear separation of the two.

The wildcard pattern is the same as in, for example:

- ext/generated/**/*.model.yml

@jacknojo jacknojo requested a review from michaelnebel April 23, 2026 12:25
@jacknojo jacknojo requested a review from a team as a code owner April 23, 2026 12:25
Copilot AI review requested due to automatic review settings April 23, 2026 12:25
@github-actions github-actions Bot added the Java label Apr 23, 2026
@jacknojo jacknojo added the no-change-note-required This PR does not need a change note label Apr 23, 2026
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR reorganizes the Java “models as data” (MaD) files by moving the currently generated MaDs into ext/generated/modelgenerator/, and updates the Java pack’s dataExtensions glob to continue picking them up recursively. This sets up a clear separation so future LLM-generated MaDs can live in a different subfolder.

Changes:

  • Update java/ql/lib/qlpack.yml to load generated models from nested subdirectories via ext/generated/**/*.model.yml.
  • Add/move generated MaD .model.yml files under java/ql/lib/ext/generated/modelgenerator/.
Show a summary per file
File Description
java/ql/lib/qlpack.yml Switch dataExtensions glob to recurse under ext/generated/ so nested generated MaDs are included.
java/ql/lib/ext/generated/modelgenerator/javax.xml.xpath.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.xml.validation.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.xml.transform.stream.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.xml.transform.stax.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.xml.transform.sax.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.xml.transform.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.xml.transform.dom.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.xml.stream.util.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.xml.stream.events.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.xml.namespace.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.dsig.spec.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.dsig.keyinfo.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.dsig.dom.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.xml.crypto.dom.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.xml.catalog.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.transaction.xa.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.sql.rowset.spi.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.sql.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.sound.sampled.spi.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.sound.midi.spi.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.security.sasl.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.security.cert.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.security.auth.x500.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.security.auth.spi.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.security.auth.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.security.auth.login.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.security.auth.callback.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.rmi.ssl.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.print.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.print.event.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.print.attribute.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.net.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.naming.spi.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.naming.ldap.spi.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.naming.event.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.management.timer.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.management.monitor.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.management.loading.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.lang.model.type.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.lang.model.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.lang.model.element.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.imageio.plugins.jpeg.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.imageio.plugins.bmp.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.crypto.interfaces.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/javax.annotation.processing.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.util.spi.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.util.regex.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.util.prefs.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.util.jar.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.util.function.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.time.zone.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.time.temporal.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.text.spi.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.security.interfaces.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.rmi.server.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.rmi.registry.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.rmi.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.rmi.dgc.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.nio.file.spi.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.nio.file.attribute.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.nio.charset.spi.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.nio.channels.spi.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.lang.runtime.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.lang.ref.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.lang.management.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.lang.instrument.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.lang.annotation.model.yml Generated MaD file now located under ext/generated/modelgenerator/.
java/ql/lib/ext/generated/modelgenerator/java.applet.model.yml Generated MaD file now located under ext/generated/modelgenerator/.

Copilot's findings

  • Files reviewed: 1/140 changed files
  • Comments generated: 0

Copy link
Copy Markdown
Contributor

@michaelnebel michaelnebel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps, we should

  • Update the "shared" part of the model generator script to point to the new "default" location for generated models. More specifically, we need to update this location and also update the documentation in the script.
  • Move the generated models for the other languages as well.

Both of the above can be considered follow ups.

However, we should run DCA before merging.

@jacknojo
Copy link
Copy Markdown
Author

  • Move the generated models for the other languages as well.
    However, we should run DCA before merging.

I'll do them all now, so we avoid having to run DCA twice.

@jacknojo jacknojo force-pushed the jacknojo/move_java_generated_mads branch from ccf14ad to 40d2503 Compare April 24, 2026 06:46
@jacknojo jacknojo requested review from a team as code owners April 24, 2026 06:46
@github-actions github-actions Bot added C# C++ Rust Pull requests that update Rust code labels Apr 24, 2026
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 24, 2026

⚠️ The head of this PR and the base branch were compared for differences in the framework coverage reports. A recent commit removed the previously reported differences.

Copy link
Copy Markdown
Contributor

@michaelnebel michaelnebel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The qlpack.yml file needs to be updated for all the language packs where the models are moved.

@jacknojo jacknojo force-pushed the jacknojo/move_java_generated_mads branch from 40d2503 to d3ce582 Compare April 24, 2026 07:19
@jacknojo
Copy link
Copy Markdown
Author

The qlpack.yml file needs to be updated for all the language packs where the models are moved.

Thanks, I forgot. It was only C# that needed an update, the others are already using **.

@jacknojo jacknojo force-pushed the jacknojo/move_java_generated_mads branch from d3ce582 to 7f12fb7 Compare April 24, 2026 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

C# C++ Java no-change-note-required This PR does not need a change note Rust Pull requests that update Rust code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants