Merge branch 'juliuskrah-master'

spring-boot/pom.xml

@@ -21,7 +21,7 @@
 		<start-class>org.baeldung.boot.DemoApplication</start-class>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-        <!-- <spring.version>4.3.0.RELEASE</spring.version> -->
+		<spring.version>4.3.1.RELEASE</spring.version>
 	</properties>
 
 	<dependencies>

spring-boot/src/main/java/org/baeldung/session/exception/Application.java

@@ -0,0 +1,23 @@
+package org.baeldung.session.exception;
+
+import org.baeldung.boot.model.Foo;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.orm.jpa.vendor.HibernateJpaSessionFactoryBean;
+
+@EntityScan(basePackageClasses = Foo.class)
+@SpringBootApplication
+public class Application {
+    public static void main(String[] args) {
+        System.setProperty("spring.config.name", "exception");
+        System.setProperty("spring.profiles.active", "exception");
+        SpringApplication.run(Application.class, args);
+    }
+
+    @Bean
+    public HibernateJpaSessionFactoryBean sessionFactory() {
+        return new HibernateJpaSessionFactoryBean();
+    }
+}

spring-boot/src/main/java/org/baeldung/session/exception/repository/FooRepository.java

@@ -0,0 +1,10 @@
+package org.baeldung.session.exception.repository;
+
+import org.baeldung.boot.model.Foo;
+
+public interface FooRepository {
+
+    void save(Foo foo);
+
+    Foo get(Integer id);
+}

spring-boot/src/main/java/org/baeldung/session/exception/repository/FooRepositoryImpl.java

@@ -0,0 +1,25 @@
+package org.baeldung.session.exception.repository;
+
+import org.baeldung.boot.model.Foo;
+import org.hibernate.SessionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Repository;
+
+@Profile("exception")
+@Repository
+public class FooRepositoryImpl implements FooRepository {
+    @Autowired
+    private SessionFactory sessionFactory;
+
+    @Override
+    public void save(Foo foo) {
+        sessionFactory.getCurrentSession().saveOrUpdate(foo);
+    }
+
+    @Override
+    public Foo get(Integer id) {
+        return sessionFactory.getCurrentSession().get(Foo.class, id);
+    }
+
+}

spring-boot/src/test/java/org/baeldung/boot/ApplicationTests.java

@@ -0,0 +1,17 @@
+package org.baeldung.boot;
+
+import org.baeldung.session.exception.Application;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(classes = Application.class)
+@TestPropertySource("classpath:exception.properties")
+public class ApplicationTests {
+    @Test
+    public void contextLoads() {
+    }
+}

spring-boot/src/test/java/org/baeldung/boot/DemoApplicationTests.java

@@ -2,12 +2,12 @@ package org.baeldung.boot;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = DemoApplication.class)
+@SpringBootTest(classes = DemoApplication.class)
 @WebAppConfiguration
 public class DemoApplicationTests {
 

spring-boot/src/test/java/org/baeldung/boot/repository/HibernateSessionTest.java

@@ -0,0 +1,32 @@
+package org.baeldung.boot.repository;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+import org.baeldung.boot.ApplicationTests;
+import org.baeldung.boot.model.Foo;
+import org.baeldung.session.exception.repository.FooRepository;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+@TestPropertySource("classpath:exception-hibernate.properties")
+public class HibernateSessionTest extends ApplicationTests {
+    @Autowired
+    private FooRepository fooRepository;
+
+    @Test
+    public void whenSavingWithCurrentSession_thenThrowNoException() {
+        Foo foo = new Foo("Exception Solved");
+        fooRepository.save(foo);
+        foo = null;
+        foo = fooRepository.get(1);
+
+        assertThat(foo, notNullValue());
+        assertThat(foo.getId(), is(1));
+        assertThat(foo.getName(), is("Exception Solved"));
+    }
+}

spring-boot/src/test/java/org/baeldung/boot/repository/NoHibernateSessionTest.java

@@ -0,0 +1,21 @@
+package org.baeldung.boot.repository;
+
+import org.baeldung.boot.ApplicationTests;
+import org.baeldung.boot.model.Foo;
+import org.baeldung.session.exception.repository.FooRepository;
+import org.hibernate.HibernateException;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
+public class NoHibernateSessionTest extends ApplicationTests {
+    @Autowired
+    private FooRepository fooRepository;
+
+    @Test(expected = HibernateException.class)
+    public void whenSavingWithoutCurrentSession_thenThrowException() {
+        Foo foo = new Foo("Exception Thrown");
+        fooRepository.save(foo);
+    }
+}

spring-boot/src/test/resources/exception-hibernate.properties

@@ -0,0 +1,2 @@
+spring.profiles.active=exception
+spring.jpa.properties.hibernate.current_session_context_class=org.springframework.orm.hibernate4.SpringSessionContext

spring-boot/src/test/resources/exception.properties

@@ -0,0 +1,6 @@
+# Security
+security.user.name=admin
+security.user.password=password
+
+spring.dao.exceptiontranslation.enabled=false
+spring.profiles.active=exception