From 90a3478263d6cc1a38178172c84158df00524413 Mon Sep 17 00:00:00 2001 From: Cristobal Bernal Mayordomo <90463533+Racriberny@users.noreply.github.com> Date: Mon, 21 Nov 2022 23:08:21 +0100 Subject: [PATCH] Error en algunas classes por sintaxis y lo ha cambiado todo. --- .../loladvisor/LolAdvisorApplication.java | 13 ---- .../loladvisor/config/AppConfig.java | 33 -------- .../loladvisor/dao/LolDao.java | 13 ---- .../loladvisor/dao/LolDaoImplMemory.java | 76 ------------------- .../loladvisor/dao/UtilLolFileReader.java | 38 ---------- .../cristobalbernal/loladvisor/model/Lol.java | 68 ----------------- .../loladvisor/service/LolQueryService.java | 13 ---- .../loladvisor/service/LolQueryServices.java | 47 ------------ .../loladvisor/service/LolService.java | 17 ----- src/main/resources/Ayuda.txt | 0 10 files changed, 318 deletions(-) delete mode 100644 src/main/java/com/cristobalbernal/loladvisor/LolAdvisorApplication.java delete mode 100644 src/main/java/com/cristobalbernal/loladvisor/config/AppConfig.java delete mode 100644 src/main/java/com/cristobalbernal/loladvisor/dao/LolDao.java delete mode 100644 src/main/java/com/cristobalbernal/loladvisor/dao/LolDaoImplMemory.java delete mode 100644 src/main/java/com/cristobalbernal/loladvisor/dao/UtilLolFileReader.java delete mode 100644 src/main/java/com/cristobalbernal/loladvisor/model/Lol.java delete mode 100644 src/main/java/com/cristobalbernal/loladvisor/service/LolQueryService.java delete mode 100644 src/main/java/com/cristobalbernal/loladvisor/service/LolQueryServices.java delete mode 100644 src/main/java/com/cristobalbernal/loladvisor/service/LolService.java create mode 100644 src/main/resources/Ayuda.txt diff --git a/src/main/java/com/cristobalbernal/loladvisor/LolAdvisorApplication.java b/src/main/java/com/cristobalbernal/loladvisor/LolAdvisorApplication.java deleted file mode 100644 index 302baa1..0000000 --- a/src/main/java/com/cristobalbernal/loladvisor/LolAdvisorApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cristobalbernal.loladvisor; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class LolAdvisorApplication { - - public static void main(String[] args) { - SpringApplication.run(LolAdvisorApplication.class, args); - } - -} diff --git a/src/main/java/com/cristobalbernal/loladvisor/config/AppConfig.java b/src/main/java/com/cristobalbernal/loladvisor/config/AppConfig.java deleted file mode 100644 index 5bc924e..0000000 --- a/src/main/java/com/cristobalbernal/loladvisor/config/AppConfig.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.cristobalbernal.loladvisor.config; - - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; - -@Configuration -@ComponentScan(basePackages="com.cristobalbernal") -@PropertySource("classpath:/application.properties") -public class AppConfig { - @Value("${file.path}") - public String file; - - @Value("${file.csv.separator}") - public String separator; - - @Value("${file.csv.list_separator}") - public String listSeparator; - - public String getFile() { - return file; - } - - public String getSeparator() { - return separator; - } - - public String getListSeparator() { - return listSeparator; - } -} diff --git a/src/main/java/com/cristobalbernal/loladvisor/dao/LolDao.java b/src/main/java/com/cristobalbernal/loladvisor/dao/LolDao.java deleted file mode 100644 index 922cd4b..0000000 --- a/src/main/java/com/cristobalbernal/loladvisor/dao/LolDao.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cristobalbernal.loladvisor.dao; - -import com.cristobalbernal.loladvisor.model.Lol; - -import java.util.Collection; - -public interface LolDao { - public Lol findById(long id); - public Collection findAll(); - public void insert(Lol lol); - public void edit(Lol lol); - public void delete(long id); -} diff --git a/src/main/java/com/cristobalbernal/loladvisor/dao/LolDaoImplMemory.java b/src/main/java/com/cristobalbernal/loladvisor/dao/LolDaoImplMemory.java deleted file mode 100644 index 5873b75..0000000 --- a/src/main/java/com/cristobalbernal/loladvisor/dao/LolDaoImplMemory.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.cristobalbernal.loladvisor.dao; - -import com.cristobalbernal.loladvisor.config.AppConfig; -import com.cristobalbernal.loladvisor.model.Lol; -import org.springframework.stereotype.Repository; - -import javax.annotation.PostConstruct; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Optional; - -@Repository -public class LolDaoImplMemory implements LolDao{ - - public List lols = new ArrayList<>(); - - private AppConfig appConfig; - public void init() { - lols = UtilLolFileReader.readFile(appConfig.getFile(), appConfig.getSeparator(), appConfig.getListSeparator()); - } - - - @Override - public Lol findById(long id) { - - Optional result = lols - .stream() - .filter(f -> f.getId() == id) - .findFirst(); - - // @formatter:on - - return result.orElse(null); - } - - @Override - public Collection findAll() { - return lols; - } - - @Override - public void insert(Lol lol) { - lols.add(lol); - } - - @Override - public void edit(Lol lol) { - int i = getIndexOf(lol.getId()); - if(i != -1) - lols.set(i, lol); - } - - @Override - public void delete(long id) { - int index = getIndexOf(id); - if(index != -1) - lols.remove(index); - } - - private int getIndexOf(long id) { - boolean encontrado = false; - int index = 0; - - while(!encontrado && index < lols.size()) { - if(lols.get(index).getId() == id){ - encontrado = true; - } else{ - index++; - } - } - return (encontrado) ? index : -1; - } - - -} diff --git a/src/main/java/com/cristobalbernal/loladvisor/dao/UtilLolFileReader.java b/src/main/java/com/cristobalbernal/loladvisor/dao/UtilLolFileReader.java deleted file mode 100644 index 10e040d..0000000 --- a/src/main/java/com/cristobalbernal/loladvisor/dao/UtilLolFileReader.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.cristobalbernal.loladvisor.dao; - -import com.cristobalbernal.loladvisor.model.Lol; -import org.springframework.util.ResourceUtils; - -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -public class UtilLolFileReader { - public static List readFile(final String path, final String separator, final String listSeparator) { - List result = new ArrayList<>(); - - - try { - // @formatter:off - result = Files - .lines(Paths.get(ResourceUtils.getFile(path).toURI())) - .skip(1) - .map(line -> { - String[] values = line.split(separator); - return new Lol(Long.parseLong(values[0]), values[1], - Arrays.asList(values[2].split(listSeparator)), - values[3],values[4]); - }).collect(Collectors.toList()); - // @formatter:on - - - } catch (Exception e) { - System.err.println("Error de lectura del fichero de datos"); - System.exit(-1); - } - return result; - } -} diff --git a/src/main/java/com/cristobalbernal/loladvisor/model/Lol.java b/src/main/java/com/cristobalbernal/loladvisor/model/Lol.java deleted file mode 100644 index 0bcde47..0000000 --- a/src/main/java/com/cristobalbernal/loladvisor/model/Lol.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.cristobalbernal.loladvisor.model; - -import java.util.List; - -public class Lol { - private long id; - private String nombre; - private List rol; - private String dificultad; - private String genero; - - public Lol(long id, String nombre, List rol, String dificultad, String genero) { - this.id = id; - this.nombre = nombre; - this.rol = rol; - this.dificultad = dificultad; - this.genero = genero; - } - - public long getId() { - return id; - } - - public String getNombre() { - return nombre; - } - public String getDificultad() { - return dificultad; - } - - public void setId(long id) { - this.id = id; - } - - public void setNombre(String nombre) { - this.nombre = nombre; - } - - public List getRol() { - return rol; - } - - public void setRol(List rol) { - this.rol = rol; - } - - public void setDificultad(String dificultad) { - this.dificultad = dificultad; - } - - public String getGenero() { - return genero; - } - - public void setGenero(String genero) { - this.genero = genero; - } - @Override - public String toString() { - return "Lol{" + - "id=" + id + - ", nombre='" + nombre + '\'' + - ", rol=" + rol + - ", dificultad='" + dificultad + '\'' + - ", genero='" + genero + '\'' + - '}'; - } -} diff --git a/src/main/java/com/cristobalbernal/loladvisor/service/LolQueryService.java b/src/main/java/com/cristobalbernal/loladvisor/service/LolQueryService.java deleted file mode 100644 index 4349630..0000000 --- a/src/main/java/com/cristobalbernal/loladvisor/service/LolQueryService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.cristobalbernal.loladvisor.service; - -import com.cristobalbernal.loladvisor.model.Lol; - -import java.util.Collection; - -public interface LolQueryService { - public Collection exec(); - public LolQueryService anyGenre(String... genres); - public LolQueryService allGenres(String... genres); - public LolQueryService titleContains(String title); - -} diff --git a/src/main/java/com/cristobalbernal/loladvisor/service/LolQueryServices.java b/src/main/java/com/cristobalbernal/loladvisor/service/LolQueryServices.java deleted file mode 100644 index ebc19e7..0000000 --- a/src/main/java/com/cristobalbernal/loladvisor/service/LolQueryServices.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.cristobalbernal.loladvisor.service; - -import com.cristobalbernal.loladvisor.dao.LolDao; -import com.cristobalbernal.loladvisor.model.Lol; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.Collection; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -@Service -public class LolQueryServices implements LolQueryService { - - private LolDao dao; - - private Predicate predicate; - - @Override - public Collection exec() { - return dao.findAll() - .stream() - .filter(predicate) - .collect(Collectors.toList()); - } - - @Override - public LolQueryService anyGenre(String... genres) { - Predicate pAnyGenre = (vg -> Arrays.stream(genres).anyMatch(vg.getNombre()::contains)); - predicate = (predicate == null) ? pAnyGenre : predicate.and(pAnyGenre); - return this; - } - - @Override - public LolQueryService allGenres(String... genres) { - Predicate pAllGenre = (vg -> Arrays.stream(genres).allMatch(vg.getNombre()::contains)); - predicate = (predicate == null) ? pAllGenre : predicate.and(pAllGenre); - return this; - } - - @Override - public LolQueryService titleContains(String title) { - Predicate pTitleContains = (vg -> vg.getNombre().toLowerCase().contains(title.toLowerCase())); - predicate = (predicate == null) ? pTitleContains : predicate.and(pTitleContains); - return this; - } -} diff --git a/src/main/java/com/cristobalbernal/loladvisor/service/LolService.java b/src/main/java/com/cristobalbernal/loladvisor/service/LolService.java deleted file mode 100644 index f534228..0000000 --- a/src/main/java/com/cristobalbernal/loladvisor/service/LolService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.cristobalbernal.loladvisor.service; - -import com.cristobalbernal.loladvisor.dao.LolDao; - -import java.util.Collection; - -public class LolService { - LolDao filmDao; - LolQueryService queryService; - - public Collection findAllGenres(){ - return null; - } - - - -} diff --git a/src/main/resources/Ayuda.txt b/src/main/resources/Ayuda.txt new file mode 100644 index 0000000..e69de29