This is an automated email from the git hooks/post-receive script. New commit to branch feature/7464 in repository observe. See http://git.codelutin.com/observe.git commit 6df5da05b52991564bb22f72ddddebae6d8e6de9 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Aug 21 12:16:15 2015 +0200 Portage des DAO dans fr.ird.observe.entities.seine vers ToPIA 3 --- ...eineDAOImpl.java => ActivitySeineTopiaDao.java} | 35 ++++++------ ...ectDAOImpl.java => FloatingObjectTopiaDao.java} | 35 ++++++------ .../{RouteDAOImpl.java => RouteTopiaDao.java} | 43 +++++++------- ...ripSeineDAOImpl.java => TripSeineTopiaDao.java} | 65 +++++++++++----------- 4 files changed, 86 insertions(+), 92 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java similarity index 71% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java rename to observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java index d633187..a9bdcc8 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java @@ -25,9 +25,8 @@ package fr.ird.observe.entities.seine; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeineImpl; - -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.framework.TopiaSQLQuery; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.sql.Connection; import java.sql.PreparedStatement; @@ -35,23 +34,23 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -public class ActivitySeineDAOImpl<E extends ActivitySeine> extends ActivitySeineDAOAbstract<E> { +public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<ActivitySeine> { - public List<E> findAllStubByRouteId(String routeId, ReferenceLocale referenceLocale) { + public List<ActivitySeine> findAllStubByRouteId(String routeId, ReferenceLocale referenceLocale) { - List<E> result = StubSqlQuery.findAll(context, routeId, referenceLocale); + List<ActivitySeine> result = StubSqlQuery.findAll(topiaSqlSupport, routeId, referenceLocale); return result; } - public E findStubByTopiaId(String activityId, ReferenceLocale referenceLocale) { + public ActivitySeine findStubByTopiaId(String activityId, ReferenceLocale referenceLocale) { - E result = StubSqlQuery.find(context, activityId, referenceLocale); + ActivitySeine result = StubSqlQuery.find(topiaSqlSupport, activityId, referenceLocale); return result; } - private static class StubSqlQuery<E extends ActivitySeine> extends TopiaSQLQuery<E> { + private static class StubSqlQuery extends TopiaSqlQuery<ActivitySeine> { private final String sql; @@ -59,7 +58,7 @@ public class ActivitySeineDAOImpl<E extends ActivitySeine> extends ActivitySeine private final ReferenceLocale referenceLocale; - static <E extends ActivitySeine> List<E> findAll(TopiaContextImplementor context, String routeId, ReferenceLocale referenceLocale) { + static List<ActivitySeine> findAll(TopiaSqlSupport context, String routeId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " a.topiaId," + @@ -73,12 +72,12 @@ public class ActivitySeineDAOImpl<E extends ActivitySeine> extends ActivitySeine " AND a.vesselactivity = va.topiaid" + " ORDER BY a.time"; - StubSqlQuery<E> request = new StubSqlQuery<E>(sql, routeId, referenceLocale); - return request.findMultipleResult(context); + StubSqlQuery request = new StubSqlQuery(sql, routeId, referenceLocale); + return context.findMultipleResult(request); } - static <E extends ActivitySeine> E find(TopiaContextImplementor context, String activityId, ReferenceLocale referenceLocale) { + static ActivitySeine find(TopiaSqlSupport context, String activityId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " a.topiaId," + @@ -92,8 +91,8 @@ public class ActivitySeineDAOImpl<E extends ActivitySeine> extends ActivitySeine " AND a.vesselactivity = va.topiaid" + " ORDER BY a.time"; - StubSqlQuery<E> request = new StubSqlQuery<E>(sql, activityId, referenceLocale); - return request.findSingleResult(context); + StubSqlQuery request = new StubSqlQuery(sql, activityId, referenceLocale); + return context.findSingleResult(request); } @@ -104,16 +103,16 @@ public class ActivitySeineDAOImpl<E extends ActivitySeine> extends ActivitySeine } @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + public PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement preparedStatement = connection.prepareStatement(sql); preparedStatement.setString(1, id); return preparedStatement; } @Override - protected E prepareResult(ResultSet set) throws SQLException { + public ActivitySeine prepareResult(ResultSet set) throws SQLException { - E activity = (E) new ActivitySeineImpl(); + ActivitySeine activity = new ActivitySeineImpl(); activity.setTopiaId(set.getString(1)); activity.setTime(set.getTime(2)); activity.setOpen(set.getBoolean(3)); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java similarity index 67% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java rename to observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java index 5b9ac60..5e0f3f3 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java @@ -25,9 +25,8 @@ package fr.ird.observe.entities.seine; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.seine.ObjectType; import fr.ird.observe.entities.referentiel.seine.ObjectTypeImpl; - -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.framework.TopiaSQLQuery; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.sql.Connection; import java.sql.PreparedStatement; @@ -35,23 +34,23 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -public class FloatingObjectDAOImpl<E extends FloatingObject> extends FloatingObjectDAOAbstract<E> { +public class FloatingObjectTopiaDao extends AbstractFloatingObjectTopiaDao<FloatingObject> { - public List<E> findAllStubByActivityId(String activityId, ReferenceLocale referenceLocale) { + public List<FloatingObject> findAllStubByActivityId(String activityId, ReferenceLocale referenceLocale) { - List<E> result = StubSqlQuery.findAll(context, activityId, referenceLocale); + List<FloatingObject> result = StubSqlQuery.findAll(topiaSqlSupport, activityId, referenceLocale); return result; } - public E findStubByTopiaId(String floatingObjectId, ReferenceLocale referenceLocale) { + public FloatingObject findStubByTopiaId(String floatingObjectId, ReferenceLocale referenceLocale) { - E result = StubSqlQuery.find(context, floatingObjectId, referenceLocale); + FloatingObject result = StubSqlQuery.find(topiaSqlSupport, floatingObjectId, referenceLocale); return result; } - private static class StubSqlQuery<E extends FloatingObject> extends TopiaSQLQuery<E> { + private static class StubSqlQuery extends TopiaSqlQuery<FloatingObject> { private final String sql; @@ -59,7 +58,7 @@ public class FloatingObjectDAOImpl<E extends FloatingObject> extends FloatingObj private final ReferenceLocale referenceLocale; - static <E extends FloatingObject> List<E> findAll(TopiaContextImplementor context, String activityId, ReferenceLocale referenceLocale) { + static List<FloatingObject> findAll(TopiaSqlSupport context, String activityId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " fo.topiaId," + @@ -70,12 +69,12 @@ public class FloatingObjectDAOImpl<E extends FloatingObject> extends FloatingObj " AND fo.objecttype = ot.topiaid" + " ORDER BY ot." + referenceLocale.getColumnName(); - StubSqlQuery<E> request = new StubSqlQuery<E>(sql, activityId, referenceLocale); - return request.findMultipleResult(context); + StubSqlQuery request = new StubSqlQuery(sql, activityId, referenceLocale); + return context.findMultipleResult(request); } - static <E extends FloatingObject> E find(TopiaContextImplementor context, String floatingObjectId, ReferenceLocale referenceLocale) { + static FloatingObject find(TopiaSqlSupport context, String floatingObjectId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " fo.topiaId," + @@ -86,8 +85,8 @@ public class FloatingObjectDAOImpl<E extends FloatingObject> extends FloatingObj " AND fo.objecttype = ot.topiaid" + " ORDER BY ot." + referenceLocale.getColumnName(); - StubSqlQuery<E> request = new StubSqlQuery<E>(sql, floatingObjectId, referenceLocale); - return request.findSingleResult(context); + StubSqlQuery request = new StubSqlQuery(sql, floatingObjectId, referenceLocale); + return context.findSingleResult(request); } @@ -98,16 +97,16 @@ public class FloatingObjectDAOImpl<E extends FloatingObject> extends FloatingObj } @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + public PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement preparedStatement = connection.prepareStatement(sql); preparedStatement.setString(1, id); return preparedStatement; } @Override - protected E prepareResult(ResultSet set) throws SQLException { + public FloatingObject prepareResult(ResultSet set) throws SQLException { - E floatingObject = (E) new FloatingObjectImpl(); + FloatingObject floatingObject = new FloatingObjectImpl(); floatingObject.setTopiaId(set.getString(1)); String objectTypeLabel = set.getString(2); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java similarity index 73% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java rename to observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java index 499a25d..558b45f 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java @@ -23,10 +23,9 @@ package fr.ird.observe.entities.seine; */ import com.google.common.base.Preconditions; -import org.hibernate.jdbc.Work; - -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.framework.TopiaSQLQuery; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.topia.persistence.support.TopiaSqlWork; import java.sql.Connection; import java.sql.Date; @@ -35,30 +34,30 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -public class RouteDAOImpl<E extends Route> extends RouteDAOAbstract<E> { +public class RouteTopiaDao extends AbstractRouteTopiaDao<Route> { - public List<E> findAllStubByTripId(String tripSeineId) { + public List<Route> findAllStubByTripId(String tripSeineId) { - List<E> result = StubSqlQuery.findAll(context, tripSeineId); + List<Route> result = StubSqlQuery.findAll(topiaSqlSupport, tripSeineId); return result; } - public E findStubByTopiaId(String routeId) { + public Route findStubByTopiaId(String routeId) { - E result = StubSqlQuery.find(context, routeId); + Route result = StubSqlQuery.find(topiaSqlSupport, routeId); return result; } - private static class StubSqlQuery<E extends Route> extends TopiaSQLQuery<E> { + private static class StubSqlQuery extends TopiaSqlQuery<Route> { private final String sql; private final String id; - static <E extends Route> List<E> findAll(TopiaContextImplementor context, String tripSeineId) { + static List<Route> findAll(TopiaSqlSupport context, String tripSeineId) { String sql = "SELECT" + " r.topiaId," + @@ -69,12 +68,12 @@ public class RouteDAOImpl<E extends Route> extends RouteDAOAbstract<E> { " r.trip = ?" + " ORDER BY r.date"; - StubSqlQuery<E> request = new StubSqlQuery<E>(sql, tripSeineId); - return request.findMultipleResult(context); + StubSqlQuery request = new StubSqlQuery(sql, tripSeineId); + return context.findMultipleResult(request); } - static <E extends Route> E find(TopiaContextImplementor context, String routeId) { + static Route find(TopiaSqlSupport context, String routeId) { String sql = "SELECT" + " r.topiaId," + @@ -85,8 +84,8 @@ public class RouteDAOImpl<E extends Route> extends RouteDAOAbstract<E> { " r.topiaId = ?" + " ORDER BY r.date"; - StubSqlQuery<E> request = new StubSqlQuery<E>(sql, routeId); - return request.findSingleResult(context); + StubSqlQuery request = new StubSqlQuery(sql, routeId); + return context.findSingleResult(request); } @@ -96,16 +95,16 @@ public class RouteDAOImpl<E extends Route> extends RouteDAOAbstract<E> { } @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + public PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement preparedStatement = connection.prepareStatement(sql); preparedStatement.setString(1, id); return preparedStatement; } @Override - protected E prepareResult(ResultSet set) throws SQLException { + public Route prepareResult(ResultSet set) throws SQLException { - E trip = (E) new RouteImpl(); + Route trip = new RouteImpl(); trip.setTopiaId(set.getString(1)); trip.setDate(set.getDate(2)); trip.setOpen(set.getBoolean(3)); @@ -127,13 +126,11 @@ public class RouteDAOImpl<E extends Route> extends RouteDAOAbstract<E> { Preconditions.checkNotNull(routeId,"routeId can't be null"); - E route = findByTopiaId(routeId); - - Preconditions.checkNotNull(route,"Could not find route this id: "+routeId); + Route route = forTopiaIdEquals(routeId).findUnique(); final Date date = new Date(route.getDate().getTime()); - context.getHibernate().doWork(new Work() { + topiaSqlSupport.doSqlWork(new TopiaSqlWork() { @Override public void execute(Connection connection) throws SQLException { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java similarity index 81% rename from observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java rename to observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java index 4846027..2910b8a 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineDAOImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java @@ -31,9 +31,8 @@ import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselImpl; import fr.ird.observe.tripMap.TripMapPoint; import fr.ird.observe.tripMap.TripMapPointType; - -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.framework.TopiaSQLQuery; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.DateUtil; import java.sql.Connection; @@ -49,14 +48,14 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 2.2 */ -public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract<E> { +public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { public static final String ACTIVITY_HARBOUR_ID = "fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675349#0.363119635949572"; public int findPositionByProgramId(String programId, String tripId) { int result = 0; - List<E> list = findAllStubByProgramId(programId, ReferenceLocale.FR); - for (E e : list) { + List<TripSeine> list = findAllStubByProgramId(programId, ReferenceLocale.FR); + for (TripSeine e : list) { if (tripId.equals(e.getTopiaId())) { return result; } @@ -67,23 +66,23 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< return -1; } - public List<E> findAllStubByProgramId(String programId, ReferenceLocale referenceLocale) { + public List<TripSeine> findAllStubByProgramId(String programId, ReferenceLocale referenceLocale) { - List<E> result = StubSqlQuery.findAll(context, programId, referenceLocale); + List<TripSeine> result = StubSqlQuery.findAll(topiaSqlSupport, programId, referenceLocale); return result; } - public E findStubByTopiaId(String tripId, ReferenceLocale referenceLocale) { + public TripSeine findStubByTopiaId(String tripId, ReferenceLocale referenceLocale) { - E result = StubSqlQuery.find(context, tripId, referenceLocale); + TripSeine result = StubSqlQuery.find(topiaSqlSupport, tripId, referenceLocale); return result; } public List<TripMapPoint> extractTripMapActivityPoints(String tripId) { - TripSeine tripSeine = findByTopiaId(tripId); + TripSeine tripSeine = forTopiaIdEquals(tripId).findUnique(); List<TripMapPoint> tripMapPoints = Lists.newLinkedList(); @@ -100,7 +99,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< // Add Activities TripMapActivityPointQuery tripMapActivityPointQuery = new TripMapActivityPointQuery(tripId); - tripMapPoints.addAll(tripMapActivityPointQuery.findMultipleResult(context)); + tripMapPoints.addAll(topiaSqlSupport.findMultipleResult(tripMapActivityPointQuery)); // add landing harbours Harbour landingHarbour = tripSeine.getLandingHarbour(); @@ -116,7 +115,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< return tripMapPoints; } - private static class TripMapActivityPointQuery extends TopiaSQLQuery<TripMapPoint> { + private static class TripMapActivityPointQuery extends TopiaSqlQuery<TripMapPoint> { private static String SQL = "SELECT" + " r.date, " + @@ -140,14 +139,14 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< } @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + public PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement preparedStatement = connection.prepareStatement(SQL); preparedStatement.setString(1, tripId); return preparedStatement; } @Override - protected TripMapPoint prepareResult(ResultSet resultSet) throws SQLException { + public TripMapPoint prepareResult(ResultSet resultSet) throws SQLException { TripMapPoint point = new TripMapPoint(); Date time = DateUtil.getDateAndTime(resultSet.getDate(1), resultSet.getTime(2), true, false); @@ -178,7 +177,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< } - private static class StubSqlQuery<E extends TripSeine> extends TopiaSQLQuery<E> { + private static class StubSqlQuery extends TopiaSqlQuery<TripSeine> { private final String sql; @@ -186,7 +185,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< private final ReferenceLocale referenceLocale; - static <E extends TripSeine> List<E> findAll(TopiaContextImplementor context, String programId, ReferenceLocale referenceLocale) { + static <E extends TripSeine> List<TripSeine> findAll(TopiaSqlSupport context, String programId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " t.topiaId," + @@ -204,12 +203,12 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; - StubSqlQuery<E> request = new StubSqlQuery<E>(sql, programId, referenceLocale); - return request.findMultipleResult(context); + StubSqlQuery request = new StubSqlQuery(sql, programId, referenceLocale); + return context.findMultipleResult(request); } - static <E extends TripSeine> E find(TopiaContextImplementor context, String tripId, ReferenceLocale referenceLocale) { + static TripSeine find(TopiaSqlSupport context, String tripId, ReferenceLocale referenceLocale) { String sql = "SELECT" + " t.topiaId," + @@ -227,8 +226,8 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< " AND t.vessel = v.topiaId" + " ORDER BY t.endDate"; - StubSqlQuery<E> request = new StubSqlQuery<E>(sql, tripId, referenceLocale); - return request.findSingleResult(context); + StubSqlQuery request = new StubSqlQuery(sql, tripId, referenceLocale); + return context.findSingleResult(request); } @@ -239,16 +238,16 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< } @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + public PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement preparedStatement = connection.prepareStatement(sql); preparedStatement.setString(1, id); return preparedStatement; } @Override - protected E prepareResult(ResultSet set) throws SQLException { + public TripSeine prepareResult(ResultSet set) throws SQLException { - E trip = (E) new TripSeineImpl(); + TripSeine trip = new TripSeineImpl(); trip.setTopiaId(set.getString(1)); trip.setStartDate(set.getDate(2)); @@ -275,7 +274,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< } - public boolean updateEndDate(E trip) { + public boolean updateEndDate(TripSeine trip) { boolean wasUpdated = false; @@ -298,11 +297,11 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< } - public Date getTheoricalEndDate(E trip) { + public Date getTheoricalEndDate(TripSeine trip) { Date d; - Date lastRouteDate = TheoricalEndOfDateSqlQuery.find(context, trip.getTopiaId()); + Date lastRouteDate = TheoricalEndOfDateSqlQuery.find(topiaSqlSupport, trip.getTopiaId()); if (lastRouteDate == null) { @@ -322,7 +321,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< } - private static class TheoricalEndOfDateSqlQuery extends TopiaSQLQuery<Date> { + private static class TheoricalEndOfDateSqlQuery extends TopiaSqlQuery<Date> { private final String sql; @@ -333,19 +332,19 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< this.tripId = tripId; } - public static Date find(TopiaContextImplementor context, String tripId) { + public static Date find(TopiaSqlSupport context, String tripId) { String sql = "SELECT max(r.date)" + " FROM observe_seine.route r" + " WHERE r.trip = ?"; TheoricalEndOfDateSqlQuery request = new TheoricalEndOfDateSqlQuery(sql, tripId); - return request.findSingleResult(context); + return context.findSingleResult(request); } @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + public PreparedStatement prepareQuery(Connection connection) throws SQLException { PreparedStatement preparedStatement = connection.prepareStatement(sql); preparedStatement.setString(1, tripId); @@ -354,7 +353,7 @@ public class TripSeineDAOImpl<E extends TripSeine> extends TripSeineDAOAbstract< } @Override - protected Date prepareResult(ResultSet set) throws SQLException { + public Date prepareResult(ResultSet set) throws SQLException { Date result = set.getDate(1); return result; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.