Author: tchemit Date: 2012-08-18 14:33:57 +0200 (Sat, 18 Aug 2012) New Revision: 432 Url: http://forge.codelutin.com/repositories/revision/sammoa/432 Log: improve dao codes (using new dao methods from ToPIA) + review return local variables scopes :( Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightDAOImpl.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointDAOImpl.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/StrateDAOImpl.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectDAOImpl.java trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightDAOImpl.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 10:36:59 UTC (rev 431) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/FlightDAOImpl.java 2012-08-18 12:33:57 UTC (rev 432) @@ -33,31 +33,29 @@ * @author fdesbois <desbois@codelutin.com> */ public class FlightDAOImpl<E extends Flight> extends FlightDAOAbstract<E> { - - public int getLastFlightNumber(int defaultValue) { - int result; + public int findLastFlightNumber(int defaultValue) { + String ql = String.format("SELECT max(%1$s) FROM %2$s", - Flight.PROPERTY_FLIGHT_NUMBER, - FlightImpl.class.getSimpleName() + Flight.PROPERTY_FLIGHT_NUMBER, + FlightImpl.class.getSimpleName() ); try { - Integer queryResult = (Integer) context.findUnique(ql); + Integer queryResult = findUniqueByQuery(Integer.class, ql); - result = queryResult == null ? defaultValue : queryResult + 1; + int result = queryResult == null ? defaultValue : queryResult + 1; if (result < defaultValue) { result = defaultValue; } - + return result; } catch (TopiaException e) { throw new TopiaRuntimeException(e); } - return result; } - + // public List<Flight> findAllByCampaignOrderedByBeginDateDesc(Campaign campaign) { // // List<Flight> result; @@ -76,5 +74,5 @@ // } // return result; // } - + } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointDAOImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointDAOImpl.java 2012-08-18 10:36:59 UTC (rev 431) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/GeoPointDAOImpl.java 2012-08-18 12:33:57 UTC (rev 432) @@ -2,8 +2,8 @@ /* * #%L * SAMMOA :: Persistence - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2012 UMS 3462, Code Lutin * %% @@ -30,23 +30,20 @@ public class GeoPointDAOImpl<E extends GeoPoint> extends GeoPointDAOAbstract<E> { - public List<GeoPoint> findAllByFlightOrderedByRecordTime(Flight flight) { + public List<E> findAllByFlightOrderedByRecordTime(Flight flight) { - List<GeoPoint> result; - String ql = String.format("FROM %1$s WHERE %2$s = :flight ORDER BY %3$s", - GeoPointImpl.class.getSimpleName(), - GeoPoint.PROPERTY_FLIGHT, - GeoPoint.PROPERTY_RECORD_TIME + GeoPointImpl.class.getSimpleName(), + GeoPoint.PROPERTY_FLIGHT, + GeoPoint.PROPERTY_RECORD_TIME ); try { - result = context.findAll(ql, "flight", flight); - + List<E> result = findAllByQuery(ql, "flight", flight); + return result; } catch (TopiaException e) { throw new TopiaRuntimeException(e); } - return result; } } //GeoPointDAOImpl<E extends GeoPoint> 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 10:36:59 UTC (rev 431) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/ObservationDAOImpl.java 2012-08-18 12:33:57 UTC (rev 432) @@ -78,9 +78,8 @@ return super.update(e); } - public List<Observation> findAllByFlightOrderedByObservationTime(Flight flight) { + public List<E> findAllByFlightOrderedByObservationTime(Flight flight) { - List<Observation> result; String ql = String.format("FROM %1$s WHERE %2$s = :flight ORDER BY %3$s", ObservationImpl.class.getSimpleName(), @@ -89,19 +88,15 @@ ); try { - result = context.findAll(ql, "flight", flight); - + List<E> result = findAllByQuery(ql, "flight", flight); + return result; } catch (TopiaException e) { throw new TopiaRuntimeException(e); } - return result; - } - public int getLastObservationNumber(Flight flight) { + public int findLastObservationNumber(Flight flight) { - int result; - String ql = String.format("SELECT max(%1$s) FROM %2$s WHERE %3$s = :flight", Observation.PROPERTY_OBSERVATION_NUMBER, ObservationImpl.class.getSimpleName(), @@ -109,14 +104,12 @@ ); try { - Integer queryResult = (Integer) context.findUnique(ql, "flight", flight); - - result = queryResult == null ? 1 : queryResult + 1; - + Integer queryResult = findUniqueByQuery(Integer.class, ql, "flight", flight); + int result = queryResult == null ? 1 : queryResult + 1; + return result; } catch (TopiaException e) { throw new TopiaRuntimeException(e); } - return result; } } //ObservationDAOImpl<E extends Observation> 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 10:36:59 UTC (rev 431) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/RouteDAOImpl.java 2012-08-18 12:33:57 UTC (rev 432) @@ -34,10 +34,8 @@ * @author fdesbois <desbois@codelutin.com> */ public class RouteDAOImpl<E extends Route> extends RouteDAOAbstract<E> { - - public List<Route> findAllByFlightOrderedByBeginTime(Flight flight) { - List<Route> result; + public List<E> findAllByFlightOrderedByBeginTime(Flight flight) { String ql = String.format("FROM %1$s WHERE %2$s = :flight ORDER BY %3$s", RouteImpl.class.getSimpleName(), @@ -46,17 +44,14 @@ ); try { - result = context.findAll(ql, "flight", flight); - + List<E> result = findAllByQuery(ql, "flight", flight); + return result; } catch (TopiaException e) { throw new TopiaRuntimeException(e); } - return result; } - - public Route findLastByFlight(Flight flight) { - Route result; + public E findLastByFlight(Flight flight) { String ql = String.format("FROM %1$s WHERE %2$s = :flight ORDER BY %3$s DESC", RouteImpl.class.getSimpleName(), @@ -65,19 +60,16 @@ ); try { - List<Route> queryResults = context.find(ql, 0, 1, "flight", flight); - - result = queryResults.isEmpty() ? null : queryResults.get(0); - + List<E> queryResults = findAllByQueryWithBound( + ql, 0, 1, "flight", flight); + E result = queryResults.isEmpty() ? null : queryResults.get(0); + return result; } catch (TopiaException e) { throw new TopiaRuntimeException(e); } - return result; } - - public Route findLastByFlightAndType(Flight flight, RouteType type) { - Route result; + public E findLastByFlightAndType(Flight flight, RouteType type) { String ql = String.format("FROM %1$s WHERE %2$s = :flight AND %3$s = :type ORDER BY %4$s DESC", RouteImpl.class.getSimpleName(), @@ -87,35 +79,31 @@ ); try { - List<Route> queryResults = context.find(ql, 0, 1, "flight", flight, "type", type); - - result = queryResults.isEmpty() ? null : queryResults.get(0); - + List<E> queryResults = findAllByQueryWithBound( + ql, 0, 1, "flight", flight, "type", type); + E result = queryResults.isEmpty() ? null : queryResults.get(0); + return result; } catch (TopiaException e) { throw new TopiaRuntimeException(e); } - return result; } public int getLastEffortNumber(Flight flight) { - int result; - String ql = String.format("SELECT max(%1$s) FROM %2$s WHERE %1$s IS NOT NULL AND %3$s = :flight", - Route.PROPERTY_EFFORT_NUMBER, - RouteImpl.class.getSimpleName(), - Route.PROPERTY_FLIGHT + Route.PROPERTY_EFFORT_NUMBER, + RouteImpl.class.getSimpleName(), + Route.PROPERTY_FLIGHT ); try { - Integer queryResult = (Integer) context.findUnique(ql, "flight", flight); - - result = queryResult == null ? 1 : queryResult + 1; - + Integer queryResult = findUniqueByQuery( + Integer.class, ql, "flight", flight); + int result = queryResult == null ? 1 : queryResult + 1; + return result; } catch (TopiaException e) { throw new TopiaRuntimeException(e); } - return result; } - + } Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateDAOImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateDAOImpl.java 2012-08-18 10:36:59 UTC (rev 431) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/StrateDAOImpl.java 2012-08-18 12:33:57 UTC (rev 432) @@ -30,9 +30,8 @@ public class StrateDAOImpl<E extends Strate> extends StrateDAOAbstract<E> { - public List<Strate> findAllByCampaignOrderedByCode(Campaign campaign) { + public List<E> findAllByCampaignOrderedByCode(Campaign campaign) { - List<Strate> result; String ql = String.format("FROM %1$s WHERE %2$s.%3$s = :campaign ORDER BY %4$s", StrateImpl.class.getSimpleName(), @@ -42,11 +41,10 @@ ); try { - result = context.findAll(ql, "campaign", campaign); - + List<E> result = findAllByQuery(ql, "campaign", campaign); + return result; } catch (TopiaException e) { throw new TopiaRuntimeException(e); } - return result; } } //StrateDAOImpl<E extends Strate> Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectDAOImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectDAOImpl.java 2012-08-18 10:36:59 UTC (rev 431) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectDAOImpl.java 2012-08-18 12:33:57 UTC (rev 432) @@ -29,10 +29,8 @@ import java.util.List; public class TransectDAOImpl<E extends Transect> extends TransectDAOAbstract<E> { - - public List<Transect> findAllByCampaignOrderedByName(Campaign campaign) { - List<Transect> result; + public List<E> findAllByCampaignOrderedByName(Campaign campaign) { String ql = String.format("FROM %1$s WHERE %2$s.%3$s.%4$s = :campaign ORDER BY %5$s", TransectImpl.class.getSimpleName(), @@ -43,12 +41,11 @@ ); try { - result = context.findAll(ql, "campaign", campaign); - + List<E> result = findAllByQuery(ql, "campaign", campaign); + return result; } catch (TopiaException e) { throw new TopiaRuntimeException(e); } - return result; } - + } //TransectDAOImpl<E extends Transect> Modified: trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightDAOImpl.java =================================================================== --- trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightDAOImpl.java 2012-08-18 10:36:59 UTC (rev 431) +++ trunk/sammoa-persistence/src/main/java/fr/ulr/sammoa/persistence/TransectFlightDAOImpl.java 2012-08-18 12:33:57 UTC (rev 432) @@ -32,51 +32,49 @@ import java.util.Map; public class TransectFlightDAOImpl<E extends TransectFlight> extends TransectFlightDAOAbstract<E> { - + public Map<Transect, Long> countAllByTransect() { - Map<Transect, Long> result = Maps.newHashMap(); + String ql = String.format( + "SELECT %2$s, count(*) FROM %1$s GROUP BY %2$s", + TransectFlightImpl.class.getSimpleName(), + TransectFlight.PROPERTY_TRANSECT); - String ql = String.format("SELECT %2$s, count(*) FROM %1$s GROUP BY %2$s", - TransectFlightImpl.class.getSimpleName(), - TransectFlight.PROPERTY_TRANSECT - ); - try { - List<Object[]> queryResults = (List<Object[]>) context.findAll(ql); + List<Object[]> queryResults = findAllByQuery(Object[].class, ql); + Map<Transect, Long> result = Maps.newHashMap(); for (Object[] row : queryResults) { Transect transect = (Transect) row[0]; Long nbTransectFlights = (Long) row[1]; result.put(transect, nbTransectFlights); } - + return result; } catch (TopiaException e) { throw new TopiaRuntimeException(e); } - return result; } public Map<Transect, Long> countAllByTransects(Collection<Transect> transects) { - Map<Transect, Long> result = Maps.newHashMap(); - String ql = String.format("SELECT %2$s, count(*) FROM %1$s WHERE %2$s IN (:transects) GROUP BY %2$s", - TransectFlightImpl.class.getSimpleName(), - TransectFlight.PROPERTY_TRANSECT - ); + String ql = String.format( + "SELECT %2$s, count(*) FROM %1$s WHERE %2$s IN (:transects) GROUP BY %2$s", + TransectFlightImpl.class.getSimpleName(), + TransectFlight.PROPERTY_TRANSECT); try { - List<Object[]> queryResults = (List<Object[]>) context.findAll(ql, "transects", transects); + List<Object[]> queryResults = findAllByQuery( + Object[].class, ql, "transects", transects); + Map<Transect, Long> result = Maps.newHashMap(); for (Object[] row : queryResults) { Transect transect = (Transect) row[0]; Long nbTransectFlights = (Long) row[1]; result.put(transect, nbTransectFlights); } - + return result; } catch (TopiaException e) { throw new TopiaRuntimeException(e); } - return result; } // public Long countByTransect(Transect transect) { @@ -96,5 +94,5 @@ // } // return result; // } - + } //TransectFlightDAOImpl<E extends TransectFlight>