diff --git a/pom.xml b/pom.xml index d2773b7d9..383a8057d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 br.com.rjconsultores ModelWeb - 1.1.50 + 1.2.0 rj-releases diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaHibernateDAO.java index 4e42ecf1d..1fd09ae66 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ParadaHibernateDAO.java @@ -30,6 +30,7 @@ import com.rjconsultores.ventaboletos.entidad.RegionMetropolitana; import com.rjconsultores.ventaboletos.entidad.Ruta; import com.rjconsultores.ventaboletos.entidad.TipoParada; import com.rjconsultores.ventaboletos.utilerias.DateUtil; +import java.util.Collections; /** * @@ -168,17 +169,20 @@ public class ParadaHibernateDAO extends GenericHibernateDAO imp @Override public List obterPossiveisDestinos(Parada origem) { if (origem == null) { - return null; + return Collections.emptyList(); } + StringBuilder sql = new StringBuilder(); + sql.append("SELECT DISTINCT ") + .append("d ") + .append( "FROM Tramo t ") + .append( "JOIN t.destino d ") + .append( "WHERE t.origem = :origem ") + .append( "ORDER BY d.descparada "); - String sql = "SELECT DISTINCT " - + "d " - + "FROM Tramo t " - + "JOIN t.destino d " - + "WHERE t.origem = :origem " - + "ORDER BY d.descparada"; - - return getSession().createQuery(sql).setEntity("origem", origem).list(); + return getSession() + .createQuery(sql.toString()) + .setEntity("origem", origem) + .list(); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java index f09a5e060..de06ea925 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaHibernateDAO.java @@ -97,7 +97,7 @@ public class RutaHibernateDAO extends GenericHibernateDAO impleme } public List buscarPorClaseServicioEmpresa(ClaseServicio claseServicio, Empresa empresa) { - StringBuffer hql = new StringBuffer(); + StringBuilder hql = new StringBuilder(); hql.append("SELECT DISTINCT r "); hql.append("FROM Ruta r INNER JOIN r.lsRutaEmpresa re "); hql.append("WHERE r.claseServicio.claseservicioId = :idClaseServicio "); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/SapHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/SapHibernateDAO.java index c2abbfce1..160659d6a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/SapHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/SapHibernateDAO.java @@ -158,7 +158,20 @@ public class SapHibernateDAO extends GenericHibernateDAO