From ac71c390625c7cf2e76748781f76c5dfeb47f44e Mon Sep 17 00:00:00 2001 From: valdevir Date: Tue, 8 Nov 2016 13:20:41 +0000 Subject: [PATCH] fixes bug #7985 (Remocao de warnings e codigos desnecessarios) git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@62413 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../dao/hibernate/AbastoBoletoHibernateDAO.java | 1 - .../dao/hibernate/AliasServicoHibernateDAO.java | 1 - .../dao/hibernate/AutorizacionHibernateDAO.java | 8 ++++---- .../hibernate/BusquedaDatosTicketHibernateDAO.java | 8 +------- .../dao/hibernate/CasetaPeajeHibernateDAO.java | 2 -- .../dao/hibernate/CategoriaPeriodoHibernateDAO.java | 13 +++++-------- .../dao/hibernate/CiudadHibernateDAO.java | 5 ----- .../dao/hibernate/ClasseServicoHibernateDAO.java | 4 ---- .../dao/hibernate/ClienteDescuentoHibernateDAO.java | 1 - .../dao/hibernate/ClientePacoteHibernateDAO.java | 1 - .../hibernate/CoeficienteTarifaHibernateDAO.java | 2 -- .../dao/hibernate/ComissaoHibernateDAO.java | 3 --- .../dao/hibernate/ConductorHibernateDAO.java | 8 ++++---- 13 files changed, 14 insertions(+), 43 deletions(-) diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoBoletoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoBoletoHibernateDAO.java index 58841771a..96324b16a 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoBoletoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AbastoBoletoHibernateDAO.java @@ -2,7 +2,6 @@ package com.rjconsultores.ventaboletos.dao.hibernate; import java.util.List; -import org.hibernate.Criteria; import org.hibernate.SessionFactory; import org.hibernate.criterion.Restrictions; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java index 99ad7a81c..8ee3bbb93 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AliasServicoHibernateDAO.java @@ -53,7 +53,6 @@ public class AliasServicoHibernateDAO extends GenericHibernateDAO buscarPorLinhaEmpresa(List linhas, List empresas, List tiposClasses, List orgaos, String prefixo) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionHibernateDAO.java index c537cfbfa..98dd66b85 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/AutorizacionHibernateDAO.java @@ -4,11 +4,8 @@ */ package com.rjconsultores.ventaboletos.dao.hibernate; -import com.rjconsultores.ventaboletos.dao.AutorizacionDAO; -import com.rjconsultores.ventaboletos.entidad.Autorizacion; -import com.rjconsultores.ventaboletos.entidad.Perfil; - import java.util.List; + import org.hibernate.Criteria; import org.hibernate.SessionFactory; import org.hibernate.criterion.Order; @@ -17,6 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Repository; +import com.rjconsultores.ventaboletos.dao.AutorizacionDAO; +import com.rjconsultores.ventaboletos.entidad.Autorizacion; + /** * * @author Administrador diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/BusquedaDatosTicketHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/BusquedaDatosTicketHibernateDAO.java index a5a118481..5d03f6c91 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/BusquedaDatosTicketHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/BusquedaDatosTicketHibernateDAO.java @@ -71,7 +71,6 @@ public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO carregarDadosPacotes(Date fecInicial, Date fecFinal, Date fecVentaInicial, Date fecVentaFinal) { StringBuilder sQuery = new StringBuilder(); sQuery.append("SELECT VP.VENDAPACOTE_ID, VP.DATAPACOTE, VP.DATAVENDA, VP.SUBTOTAL, VP.TOTAL, VP.DESCONTO, VP.NUMOPERACION, P.PACOTE_ID, ") @@ -139,7 +138,6 @@ public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO pacotes) { StringBuilder sQuery = new StringBuilder(); sQuery.append("SELECT PFP.PACOTEFORMAPAGO_ID, PFP.VALOR, PFP.VENDAPACOTE_ID, FP.FORMAPAGO_ID, FP.DESCPAGO, CT.TIPOTARJETA, CT.NUMAUTORIZACION, CT.CANTPARCELAS, ") @@ -199,7 +197,7 @@ public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO pacotes) { StringBuilder sQuery = new StringBuilder(); sQuery.append("SELECT DISTINCT VP.VENDAPACOTE_ID, B.FECHORVIAJE, B.ORIGEN_ID, CONCAT(CONCAT(ORI.CVEPARADA,' - '),ORI.DESCPARADA) AS ORIGEM, CONCAT(CONCAT(DES.CVEPARADA,' - '),DES.DESCPARADA) AS DESTINO ") @@ -232,7 +230,6 @@ public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO pacotes) { StringBuilder sQuery = new StringBuilder(); sQuery.append("SELECT DISTINCT VP.VENDAPACOTE_ID, CP.RAZAO_SOCIAL, CP.CPF_CNPJ, CP.TIPO_PESSOA, CP.DESCEMAIL, CP.DESCTELEFONE, CP.DESCFAX, CP.CEP, CP.ENDERECO, CP.NUMERO, CP.COMPLEMENTO, CP.PAIS, CP.ESTADO, CP.CIDADE, CP.BAIRRO ") @@ -270,7 +267,6 @@ public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO pacotes) { StringBuilder sQuery = new StringBuilder(); sQuery.append("SELECT DISTINCT VP.VENDAPACOTE_ID, TVP.TARIFAVENDAPACOTE_ID, TVP.NOMEPASSAGEIRO, CONCAT(CONCAT(TVP.TIPODOC,' - '), TVP.DOCUMENTO) AS DOCUMENTO, B.NUMASIENTO, C.CATEGORIA_ID, C.DESCCATEGORIA, B.BOLETO_ID ") @@ -306,7 +302,6 @@ public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO pacotes) { StringBuilder sQuery = new StringBuilder(); sQuery.append("SELECT DISTINCT VP.VENDAPACOTE_ID, EA.LOCAL, EA.DESCHOTEL, EA.CEP, EA.ENDERECO, EA.NUMERO, EA.COMPLEMENTO, EA.CIDADE, EA.BAIRRO, EA.REFERENCIA ") @@ -350,7 +345,6 @@ public class BusquedaDatosTicketHibernateDAO extends GenericHibernateDAO pacotes) { StringBuilder sQuery = new StringBuilder(); sQuery.append("SELECT DISTINCT IA.DESCITEMADICIONAL, VP.VENDAPACOTE_ID, PI.ITEMADICIONAL_ID ") diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java index 2f86e5786..c3e6d69fd 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CasetaPeajeHibernateDAO.java @@ -23,7 +23,6 @@ public class CasetaPeajeHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); @@ -39,7 +38,6 @@ public class CasetaPeajeHibernateDAO extends GenericHibernateDAO) c.list(); } - @SuppressWarnings("unchecked") @Override public List buscar(String casetaPeajeDesc) { Criteria c = getSession().createCriteria(getPersistentClass()); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaPeriodoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaPeriodoHibernateDAO.java index 6ca33d17a..8c700c76b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaPeriodoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CategoriaPeriodoHibernateDAO.java @@ -4,16 +4,9 @@ */ package com.rjconsultores.ventaboletos.dao.hibernate; -import com.rjconsultores.ventaboletos.dao.CategoriaPeriodoDAO; -import com.rjconsultores.ventaboletos.entidad.CategoriaDescuento; -import com.rjconsultores.ventaboletos.entidad.CategoriaPeriodo; -import com.rjconsultores.ventaboletos.entidad.VigenciaTarifa; -import com.rjconsultores.ventaboletos.utilerias.ApplicationProperties; -import java.text.SimpleDateFormat; import java.util.Calendar; -import java.util.Date; import java.util.List; -import org.hibernate.Query; + import org.hibernate.Criteria; import org.hibernate.SessionFactory; import org.hibernate.criterion.Restrictions; @@ -21,6 +14,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Repository; +import com.rjconsultores.ventaboletos.dao.CategoriaPeriodoDAO; +import com.rjconsultores.ventaboletos.entidad.CategoriaDescuento; +import com.rjconsultores.ventaboletos.entidad.CategoriaPeriodo; + /** * * @author Administrador diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CiudadHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CiudadHibernateDAO.java index d6e82b81a..40a94f76b 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CiudadHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CiudadHibernateDAO.java @@ -31,7 +31,6 @@ public class CiudadHibernateDAO extends GenericHibernateDAO setSessionFactory(factory); } - @SuppressWarnings("unchecked") @Override public List obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); @@ -41,7 +40,6 @@ public class CiudadHibernateDAO extends GenericHibernateDAO return c.list(); } - @SuppressWarnings("unchecked") public List buscar(String nombciudad, Estado estado, Plaza plaza) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("activo", Boolean.TRUE)); @@ -51,7 +49,6 @@ public class CiudadHibernateDAO extends GenericHibernateDAO return c.list(); } - @SuppressWarnings("unchecked") public List buscaLike(String strCiudad) { Criteria c = getSession().createCriteria(getPersistentClass()); c.add(Restrictions.eq("activo", Boolean.TRUE)); @@ -60,8 +57,6 @@ public class CiudadHibernateDAO extends GenericHibernateDAO return c.list(); } - - @SuppressWarnings("unchecked") @Override public List buscarPorEstado(Estado estado) { Criteria c = getSession().createCriteria(getPersistentClass()); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java index dc4261a0b..f858db584 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClasseServicoHibernateDAO.java @@ -9,12 +9,9 @@ import java.util.List; import org.hibernate.Criteria; import org.hibernate.Query; -import org.hibernate.SQLQuery; import org.hibernate.SessionFactory; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; -import org.hibernate.transform.AliasToBeanResultTransformer; -import org.hibernate.type.StringType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Repository; @@ -43,7 +40,6 @@ public class ClasseServicoHibernateDAO extends GenericHibernateDAO buscarPorEmpresasDoUsuario(String empresasUsuario) { String consulta = "SELECT DISTINCT mcs.marcaClaseservicioPK.claseservicio " diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDescuentoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDescuentoHibernateDAO.java index 25e3f7c9e..f6c4fcc58 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDescuentoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClienteDescuentoHibernateDAO.java @@ -12,7 +12,6 @@ import org.springframework.stereotype.Repository; import com.rjconsultores.ventaboletos.dao.ClienteDescuentoDAO; import com.rjconsultores.ventaboletos.entidad.Cliente; import com.rjconsultores.ventaboletos.entidad.ClienteDescuento; -import com.rjconsultores.ventaboletos.entidad.ClienteDireccion; @Repository("clienteDescuentoDAO") public class ClienteDescuentoHibernateDAO extends GenericHibernateDAO diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClientePacoteHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClientePacoteHibernateDAO.java index 87356fd7d..4baecf701 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ClientePacoteHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ClientePacoteHibernateDAO.java @@ -26,7 +26,6 @@ public class ClientePacoteHibernateDAO extends GenericHibernateDAO busquedaDatosClientePacote(String cpfCnpj) { List clientePacoteVOs = new ArrayList(); if(StringUtils.isNotBlank(cpfCnpj)) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CoeficienteTarifaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CoeficienteTarifaHibernateDAO.java index 825fdc658..d03c9a6ff 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CoeficienteTarifaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CoeficienteTarifaHibernateDAO.java @@ -23,7 +23,6 @@ public class CoeficienteTarifaHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass()); @@ -33,7 +32,6 @@ public class CoeficienteTarifaHibernateDAO extends GenericHibernateDAO buscar(String nomb) { Criteria c = getSession().createCriteria(getPersistentClass()); diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoHibernateDAO.java index 28efbb0ec..55fa4874d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ComissaoHibernateDAO.java @@ -30,7 +30,6 @@ public class ComissaoHibernateDAO extends GenericHibernateDAO setSessionFactory(factory); } - @SuppressWarnings("unchecked") @Override public List buscarReceitasComissoes(Integer puntoVentaId, Integer empresaId, Date periodo) { @@ -109,7 +108,6 @@ public class ComissaoHibernateDAO extends GenericHibernateDAO } @Override - @SuppressWarnings("unchecked") public List buscaHistoricoComissao(Integer puntoVentaId, Integer empresaId, Date periodoInicio, Date periodoFim) { String competenciaInicio = DateUtil.getStringDate(periodoInicio, "MM/yyyy"); @@ -197,7 +195,6 @@ public class ComissaoHibernateDAO extends GenericHibernateDAO } @Override - @SuppressWarnings("unchecked") public List buscaPuntoVentasEmpresaComComissaoParametrizada(Integer empresaId) { StringBuilder sQuery = new StringBuilder("SELECT pv FROM PtovtaComissao c "); sQuery.append("JOIN c.puntoventaId pv ") diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConductorHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConductorHibernateDAO.java index e488facb4..cfa9112bf 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/ConductorHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/ConductorHibernateDAO.java @@ -4,10 +4,8 @@ */ package com.rjconsultores.ventaboletos.dao.hibernate; -import com.rjconsultores.ventaboletos.dao.ConductorDAO; -import com.rjconsultores.ventaboletos.entidad.Cliente; -import com.rjconsultores.ventaboletos.entidad.Conductor; import java.util.List; + import org.hibernate.Criteria; import org.hibernate.SessionFactory; import org.hibernate.criterion.Restrictions; @@ -15,6 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Repository; +import com.rjconsultores.ventaboletos.dao.ConductorDAO; +import com.rjconsultores.ventaboletos.entidad.Conductor; + /** * * @author Administrador @@ -28,7 +29,6 @@ public class ConductorHibernateDAO extends GenericHibernateDAO obtenerTodos() { Criteria c = getSession().createCriteria(getPersistentClass());