HHH-7718 Support "import" in HBM mappings

Author: brmeyer

hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/HibernateMappingProcessor.java

@@ -301,7 +301,7 @@ private void processImports() {
 					.qualifyClassName( importValue.getClazz() );
 			String rename = importValue.getRename();
 			rename = ( rename == null ) ? StringHelper.unqualify( className ) : rename;
-			metadata.addImport( className, rename );
+			metadata.addImport( rename, className );
 		}
 		if ( root.isAutoImport() ) {
 			processEntityElementsImport( root.getClazz() );

hibernate-core/src/test/java/org/hibernate/test/stats/StatsTest.java

@@ -52,7 +52,6 @@
  *
  * @author Emmanuel Bernard
  */
-@FailureExpectedWithNewMetamodel
 public class StatsTest extends BaseCoreFunctionalTestCase {
 	@Override
 	public String[] getMappings() {
@@ -67,6 +66,7 @@ public void configure(Configuration cfg) {
 
 	@Test
 	@SuppressWarnings( {"UnusedAssignment"})
+	@FailureExpectedWithNewMetamodel
 	public void testCollectionFetchVsLoad() throws Exception {
 		Statistics stats = sessionFactory().getStatistics();
 		stats.clear();