From 3d71bfee2b57d44416e9e717894b24dc1c39b350 Mon Sep 17 00:00:00 2001 From: Erik Foris Date: Fri, 5 Jul 2024 13:05:56 +0200 Subject: [PATCH] refactor: finilase project structure --- .../DataDash/{model => Dataset}/Dataset.java | 5 ++- .../DatasetController.java | 10 ++--- .../{model => Dataset}/DatasetService.java | 6 ++- .../PADAS/group3/DataDash/Dataset/Type.java | 6 +++ .../{model => Dataset}/dataRepository.java | 4 +- .../{model => category}/Category.java | 3 +- .../CategoryController.java | 6 +-- .../{model => category}/CategoryDto.java | 2 +- .../CategoryDtoMapper.java | 2 +- .../CategoryRepository.java | 2 +- .../{model => category}/CategoryService.java | 2 +- .../DataDash/model/LoadDummyDatabase.java | 40 ------------------- .../fim/PADAS/group3/DataDash/model/Type.java | 6 --- 13 files changed, 28 insertions(+), 66 deletions(-) rename src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/{model => Dataset}/Dataset.java (96%) rename src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/{controler => Dataset}/DatasetController.java (94%) rename src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/{model => Dataset}/DatasetService.java (95%) create mode 100644 src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/Type.java rename src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/{model => Dataset}/dataRepository.java (96%) rename src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/{model => category}/Category.java (86%) rename src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/{controler => category}/CategoryController.java (87%) rename src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/{model => category}/CategoryDto.java (85%) rename src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/{model => category}/CategoryDtoMapper.java (77%) rename src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/{model => category}/CategoryRepository.java (88%) rename src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/{model => category}/CategoryService.java (94%) delete mode 100644 src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/LoadDummyDatabase.java delete mode 100644 src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Type.java diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Dataset.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/Dataset.java similarity index 96% rename from src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Dataset.java rename to src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/Dataset.java index 7877d53..c8ed4e3 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Dataset.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/Dataset.java @@ -1,10 +1,13 @@ -package de.uni_passau.fim.PADAS.group3.DataDash.model; +package de.uni_passau.fim.PADAS.group3.DataDash.Dataset; import java.net.URL; import java.time.LocalDate; import java.util.Arrays; import java.util.List; import java.util.UUID; + +import de.uni_passau.fim.PADAS.group3.DataDash.category.Category; + import java.sql.Date; import jakarta.persistence.Entity; diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/controler/DatasetController.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetController.java similarity index 94% rename from src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/controler/DatasetController.java rename to src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetController.java index 947b346..3e54858 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/controler/DatasetController.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetController.java @@ -1,15 +1,9 @@ -package de.uni_passau.fim.PADAS.group3.DataDash.controler; +package de.uni_passau.fim.PADAS.group3.DataDash.Dataset; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.web.bind.annotation.*; - -import de.uni_passau.fim.PADAS.group3.DataDash.model.Category; -import de.uni_passau.fim.PADAS.group3.DataDash.model.Dataset; -import de.uni_passau.fim.PADAS.group3.DataDash.model.DatasetService; -import de.uni_passau.fim.PADAS.group3.DataDash.model.Type; - import org.springframework.data.domain.Pageable; import org.springframework.data.web.config.EnableSpringDataWebSupport; import org.springframework.http.HttpStatus; @@ -20,6 +14,8 @@ import java.util.UUID; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import de.uni_passau.fim.PADAS.group3.DataDash.category.Category; + @RestController @RequestMapping("/api/v1/datasets") @EnableSpringDataWebSupport diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/DatasetService.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetService.java similarity index 95% rename from src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/DatasetService.java rename to src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetService.java index ea1fe96..7762f31 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/DatasetService.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/DatasetService.java @@ -1,4 +1,4 @@ -package de.uni_passau.fim.PADAS.group3.DataDash.model; +package de.uni_passau.fim.PADAS.group3.DataDash.Dataset; import java.time.LocalDate; import java.util.List; @@ -7,6 +7,10 @@ import java.util.UUID; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; + +import de.uni_passau.fim.PADAS.group3.DataDash.category.Category; +import de.uni_passau.fim.PADAS.group3.DataDash.category.CategoryRepository; + import org.springframework.data.domain.Page; @Service diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/Type.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/Type.java new file mode 100644 index 0000000..9f2770d --- /dev/null +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/Type.java @@ -0,0 +1,6 @@ +package de.uni_passau.fim.PADAS.group3.DataDash.Dataset; + +public enum Type { + DATASET, + API +} \ No newline at end of file diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataRepository.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/dataRepository.java similarity index 96% rename from src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataRepository.java rename to src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/dataRepository.java index 130415d..c896552 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/dataRepository.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/Dataset/dataRepository.java @@ -1,4 +1,4 @@ -package de.uni_passau.fim.PADAS.group3.DataDash.model; +package de.uni_passau.fim.PADAS.group3.DataDash.Dataset; import java.util.List; import java.util.Optional; @@ -11,6 +11,8 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.uni_passau.fim.PADAS.group3.DataDash.category.Category; + public interface dataRepository extends JpaRepository { Dataset getDatasetById(UUID id); diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Category.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/Category.java similarity index 86% rename from src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Category.java rename to src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/Category.java index 4246baa..a868283 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Category.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/Category.java @@ -1,10 +1,11 @@ -package de.uni_passau.fim.PADAS.group3.DataDash.model; +package de.uni_passau.fim.PADAS.group3.DataDash.category; import java.util.List; import java.util.UUID; import org.springframework.context.annotation.Lazy; +import de.uni_passau.fim.PADAS.group3.DataDash.Dataset.Dataset; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/controler/CategoryController.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryController.java similarity index 87% rename from src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/controler/CategoryController.java rename to src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryController.java index 69a162e..3ce13b0 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/controler/CategoryController.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryController.java @@ -1,14 +1,10 @@ -package de.uni_passau.fim.PADAS.group3.DataDash.controler; +package de.uni_passau.fim.PADAS.group3.DataDash.category; import java.util.List; import java.util.UUID; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; - -import de.uni_passau.fim.PADAS.group3.DataDash.model.CategoryDto; -import de.uni_passau.fim.PADAS.group3.DataDash.model.CategoryService; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryDto.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryDto.java similarity index 85% rename from src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryDto.java rename to src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryDto.java index a21d0cf..11644cc 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryDto.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryDto.java @@ -1,4 +1,4 @@ -package de.uni_passau.fim.PADAS.group3.DataDash.model; +package de.uni_passau.fim.PADAS.group3.DataDash.category; import java.util.UUID; diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryDtoMapper.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryDtoMapper.java similarity index 77% rename from src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryDtoMapper.java rename to src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryDtoMapper.java index e7ecc10..683fdc8 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryDtoMapper.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryDtoMapper.java @@ -1,4 +1,4 @@ -package de.uni_passau.fim.PADAS.group3.DataDash.model; +package de.uni_passau.fim.PADAS.group3.DataDash.category; public class CategoryDtoMapper { diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryRepository.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryRepository.java similarity index 88% rename from src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryRepository.java rename to src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryRepository.java index a0b67e5..acde965 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryRepository.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryRepository.java @@ -1,4 +1,4 @@ -package de.uni_passau.fim.PADAS.group3.DataDash.model; +package de.uni_passau.fim.PADAS.group3.DataDash.category; import java.util.List; import java.util.Optional; diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryService.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryService.java similarity index 94% rename from src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryService.java rename to src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryService.java index d975497..3e2698f 100644 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/CategoryService.java +++ b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/category/CategoryService.java @@ -1,4 +1,4 @@ -package de.uni_passau.fim.PADAS.group3.DataDash.model; +package de.uni_passau.fim.PADAS.group3.DataDash.category; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/LoadDummyDatabase.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/LoadDummyDatabase.java deleted file mode 100644 index 6600bdb..0000000 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/LoadDummyDatabase.java +++ /dev/null @@ -1,40 +0,0 @@ -package de.uni_passau.fim.PADAS.group3.DataDash.model; - -import java.util.List; -import java.util.Random; - -import org.slf4j.LoggerFactory; -import org.springframework.boot.CommandLineRunner; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - - - -@Configuration -public class LoadDummyDatabase { - - private static final org.slf4j.Logger log = LoggerFactory.getLogger(LoadDummyDatabase.class); - - //@Bean - CommandLineRunner initDatabase(dataRepository repository, CategoryRepository categoryRepository) { - - - - return args -> { - for (int i = 0; i < 100; i++) { - Category category = new Category("Category" + i); - log.info("Preloading" + categoryRepository.save(category)); - - Dataset dataset = new Dataset("Title" + i, "Abst" + i, "Description" + i, "Author" + i,null, category, Type.API, "MIT"); - for (int j = 0; j < new Random().nextInt(50); j++) { - dataset.upvote(); - } - log.info("Preloading" + repository.save(dataset)); - log.info("Preloading" + categoryRepository.save(category)); - } - List s = repository.findByTitleLike("%Title%"); - log.info("Found Entry with ID: " + s.get(1).getId());}; - } - - -} \ No newline at end of file diff --git a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Type.java b/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Type.java deleted file mode 100644 index 8f72c12..0000000 --- a/src/main/java/de/uni_passau/fim/PADAS/group3/DataDash/model/Type.java +++ /dev/null @@ -1,6 +0,0 @@ -package de.uni_passau.fim.PADAS.group3.DataDash.model; - -public enum Type { - DATASET, - API -} \ No newline at end of file