HHH-14196 Add parsing of persistence.xml/orm.xml documents in the EE 9 namespace

Signed-off-by: Scott Marlow <smarlow@redhat.com>

Author: scottmarlow

hibernate-core/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java

@@ -42,6 +42,12 @@ public Object resolveEntity(String publicID, String systemID, String baseURI, St
 			else if ( JPA_XSD_MAPPING.matches( namespace ) ) {
 				return openUrlStream( JPA_XSD_MAPPING.getMappedLocalUrl() );
 			}
+			else if ( PERSISTENCE_ORM_XSD_MAPPING.matches( namespace ) ) {
+				return openUrlStream( PERSISTENCE_ORM_XSD_MAPPING.getMappedLocalUrl() );
+			}
+			else if ( PERSISTENCE_ORM_XSD_MAPPING2.matches( namespace ) ) {
+				return openUrlStream( PERSISTENCE_ORM_XSD_MAPPING2.getMappedLocalUrl() );
+			}
 			else if ( HBM_XSD_MAPPING.matches( namespace ) ) {
 				return openUrlStream( HBM_XSD_MAPPING.getMappedLocalUrl() );
 			}
@@ -152,7 +158,23 @@ private InputStream resolveInLocalNamespace(String path) {
 			"http://xmlns.jcp.org/xml/ns/persistence/orm",
 			"org/hibernate/jpa/orm_2_1.xsd"
 	);
+	
+	/**
+	 * Maps the namespace for the orm.xml xsd for Jakarta Persistence 2.2
+	 */
+	public static final NamespaceSchemaMapping PERSISTENCE_ORM_XSD_MAPPING = new NamespaceSchemaMapping(
+			"http://xmlns.jcp.org/xml/ns/persistence/orm",
+			"org/hibernate/jpa/orm_2_2.xsd"
+	);
 
+	/**
+	 * Maps the namespace for the orm.xml xsd for Jakarta Persistence 3.0
+	 */
+	public static final NamespaceSchemaMapping PERSISTENCE_ORM_XSD_MAPPING2 = new NamespaceSchemaMapping(
+			"https://jakarta.ee/xml/ns/persistence/orm",
+			"org/hibernate/jpa/orm_3_0.xsd"
+	);
+	
 	public static final NamespaceSchemaMapping HBM_XSD_MAPPING = new NamespaceSchemaMapping(
 			"http://www.hibernate.org/xsd/orm/hbm",
 			"org/hibernate/xsd/mapping/legacy-mapping-4.0.xsd"

hibernate-core/src/main/java/org/hibernate/boot/xsd/ConfigXsdSupport.java

@@ -26,9 +26,10 @@ public class ConfigXsdSupport {
 	 * 1: JPA 1.0
 	 * 2: JPA 2.0
 	 * 3: JPA 2.1
-	 * 4: JPA 2.2
+	 * 4: JPA 2.2 (default)
+	 * 5: Jakarta Persistence 3.0
 	 */
-	private static final XsdDescriptor[] xsdCache = new XsdDescriptor[5];
+	private static final XsdDescriptor[] xsdCache = new XsdDescriptor[6];
 
 	public XsdDescriptor latestJpaDescriptor() {
 		return getJPA22();
@@ -48,6 +49,9 @@ public XsdDescriptor jpaXsd(String version) {
 			case "2.2": {
 				return getJPA22();
 			}
+			case "3.0": {
+				return getJPA30();
+			}
 			default: {
 				throw new IllegalArgumentException( "Unrecognized JPA persistence.xml XSD version : `" + version + "`" );
 			}
@@ -134,4 +138,20 @@ private XsdDescriptor getJPA22() {
 		}
 	}
 
+	private XsdDescriptor getJPA30() {
+		final int index = 5;
+		synchronized ( xsdCache ) {
+			XsdDescriptor jpa30 = xsdCache[index];
+			if ( jpa30 == null ) {
+				jpa30 = LocalXsdResolver.buildXsdDescriptor(
+						"org/hibernate/jpa/persistence_3_0.xsd",
+						"3.0",
+						"https://jakarta.ee/xml/ns/persistence"
+				);
+				xsdCache[index] = jpa30;
+			}
+			return jpa30;
+		}
+	}
+	
 }

hibernate-core/src/main/java/org/hibernate/boot/xsd/LocalXsdResolver.java

@@ -43,6 +43,7 @@ public static boolean isValidJpaVersion(String version) {
 			case "2.0":
 			case "2.1":
 			case "2.2":
+			case "3.0":
 				return true;
 			default:
 				return false;

hibernate-core/src/main/java/org/hibernate/boot/xsd/MappingXsdSupport.java

@@ -44,6 +44,12 @@ public class MappingXsdSupport {
 			"http://xmlns.jcp.org/xml/ns/persistence"
 	);
 
+	private final XsdDescriptor jpa30 = LocalXsdResolver.buildXsdDescriptor(
+			"org/hibernate/jpa/orm_3_0.xsd",
+			"3.0",
+			"https://jakarta.ee/xml/ns/persistence/orm"
+	);
+	
 	private final XsdDescriptor hbmXml = LocalXsdResolver.buildXsdDescriptor(
 			"org/hibernate/xsd/mapping/legacy-mapping-4.0.xsd",
 			"4.0",
@@ -72,6 +78,9 @@ public XsdDescriptor jpaXsd(String version) {
 			case "2.2": {
 				return jpa22;
 			}
+			case "3.0:": {
+				return jpa30;
+			}
 			default: {
 				throw new IllegalArgumentException( "Unrecognized JPA orm.xml XSD version : `" + version + "`" );
 			}

hibernate-core/src/main/java/org/hibernate/cfg/EJB3DTDEntityResolver.java

@@ -41,13 +41,27 @@ public boolean isResolved() {
 	public InputSource resolveEntity(String publicId, String systemId) {
 		LOG.tracev( "Resolving XML entity {0} : {1}", publicId, systemId );
 		if ( systemId != null ) {
-			if ( systemId.endsWith( "orm_2_1.xsd" ) ) {
+			if ( systemId.endsWith( "orm_3_0.xsd" ) ) {
+				InputStream dtdStream = getStreamFromClasspath( "orm_3_0.xsd" );
+				final InputSource source = buildInputSource( publicId, systemId, dtdStream, false );
+				if ( source != null ) {
+					return source;
+				}
+			}
+			else if ( systemId.endsWith( "orm_2_1.xsd" ) ) {
 				InputStream dtdStream = getStreamFromClasspath( "orm_2_1.xsd" );
 				final InputSource source = buildInputSource( publicId, systemId, dtdStream, false );
 				if ( source != null ) {
 					return source;
 				}
 			}
+			else if ( systemId.endsWith( "orm_2_2.xsd" ) ) {
+				InputStream dtdStream = getStreamFromClasspath( "orm_2_2.xsd" );
+				final InputSource source = buildInputSource( publicId, systemId, dtdStream, false );
+				if ( source != null ) {
+					return source;
+				}
+			}
 			else if ( systemId.endsWith( "orm_2_0.xsd" ) ) {
 				InputStream dtdStream = getStreamFromClasspath( "orm_2_0.xsd" );
 				final InputSource source = buildInputSource( publicId, systemId, dtdStream, false );
@@ -62,6 +76,20 @@ else if ( systemId.endsWith( "orm_1_0.xsd" ) ) {
 					return source;
 				}
 			}
+			else if ( systemId.endsWith( "persistence_3_0.xsd" ) ) {
+				InputStream dtdStream = getStreamFromClasspath( "persistence_3_0.xsd" );
+				final InputSource source = buildInputSource( publicId, systemId, dtdStream, true );
+				if ( source != null ) {
+					return source;
+				}
+			}
+			else if ( systemId.endsWith( "persistence_2_2.xsd" ) ) {
+				InputStream dtdStream = getStreamFromClasspath( "persistence_2_2.xsd" );
+				final InputSource source = buildInputSource( publicId, systemId, dtdStream, true );
+				if ( source != null ) {
+					return source;
+				}
+			}
 			else if ( systemId.endsWith( "persistence_2_1.xsd" ) ) {
 				InputStream dtdStream = getStreamFromClasspath( "persistence_2_1.xsd" );
 				final InputSource source = buildInputSource( publicId, systemId, dtdStream, true );