cleanup some typing-related compiler warnings

Author: gavinking

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

@@ -26,11 +26,11 @@ public FileXmlSource(Origin origin, File file) {
 	}
 
 	@Override
-	public Binding doBind(Binder binder) {
+	public <T> Binding<T> doBind(Binder<T> binder) {
 		return doBind( binder, file, getOrigin() );
 	}
 
-	public static Binding doBind(Binder binder, File file, Origin origin) {
+	public static <T> Binding<T> doBind(Binder<T> binder, File file, Origin origin) {
 		final FileInputStream fis;
 		try {
 			fis = new FileInputStream( file );

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

@@ -32,11 +32,11 @@ public InputStreamXmlSource(Origin origin, InputStream inputStream, boolean auto
 	}
 
 	@Override
-	public Binding doBind(Binder binder) {
+	public <T> Binding<T> doBind(Binder<T> binder) {
 		return doBind( binder, inputStream, getOrigin(), autoClose );
 	}
 
-	public static Binding doBind(Binder binder, InputStream inputStream, Origin origin, boolean autoClose) {
+	public static <T> Binding<T> doBind(Binder<T> binder, InputStream inputStream, Origin origin, boolean autoClose) {
 		try {
 			return binder.bind( inputStream, origin );
 		}

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

@@ -29,7 +29,7 @@ public UrlXmlSource(Origin origin, URL url) {
 	}
 
 	@Override
-	public Binding doBind(Binder binder) {
+	public <T> Binding<T> doBind(Binder<T> binder) {
 		try {
 			InputStream stream = url.openStream();
 			return InputStreamXmlSource.doBind( binder, stream, getOrigin(), true );

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

@@ -26,5 +26,5 @@ public Origin getOrigin() {
 		return origin;
 	}
 
-	public abstract Binding doBind(Binder binder);
+	public abstract <T> Binding<T> doBind(Binder<T> binder);
 }

hibernate-core/src/main/java/org/hibernate/boot/spi/XmlMappingBinderAccess.java

@@ -55,44 +55,36 @@ public MappingBinder getMappingBinder() {
 	/**
 	 * Create a {@linkplain Binding binding} from a named URL resource
 	 */
-	public <X extends JaxbBindableMappingDescriptor> Binding<X> bind(String resource) {
+	public Binding<JaxbBindableMappingDescriptor> bind(String resource) {
 		LOG.tracef( "reading mappings from resource : %s", resource );
-
 		final Origin origin = new Origin( SourceType.RESOURCE, resource );
 		final URL url = classLoaderService.locateResource( resource );
 		if ( url == null ) {
 			throw new MappingNotFoundException( origin );
 		}
-
-		//noinspection unchecked
 		return new UrlXmlSource( origin, url ).doBind( getMappingBinder() );
 	}
 
 	/**
 	 * Create a {@linkplain Binding binding} from a File reference
 	 */
-	public <X extends JaxbBindableMappingDescriptor> Binding<X> bind(File file) {
+	public Binding<JaxbBindableMappingDescriptor> bind(File file) {
 		final Origin origin = new Origin( SourceType.FILE, file.getPath() );
 		LOG.tracef( "reading mappings from file : %s", origin.getName() );
-
 		if ( !file.exists() ) {
 			throw new MappingNotFoundException( origin );
 		}
-
-		//noinspection unchecked
 		return new FileXmlSource( origin, file ).doBind( getMappingBinder() );
 	}
 
 	/**
 	 * Create a {@linkplain Binding binding} from an input stream
 	 */
-	public <X extends JaxbBindableMappingDescriptor> Binding<X> bind(InputStreamAccess xmlInputStreamAccess) {
+	public Binding<JaxbBindableMappingDescriptor> bind(InputStreamAccess xmlInputStreamAccess) {
 		LOG.tracef( "reading mappings from InputStreamAccess : %s", xmlInputStreamAccess.getStreamName() );
-
 		final Origin origin = new Origin( SourceType.INPUT_STREAM, xmlInputStreamAccess.getStreamName() );
-		InputStream xmlInputStream = xmlInputStreamAccess.accessInputStream();
+		final InputStream xmlInputStream = xmlInputStreamAccess.accessInputStream();
 		try {
-			//noinspection unchecked
 			return new InputStreamXmlSource( origin, xmlInputStream, false ).doBind( mappingBinder );
 		}
 		finally {
@@ -108,22 +100,19 @@ public <X extends JaxbBindableMappingDescriptor> Binding<X> bind(InputStreamAcce
 	/**
 	 * Create a {@linkplain Binding binding} from an input stream
 	 */
-	public <X extends JaxbBindableMappingDescriptor> Binding<X> bind(InputStream xmlInputStream) {
+	public Binding<JaxbBindableMappingDescriptor> bind(InputStream xmlInputStream) {
 		LOG.trace( "reading mappings from InputStream" );
 		final Origin origin = new Origin( SourceType.INPUT_STREAM, null );
-		//noinspection unchecked
 		return new InputStreamXmlSource( origin, xmlInputStream, false ).doBind( getMappingBinder() );
 	}
 
 	/**
 	 * Create a {@linkplain Binding binding} from a URL
 	 */
-	public <X extends JaxbBindableMappingDescriptor> Binding<X> bind(URL url) {
+	public Binding<JaxbBindableMappingDescriptor> bind(URL url) {
 		final String urlExternalForm = url.toExternalForm();
 		LOG.debugf( "Reading mapping document from URL : %s", urlExternalForm );
-
 		final Origin origin = new Origin( SourceType.URL, urlExternalForm );
-		//noinspection unchecked
 		return new UrlXmlSource( origin, url ).doBind( getMappingBinder() );
 	}
 }