diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause1/persistence/dao/FooDao.java b/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause1/persistence/dao/FooDao.java
deleted file mode 100644
index 2755be8445..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause1/persistence/dao/FooDao.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.baeldung.ex.mappingexception.cause1.persistence.dao;
-
-import org.baeldung.ex.mappingexception.cause1.persistence.model.Foo;
-import org.baeldung.persistence.common.AbstractHibernateDao;
-import org.hibernate.SessionFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class FooDao extends AbstractHibernateDao<Foo> implements IFooDao {
-
-    @Autowired
-    private SessionFactory sessionFactory;
-
-    public FooDao() {
-        super();
-
-        setClazz(Foo.class);
-    }
-
-    // API
-
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause1/persistence/dao/IFooDao.java b/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause1/persistence/dao/IFooDao.java
deleted file mode 100644
index 8519858eca..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause1/persistence/dao/IFooDao.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.ex.mappingexception.cause1.persistence.dao;
-
-import org.baeldung.ex.mappingexception.cause1.persistence.model.Foo;
-import org.baeldung.persistence.common.IOperations;
-
-public interface IFooDao extends IOperations<Foo> {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause1/persistence/service/FooService.java b/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause1/persistence/service/FooService.java
deleted file mode 100644
index 7054b721cf..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause1/persistence/service/FooService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.baeldung.ex.mappingexception.cause1.persistence.service;
-
-import org.baeldung.ex.mappingexception.cause1.persistence.dao.IFooDao;
-import org.baeldung.ex.mappingexception.cause1.persistence.model.Foo;
-import org.baeldung.persistence.common.AbstractService;
-import org.baeldung.persistence.common.IOperations;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class FooService extends AbstractService<Foo> implements IFooService {
-
-    @Autowired
-    private IFooDao dao;
-
-    public FooService() {
-        super();
-    }
-
-    // API
-
-    @Override
-    protected IOperations<Foo> getDao() {
-        return dao;
-    }
-
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause1/persistence/service/IFooService.java b/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause1/persistence/service/IFooService.java
deleted file mode 100644
index 5d7015cbc2..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause1/persistence/service/IFooService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.ex.mappingexception.cause1.persistence.service;
-
-import org.baeldung.ex.mappingexception.cause1.persistence.model.Foo;
-import org.baeldung.persistence.common.IOperations;
-
-public interface IFooService extends IOperations<Foo> {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause2/persistence/dao/FooDao.java b/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause2/persistence/dao/FooDao.java
deleted file mode 100644
index 4454c3f063..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause2/persistence/dao/FooDao.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.baeldung.ex.mappingexception.cause2.persistence.dao;
-
-import org.baeldung.ex.mappingexception.cause2.persistence.model.Foo;
-import org.baeldung.persistence.common.AbstractHibernateDao;
-import org.hibernate.SessionFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class FooDao extends AbstractHibernateDao<Foo> implements IFooDao {
-
-    @Autowired
-    private SessionFactory sessionFactory;
-
-    public FooDao() {
-        super();
-
-        setClazz(Foo.class);
-    }
-
-    // API
-
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause2/persistence/dao/IFooDao.java b/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause2/persistence/dao/IFooDao.java
deleted file mode 100644
index 17e0822ed6..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause2/persistence/dao/IFooDao.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.ex.mappingexception.cause2.persistence.dao;
-
-import org.baeldung.ex.mappingexception.cause2.persistence.model.Foo;
-import org.baeldung.persistence.common.IOperations;
-
-public interface IFooDao extends IOperations<Foo> {
-    //
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause2/persistence/service/FooService.java b/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause2/persistence/service/FooService.java
deleted file mode 100644
index 609b503080..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause2/persistence/service/FooService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.baeldung.ex.mappingexception.cause2.persistence.service;
-
-import org.baeldung.ex.mappingexception.cause2.persistence.dao.IFooDao;
-import org.baeldung.ex.mappingexception.cause2.persistence.model.Foo;
-import org.baeldung.persistence.common.AbstractService;
-import org.baeldung.persistence.common.IOperations;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class FooService extends AbstractService<Foo> implements IFooService {
-
-    @Autowired
-    private IFooDao dao;
-
-    public FooService() {
-        super();
-    }
-
-    // API
-
-    @Override
-    protected IOperations<Foo> getDao() {
-        return dao;
-    }
-
-}
diff --git a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause2/persistence/service/IFooService.java b/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause2/persistence/service/IFooService.java
deleted file mode 100644
index b569dd2aa4..0000000000
--- a/spring-exceptions/src/main/java/org/baeldung/ex/mappingexception/cause2/persistence/service/IFooService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.ex.mappingexception.cause2.persistence.service;
-
-import org.baeldung.ex.mappingexception.cause2.persistence.model.Foo;
-import org.baeldung.persistence.common.IOperations;
-
-public interface IFooService extends IOperations<Foo> {
-    //
-}
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause1MappingExceptionIntegrationTest.java b/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause1MappingExceptionIntegrationTest.java
index 46f551c652..98c52914b2 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause1MappingExceptionIntegrationTest.java
+++ b/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause1MappingExceptionIntegrationTest.java
@@ -3,27 +3,29 @@ package org.baeldung.ex.mappingexception;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
 import org.baeldung.ex.mappingexception.cause1.persistence.model.Foo;
-import org.baeldung.ex.mappingexception.cause1.persistence.service.IFooService;
 import org.baeldung.ex.mappingexception.spring.Cause1PersistenceConfig;
+import org.hibernate.SessionFactory;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.springframework.transaction.annotation.Transactional;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { Cause1PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class Cause1MappingExceptionIntegrationTest {
 
     @Autowired
-    private IFooService fooApi;
+    private SessionFactory sessionFactory;
 
     // tests
 
     @Test
+    @Transactional
     public final void givenEntityIsPersisted_thenException() {
-        fooApi.create(new Foo(randomAlphabetic(6)));
+        sessionFactory.getCurrentSession().saveOrUpdate(new Foo(randomAlphabetic(6)));
     }
 
 }
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause2MappingExceptionIntegrationTest.java b/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause2MappingExceptionIntegrationTest.java
index c040686fba..4bb224dfa7 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause2MappingExceptionIntegrationTest.java
+++ b/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause2MappingExceptionIntegrationTest.java
@@ -3,27 +3,29 @@ package org.baeldung.ex.mappingexception;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
 import org.baeldung.ex.mappingexception.cause2.persistence.model.Foo;
-import org.baeldung.ex.mappingexception.cause2.persistence.service.IFooService;
 import org.baeldung.ex.mappingexception.spring.Cause2PersistenceConfig;
+import org.hibernate.SessionFactory;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.springframework.transaction.annotation.Transactional;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { Cause2PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class Cause2MappingExceptionIntegrationTest {
 
     @Autowired
-    private IFooService fooApi;
+    private SessionFactory sessionFactory;
 
     // tests
 
     @Test
+    @Transactional
     public final void givenEntityIsPersisted_thenException() {
-        fooApi.create(new Foo(randomAlphabetic(6)));
+        sessionFactory.getCurrentSession().saveOrUpdate(new Foo(randomAlphabetic(6)));
     }
 
 }