From 29f02a2a8b6442350a4e2e26842c04b1fb38be5f Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Sat, 25 Jan 2014 15:28:38 +0200
Subject: [PATCH] persistence cleanup

---
 .../{spring => config}/PersistenceJPAConfig.java      |  8 +++++---
 .../{spring => config}/PersistenceJPAConfigXml.java   |  5 ++---
 .../org/baeldung/persistence/service/FooService.java  |  4 ++++
 .../service/FooServicePersistenceIntegrationTest.java | 11 ++++++++++-
 4 files changed, 21 insertions(+), 7 deletions(-)
 rename spring-jpa/src/main/java/org/baeldung/{spring => config}/PersistenceJPAConfig.java (96%)
 rename spring-jpa/src/main/java/org/baeldung/{spring => config}/PersistenceJPAConfigXml.java (80%)

diff --git a/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java b/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java
similarity index 96%
rename from spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java
rename to spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java
index 3b36b47438..ea729fde0c 100644
--- a/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfig.java
+++ b/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring;
+package org.baeldung.config;
 
 import java.util.Properties;
 
@@ -8,6 +8,7 @@ import javax.sql.DataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
@@ -20,7 +21,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
 
-// @Configuration
+@Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-mysql.properties" })
 @ComponentScan({ "org.baeldung.persistence" })
@@ -33,6 +34,8 @@ public class PersistenceJPAConfig {
         super();
     }
 
+    // beans
+
     @Bean
     public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
@@ -40,7 +43,6 @@ public class PersistenceJPAConfig {
         em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
 
         final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
-        // vendorAdapter.set
         em.setJpaVendorAdapter(vendorAdapter);
         em.setJpaProperties(additionalProperties());
 
diff --git a/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfigXml.java b/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigXml.java
similarity index 80%
rename from spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfigXml.java
rename to spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigXml.java
index 98f4f47249..3df36e62ee 100644
--- a/spring-jpa/src/main/java/org/baeldung/spring/PersistenceJPAConfigXml.java
+++ b/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfigXml.java
@@ -1,11 +1,10 @@
-package org.baeldung.spring;
+package org.baeldung.config;
 
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-@Configuration
+// @Configuration
 @EnableTransactionManagement
 @ComponentScan({ "org.baeldung.persistence" })
 @ImportResource({ "classpath:jpaConfig.xml" })
diff --git a/spring-jpa/src/main/java/org/baeldung/persistence/service/FooService.java b/spring-jpa/src/main/java/org/baeldung/persistence/service/FooService.java
index b07698c438..b72e40a430 100644
--- a/spring-jpa/src/main/java/org/baeldung/persistence/service/FooService.java
+++ b/spring-jpa/src/main/java/org/baeldung/persistence/service/FooService.java
@@ -23,4 +23,8 @@ public class FooService {
         dao.create(entity);
     }
 
+    public Foo findOne(final long id) {
+        return dao.findOne(id);
+    }
+
 }
diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java b/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
index 2d8de007db..96b3235f64 100644
--- a/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
+++ b/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java
@@ -2,8 +2,9 @@ package org.baeldung.persistence.service;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
+import org.baeldung.config.PersistenceJPAConfig;
 import org.baeldung.persistence.model.Foo;
-import org.baeldung.spring.PersistenceJPAConfig;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,4 +56,12 @@ public class FooServicePersistenceIntegrationTest {
         service.create(new Foo());
     }
 
+    @Test
+    public final void whenEntityIsCreated_thenFound() {
+        final Foo fooEntity = new Foo("abc");
+        service.create(fooEntity);
+        final Foo found = service.findOne(fooEntity.getId());
+        Assert.assertNotNull(found);
+    }
+
 }