DRAFT: Merge tools into orm #11123

koentsje · 2025-10-15T14:28:29Z

[Please describe here what your change is about]

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license
and can be relicensed under the terms of the LGPL v2.1 license in the future at the maintainers' discretion.
For more information on licensing, please check here.

https://hibernate.atlassian.net/browse/HHH-19879

hibernate-github-bot · 2025-10-15T14:28:38Z

Thanks for your pull request!

This pull request appears to follow the contribution rules.

› This message was automatically generated.

github-advanced-security

CodeQL found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

yrodiere

I added a few comments below to track things we discussed and that we shouldn't forget.

Also created a Jira issue: https://hibernate.atlassian.net/browse/HHH-19879

yrodiere · 2025-10-21T09:20:07Z

tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/tool/gradle/Plugin.java

+import org.hibernate.tool.gradle.task.GenerateJavaTask;
+import org.hibernate.tool.gradle.task.RunSqlTask;
+
+public class Plugin implements org.gradle.api.Plugin<Project> {


This should probably be the same plugin as enhancement, so that we can use a syntax like this one:

hibernate { enhancement { ... } reveng { ... } }

yrodiere · 2025-10-21T09:21:34Z

tooling/hibernate-reveng/hibernate-reveng.gradle

Honest question: would this make sense to use in an application/framework as a library, and if so do we want to keep this module under tooling/?

yrodiere · 2025-10-21T09:22:21Z

.../src/test/java/org/hibernate/tool/reveng/api/core/ReverseEngineeringStrategyFactoryTest.java

Todo: migrate (all?) other tests from Tools. We can target h2 only for a start.

Main challenge would be conveting hbm.xml to orm.xml (mapping.xml?) or annotations.

yrodiere · 2025-10-21T09:29:38Z

tooling/hibernate-maven-plugin/src/main/java/org/hibernate/tool/maven/TransformHbmMojo.java

+@Mojo(
+	name = "hbm2orm",
+	defaultPhase = GENERATE_RESOURCES,
+	requiresDependencyResolution = ResolutionScope.RUNTIME)
+public class TransformHbmMojo extends AbstractMojo {


This is great and I know people have been asking for it.

We need it documented, though :)

yrodiere · 2025-10-21T09:35:34Z

tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/hbm2ddl/SchemaExport.java

There is something wrong here. Seem you duplicated the package? The SchemaExport class already exists in this module.

yrodiere · 2025-10-21T09:36:14Z

tooling/hibernate-reveng/src/main/java/org/hibernate/tool/hbm2ddl/SchemaExport.java

As discussed, the classes you duplicated here should instead be moved from hibernate-ant to this module.

...-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/AbstractExporter.java

+import org.hibernate.tool.reveng.internal.export.java.Cfg2JavaTool;
+import org.jboss.logging.Logger;
+
+import java.io.File;


...-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/AbstractExporter.java

+
+	protected MetadataDescriptor getMetadataDescriptor() {
+		return (MetadataDescriptor)getProperties().get(METADATA_DESCRIPTOR);
+	}


...-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/common/AbstractExporter.java

+			iterator = getProperties().entrySet().iterator();
+			while ( iterator.hasNext() ) {
+				Entry<Object, Object> element = iterator.next();
+				Object value = transformValue(element.getValue());


.../hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocFolder.java

.../hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/doc/DocHelper.java

...ate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/EntityPOJOClass.java

...e-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/ImportContextImpl.java

...reveng/src/main/java/org/hibernate/tool/reveng/internal/export/lint/EntityModelDetector.java

...ng/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/NameConverter.java

tooling/hibernate-reveng/src/main/java/org/hibernate/tool/reveng/internal/util/StringUtil.java

...ate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/EntityPOJOClass.java

…erge the relevant ant/gradle/maven plugins - Add the Reverse Engineering module

tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/ConfigurationTask.java

tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/HibernateToolTask.java

tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/JDBCConfigurationTask.java

+ * @author max
+ * @author <a href='mailto:the_mindstorm@evolva.ro'>Alexandru Popescu</a>
+ */
+public class JDBCConfigurationTask extends ConfigurationTask {


tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/JPAConfigurationTask.java

+import java.io.File;
+import java.util.Properties;
+
+public class JPAConfigurationTask extends ConfigurationTask {


tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/JavaFormatterTask.java

+import java.util.List;
+import java.util.Properties;
+
+public class JavaFormatterTask extends Task {


tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/hbm2ddl/SchemaUpdateTask.java

tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/hbm2ddl/SchemaExportTask.java

tooling/hibernate-ant/src/main/java/org/hibernate/tool/hbm2ddl/hbm2ddl/SchemaExport.java

tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/ExporterTask.java

+		templatePath = path;
+	}
+
+	public void setTemplatePrefix(String s) {


tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/ConfigurationTask.java

+		this.entityResolver = entityResolverName;
+	}
+
+	public void setNamingStrategy(String namingStrategy) {


…erge the relevant ant/gradle/maven plugins - Add the reveng Ant tasks Signed-off-by: Koen Aers <koen.aers@gmail.com>

github-advanced-security bot found potential problems Oct 15, 2025

View reviewed changes

koentsje force-pushed the merge-tools-into-orm branch 2 times, most recently from 9d4e4ec to 094c21a Compare October 20, 2025 14:10

yrodiere reviewed Oct 21, 2025

View reviewed changes

koentsje force-pushed the merge-tools-into-orm branch 25 times, most recently from 8239046 to 30152da Compare October 24, 2025 09:00

koentsje force-pushed the merge-tools-into-orm branch 5 times, most recently from 0678f91 to d3636e2 Compare October 27, 2025 13:21

github-advanced-security bot found potential problems Oct 27, 2025

View reviewed changes

koentsje force-pushed the merge-tools-into-orm branch 5 times, most recently from d906480 to c35239f Compare October 28, 2025 17:23

github-advanced-security bot found potential problems Oct 28, 2025

View reviewed changes

...ate-reveng/src/main/java/org/hibernate/tool/reveng/internal/export/java/EntityPOJOClass.java Fixed Show fixed Hide fixed

koentsje force-pushed the merge-tools-into-orm branch 5 times, most recently from 554e870 to 606af22 Compare October 29, 2025 13:53

HHH-19879: Move Hibernate Tools' reveng module to Hibernate ORM and m…

2b8ab99

…erge the relevant ant/gradle/maven plugins - Add the Reverse Engineering module

koentsje force-pushed the merge-tools-into-orm branch 2 times, most recently from 6080986 to 1dfd0de Compare November 3, 2025 19:49

github-advanced-security bot found potential problems Nov 3, 2025

View reviewed changes

koentsje force-pushed the merge-tools-into-orm branch 2 times, most recently from a0eb131 to 0c719d0 Compare November 4, 2025 08:10

github-advanced-security bot found potential problems Nov 4, 2025

View reviewed changes

tooling/hibernate-ant/src/main/java/org/hibernate/tool/ant/ConfigurationTask.java

this.entityResolver = entityResolverName;

}

public void setNamingStrategy(String namingStrategy) {

Check notice

Code scanning / CodeQL

Useless parameter

The parameter 'namingStrategy' is never used.

koentsje force-pushed the merge-tools-into-orm branch 4 times, most recently from a3b2471 to 86462b8 Compare November 4, 2025 11:18

HHH-19879: Move Hibernate Tools' reveng module to Hibernate ORM and m…

596248e

…erge the relevant ant/gradle/maven plugins - Add the reveng Ant tasks Signed-off-by: Koen Aers <koen.aers@gmail.com>

koentsje force-pushed the merge-tools-into-orm branch from 86462b8 to 596248e Compare November 4, 2025 13:19

Uh oh!

DRAFT: Merge tools into orm #11123

Are you sure you want to change the base?

DRAFT: Merge tools into orm #11123

Conversation

koentsje commented Oct 15, 2025 • edited by hibernate-github-bot bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hibernate-github-bot bot commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-advanced-security bot left a comment

Choose a reason for hiding this comment

Uh oh!

yrodiere left a comment

Choose a reason for hiding this comment

Uh oh!

yrodiere Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

yrodiere Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

yrodiere Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

yrodiere Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

yrodiere Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

yrodiere Oct 21, 2025

Choose a reason for hiding this comment

Uh oh!

Check notice

Uh oh!

Check notice

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check notice

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Check failure

Check failure

Check failure

Uh oh!

Uh oh!

Uh oh!

Check notice

Uh oh!

Check notice

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

koentsje commented Oct 15, 2025 •

edited by hibernate-github-bot bot

Loading

hibernate-github-bot bot commented Oct 15, 2025 •

edited

Loading