Author: sclassen
Date: Wed Oct 15 22:04:42 2014
New Revision: 1632187
URL: http://svn.apache.org/r1632187
Log:
ONAMI-115: fix PersistenceFilter to use correct dependencies
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceFilterImpl.java
onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceFilterImplTest.java
Modified:
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceFilterImpl.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceFilterImpl.java?rev=1632187&r1=1632186&r2=1632187&view=diff
==============================================================================
---
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceFilterImpl.java
(original)
+++
onami/trunk/persist/src/main/java/org/apache/onami/persist/PersistenceFilterImpl.java
Wed Oct 15 22:04:42 2014
@@ -38,20 +38,26 @@ class PersistenceFilterImpl
{
/**
- * Container of all known persistence unit and units of work.
+ * Container of all known persistence services.
*/
- private final AllPersistenceUnits persistenceUnitsContainer;
+ private final AllPersistenceServices allPersistenceServices;
+
+ /**
+ * Container of all known units of work.
+ */
+ private final AllUnitsOfWork allUnitsOfWork;
/**
* Constructor.
*
- * @param persistenceUnitsContainer container of all known persistence
unit and units of work.
+ * @param allPersistenceServices container of all known persistence
services.
+ * @param allUnitsOfWork container of all known units of work.
*/
@Inject
- PersistenceFilterImpl( AllPersistenceUnits persistenceUnitsContainer )
+ PersistenceFilterImpl( AllPersistenceServices allPersistenceServices,
AllUnitsOfWork allUnitsOfWork )
{
- checkNotNull( persistenceUnitsContainer );
- this.persistenceUnitsContainer = persistenceUnitsContainer;
+ this.allPersistenceServices = checkNotNull( allPersistenceServices,
"allPersistenceServices is mandatory!" );
+ this.allUnitsOfWork = checkNotNull( allUnitsOfWork, "allUnitsOfWork is
mandatory!" );
}
/**
@@ -63,12 +69,12 @@ class PersistenceFilterImpl
{
try
{
- persistenceUnitsContainer.beginAllInactiveUnitsOfWork();
+ allUnitsOfWork.beginAllInactiveUnitsOfWork();
chain.doFilter( request, response );
}
finally
{
- persistenceUnitsContainer.endAllUnitsOfWork();
+ allUnitsOfWork.endAllUnitsOfWork();
}
}
@@ -79,7 +85,7 @@ class PersistenceFilterImpl
public void init( FilterConfig filterConfig )
throws ServletException
{
- persistenceUnitsContainer.startAllStoppedPersistenceServices();
+ allPersistenceServices.startAllStoppedPersistenceServices();
}
/**
@@ -88,7 +94,7 @@ class PersistenceFilterImpl
// @Override
public void destroy()
{
- persistenceUnitsContainer.stopAllPersistenceServices();
+ allPersistenceServices.stopAllPersistenceServices();
}
}
Modified:
onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceFilterImplTest.java
URL:
http://svn.apache.org/viewvc/onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceFilterImplTest.java?rev=1632187&r1=1632186&r2=1632187&view=diff
==============================================================================
---
onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceFilterImplTest.java
(original)
+++
onami/trunk/persist/src/test/java/org/apache/onami/persist/PersistenceFilterImplTest.java
Wed Oct 15 22:04:42 2014
@@ -41,14 +41,16 @@ public class PersistenceFilterImplTest
private PersistenceFilterImpl sut;
- private AllPersistenceUnits persistenceUnitsContainer;
+ private AllPersistenceServices allPersistenceServices;
+ private AllUnitsOfWork allUnitsOfWork;
@Before
public void setUp()
throws Exception
{
- persistenceUnitsContainer = mock( AllPersistenceUnits.class );
- sut = new PersistenceFilterImpl( persistenceUnitsContainer );
+ allPersistenceServices = mock( AllPersistenceServices.class );
+ allUnitsOfWork = mock( AllUnitsOfWork.class );
+ sut = new PersistenceFilterImpl( allPersistenceServices,
allUnitsOfWork );
}
@Test
@@ -56,14 +58,14 @@ public class PersistenceFilterImplTest
throws Exception
{
sut.init( mock( FilterConfig.class ) );
- verify( persistenceUnitsContainer
).startAllStoppedPersistenceServices();
+ verify( allPersistenceServices ).startAllStoppedPersistenceServices();
}
@Test
public void destroyShouldStopService()
{
sut.destroy();
- verify( persistenceUnitsContainer ).stopAllPersistenceServices();
+ verify( allPersistenceServices ).stopAllPersistenceServices();
}
@Test
@@ -72,7 +74,7 @@ public class PersistenceFilterImplTest
{
// given
final FilterChain chain = mock( FilterChain.class );
- final InOrder inOrder = inOrder( persistenceUnitsContainer, chain );
+ final InOrder inOrder = inOrder( allUnitsOfWork, chain );
final ServletRequest request = mock( ServletRequest.class );
final ServletResponse response = mock( ServletResponse.class );
@@ -81,9 +83,9 @@ public class PersistenceFilterImplTest
sut.doFilter( request, response, chain );
// then
- inOrder.verify( persistenceUnitsContainer
).beginAllInactiveUnitsOfWork();
+ inOrder.verify( allUnitsOfWork ).beginAllInactiveUnitsOfWork();
inOrder.verify( chain ).doFilter( request, response );
- inOrder.verify( persistenceUnitsContainer ).endAllUnitsOfWork();
+ inOrder.verify( allUnitsOfWork ).endAllUnitsOfWork();
}
@Test(expected = RuntimeException.class)
@@ -92,7 +94,7 @@ public class PersistenceFilterImplTest
{
// given
final FilterChain chain = mock( FilterChain.class );
- final InOrder inOrder = inOrder( persistenceUnitsContainer, chain );
+ final InOrder inOrder = inOrder( allUnitsOfWork, chain );
final ServletRequest request = mock( ServletRequest.class );
final ServletResponse response = mock( ServletResponse.class );
@@ -107,9 +109,9 @@ public class PersistenceFilterImplTest
// then
finally
{
- inOrder.verify( persistenceUnitsContainer
).beginAllInactiveUnitsOfWork();
+ inOrder.verify( allUnitsOfWork ).beginAllInactiveUnitsOfWork();
inOrder.verify( chain ).doFilter( request, response );
- inOrder.verify( persistenceUnitsContainer ).endAllUnitsOfWork();
+ inOrder.verify( allUnitsOfWork ).endAllUnitsOfWork();
}
}
