HHH-18455 - deprecate Binder.bind(InputStream, Origin)

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

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

@@ -15,6 +15,7 @@
 
 import org.hibernate.boot.MappingException;
 import org.hibernate.boot.ResourceStreamLocator;
+import org.hibernate.boot.archive.internal.RepeatableInputStreamAccess;
 import org.hibernate.boot.archive.spi.InputStreamAccess;
 import org.hibernate.boot.jaxb.Origin;
 import org.hibernate.boot.jaxb.internal.stax.BufferedXMLEventReader;
@@ -43,6 +44,11 @@ protected AbstractBinder(ResourceStreamLocator resourceStreamLocator) {
 		this.xmlResourceResolver = new LocalXmlResourceResolver( resourceStreamLocator );
 	}
 
+	@Override
+	public <X extends T> Binding<X> bind(InputStream stream, Origin origin) {
+		return bind( new RepeatableInputStreamAccess(origin.getName(), stream), origin );
+	}
+
 	@Override
 	public <X extends T> Binding<X> bind(InputStreamAccess streamAccess, Origin origin) {
 		this.streamAccess = streamAccess;

hibernate-core/src/main/java/org/hibernate/boot/jaxb/spi/Binder.java

@@ -9,6 +9,8 @@
 import org.hibernate.boot.archive.spi.InputStreamAccess;
 import org.hibernate.boot.jaxb.Origin;
 
+import java.io.InputStream;
+
 /**
  * Contract for performing JAXB binding.
  *
@@ -24,6 +26,17 @@ public interface Binder<T> {
 	 */
 	<X extends T> Binding<X> bind(Source source, Origin origin);
 
+	/**
+	 * Bind from an InputStream
+	 *
+	 * @param stream The InputStream containing XML
+	 * @param origin The descriptor of the stream origin
+	 * @return The bound JAXB model
+	 * @deprecated Use {@link #bind(InputStreamAccess, Origin)} instead
+	 */
+	@Deprecated(since = "7.2")
+	<X extends T> Binding<X> bind(InputStream stream, Origin origin);
+
 	/**
 	 * Bind from an InputStreamAccess
 	 *