Author: tchemit Date: 2012-08-19 14:02:58 +0200 (Sun, 19 Aug 2012) New Revision: 434 Url: http://forge.codelutin.com/repositories/revision/sammoa/434 Log: use last topia query api + add destroydb method on SammoaPersistence Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightDAOImpl.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationDAOImpl.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteDAOImpl.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightDAOImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightDAOImpl.java 2012-08-18 12:44:43 UTC (rev 433) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightDAOImpl.java 2012-08-19 12:02:58 UTC (rev 434) @@ -43,7 +43,7 @@ ); try { - Integer queryResult = findUniqueByQuery(Integer.class, ql); + Integer queryResult = findByQuery(Integer.class, ql); int result = queryResult == null ? defaultValue : queryResult + 1; Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationDAOImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationDAOImpl.java 2012-08-18 12:44:43 UTC (rev 433) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationDAOImpl.java 2012-08-19 12:02:58 UTC (rev 434) @@ -104,7 +104,7 @@ ); try { - Integer queryResult = findUniqueByQuery(Integer.class, ql, "flight", flight); + Integer queryResult = findByQuery(Integer.class, ql, "flight", flight); int result = queryResult == null ? 1 : queryResult + 1; return result; } catch (TopiaException e) { Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteDAOImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteDAOImpl.java 2012-08-18 12:44:43 UTC (rev 433) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteDAOImpl.java 2012-08-19 12:02:58 UTC (rev 434) @@ -97,7 +97,7 @@ ); try { - Integer queryResult = findUniqueByQuery( + Integer queryResult = findByQuery( Integer.class, ql, "flight", flight); int result = queryResult == null ? 1 : queryResult + 1; return result; Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java 2012-08-18 12:44:43 UTC (rev 433) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/SammoaPersistence.java 2012-08-19 12:02:58 UTC (rev 434) @@ -155,6 +155,22 @@ this.rootContext = rootContext; } + public void destroyDb() { + autoSaveListener.stop(); + if (rootContext != null) { + try { + // destroy current db (only orks with h2) + rootContext.clear(true); + + // clean root context + setRootContext(null); + } catch (TopiaException e) { + + throw new TopiaRuntimeException(e); + } + } + } + /** * Close the persistence context. This will close the main {@link TopiaContext} * and the {@link AutoSaveListener}.