rationalize one more Logger

Author: gavinking

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

@@ -48,9 +48,8 @@ public static Schema resolveLocalSchema(URL schemaUrl) {
 		try {
 			final var schemaStream = schemaUrl.openStream();
 			try {
-				final var source = new StreamSource(schemaUrl.openStream());
-				final var schemaFactory = SchemaFactory.newInstance( W3C_XML_SCHEMA_NS_URI );
-				return schemaFactory.newSchema(source);
+				return SchemaFactory.newInstance( W3C_XML_SCHEMA_NS_URI )
+						.newSchema( new StreamSource( schemaUrl.openStream() ) );
 			}
 			catch ( Exception e ) {
 				throw new XmlInfrastructureException( "Unable to load schema [" + schemaUrl.toExternalForm() + "]", e );

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

@@ -18,6 +18,9 @@
 
 import org.xml.sax.SAXException;
 
+import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI;
+import static org.hibernate.boot.jaxb.JaxbLogger.JAXB_LOGGER;
+
 /**
  * When Hibernate loads an XSD we fully expect that to be resolved from our
  * jar file via ClassLoader resource look-up.  This class simplifies
@@ -33,18 +36,10 @@ public static String latestJpaVerison() {
 	}
 
 	public static boolean isValidJpaVersion(String version) {
-		switch ( version ) {
-			case "1.0":
-			case "2.0":
-			case "2.1":
-			case "2.2":
-			case "3.0":
-			case "3.1":
-			case "3.2":
-				return true;
-			default:
-				return false;
-		}
+		return switch ( version ) {
+			case "1.0", "2.0", "2.1", "2.2", "3.0", "3.1", "3.2" -> true;
+			default -> false;
+		};
 	}
 
 	public static URL resolveLocalXsdUrl(String resourceName) {
@@ -87,11 +82,10 @@ public static Schema resolveLocalXsdSchema(String schemaResourceName) {
 			throw new XsdException( "Unable to locate schema [" + schemaResourceName + "] via classpath", schemaResourceName );
 		}
 		try {
-			InputStream schemaStream = url.openStream();
+			final var schemaStream = url.openStream();
 			try {
-				StreamSource source = new StreamSource( url.openStream() );
-				SchemaFactory schemaFactory = SchemaFactory.newInstance( XMLConstants.W3C_XML_SCHEMA_NS_URI );
-				return schemaFactory.newSchema( source );
+				return SchemaFactory.newInstance( W3C_XML_SCHEMA_NS_URI )
+						.newSchema( new StreamSource( url.openStream() ) );
 			}
 			catch ( SAXException | IOException e ) {
 				throw new XsdException( "Unable to load schema [" + schemaResourceName + "]", e, schemaResourceName );
@@ -101,8 +95,7 @@ public static Schema resolveLocalXsdSchema(String schemaResourceName) {
 					schemaStream.close();
 				}
 				catch ( IOException e ) {
-					Logger.getLogger( LocalXsdResolver.class )
-							.debugf( "Problem closing schema stream [%s]", e.toString() );
+					JAXB_LOGGER.problemClosingSchemaStream( e.toString() );
 				}
 			}
 		}