From 0987f52a886ea34c7c2f32dd79fe7f8662fb56b1 Mon Sep 17 00:00:00 2001
From: Ali Dehghani <ali.dehghani.g@gmail.com>
Date: Sat, 27 Oct 2018 11:08:14 +0330
Subject: [PATCH] BAEL-2306: Update Spring JNDI article (#5540)

---
 .../org/baeldung/config/PersistenceJNDIConfig.java | 14 ++++----------
 .../java/org/baeldung/persistence/model/Foo.java   |  6 +++---
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJNDIConfig.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJNDIConfig.java
index 7f28c958f1..56ba68dcbb 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJNDIConfig.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/config/PersistenceJNDIConfig.java
@@ -23,23 +23,19 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
 @EnableTransactionManagement
-@PropertySource({ "classpath:persistence-jndi.properties" })
-@ComponentScan({ "org.baeldung.persistence" })
+@PropertySource("classpath:persistence-jndi.properties")
+@ComponentScan("org.baeldung.persistence")
 @EnableJpaRepositories(basePackages = "org.baeldung.persistence.dao")
 public class PersistenceJNDIConfig {
 
     @Autowired
     private Environment env;
 
-    public PersistenceJNDIConfig() {
-        super();
-    }
-
     @Bean
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() throws NamingException {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" });
+        em.setPackagesToScan("org.baeldung.persistence.model");
         em.setJpaVendorAdapter(new HibernateJpaVendorAdapter());
         em.setJpaProperties(additionalProperties());
         return em;
@@ -52,9 +48,7 @@ public class PersistenceJNDIConfig {
 
     @Bean
     public PlatformTransactionManager transactionManager(final EntityManagerFactory emf) {
-        final JpaTransactionManager transactionManager = new JpaTransactionManager();
-        transactionManager.setEntityManagerFactory(emf);
-        return transactionManager;
+        return new JpaTransactionManager(emf);
     }
 
     @Bean
diff --git a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java
index 209ab081de..5294860311 100644
--- a/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java
+++ b/persistence-modules/spring-jpa/src/main/java/org/baeldung/persistence/model/Foo.java
@@ -25,7 +25,7 @@ public class Foo implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "ID")
-    private long id;
+    private Long id;
     @Column(name = "NAME")
     private String name;
 
@@ -41,11 +41,11 @@ public class Foo implements Serializable {
         this.bar = bar;
     }
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
-    public void setId(final int id) {
+    public void setId(final Long id) {
         this.id = id;
     }