From 3397d9fc6deb2da953aa9d8fe05b74a6ddd0e1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Cort=C3=A9s?= Date: Thu, 20 Jun 2019 13:25:59 -0400 Subject: [PATCH] Corrigiendo errores segun sonarqube --- .../controllers/LaunchController.java | 17 ++++++++--------- .../AbstractTelefonoUpdateController.java | 6 +++--- .../comprar/ComprarSearchController.java | 2 +- .../xyz/danielcortes/framework/Config.java | 3 +++ .../framework/GeneralValidator.java | 3 +++ .../xyz/danielcortes/framework/JListUtils.java | 3 +++ .../framework/PersistenceManager.java | 2 ++ .../framework/ValidationResult.java | 2 +- .../java/xyz/danielcortes/models/Arriendo.java | 10 +++++----- .../repository/ClienteRespository.java | 6 ++++-- .../repository/EjemplarRepository.java | 18 +++++++++--------- .../repository/IdiomaRepository.java | 9 ++++----- .../danielcortes/validator/AutorValidator.java | 2 +- .../validator/CategoriaValidator.java | 2 +- .../validator/EditorialValidator.java | 2 +- .../validator/EjemplarValidator.java | 4 ++-- .../validator/IdiomaValidator.java | 2 +- .../danielcortes/validator/LibroValidator.java | 6 +++--- 18 files changed, 55 insertions(+), 44 deletions(-) diff --git a/src/main/java/xyz/danielcortes/controllers/LaunchController.java b/src/main/java/xyz/danielcortes/controllers/LaunchController.java index c09af8e..dd20e21 100644 --- a/src/main/java/xyz/danielcortes/controllers/LaunchController.java +++ b/src/main/java/xyz/danielcortes/controllers/LaunchController.java @@ -1,7 +1,7 @@ package xyz.danielcortes.controllers; -import java.util.HashMap; -import java.util.Map; +import java.util.EnumMap; +import java.util.Map.Entry; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; @@ -145,12 +145,12 @@ import xyz.danielcortes.views.usuario.UsuarioViewPanel; public class LaunchController { private LaunchFrame frame; - private Map controllers; + private EnumMap controllers; private Usuario user; public LaunchController(Usuario user) { this.user = user; - this.controllers = new HashMap<>(); + this.controllers = new EnumMap<>(PanelName.class); } /** @@ -183,11 +183,11 @@ public class LaunchController { /** * Crea las cartas que estaran contenidas en la vista *

- * Estan son agregadas a un HashMap que las almacenara relacionadas a su PanelName + * Estan son agregadas a un EnumMap que las almacenara relacionadas a su PanelName *

* A cada controlador se le entregara una referencia a esta clase *

- * Luego de agregar todos los controladores al HashMap estos son agregados al CardLayout del JFrame + * Luego de agregar todos los controladores al EnumMap estos son agregados al CardLayout del JFrame */ private void createCards() { this.frame.addCard(new JPanel(), PanelName.EMPTY); @@ -286,9 +286,8 @@ public class LaunchController { this.controllers.put(PanelName.DISTRIBUIDOR_DIRECCION_CREATE, new DistribuidorDireccionCreateController(new DireccionCreatePanel(), this)); this.controllers.put(PanelName.DISTRIBUIDOR_DIRECCION_UPDATE, new DistribuidorDireccionUpdateController(new DireccionUpdatePanel(), this)); - for (PanelName name : this.controllers.keySet()) { - BaseController controller = this.controllers.get(name); - this.frame.addCard(controller.getView().getContentPane(), name); + for (Entry entry : this.controllers.entrySet()) { + this.frame.addCard(entry.getValue().getView().getContentPane(), entry.getKey()); } } diff --git a/src/main/java/xyz/danielcortes/controllers/abstract_telefono/AbstractTelefonoUpdateController.java b/src/main/java/xyz/danielcortes/controllers/abstract_telefono/AbstractTelefonoUpdateController.java index c485fb0..324d93a 100644 --- a/src/main/java/xyz/danielcortes/controllers/abstract_telefono/AbstractTelefonoUpdateController.java +++ b/src/main/java/xyz/danielcortes/controllers/abstract_telefono/AbstractTelefonoUpdateController.java @@ -31,20 +31,20 @@ public abstract class AbstractTelefonoUpdateController extends BaseController { } protected void update() { - String telefono = this.view.getTelefonoField().getText(); + String sTelefono = this.view.getTelefonoField().getText(); ValidationResult originalValidation = this.validator.validateOriginal(this.telefono); if (originalValidation.hasError()) { originalValidation.showErrorDialog(); return; } - ValidationResult telefonoValidation = this.validator.validateTelefono(telefono); + ValidationResult telefonoValidation = this.validator.validateTelefono(sTelefono); if (telefonoValidation.hasError()) { telefonoValidation.showErrorDialog(); return; } - this.telefono.setNumero(telefono); + this.telefono.setNumero(sTelefono); this.repository.update(this.telefono); this.volver(); diff --git a/src/main/java/xyz/danielcortes/controllers/comprar/ComprarSearchController.java b/src/main/java/xyz/danielcortes/controllers/comprar/ComprarSearchController.java index 47e91d8..93a6541 100644 --- a/src/main/java/xyz/danielcortes/controllers/comprar/ComprarSearchController.java +++ b/src/main/java/xyz/danielcortes/controllers/comprar/ComprarSearchController.java @@ -5,6 +5,6 @@ import xyz.danielcortes.views.comprar.ComprarSearchPanel; public class ComprarSearchController { - public ComprarSearchPanel view; + private ComprarSearchPanel view; private CompraRepository repository; } diff --git a/src/main/java/xyz/danielcortes/framework/Config.java b/src/main/java/xyz/danielcortes/framework/Config.java index 754871b..5c46686 100644 --- a/src/main/java/xyz/danielcortes/framework/Config.java +++ b/src/main/java/xyz/danielcortes/framework/Config.java @@ -17,6 +17,9 @@ public class Config { } } + private Config() { + } + public static String get(String key) { return defaultProps.getProperty(key); } diff --git a/src/main/java/xyz/danielcortes/framework/GeneralValidator.java b/src/main/java/xyz/danielcortes/framework/GeneralValidator.java index f703c5d..b6eeb42 100644 --- a/src/main/java/xyz/danielcortes/framework/GeneralValidator.java +++ b/src/main/java/xyz/danielcortes/framework/GeneralValidator.java @@ -5,6 +5,9 @@ import java.time.Year; public class GeneralValidator { + private GeneralValidator() { + } + public static boolean isLong(String number) { try { Long.parseLong(number); diff --git a/src/main/java/xyz/danielcortes/framework/JListUtils.java b/src/main/java/xyz/danielcortes/framework/JListUtils.java index 2c56310..b34d60b 100644 --- a/src/main/java/xyz/danielcortes/framework/JListUtils.java +++ b/src/main/java/xyz/danielcortes/framework/JListUtils.java @@ -6,6 +6,9 @@ import javax.swing.ListModel; public class JListUtils { + private JListUtils() { + } + public static void setSelectedValues(JList list, List values) { list.clearSelection(); for (Object value : values) { diff --git a/src/main/java/xyz/danielcortes/framework/PersistenceManager.java b/src/main/java/xyz/danielcortes/framework/PersistenceManager.java index 4fcd5ae..b7e7b6d 100644 --- a/src/main/java/xyz/danielcortes/framework/PersistenceManager.java +++ b/src/main/java/xyz/danielcortes/framework/PersistenceManager.java @@ -14,6 +14,8 @@ public class PersistenceManager { em = factory.createEntityManager(); } + private PersistenceManager() { + } public static EntityManager getEntityManager() { return em; diff --git a/src/main/java/xyz/danielcortes/framework/ValidationResult.java b/src/main/java/xyz/danielcortes/framework/ValidationResult.java index 23ecd2b..c15ca96 100644 --- a/src/main/java/xyz/danielcortes/framework/ValidationResult.java +++ b/src/main/java/xyz/danielcortes/framework/ValidationResult.java @@ -4,7 +4,7 @@ import javax.swing.JOptionPane; public class ValidationResult { - public static ValidationResult NON_ERROR = new ValidationResult(); + public static final ValidationResult NON_ERROR = new ValidationResult(); private String message; private String title; private boolean hasError; diff --git a/src/main/java/xyz/danielcortes/models/Arriendo.java b/src/main/java/xyz/danielcortes/models/Arriendo.java index 7c7fb74..bb8801e 100644 --- a/src/main/java/xyz/danielcortes/models/Arriendo.java +++ b/src/main/java/xyz/danielcortes/models/Arriendo.java @@ -44,7 +44,7 @@ public class Arriendo { @ManyToOne @JoinColumn(name = "cliente_id", nullable = false) - private Trabajador Cliente; + private Cliente cliente; @ManyToMany @JoinTable( @@ -109,12 +109,12 @@ public class Arriendo { this.trabajador = trabajador; } - public Trabajador getCliente() { - return this.Cliente; + public Cliente getCliente() { + return this.cliente; } - public void setCliente(Trabajador cliente) { - this.Cliente = cliente; + public void setCliente(Cliente cliente) { + this.cliente = cliente; } public List getEjemplares() { diff --git a/src/main/java/xyz/danielcortes/repository/ClienteRespository.java b/src/main/java/xyz/danielcortes/repository/ClienteRespository.java index ccaf875..7ff052d 100644 --- a/src/main/java/xyz/danielcortes/repository/ClienteRespository.java +++ b/src/main/java/xyz/danielcortes/repository/ClienteRespository.java @@ -8,12 +8,12 @@ import xyz.danielcortes.models.Cliente; public class ClienteRespository extends BaseRepository { public List getAll() { - TypedQuery query = em.createQuery("SELECT c FROM Cliente c", Cliente.class); + TypedQuery query = this.em.createQuery("SELECT c FROM Cliente c", Cliente.class); return query.getResultList(); } public List search(String term) { - TypedQuery query = em.createQuery( + TypedQuery query = this.em.createQuery( "SELECT c FROM Cliente c WHERE " + " LOWER(c.rut) LIKE :term OR " + " LOWER(c.nombre) LIKE :term OR " @@ -23,6 +23,8 @@ public class ClienteRespository extends BaseRepository { Cliente.class ); + query.setParameter("term", term); + return query.getResultList(); } diff --git a/src/main/java/xyz/danielcortes/repository/EjemplarRepository.java b/src/main/java/xyz/danielcortes/repository/EjemplarRepository.java index 9e7e6d7..c628be1 100644 --- a/src/main/java/xyz/danielcortes/repository/EjemplarRepository.java +++ b/src/main/java/xyz/danielcortes/repository/EjemplarRepository.java @@ -12,12 +12,12 @@ import xyz.danielcortes.models.Ejemplar; public class EjemplarRepository extends BaseRepository { public List getAll() { - TypedQuery query = em.createQuery("SELECT e FROM Ejemplar e", Ejemplar.class); + TypedQuery query = this.em.createQuery("SELECT e FROM Ejemplar e", Ejemplar.class); return query.getResultList(); } public List search(String term) { - CriteriaBuilder cb = em.getCriteriaBuilder(); + CriteriaBuilder cb = this.em.getCriteriaBuilder(); CriteriaQuery query = cb.createQuery(Ejemplar.class); Root r = query.from(Ejemplar.class); query.where( @@ -26,21 +26,21 @@ public class EjemplarRepository extends BaseRepository { ) ); - return em.createQuery(query).getResultList(); + return this.em.createQuery(query).getResultList(); } - public boolean exists(String serie, Integer libro_id) { - Query query = em.createQuery("SELECT count(e) FROM Ejemplar e WHERE serie = :serie and libro.id = :libro_id"); + public boolean exists(String serie, Integer libroId) { + Query query = this.em.createQuery("SELECT count(e) FROM Ejemplar e WHERE serie = :serie and libro.id = :libro_id"); query.setParameter("serie", serie); - query.setParameter("libro_id", libro_id); + query.setParameter("libro_id", libroId); return (Long) query.getResultList().get(0) == 1; } - public boolean exists(String serie, Integer libro_id, Integer id) { - Query query = em.createQuery("SELECT count(e) FROM Ejemplar e WHERE id != :id and serie = :serie and libro.id = :libro_id"); + public boolean exists(String serie, Integer libroId, Integer id) { + Query query = this.em.createQuery("SELECT count(e) FROM Ejemplar e WHERE id != :id and serie = :serie and libro.id = :libro_id"); query.setParameter("id", id); query.setParameter("serie", serie); - query.setParameter("libro_id", libro_id); + query.setParameter("libro_id", libroId); return (Long) query.getResultList().get(0) == 1; } } diff --git a/src/main/java/xyz/danielcortes/repository/IdiomaRepository.java b/src/main/java/xyz/danielcortes/repository/IdiomaRepository.java index bf31b7c..5595ff0 100644 --- a/src/main/java/xyz/danielcortes/repository/IdiomaRepository.java +++ b/src/main/java/xyz/danielcortes/repository/IdiomaRepository.java @@ -11,19 +11,18 @@ import xyz.danielcortes.models.Idioma; public class IdiomaRepository extends BaseRepository { public List getAll() { - TypedQuery query = em.createQuery("SELECT i FROM Idioma i", Idioma.class); + TypedQuery query = this.em.createQuery("SELECT i FROM Idioma i", Idioma.class); - List idiomas = query.getResultList(); - return idiomas; + return query.getResultList(); } public List search(String term) { - CriteriaBuilder cb = em.getCriteriaBuilder(); + CriteriaBuilder cb = this.em.getCriteriaBuilder(); CriteriaQuery query = cb.createQuery(Idioma.class); Root r = query.from(Idioma.class); query.where( cb.like(cb.lower(r.get("nombre")), "%" + term.toLowerCase() + "%") ); - return em.createQuery(query).getResultList(); + return this.em.createQuery(query).getResultList(); } } diff --git a/src/main/java/xyz/danielcortes/validator/AutorValidator.java b/src/main/java/xyz/danielcortes/validator/AutorValidator.java index 1984aa3..eb158e6 100644 --- a/src/main/java/xyz/danielcortes/validator/AutorValidator.java +++ b/src/main/java/xyz/danielcortes/validator/AutorValidator.java @@ -47,7 +47,7 @@ public class AutorValidator { } public ValidationResult isDeleteable(Autor autor) { - if (autor.getLibros().size() > 0) { + if (!autor.getLibros().isEmpty()) { return new ValidationResult("No se puede eliminar el autor ya que tiene libros asociados"); } return ValidationResult.NON_ERROR; diff --git a/src/main/java/xyz/danielcortes/validator/CategoriaValidator.java b/src/main/java/xyz/danielcortes/validator/CategoriaValidator.java index 0aca03c..b044736 100644 --- a/src/main/java/xyz/danielcortes/validator/CategoriaValidator.java +++ b/src/main/java/xyz/danielcortes/validator/CategoriaValidator.java @@ -29,7 +29,7 @@ public class CategoriaValidator { } public ValidationResult isDeleteable(Categoria categoria) { - if (categoria.getLibros().size() > 0) { + if (!categoria.getLibros().isEmpty()) { return new ValidationResult("No se puede eliminar la categoria ya que tiene libros asociados"); } return ValidationResult.NON_ERROR; diff --git a/src/main/java/xyz/danielcortes/validator/EditorialValidator.java b/src/main/java/xyz/danielcortes/validator/EditorialValidator.java index 85b2506..a4844b2 100644 --- a/src/main/java/xyz/danielcortes/validator/EditorialValidator.java +++ b/src/main/java/xyz/danielcortes/validator/EditorialValidator.java @@ -29,7 +29,7 @@ public class EditorialValidator { } public ValidationResult isDeleteable(Editorial editorial) { - if (editorial.getLibros().size() > 0) { + if (!editorial.getLibros().isEmpty()) { return new ValidationResult("No se puede eliminar la editorial ya que tiene libros asociados"); } return ValidationResult.NON_ERROR; diff --git a/src/main/java/xyz/danielcortes/validator/EjemplarValidator.java b/src/main/java/xyz/danielcortes/validator/EjemplarValidator.java index 6e5be90..6820ef0 100644 --- a/src/main/java/xyz/danielcortes/validator/EjemplarValidator.java +++ b/src/main/java/xyz/danielcortes/validator/EjemplarValidator.java @@ -11,14 +11,14 @@ public class EjemplarValidator { this.ejemplarRepository = ejemplarRepository; } - public ValidationResult validateSerie(String serie, Integer libro_id) { + public ValidationResult validateSerie(String serie, Integer libroId) { if (serie == null) { return new ValidationResult("La serie es nula"); } if (serie.isEmpty()) { return new ValidationResult("La serie esta vacia"); } - if (this.ejemplarRepository.exists(serie, libro_id)) { + if (this.ejemplarRepository.exists(serie, libroId)) { return new ValidationResult("El numero de serie ya existe"); } diff --git a/src/main/java/xyz/danielcortes/validator/IdiomaValidator.java b/src/main/java/xyz/danielcortes/validator/IdiomaValidator.java index cf3d5df..e793ab3 100644 --- a/src/main/java/xyz/danielcortes/validator/IdiomaValidator.java +++ b/src/main/java/xyz/danielcortes/validator/IdiomaValidator.java @@ -30,7 +30,7 @@ public class IdiomaValidator { } public ValidationResult isDeleteable(Idioma idioma) { - if (idioma.getLibros().size() > 0) { + if (!idioma.getLibros().isEmpty()) { return new ValidationResult("No se puede eliminar el idioma ya que tiene libros asociados"); } return ValidationResult.NON_ERROR; diff --git a/src/main/java/xyz/danielcortes/validator/LibroValidator.java b/src/main/java/xyz/danielcortes/validator/LibroValidator.java index 4241588..5b4e7c3 100644 --- a/src/main/java/xyz/danielcortes/validator/LibroValidator.java +++ b/src/main/java/xyz/danielcortes/validator/LibroValidator.java @@ -144,7 +144,7 @@ public class LibroValidator { } public ValidationResult validateIdiomas(List idiomas) { - if (idiomas.size() == 0) { + if (idiomas.isEmpty()) { return new ValidationResult("No hay idiomas seleccionados"); } if (idiomas.stream().anyMatch(Objects::isNull)) { @@ -155,7 +155,7 @@ public class LibroValidator { } public ValidationResult validateAutores(List autores) { - if (autores.size() == 0) { + if (autores.isEmpty()) { return new ValidationResult("No hay autores seleccionados"); } if (autores.stream().anyMatch(Objects::isNull)) { @@ -166,7 +166,7 @@ public class LibroValidator { } public ValidationResult validateCategorias(List categorias) { - if (categorias.size() == 0) { + if (categorias.isEmpty()) { return new ValidationResult("No hay categorias seleccionadas"); } if (categorias.stream().anyMatch(Objects::isNull)) {