diff --git a/src/main/java/com/cristobalbernal/loladvisor/LolAdvisorRunApp.java b/src/main/java/com/cristobalbernal/loladvisor/LolAdvisorRunApp.java index ad13312..c4bbb97 100644 --- a/src/main/java/com/cristobalbernal/loladvisor/LolAdvisorRunApp.java +++ b/src/main/java/com/cristobalbernal/loladvisor/LolAdvisorRunApp.java @@ -65,7 +65,7 @@ public class LolAdvisorRunApp { lolQueryService.titleContains(argumento[1]); break; case "-l": - daoImplMemory.findAll(); + daoImplMemory.mostrarTodos(); break; case "-c": daoImplMemory.mostrarCantidadPersonajes(); diff --git a/src/main/java/com/cristobalbernal/loladvisor/dao/LolDao.java b/src/main/java/com/cristobalbernal/loladvisor/dao/LolDao.java index 407a0ec..cbb08f1 100644 --- a/src/main/java/com/cristobalbernal/loladvisor/dao/LolDao.java +++ b/src/main/java/com/cristobalbernal/loladvisor/dao/LolDao.java @@ -5,7 +5,7 @@ import java.util.Collection; public interface LolDao { public void buscarPorID(long id); - public Collection findAll(); + public Collection mostrarTodos(); public void insertarPersonaje(Lol videogame); public void editarPersonaje(Lol videogame); public void eliminarPersonaje(long id); diff --git a/src/main/java/com/cristobalbernal/loladvisor/dao/LolDaoImplMemory.java b/src/main/java/com/cristobalbernal/loladvisor/dao/LolDaoImplMemory.java index 99a5bea..6d31e95 100644 --- a/src/main/java/com/cristobalbernal/loladvisor/dao/LolDaoImplMemory.java +++ b/src/main/java/com/cristobalbernal/loladvisor/dao/LolDaoImplMemory.java @@ -29,7 +29,7 @@ public class LolDaoImplMemory implements LolDao { System.out.println(result.orElse(null)); } @Override - public Collection findAll() { + public Collection mostrarTodos() { return lol; } diff --git a/src/main/java/com/cristobalbernal/loladvisor/service/LolQueryService.java b/src/main/java/com/cristobalbernal/loladvisor/service/LolQueryService.java index 6e2f1a8..6277a52 100644 --- a/src/main/java/com/cristobalbernal/loladvisor/service/LolQueryService.java +++ b/src/main/java/com/cristobalbernal/loladvisor/service/LolQueryService.java @@ -9,6 +9,5 @@ public interface LolQueryService { public LolQueryService allName(String... name); public LolQueryService titleContains(String title); public LolQueryService mostrarPorDificultada(String... dificultad); - public LolQueryService mostrarPorGenero(String... genero); } diff --git a/src/main/java/com/cristobalbernal/loladvisor/service/LolQueryServiceImpl.java b/src/main/java/com/cristobalbernal/loladvisor/service/LolQueryServiceImpl.java index cc2d249..05ea3ac 100644 --- a/src/main/java/com/cristobalbernal/loladvisor/service/LolQueryServiceImpl.java +++ b/src/main/java/com/cristobalbernal/loladvisor/service/LolQueryServiceImpl.java @@ -26,7 +26,7 @@ public class LolQueryServiceImpl implements LolQueryService { @Override public Collection exec() { //@formatter:off - return dao.findAll() + return dao.mostrarTodos() .stream() .filter(predicate) .collect(Collectors.toList()); @@ -60,11 +60,4 @@ public class LolQueryServiceImpl implements LolQueryService { predicate = (predicate == null) ? pAnyGenre : predicate.and(pAnyGenre); return this; } - - @Override - public LolQueryService mostrarPorGenero(String... genero) { - Predicate pAnyGenre = (lol -> Arrays.stream(genero).anyMatch(lol.getGenero()::contains)); - predicate = (predicate == null) ? pAnyGenre : predicate.and(pAnyGenre); - return this; - } } diff --git a/src/main/java/com/cristobalbernal/loladvisor/service/LolService.java b/src/main/java/com/cristobalbernal/loladvisor/service/LolService.java index 5d2b259..2ccefec 100644 --- a/src/main/java/com/cristobalbernal/loladvisor/service/LolService.java +++ b/src/main/java/com/cristobalbernal/loladvisor/service/LolService.java @@ -20,7 +20,7 @@ public class LolService { List result = null; - result = lolDao.findAll() + result = lolDao.mostrarTodos() .stream() .map(lol -> lol.getRol()) .flatMap(list -> list.stream()) @@ -36,12 +36,11 @@ public class LolService { public Collection findByAnyGenre(String... genres) { return queryService.anyName(genres).exec(); } - public Collection findByAllGenres(String... genres) { return queryService.allName(genres).exec(); } public Collection buscarPorDifucultad(String... dificultada){ - return null; + return queryService.mostrarPorDificultada(dificultada).exec(); } public Collection findByTitleContains(String title) { @@ -49,6 +48,6 @@ public class LolService { } public Collection findAll() { - return lolDao.findAll(); + return lolDao.mostrarTodos(); } }