Author: sbavencoff Date: 2014-05-19 09:30:54 +0200 (Mon, 19 May 2014) New Revision: 673 Url: http://forge.codelutin.com/projects/sammoa/repository/revisions/673 Log: refactor transaction flush Modified: trunk/sammoa-application/pom.xml trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/ImportApplicationService.java trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java Modified: trunk/sammoa-application/pom.xml =================================================================== --- trunk/sammoa-application/pom.xml 2014-05-16 15:55:47 UTC (rev 672) +++ trunk/sammoa-application/pom.xml 2014-05-19 07:30:54 UTC (rev 673) @@ -72,11 +72,6 @@ <artifactId>commons-io</artifactId> </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <!-- logging dependencies --> <dependency> Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/ImportApplicationService.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/ImportApplicationService.java 2014-05-16 15:55:47 UTC (rev 672) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/ImportApplicationService.java 2014-05-19 07:30:54 UTC (rev 673) @@ -156,7 +156,7 @@ } } - persistence.flushTransaction(sammoaTopiaPersistenceContext); + sammoaTopiaPersistenceContext.flush(); startTime = timeLog.log(startTime, "importDb", "after flights delete"); @@ -239,7 +239,7 @@ } // need to flush session (otherwise object are not accessible by a find ?) - persistence.flushTransaction(tx); + tx.flush(); for (Map.Entry<AssociationMeta<SammoaEntityEnum>, File> entry : associationMap.entrySet()) { AssociationMeta<SammoaEntityEnum> meta = entry.getKey(); Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java 2014-05-16 15:55:47 UTC (rev 672) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/io/input/application/strategy/AbstractImportStrategy.java 2014-05-19 07:30:54 UTC (rev 673) @@ -93,7 +93,7 @@ } protected void flushTransaction() throws TopiaException { - tx.getHibernateSupport().getHibernateSession().flush();; + tx.flush(); } } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java 2014-05-16 15:55:47 UTC (rev 672) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaTopiaPersistenceContext.java 2014-05-19 07:30:54 UTC (rev 673) @@ -21,4 +21,8 @@ return firesSupport; } + public void flush() { + getHibernateSupport().getHibernateSession().flush(); + } + } //SammoaTopiaPersistenceContext