JPA - Polished configuration and test case.

Author: odrotbohm

jpa/src/main/java/com/oreilly/springdata/jpa/ApplicationConfig.java

@@ -27,6 +27,7 @@
 import org.springframework.orm.jpa.JpaDialect;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.vendor.Database;
 import org.springframework.orm.jpa.vendor.HibernateJpaDialect;
 import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -35,7 +36,7 @@
 /**
  * Spring JavaConfig configuration class to setup a Spring container and infrastructure components like a
  * {@link DataSource}, a {@link EntityManagerFactory} and a {@link PlatformTransactionManager}.
- *
+ * 
  * @author Oliver Gierke
  */
 @Configuration
@@ -44,50 +45,53 @@
 @EnableTransactionManagement
 class ApplicationConfig {
 
-  /**
-   * Bootstraps an in-memory HSQL database.
-   *
-   * @return
-   * @see http://static.springsource.org/spring/docs/3.1.x/spring-framework-reference/html/jdbc.html#jdbc-embedded-database-support
-   */
-  @Bean
-  public DataSource dataSource() {
-    EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
-    return builder.setType( EmbeddedDatabaseType.HSQL ).build();
-  }
+	/**
+	 * Bootstraps an in-memory HSQL database.
+	 * 
+	 * @return
+	 * @see http 
+	 *      ://static.springsource.org/spring/docs/3.1.x/spring-framework-reference/html/jdbc.html#jdbc-embedded-database
+	 *      -support
+	 */
+	@Bean
+	public DataSource dataSource() {
+		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
+		return builder.setType(EmbeddedDatabaseType.HSQL).build();
+	}
 
-  /**
-   * Sets up a {@link LocalContainerEntityManagerFactoryBean} to use Hibernate. Activates picking up entities from the
-   * project's base package.
-   *
-   * @return
-   */
-  @Bean
-  public EntityManagerFactory entityManagerFactory() {
+	/**
+	 * Sets up a {@link LocalContainerEntityManagerFactoryBean} to use Hibernate. Activates picking up entities from the
+	 * project's base package.
+	 * 
+	 * @return
+	 */
+	@Bean
+	public EntityManagerFactory entityManagerFactory() {
 
-    HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-    vendorAdapter.setGenerateDdl( true );
+		HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
+		vendorAdapter.setDatabase(Database.HSQL);
+		vendorAdapter.setGenerateDdl(true);
 
-    LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
-    factory.setJpaVendorAdapter( vendorAdapter );
-    factory.setPackagesToScan( getClass().getPackage().getName() );
-    factory.setDataSource( dataSource() );
+		LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
+		factory.setJpaVendorAdapter(vendorAdapter);
+		factory.setPackagesToScan(getClass().getPackage().getName());
+		factory.setDataSource(dataSource());
 
-    factory.afterPropertiesSet();
+		factory.afterPropertiesSet();
 
-    return factory.getObject();
-  }
+		return factory.getObject();
+	}
 
-  @Bean
-  public JpaDialect jpaDialect() {
-    return new HibernateJpaDialect();
-  }
+	@Bean
+	public JpaDialect jpaDialect() {
+		return new HibernateJpaDialect();
+	}
 
-  @Bean
-  public PlatformTransactionManager transactionManager() {
+	@Bean
+	public PlatformTransactionManager transactionManager() {
 
-    JpaTransactionManager txManager = new JpaTransactionManager();
-    txManager.setEntityManagerFactory( entityManagerFactory() );
-    return txManager;
-  }
+		JpaTransactionManager txManager = new JpaTransactionManager();
+		txManager.setEntityManagerFactory(entityManagerFactory());
+		return txManager;
+	}
 }

jpa/src/main/resources/META-INF/spring/application-context.xml

@@ -6,7 +6,7 @@
 	xmlns:jpa="http://www.springframework.org/schema/data/jpa"
 	xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.2.xsd
+		http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">
 
 	<jpa:repositories base-package="com.oreilly.springdata.jpa" />

jpa/src/test/java/com/oreilly/springdata/jpa/ApplicationConfigTest.java

@@ -23,6 +23,8 @@
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
+import com.oreilly.springdata.jpa.core.CustomerRepository;
+
 /**
  * Test case bootstrapping both JavaConfig and XML configuration to validate configuration.
  * 
@@ -35,12 +37,14 @@ public void bootstrapAppFromJavaConfig() {
 
 		ApplicationContext context = new AnnotationConfigApplicationContext(ApplicationConfig.class);
 		assertThat(context, is(notNullValue()));
+		assertThat(context.getBean(CustomerRepository.class), is(notNullValue()));
 	}
 
 	@Test
-	public void bootsrapAppFromXml() {
+	public void bootstrapAppFromXml() {
 
 		ApplicationContext context = new ClassPathXmlApplicationContext("META-INF/spring/application-context.xml");
 		assertThat(context, is(notNullValue()));
+		assertThat(context.getBean(CustomerRepository.class), is(notNullValue()));
 	}
 }