Add exporter-based schema annotation generation for Maven and Ant

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

@@ -18,6 +18,8 @@ public class Hbm2JavaExporterTask extends ExporterTask {
 
 	boolean jdk5 = true;
 
+	boolean useSchemaAnnotations = false;
+
 	public Hbm2JavaExporterTask(HibernateToolTask parent) {
 		super( parent );
 	}
@@ -30,10 +32,19 @@ public void setJdk5(boolean b) {
 		jdk5 = b;
 	}
 
+	public void setUseSchemaAnnotations(boolean b) {
+		useSchemaAnnotations = b;
+	}
+
+	public void setSchemaPackage(String schemaPackage) {
+		properties.put( "schemaPackage", schemaPackage );
+	}
+
 	protected Exporter configureExporter(Exporter exp) {
 		super.configureExporter( exp );
 		exp.getProperties().setProperty("ejb3", ""+ejb3);
 		exp.getProperties().setProperty("jdk5", ""+jdk5);
+		exp.getProperties().setProperty("useSchemaAnnotations", ""+useSchemaAnnotations);
 		return exp;
 	}
 

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

@@ -129,6 +129,12 @@ public HbmLintExporterTask createHbmLint() {
 		return generator;
 	}
 
+	public ExporterTask createSchemaAnnotations() {
+		ExporterTask generator = new SchemaAnnotationExporterTask(this);
+		addGenerator( generator );
+		return generator;
+	}
+
 
 	/**
 	 * Set the classpath to be used when running the Java class

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

@@ -0,0 +1,28 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.hibernate.tool.reveng.api.export.Exporter;
+import org.hibernate.tool.reveng.api.export.ExporterFactory;
+import org.hibernate.tool.reveng.api.export.ExporterType;
+
+public class SchemaAnnotationExporterTask extends ExporterTask {
+
+	public SchemaAnnotationExporterTask(HibernateToolTask parent) {
+		super( parent );
+	}
+
+	public void setSchemaPackage(String schemaPackage) {
+		properties.put( "schemaPackage", schemaPackage );
+	}
+
+	protected Exporter createExporter() {
+		return ExporterFactory.createExporter(ExporterType.SCHEMA);
+	}
+
+	String getName() {
+		return "schemaAnnotations (Generates schema annotation classes)";
+	}
+}

tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/SchemaAnnotationExporterTaskTest.java

@@ -0,0 +1,27 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class SchemaAnnotationExporterTaskTest {
+
+	@Test
+	public void testGetName() {
+		HibernateToolTask parent = new HibernateToolTask();
+		SchemaAnnotationExporterTask task = new SchemaAnnotationExporterTask(parent);
+		assertEquals("schemaAnnotations (Generates schema annotation classes)", task.getName());
+	}
+
+	@Test
+	public void testSetSchemaPackage() {
+		HibernateToolTask parent = new HibernateToolTask();
+		SchemaAnnotationExporterTask task = new SchemaAnnotationExporterTask(parent);
+		task.setSchemaPackage("org.example.schema");
+		assertEquals("org.example.schema", task.properties.get("schemaPackage"));
+	}
+}

tooling/hibernate-ant/src/test/java/org/hibernate/tool/ant/SchemaAnnotationTestIT.java

@@ -0,0 +1,82 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.tool.ant;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class SchemaAnnotationTestIT extends TestTemplate {
+
+	@Test
+	public void testGenerateSchemaAnnotations() throws Exception {
+		setHibernateToolTaskXml(
+				"""
+								<hibernatetool destdir='generated'>                         \s
+									<jdbcconfiguration propertyfile='hibernate.properties'/>\s
+									<schemaAnnotations/>                                    \s
+								</hibernatetool>                                            \s
+						"""
+		);
+		setDatabaseCreationScript(new String[] {
+				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))",
+				"create table ITEM (ID int not null, NAME varchar(20), OWNER_ID int not null, " +
+						"primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
+		});
+		createProjectAndBuild();
+		assertFolderExists("generated", 2);
+		assertFileExists("generated/PERSON.java");
+		assertFileExists("generated/ITEM.java");
+		String personContents = getFileContents("generated/PERSON.java");
+		assertTrue(personContents.contains("@TableMapping"));
+		assertTrue(personContents.contains("@ColumnMapping"));
+		String itemContents = getFileContents("generated/ITEM.java");
+		assertTrue(itemContents.contains("@TableMapping"));
+		assertTrue(itemContents.contains("@JoinColumnMapping"));
+	}
+
+	@Test
+	public void testGenerateSchemaAnnotationsWithPackage() throws Exception {
+		setHibernateToolTaskXml(
+				"""
+								<hibernatetool destdir='generated'>                         \s
+									<jdbcconfiguration propertyfile='hibernate.properties'/>\s
+									<schemaAnnotations schemaPackage='org.example.schema'/>  \s
+								</hibernatetool>                                            \s
+						"""
+		);
+		setDatabaseCreationScript(new String[] {
+				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
+		});
+		createProjectAndBuild();
+		assertFolderExists("generated/org/example/schema", 1);
+		assertFileExists("generated/org/example/schema/PERSON.java");
+		String personContents = getFileContents("generated/org/example/schema/PERSON.java");
+		assertTrue(personContents.contains("package org.example.schema;"));
+		assertTrue(personContents.contains("@TableMapping"));
+	}
+
+	@Test
+	public void testGenerateSchemaAnnotationsWithoutPackage() throws Exception {
+		setHibernateToolTaskXml(
+				"""
+								<hibernatetool destdir='generated'>                         \s
+									<jdbcconfiguration propertyfile='hibernate.properties'/>\s
+									<schemaAnnotations/>                                    \s
+								</hibernatetool>                                            \s
+						"""
+		);
+		setDatabaseCreationScript(new String[] {
+				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
+		});
+		createProjectAndBuild();
+		assertFileExists("generated/PERSON.java");
+		String personContents = getFileContents("generated/PERSON.java");
+		assertFalse(personContents.contains("package "));
+		assertTrue(personContents.contains("@TableMapping"));
+	}
+
+}

tooling/hibernate-gradle-plugin/src/main/java/org/hibernate/orm/tooling/gradle/reveng/GenerateJavaTask.java

@@ -26,6 +26,10 @@ void doWork() {
 		Exporter pojoExporter = ExporterFactory.createExporter(ExporterType.JAVA);
 		pojoExporter.getProperties().setProperty("ejb3", String.valueOf(getRevengSpec().generateAnnotations));
 		pojoExporter.getProperties().setProperty("jdk5", String.valueOf(getRevengSpec().useGenerics));
+		pojoExporter.getProperties().setProperty("useSchemaAnnotations", String.valueOf(getRevengSpec().useSchemaAnnotations));
+		if (getRevengSpec().schemaPackage != null) {
+			pojoExporter.getProperties().put("schemaPackage", getRevengSpec().schemaPackage);
+		}
 		File outputFolder = getOutputFolder();
 		pojoExporter.getProperties().put(ExporterConstants.METADATA_DESCRIPTOR, createJdbcDescriptor());
 		pojoExporter.getProperties().put(ExporterConstants.DESTINATION_FOLDER, outputFolder);