From 736ee1b3d8f836c217f19f443325cf3850d88500 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Sat, 27 Mar 2021 12:13:07 +0400 Subject: [PATCH] #15 -- Some classes refactoring --- .../{mvc => config}/GlobalDefaultExceptionHandler.java | 2 +- .../ulstu/extractor/{mvc => config}/MvcConfiguration.java | 2 +- .../extractor/{mvc => config}/TemplateConfiguration.java | 2 +- .../{mvc => controller}/GitFilteringController.java | 4 ++-- .../{mvc => controller}/GitIndexingController.java | 6 +++--- .../extractor/{mvc/model => model/mvc}/FilterForm.java | 2 +- .../ulstu/extractor/{mvc/model => model/mvc}/RepoForm.java | 2 +- .../extractor/{db => repository}/CommitRepository.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) rename src/main/java/ru/ulstu/extractor/{mvc => config}/GlobalDefaultExceptionHandler.java (96%) rename src/main/java/ru/ulstu/extractor/{mvc => config}/MvcConfiguration.java (96%) rename src/main/java/ru/ulstu/extractor/{mvc => config}/TemplateConfiguration.java (97%) rename src/main/java/ru/ulstu/extractor/{mvc => controller}/GitFilteringController.java (97%) rename src/main/java/ru/ulstu/extractor/{mvc => controller}/GitIndexingController.java (93%) rename src/main/java/ru/ulstu/extractor/{mvc/model => model/mvc}/FilterForm.java (93%) rename src/main/java/ru/ulstu/extractor/{mvc/model => model/mvc}/RepoForm.java (93%) rename src/main/java/ru/ulstu/extractor/{db => repository}/CommitRepository.java (97%) diff --git a/src/main/java/ru/ulstu/extractor/mvc/GlobalDefaultExceptionHandler.java b/src/main/java/ru/ulstu/extractor/config/GlobalDefaultExceptionHandler.java similarity index 96% rename from src/main/java/ru/ulstu/extractor/mvc/GlobalDefaultExceptionHandler.java rename to src/main/java/ru/ulstu/extractor/config/GlobalDefaultExceptionHandler.java index 7a1ea5b..49f1501 100644 --- a/src/main/java/ru/ulstu/extractor/mvc/GlobalDefaultExceptionHandler.java +++ b/src/main/java/ru/ulstu/extractor/config/GlobalDefaultExceptionHandler.java @@ -1,4 +1,4 @@ -package ru.ulstu.extractor.mvc; +package ru.ulstu.extractor.config; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ControllerAdvice; diff --git a/src/main/java/ru/ulstu/extractor/mvc/MvcConfiguration.java b/src/main/java/ru/ulstu/extractor/config/MvcConfiguration.java similarity index 96% rename from src/main/java/ru/ulstu/extractor/mvc/MvcConfiguration.java rename to src/main/java/ru/ulstu/extractor/config/MvcConfiguration.java index c25a506..2355ca1 100644 --- a/src/main/java/ru/ulstu/extractor/mvc/MvcConfiguration.java +++ b/src/main/java/ru/ulstu/extractor/config/MvcConfiguration.java @@ -1,4 +1,4 @@ -package ru.ulstu.extractor.mvc; +package ru.ulstu.extractor.config; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; diff --git a/src/main/java/ru/ulstu/extractor/mvc/TemplateConfiguration.java b/src/main/java/ru/ulstu/extractor/config/TemplateConfiguration.java similarity index 97% rename from src/main/java/ru/ulstu/extractor/mvc/TemplateConfiguration.java rename to src/main/java/ru/ulstu/extractor/config/TemplateConfiguration.java index 7798224..1a638d2 100644 --- a/src/main/java/ru/ulstu/extractor/mvc/TemplateConfiguration.java +++ b/src/main/java/ru/ulstu/extractor/config/TemplateConfiguration.java @@ -1,4 +1,4 @@ -package ru.ulstu.extractor.mvc; +package ru.ulstu.extractor.config; import nz.net.ultraq.thymeleaf.LayoutDialect; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/ru/ulstu/extractor/mvc/GitFilteringController.java b/src/main/java/ru/ulstu/extractor/controller/GitFilteringController.java similarity index 97% rename from src/main/java/ru/ulstu/extractor/mvc/GitFilteringController.java rename to src/main/java/ru/ulstu/extractor/controller/GitFilteringController.java index 53320f5..5203c7d 100644 --- a/src/main/java/ru/ulstu/extractor/mvc/GitFilteringController.java +++ b/src/main/java/ru/ulstu/extractor/controller/GitFilteringController.java @@ -1,4 +1,4 @@ -package ru.ulstu.extractor.mvc; +package ru.ulstu.extractor.controller; import org.eclipse.jgit.api.errors.GitAPIException; import org.springframework.data.domain.Page; @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import ru.ulstu.extractor.model.Commit; -import ru.ulstu.extractor.mvc.model.FilterForm; +import ru.ulstu.extractor.model.mvc.FilterForm; import ru.ulstu.extractor.service.CommitService; import ru.ulstu.extractor.service.FilteringService; import ru.ulstu.extractor.service.GitRepositoryService; diff --git a/src/main/java/ru/ulstu/extractor/mvc/GitIndexingController.java b/src/main/java/ru/ulstu/extractor/controller/GitIndexingController.java similarity index 93% rename from src/main/java/ru/ulstu/extractor/mvc/GitIndexingController.java rename to src/main/java/ru/ulstu/extractor/controller/GitIndexingController.java index bfd61f6..964bc4a 100644 --- a/src/main/java/ru/ulstu/extractor/mvc/GitIndexingController.java +++ b/src/main/java/ru/ulstu/extractor/controller/GitIndexingController.java @@ -1,4 +1,4 @@ -package ru.ulstu.extractor.mvc; +package ru.ulstu.extractor.controller; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -8,8 +8,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import ru.ulstu.extractor.model.Branch; -import ru.ulstu.extractor.mvc.model.FilterForm; -import ru.ulstu.extractor.mvc.model.RepoForm; +import ru.ulstu.extractor.model.mvc.FilterForm; +import ru.ulstu.extractor.model.mvc.RepoForm; import ru.ulstu.extractor.service.GitRepositoryService; import java.util.List; diff --git a/src/main/java/ru/ulstu/extractor/mvc/model/FilterForm.java b/src/main/java/ru/ulstu/extractor/model/mvc/FilterForm.java similarity index 93% rename from src/main/java/ru/ulstu/extractor/mvc/model/FilterForm.java rename to src/main/java/ru/ulstu/extractor/model/mvc/FilterForm.java index 16e52b8..67f2194 100644 --- a/src/main/java/ru/ulstu/extractor/mvc/model/FilterForm.java +++ b/src/main/java/ru/ulstu/extractor/model/mvc/FilterForm.java @@ -1,4 +1,4 @@ -package ru.ulstu.extractor.mvc.model; +package ru.ulstu.extractor.model.mvc; public class FilterForm { private String filter; diff --git a/src/main/java/ru/ulstu/extractor/mvc/model/RepoForm.java b/src/main/java/ru/ulstu/extractor/model/mvc/RepoForm.java similarity index 93% rename from src/main/java/ru/ulstu/extractor/mvc/model/RepoForm.java rename to src/main/java/ru/ulstu/extractor/model/mvc/RepoForm.java index 73a6b8a..e0ca0aa 100644 --- a/src/main/java/ru/ulstu/extractor/mvc/model/RepoForm.java +++ b/src/main/java/ru/ulstu/extractor/model/mvc/RepoForm.java @@ -1,4 +1,4 @@ -package ru.ulstu.extractor.mvc.model; +package ru.ulstu.extractor.model.mvc; public class RepoForm { private String repo; diff --git a/src/main/java/ru/ulstu/extractor/db/CommitRepository.java b/src/main/java/ru/ulstu/extractor/repository/CommitRepository.java similarity index 97% rename from src/main/java/ru/ulstu/extractor/db/CommitRepository.java rename to src/main/java/ru/ulstu/extractor/repository/CommitRepository.java index 86a924e..e185761 100644 --- a/src/main/java/ru/ulstu/extractor/db/CommitRepository.java +++ b/src/main/java/ru/ulstu/extractor/repository/CommitRepository.java @@ -1,4 +1,4 @@ -package ru.ulstu.extractor.db; +package ru.ulstu.extractor.repository; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper;