From c52864d188a9ad38068e89989a1aba39794982c3 Mon Sep 17 00:00:00 2001 From: Brett Meyer Date: Tue, 29 Jan 2013 15:11:11 -0500 Subject: [PATCH] HHH-7580 Corrected a few failures after the cherry-pick into master --- .../source/internal/MetadataImpl.java | 4 +- .../SessionFactoryBuildingUseCasesTest.java | 144 ------------------ 2 files changed, 1 insertion(+), 147 deletions(-) delete mode 100644 hibernate-core/src/test/java/org/hibernate/test/smoke/SessionFactoryBuildingUseCasesTest.java diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java index 7693ed0ea8..b877163f4c 100644 --- a/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/metamodel/source/internal/MetadataImpl.java @@ -90,8 +90,6 @@ public class MetadataImpl implements MetadataImplementor, Serializable { private TypeResolver typeResolver = new TypeResolver(); - private SessionFactoryBuilder sessionFactoryBuilder = new SessionFactoryBuilderImpl( this ); - private final MutableIdentifierGeneratorFactory identifierGeneratorFactory; private final Database database; @@ -452,7 +450,7 @@ public class MetadataImpl implements MetadataImplementor, Serializable { @Override public SessionFactoryBuilder getSessionFactoryBuilder() { - return sessionFactoryBuilder; + return new SessionFactoryBuilderImpl( this ); } @Override diff --git a/hibernate-core/src/test/java/org/hibernate/test/smoke/SessionFactoryBuildingUseCasesTest.java b/hibernate-core/src/test/java/org/hibernate/test/smoke/SessionFactoryBuildingUseCasesTest.java deleted file mode 100644 index 5432bc6d6d..0000000000 --- a/hibernate-core/src/test/java/org/hibernate/test/smoke/SessionFactoryBuildingUseCasesTest.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * Copyright (c) 2012, Red Hat Inc. or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Inc. - * - * This copyrighted material is made available to anyone wishing to use, modify, - * copy, or redistribute it subject to the terms and conditions of the GNU - * Lesser General Public License, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution; if not, write to: - * Free Software Foundation, Inc. - * 51 Franklin Street, Fifth Floor - * Boston, MA 02110-1301 USA - */ -package org.hibernate.test.smoke; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.boot.registry.BootstrapServiceRegistry; -import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder; -import org.hibernate.boot.registry.StandardServiceRegistry; -import org.hibernate.boot.registry.StandardServiceRegistryBuilder; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.metamodel.Metadata; -import org.hibernate.metamodel.MetadataSources; - -import org.junit.Test; - -import org.hibernate.testing.FailureExpected; -import org.hibernate.testing.TestForIssue; -import org.hibernate.testing.junit4.BaseUnitTestCase; - -/** - * @author Steve Ebersole - */ -@TestForIssue( jiraKey = "HHH-7580" ) -public class SessionFactoryBuildingUseCasesTest extends BaseUnitTestCase { - @Test - public void testTheSimplestUseCase() { - StandardServiceRegistry registry = new StandardServiceRegistryBuilder() - .applySetting( AvailableSettings.HBM2DDL_AUTO, "create-drop" ) - .build(); - MetadataSources metadataSources = new MetadataSources( registry ).addAnnotatedClass( MyEntity.class ); - SessionFactory sessionFactory = metadataSources.buildMetadata().buildSessionFactory(); - - useSessionFactory( sessionFactory ); - - sessionFactory.close(); - StandardServiceRegistryBuilder.destroy( registry ); - } - - private void useSessionFactory(SessionFactory sessionFactory) { - Session session = sessionFactory.openSession(); - session.beginTransaction(); - session.createQuery( "from MyEntity" ).list(); - session.getTransaction().commit(); - session.close(); - } - - @Test - public void testStillSimpleOnePhaseUseCase() { - BootstrapServiceRegistry bootRegistry = new BootstrapServiceRegistryBuilder().build(); - StandardServiceRegistry registry = new StandardServiceRegistryBuilder( bootRegistry ) - .applySetting( AvailableSettings.HBM2DDL_AUTO, "create-drop" ) - .build(); - MetadataSources metadataSources = new MetadataSources( registry ).addAnnotatedClass( MyEntity.class ); - SessionFactory sessionFactory = metadataSources.buildMetadata().buildSessionFactory(); - - useSessionFactory( sessionFactory ); - - sessionFactory.close(); - StandardServiceRegistryBuilder.destroy( registry ); - } - - @Test - public void testSimpleTwoPhaseUseCase() { - BootstrapServiceRegistry bootRegistry = new BootstrapServiceRegistryBuilder().build(); - MetadataSources metadataSources = new MetadataSources( bootRegistry ).addAnnotatedClass( MyEntity.class ); - - StandardServiceRegistry registry = new StandardServiceRegistryBuilder( bootRegistry ) - .applySetting( AvailableSettings.HBM2DDL_AUTO, "create-drop" ) - .build(); - SessionFactory sessionFactory = metadataSources.buildMetadata( registry ).buildSessionFactory(); - - useSessionFactory( sessionFactory ); - - sessionFactory.close(); - StandardServiceRegistryBuilder.destroy( registry ); - } - - @Test - public void testFullTwoPhaseUseCase() { - BootstrapServiceRegistry bootRegistry = new BootstrapServiceRegistryBuilder().build(); - MetadataSources metadataSources = new MetadataSources( bootRegistry ).addAnnotatedClass( MyEntity.class ); - - StandardServiceRegistry registry = new StandardServiceRegistryBuilder( bootRegistry ) - .applySetting( AvailableSettings.HBM2DDL_AUTO, "create-drop" ) - .build(); - Metadata metadata = metadataSources.getMetadataBuilder( registry ).build(); - SessionFactory sessionFactory = metadata.getSessionFactoryBuilder().build(); // todo rename - - useSessionFactory( sessionFactory ); - - sessionFactory.close(); - StandardServiceRegistryBuilder.destroy( registry ); - } - - @Test - @FailureExpected( jiraKey = "HHH-7580" ) - public void testInvalidQuasiUseCase() { - BootstrapServiceRegistry bootRegistry = new BootstrapServiceRegistryBuilder().build(); - MetadataSources metadataSources = new MetadataSources( bootRegistry ).addAnnotatedClass( MyEntity.class ); - - StandardServiceRegistry registry = new StandardServiceRegistryBuilder( bootRegistry ) - .applySetting( AvailableSettings.HBM2DDL_AUTO, "create-drop" ) - .build(); - SessionFactory sessionFactory = metadataSources.buildMetadata().buildSessionFactory(); - - useSessionFactory( sessionFactory ); - - sessionFactory.close(); - StandardServiceRegistryBuilder.destroy( registry ); - } - - @Entity( name = "MyEntity" ) - @Table( name = "TST_ENT" ) - public static class MyEntity { - @Id - private Long id; - } -}