romanov73/git-extractor
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

#72 -- classes refactor

Browse Source
This commit is contained in:
Anton Romanov 2022-10-15 22:36:08 +04:00
parent 9c6a7a170f
commit 957c1bbc8c
59 changed files with 168 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/ru/ulstu/extractor/model/Author.java → src/main/java/ru/ulstu/extractor/author/model/Author.java
View File

@ -1,4 +1,6 @@
package ru.ulstu.extractor.model; package ru.ulstu.extractor.author.model;
import ru.ulstu.extractor.core.BaseEntity;
import javax.persistence.Entity; import javax.persistence.Entity;

4
src/main/java/ru/ulstu/extractor/repository/AuthorRepository.java → src/main/java/ru/ulstu/extractor/author/repository/AuthorRepository.java
View File

@ -3,13 +3,13 @@
* You may use, distribute and modify this code, please write to: romanov73@gmail.com. * You may use, distribute and modify this code, please write to: romanov73@gmail.com.
*/ */
package ru.ulstu.extractor.repository; package ru.ulstu.extractor.author.repository;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import ru.ulstu.extractor.author.model.Author;
import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.model.GitRepository;
import ru.ulstu.extractor.model.Author;
import java.util.List; import java.util.List;

6
src/main/java/ru/ulstu/extractor/service/AuthorService.java → src/main/java/ru/ulstu/extractor/author/service/AuthorService.java
View File

@ -3,13 +3,13 @@
* You may use, distribute and modify this code, please write to: romanov73@gmail.com. * You may use, distribute and modify this code, please write to: romanov73@gmail.com.
*/ */
package ru.ulstu.extractor.service; package ru.ulstu.extractor.author.service;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.ulstu.extractor.model.Author; import ru.ulstu.extractor.author.model.Author;
import ru.ulstu.extractor.repository.AuthorRepository; import ru.ulstu.extractor.author.repository.AuthorRepository;
import java.util.Optional; import java.util.Optional;

6
src/main/java/ru/ulstu/extractor/branch/controller/BranchController.java
View File

@ -10,11 +10,11 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import ru.ulstu.extractor.branch.repository.BranchRepository; import ru.ulstu.extractor.branch.repository.BranchRepository;
import ru.ulstu.extractor.gitrepository.GitRepositoryRepository; import ru.ulstu.extractor.gitrepository.repository.GitRepositoryRepository;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import static ru.ulstu.extractor.controller.Route.DELETE_BRANCH; import static ru.ulstu.extractor.core.Route.DELETE_BRANCH;
import static ru.ulstu.extractor.controller.Route.LIST_REPOSITORY_BRANCHES; import static ru.ulstu.extractor.core.Route.LIST_REPOSITORY_BRANCHES;
@Controller @Controller
@ApiIgnore @ApiIgnore

2
src/main/java/ru/ulstu/extractor/branch/model/Branch.java
View File

@ -7,8 +7,8 @@ package ru.ulstu.extractor.branch.model;
import org.hibernate.annotations.Fetch; import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchMode;
import ru.ulstu.extractor.core.BaseEntity;
import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.model.GitRepository;
import ru.ulstu.extractor.model.BaseEntity;
import ru.ulstu.extractor.model.Commit; import ru.ulstu.extractor.model.Commit;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;

2
src/main/java/ru/ulstu/extractor/branch/service/BranchService.java
View File

@ -12,8 +12,8 @@ import org.springframework.transaction.annotation.Transactional;
import ru.ulstu.extractor.branch.model.Branch; import ru.ulstu.extractor.branch.model.Branch;
import ru.ulstu.extractor.branch.repository.BranchRepository; import ru.ulstu.extractor.branch.repository.BranchRepository;
import ru.ulstu.extractor.commit.service.CommitService; import ru.ulstu.extractor.commit.service.CommitService;
import ru.ulstu.extractor.core.BaseEntity;
import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.model.GitRepository;
import ru.ulstu.extractor.model.BaseEntity;
import ru.ulstu.extractor.model.Commit; import ru.ulstu.extractor.model.Commit;
import java.util.List; import java.util.List;

3
src/main/java/ru/ulstu/extractor/commit/model/Commit.java
View File

@ -7,7 +7,10 @@ package ru.ulstu.extractor.model;
import org.hibernate.annotations.Fetch; import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchMode;
import ru.ulstu.extractor.author.model.Author;
import ru.ulstu.extractor.branch.model.Branch; import ru.ulstu.extractor.branch.model.Branch;
import ru.ulstu.extractor.core.BaseEntity;
import ru.ulstu.extractor.gitrepository.model.FileChange;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;

2
src/main/java/ru/ulstu/extractor/commit/service/CommitService.java
View File

@ -7,9 +7,9 @@ package ru.ulstu.extractor.commit.service;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.ulstu.extractor.author.service.AuthorService;
import ru.ulstu.extractor.commit.repository.CommitRepository; import ru.ulstu.extractor.commit.repository.CommitRepository;
import ru.ulstu.extractor.model.Commit; import ru.ulstu.extractor.model.Commit;
import ru.ulstu.extractor.service.AuthorService;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;

2
src/main/java/ru/ulstu/extractor/config/MvcConfiguration.java
View File

@ -10,7 +10,7 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import static ru.ulstu.extractor.controller.Route.LIST_INDEXED_REPOSITORIES; import static ru.ulstu.extractor.core.Route.LIST_INDEXED_REPOSITORIES;
@Configuration @Configuration
public class MvcConfiguration implements WebMvcConfigurer { public class MvcConfiguration implements WebMvcConfigurer {

2
src/main/java/ru/ulstu/extractor/model/BaseEntity.java → src/main/java/ru/ulstu/extractor/core/BaseEntity.java
View File

@ -1,4 +1,4 @@
package ru.ulstu.extractor.model; package ru.ulstu.extractor.core;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType; import javax.persistence.GenerationType;

2
src/main/java/ru/ulstu/extractor/model/OffsetablePageRequest.java → src/main/java/ru/ulstu/extractor/core/OffsetablePageRequest.java
View File

@ -1,4 +1,4 @@
package ru.ulstu.extractor.model; package ru.ulstu.extractor.core;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;

2
src/main/java/ru/ulstu/extractor/controller/Route.java → src/main/java/ru/ulstu/extractor/core/Route.java
View File

@ -3,7 +3,7 @@
* You may use, distribute and modify this code, please write to: romanov73@gmail.com. * You may use, distribute and modify this code, please write to: romanov73@gmail.com.
*/ */
package ru.ulstu.extractor.controller; package ru.ulstu.extractor.core;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;

10
src/main/java/ru/ulstu/extractor/controller/GitFilteringController.java → src/main/java/ru/ulstu/extractor/gitrepository/controler/GitFilteringController.java
View File

@ -3,7 +3,7 @@
* You may use, distribute and modify this code, please write to: romanov73@gmail.com. * You may use, distribute and modify this code, please write to: romanov73@gmail.com.
*/ */
package ru.ulstu.extractor.controller; package ru.ulstu.extractor.gitrepository.controler;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@ -11,10 +11,10 @@ import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import ru.ulstu.extractor.core.OffsetablePageRequest;
import ru.ulstu.extractor.gitrepository.model.FilterForm;
import ru.ulstu.extractor.gitrepository.service.FilteringService;
import ru.ulstu.extractor.model.Commit; import ru.ulstu.extractor.model.Commit;
import ru.ulstu.extractor.model.OffsetablePageRequest;
import ru.ulstu.extractor.model.mvc.FilterForm;
import ru.ulstu.extractor.service.FilteringService;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import java.util.List; import java.util.List;
@ -22,7 +22,7 @@ import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.IntStream; import java.util.stream.IntStream;
import static ru.ulstu.extractor.controller.Route.FILTER_COMMITS; import static ru.ulstu.extractor.core.Route.FILTER_COMMITS;
@Controller @Controller
@ApiIgnore @ApiIgnore

14
src/main/java/ru/ulstu/extractor/controller/GitIndexingController.java → src/main/java/ru/ulstu/extractor/gitrepository/controler/GitIndexingController.java
View File

@ -3,7 +3,7 @@
* You may use, distribute and modify this code, please write to: romanov73@gmail.com. * You may use, distribute and modify this code, please write to: romanov73@gmail.com.
*/ */
package ru.ulstu.extractor.controller; package ru.ulstu.extractor.gitrepository.controler;
import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.GitAPIException;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -16,17 +16,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import ru.ulstu.extractor.branch.model.Branch; import ru.ulstu.extractor.branch.model.Branch;
import ru.ulstu.extractor.gitrepository.GitRepositoryService; import ru.ulstu.extractor.gitrepository.model.FilterForm;
import ru.ulstu.extractor.model.mvc.FilterForm; import ru.ulstu.extractor.gitrepository.model.RepoForm;
import ru.ulstu.extractor.model.mvc.RepoForm; import ru.ulstu.extractor.gitrepository.service.GitRepositoryService;
import ru.ulstu.extractor.service.IndexService; import ru.ulstu.extractor.gitrepository.service.IndexService;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import static ru.ulstu.extractor.controller.Route.FILTER_COMMITS; import static ru.ulstu.extractor.core.Route.FILTER_COMMITS;
import static ru.ulstu.extractor.controller.Route.INDEXING_NEW_REPOSITORY; import static ru.ulstu.extractor.core.Route.INDEXING_NEW_REPOSITORY;
@Controller @Controller
@ApiIgnore @ApiIgnore

8
src/main/java/ru/ulstu/extractor/controller/RepoController.java → src/main/java/ru/ulstu/extractor/gitrepository/controler/RepoController.java
View File

@ -3,7 +3,7 @@
* You may use, distribute and modify this code, please write to: romanov73@gmail.com. * You may use, distribute and modify this code, please write to: romanov73@gmail.com.
*/ */
package ru.ulstu.extractor.controller; package ru.ulstu.extractor.gitrepository.controler;
import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.GitAPIException;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -12,16 +12,16 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import ru.ulstu.extractor.gitrepository.GitRepositoryService; import ru.ulstu.extractor.gitrepository.service.GitRepositoryService;
import ru.ulstu.extractor.gitrepository.service.IndexService;
import ru.ulstu.extractor.model.Commit; import ru.ulstu.extractor.model.Commit;
import ru.ulstu.extractor.service.IndexService;
import ru.ulstu.extractor.util.HttpUtils; import ru.ulstu.extractor.util.HttpUtils;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import static ru.ulstu.extractor.controller.RepoController.URL; import static ru.ulstu.extractor.gitrepository.controler.RepoController.URL;
@RestController @RestController
@RequestMapping(URL) @RequestMapping(URL)

8
src/main/java/ru/ulstu/extractor/controller/RepositoryController.java → src/main/java/ru/ulstu/extractor/gitrepository/controler/RepositoryController.java
View File

@ -3,17 +3,17 @@
* You may use, distribute and modify this code, please write to: romanov73@gmail.com. * You may use, distribute and modify this code, please write to: romanov73@gmail.com.
*/ */
package ru.ulstu.extractor.controller; package ru.ulstu.extractor.gitrepository.controler;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import ru.ulstu.extractor.gitrepository.GitRepositoryRepository; import ru.ulstu.extractor.gitrepository.repository.GitRepositoryRepository;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import static ru.ulstu.extractor.controller.Route.DELETE_INDEXED_REPOSITORY; import static ru.ulstu.extractor.core.Route.DELETE_INDEXED_REPOSITORY;
import static ru.ulstu.extractor.controller.Route.LIST_INDEXED_REPOSITORIES; import static ru.ulstu.extractor.core.Route.LIST_INDEXED_REPOSITORIES;
@Controller @Controller
@ApiIgnore @ApiIgnore

8
src/main/java/ru/ulstu/extractor/controller/StatisticController.java → src/main/java/ru/ulstu/extractor/gitrepository/controler/StatisticController.java
View File

@ -3,7 +3,7 @@
* You may use, distribute and modify this code, please write to: romanov73@gmail.com. * You may use, distribute and modify this code, please write to: romanov73@gmail.com.
*/ */
package ru.ulstu.extractor.controller; package ru.ulstu.extractor.gitrepository.controler;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
@ -11,15 +11,15 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import ru.ulstu.extractor.branch.service.BranchService; import ru.ulstu.extractor.branch.service.BranchService;
import ru.ulstu.extractor.commit.repository.CommitRepository; import ru.ulstu.extractor.commit.repository.CommitRepository;
import ru.ulstu.extractor.model.mvc.FilterForm; import ru.ulstu.extractor.gitrepository.model.FilterForm;
import ru.ulstu.extractor.service.FilteringService; import ru.ulstu.extractor.gitrepository.service.FilteringService;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static ru.ulstu.extractor.controller.Route.STATISTIC; import static ru.ulstu.extractor.core.Route.STATISTIC;
@Controller @Controller
@ApiIgnore @ApiIgnore

3
src/main/java/ru/ulstu/extractor/model/FileChange.java → src/main/java/ru/ulstu/extractor/gitrepository/model/FileChange.java
View File

@ -3,10 +3,11 @@
* You may use, distribute and modify this code, please write to: romanov73@gmail.com. * You may use, distribute and modify this code, please write to: romanov73@gmail.com.
*/ */
package ru.ulstu.extractor.model; package ru.ulstu.extractor.gitrepository.model;
import org.hibernate.annotations.Fetch; import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchMode;
import ru.ulstu.extractor.core.BaseEntity;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;

2
src/main/java/ru/ulstu/extractor/model/mvc/FilterForm.java → src/main/java/ru/ulstu/extractor/gitrepository/model/FilterForm.java
View File

@ -3,7 +3,7 @@
* You may use, distribute and modify this code, please write to: romanov73@gmail.com. * You may use, distribute and modify this code, please write to: romanov73@gmail.com.
*/ */
package ru.ulstu.extractor.model.mvc; package ru.ulstu.extractor.gitrepository.model;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import ru.ulstu.extractor.model.Commit; import ru.ulstu.extractor.model.Commit;

2
src/main/java/ru/ulstu/extractor/gitrepository/model/GitRepository.java
View File

@ -1,6 +1,6 @@
package ru.ulstu.extractor.gitrepository.model; package ru.ulstu.extractor.gitrepository.model;
import ru.ulstu.extractor.model.BaseEntity; import ru.ulstu.extractor.core.BaseEntity;
import javax.persistence.Entity; import javax.persistence.Entity;

4
src/main/java/ru/ulstu/extractor/model/LineChange.java → src/main/java/ru/ulstu/extractor/gitrepository/model/LineChange.java
View File

@ -3,7 +3,9 @@
* You may use, distribute and modify this code, please write to: romanov73@gmail.com. * You may use, distribute and modify this code, please write to: romanov73@gmail.com.
*/ */
package ru.ulstu.extractor.model; package ru.ulstu.extractor.gitrepository.model;
import ru.ulstu.extractor.core.BaseEntity;
import javax.persistence.Entity; import javax.persistence.Entity;

2
src/main/java/ru/ulstu/extractor/model/mvc/RepoForm.java → src/main/java/ru/ulstu/extractor/gitrepository/model/RepoForm.java
View File

@ -1,4 +1,4 @@
package ru.ulstu.extractor.model.mvc; package ru.ulstu.extractor.gitrepository.model;
public class RepoForm { public class RepoForm {
private String repo; private String repo;

2
src/main/java/ru/ulstu/extractor/gitrepository/GitRepositoryRepository.java → src/main/java/ru/ulstu/extractor/gitrepository/repository/GitRepositoryRepository.java
View File

@ -1,4 +1,4 @@
package ru.ulstu.extractor.gitrepository; package ru.ulstu.extractor.gitrepository.repository;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.model.GitRepository;

6
src/main/java/ru/ulstu/extractor/service/FilteringService.java → src/main/java/ru/ulstu/extractor/gitrepository/service/FilteringService.java
View File

@ -3,16 +3,16 @@
* You may use, distribute and modify this code, please write to: romanov73@gmail.com. * You may use, distribute and modify this code, please write to: romanov73@gmail.com.
*/ */
package ru.ulstu.extractor.service; package ru.ulstu.extractor.gitrepository.service;
import com.sun.istack.NotNull; import com.sun.istack.NotNull;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.ulstu.extractor.author.repository.AuthorRepository;
import ru.ulstu.extractor.commit.repository.CommitRepository; import ru.ulstu.extractor.commit.repository.CommitRepository;
import ru.ulstu.extractor.gitrepository.GitRepositoryRepository; import ru.ulstu.extractor.gitrepository.repository.GitRepositoryRepository;
import ru.ulstu.extractor.model.Commit; import ru.ulstu.extractor.model.Commit;
import ru.ulstu.extractor.repository.AuthorRepository;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

9
src/main/java/ru/ulstu/extractor/gitrepository/GitRepositoryService.java → src/main/java/ru/ulstu/extractor/gitrepository/service/GitRepositoryService.java
View File

@ -1,4 +1,4 @@
package ru.ulstu.extractor.gitrepository; package ru.ulstu.extractor.gitrepository.service;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.eclipse.jgit.api.CreateBranchCommand; import org.eclipse.jgit.api.CreateBranchCommand;
@ -18,16 +18,17 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.ulstu.extractor.author.model.Author;
import ru.ulstu.extractor.branch.model.Branch; import ru.ulstu.extractor.branch.model.Branch;
import ru.ulstu.extractor.gitrepository.model.FileChange;
import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.model.GitRepository;
import ru.ulstu.extractor.gitrepository.model.LineChange;
import ru.ulstu.extractor.gitrepository.repository.GitRepositoryRepository;
import ru.ulstu.extractor.heuristic.model.BusinessLogicUnit; import ru.ulstu.extractor.heuristic.model.BusinessLogicUnit;
import ru.ulstu.extractor.heuristic.model.EntityUnit; import ru.ulstu.extractor.heuristic.model.EntityUnit;
import ru.ulstu.extractor.heuristic.model.ResourceUnit; import ru.ulstu.extractor.heuristic.model.ResourceUnit;
import ru.ulstu.extractor.heuristic.service.StructuralUnitService; import ru.ulstu.extractor.heuristic.service.StructuralUnitService;
import ru.ulstu.extractor.model.Author;
import ru.ulstu.extractor.model.Commit; import ru.ulstu.extractor.model.Commit;
import ru.ulstu.extractor.model.FileChange;
import ru.ulstu.extractor.model.LineChange;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;

7
src/main/java/ru/ulstu/extractor/service/IndexService.java → src/main/java/ru/ulstu/extractor/gitrepository/service/IndexService.java
View File

@ -3,7 +3,7 @@
* You may use, distribute and modify this code, please write to: romanov73@gmail.com. * You may use, distribute and modify this code, please write to: romanov73@gmail.com.
*/ */
package ru.ulstu.extractor.service; package ru.ulstu.extractor.gitrepository.service;
import com.sun.istack.NotNull; import com.sun.istack.NotNull;
import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.GitAPIException;
@ -12,11 +12,10 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.ulstu.extractor.branch.model.Branch; import ru.ulstu.extractor.branch.model.Branch;
import ru.ulstu.extractor.branch.service.BranchService; import ru.ulstu.extractor.branch.service.BranchService;
import ru.ulstu.extractor.gitrepository.GitRepositoryRepository;
import ru.ulstu.extractor.gitrepository.GitRepositoryService;
import ru.ulstu.extractor.gitrepository.model.GitRepository; import ru.ulstu.extractor.gitrepository.model.GitRepository;
import ru.ulstu.extractor.gitrepository.repository.GitRepositoryRepository;
import ru.ulstu.extractor.model.Commit; import ru.ulstu.extractor.model.Commit;
import ru.ulstu.extractor.ts.AbstractTimeSeriesCreator; import ru.ulstu.extractor.ts.creator.AbstractTimeSeriesCreator;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.Collections;

2
src/main/java/ru/ulstu/extractor/heuristic/controller/StructuralUnitController.java
View File

@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import ru.ulstu.extractor.gitrepository.GitRepositoryService; import ru.ulstu.extractor.gitrepository.service.GitRepositoryService;
import ru.ulstu.extractor.heuristic.model.BusinessLogicUnit; import ru.ulstu.extractor.heuristic.model.BusinessLogicUnit;
import ru.ulstu.extractor.heuristic.model.EntityUnit; import ru.ulstu.extractor.heuristic.model.EntityUnit;
import ru.ulstu.extractor.heuristic.model.ResourceUnit; import ru.ulstu.extractor.heuristic.model.ResourceUnit;

2
src/main/java/ru/ulstu/extractor/http/JsonTimeSeries.java
View File

@ -1,6 +1,6 @@
package ru.ulstu.extractor.http; package ru.ulstu.extractor.http;
import ru.ulstu.extractor.model.TimeSeries; import ru.ulstu.extractor.ts.model.TimeSeries;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;

2
src/main/java/ru/ulstu/extractor/http/JsonTimeSeriesValue.java
View File

@ -1,6 +1,6 @@
package ru.ulstu.extractor.http; package ru.ulstu.extractor.http;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId; import java.time.ZoneId;

14
src/main/java/ru/ulstu/extractor/controller/RuleController.java → src/main/java/ru/ulstu/extractor/rule/controller/RuleController.java
View File

@ -1,4 +1,4 @@
package ru.ulstu.extractor.controller; package ru.ulstu.extractor.rule.controller;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
@ -7,14 +7,14 @@ import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import ru.ulstu.extractor.model.mvc.AddRuleForm; import ru.ulstu.extractor.rule.model.AddRuleForm;
import ru.ulstu.extractor.service.AntecedentValueService; import ru.ulstu.extractor.rule.service.AntecedentValueService;
import ru.ulstu.extractor.service.RuleService; import ru.ulstu.extractor.rule.service.RuleService;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import static ru.ulstu.extractor.controller.Route.ADD_RULE; import static ru.ulstu.extractor.core.Route.ADD_RULE;
import static ru.ulstu.extractor.controller.Route.LIST_RULE; import static ru.ulstu.extractor.core.Route.LIST_RULE;
@Controller @Controller
@ApiIgnore @ApiIgnore

2
src/main/java/ru/ulstu/extractor/model/mvc/AddRuleForm.java → src/main/java/ru/ulstu/extractor/rule/model/AddRuleForm.java
View File

@ -1,4 +1,4 @@
package ru.ulstu.extractor.model.mvc; package ru.ulstu.extractor.rule.model;
public class AddRuleForm { public class AddRuleForm {
private Integer firstAntecedentValueId; private Integer firstAntecedentValueId;

4
src/main/java/ru/ulstu/extractor/model/AntecedentValue.java → src/main/java/ru/ulstu/extractor/rule/model/AntecedentValue.java
View File

@ -1,4 +1,6 @@
package ru.ulstu.extractor.model; package ru.ulstu.extractor.rule.model;
import ru.ulstu.extractor.core.BaseEntity;
import javax.persistence.Entity; import javax.persistence.Entity;

5
src/main/java/ru/ulstu/extractor/model/Rule.java → src/main/java/ru/ulstu/extractor/rule/model/Rule.java
View File

@ -1,4 +1,7 @@
package ru.ulstu.extractor.model; package ru.ulstu.extractor.rule.model;
import ru.ulstu.extractor.core.BaseEntity;
import ru.ulstu.extractor.ts.model.TimeSeries;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;

4
src/main/java/ru/ulstu/extractor/repository/AntecedentValueRepository.java → src/main/java/ru/ulstu/extractor/rule/repository/AntecedentValueRepository.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.repository; package ru.ulstu.extractor.rule.repository;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import ru.ulstu.extractor.model.AntecedentValue; import ru.ulstu.extractor.rule.model.AntecedentValue;
public interface AntecedentValueRepository extends JpaRepository<AntecedentValue, Integer> { public interface AntecedentValueRepository extends JpaRepository<AntecedentValue, Integer> {
} }

4
src/main/java/ru/ulstu/extractor/repository/RuleRepository.java → src/main/java/ru/ulstu/extractor/rule/repository/RuleRepository.java
View File

@ -1,7 +1,7 @@
package ru.ulstu.extractor.repository; package ru.ulstu.extractor.rule.repository;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import ru.ulstu.extractor.model.Rule; import ru.ulstu.extractor.rule.model.Rule;
public interface RuleRepository extends JpaRepository<Rule, Integer> { public interface RuleRepository extends JpaRepository<Rule, Integer> {
} }

6
src/main/java/ru/ulstu/extractor/service/AntecedentValueService.java → src/main/java/ru/ulstu/extractor/rule/service/AntecedentValueService.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.service; package ru.ulstu.extractor.rule.service;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.ulstu.extractor.model.AntecedentValue; import ru.ulstu.extractor.rule.model.AntecedentValue;
import ru.ulstu.extractor.repository.AntecedentValueRepository; import ru.ulstu.extractor.rule.repository.AntecedentValueRepository;
import java.util.List; import java.util.List;

9
src/main/java/ru/ulstu/extractor/service/RuleService.java → src/main/java/ru/ulstu/extractor/rule/service/RuleService.java
View File

@ -1,9 +1,10 @@
package ru.ulstu.extractor.service; package ru.ulstu.extractor.rule.service;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.ulstu.extractor.model.Rule; import ru.ulstu.extractor.rule.model.AddRuleForm;
import ru.ulstu.extractor.model.mvc.AddRuleForm; import ru.ulstu.extractor.rule.model.Rule;
import ru.ulstu.extractor.repository.RuleRepository; import ru.ulstu.extractor.rule.repository.RuleRepository;
import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.List; import java.util.List;

8
src/main/java/ru/ulstu/extractor/ts/AbstractTimeSeriesCreator.java → src/main/java/ru/ulstu/extractor/ts/creator/AbstractTimeSeriesCreator.java
View File

@ -1,13 +1,13 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.creator;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.Comparator; import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import static ru.ulstu.extractor.ts.TimeSeriesDateMapper.mapTimeSeriesToInterval; import static ru.ulstu.extractor.ts.util.TimeSeriesDateMapper.mapTimeSeriesToInterval;
public abstract class AbstractTimeSeriesCreator { public abstract class AbstractTimeSeriesCreator {

6
src/main/java/ru/ulstu/extractor/ts/AuthorTS.java → src/main/java/ru/ulstu/extractor/ts/creator/AuthorTS.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.creator;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

6
src/main/java/ru/ulstu/extractor/ts/AuthorsCommentTS.java → src/main/java/ru/ulstu/extractor/ts/creator/AuthorsCommentTS.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.creator;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

6
src/main/java/ru/ulstu/extractor/ts/AuthorsCompletedIssueTS.java → src/main/java/ru/ulstu/extractor/ts/creator/AuthorsCompletedIssueTS.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.creator;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

6
src/main/java/ru/ulstu/extractor/ts/AuthorsIssueTS.java → src/main/java/ru/ulstu/extractor/ts/creator/AuthorsIssueTS.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.creator;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

6
src/main/java/ru/ulstu/extractor/ts/BranchTS.java → src/main/java/ru/ulstu/extractor/ts/creator/BranchTS.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.creator;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

6
src/main/java/ru/ulstu/extractor/ts/ClassTS.java → src/main/java/ru/ulstu/extractor/ts/creator/ClassTS.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.creator;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

8
src/main/java/ru/ulstu/extractor/ts/CommitsTS.java → src/main/java/ru/ulstu/extractor/ts/creator/CommitsTS.java
View File

@ -1,10 +1,10 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.creator;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.ulstu.extractor.commit.service.CommitService; import ru.ulstu.extractor.commit.service.CommitService;
import ru.ulstu.extractor.gitrepository.GitRepositoryService; import ru.ulstu.extractor.gitrepository.service.GitRepositoryService;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

6
src/main/java/ru/ulstu/extractor/ts/DependenceTS.java → src/main/java/ru/ulstu/extractor/ts/creator/DependenceTS.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.creator;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

6
src/main/java/ru/ulstu/extractor/ts/EntityTS.java → src/main/java/ru/ulstu/extractor/ts/creator/EntityTS.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.creator;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

6
src/main/java/ru/ulstu/extractor/ts/FileTS.java → src/main/java/ru/ulstu/extractor/ts/creator/FileTS.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.creator;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

6
src/main/java/ru/ulstu/extractor/ts/InterfaceTS.java → src/main/java/ru/ulstu/extractor/ts/creator/InterfaceTS.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.creator;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

6
src/main/java/ru/ulstu/extractor/ts/IssuesTS.java → src/main/java/ru/ulstu/extractor/ts/creator/IssuesTS.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.creator;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

6
src/main/java/ru/ulstu/extractor/ts/ProcessTS.java → src/main/java/ru/ulstu/extractor/ts/creator/ProcessTS.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.creator;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

6
src/main/java/ru/ulstu/extractor/ts/StarTS.java → src/main/java/ru/ulstu/extractor/ts/creator/StarTS.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.creator;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.service.TimeSeriesService; import ru.ulstu.extractor.ts.service.TimeSeriesService;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

3
src/main/java/ru/ulstu/extractor/model/TimeSeries.java → src/main/java/ru/ulstu/extractor/ts/model/TimeSeries.java
View File

@ -1,7 +1,8 @@
package ru.ulstu.extractor.model; package ru.ulstu.extractor.ts.model;
import org.hibernate.annotations.Fetch; import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.FetchMode;
import ru.ulstu.extractor.core.BaseEntity;
import javax.persistence.CascadeType; import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;

4
src/main/java/ru/ulstu/extractor/model/TimeSeriesValue.java → src/main/java/ru/ulstu/extractor/ts/model/TimeSeriesValue.java
View File

@ -1,4 +1,6 @@
package ru.ulstu.extractor.model; package ru.ulstu.extractor.ts.model;
import ru.ulstu.extractor.core.BaseEntity;
import javax.persistence.Entity; import javax.persistence.Entity;
import java.util.Date; import java.util.Date;

4
src/main/java/ru/ulstu/extractor/repository/TimeSeriesRepository.java → src/main/java/ru/ulstu/extractor/ts/repository/TimeSeriesRepository.java
View File

@ -1,7 +1,7 @@
package ru.ulstu.extractor.repository; package ru.ulstu.extractor.ts.repository;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import ru.ulstu.extractor.model.TimeSeries; import ru.ulstu.extractor.ts.model.TimeSeries;
import java.util.Optional; import java.util.Optional;

4
src/main/java/ru/ulstu/extractor/repository/TimeSeriesValueRepository.java → src/main/java/ru/ulstu/extractor/ts/repository/TimeSeriesValueRepository.java
View File

@ -1,7 +1,7 @@
package ru.ulstu.extractor.repository; package ru.ulstu.extractor.ts.repository;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import java.util.List; import java.util.List;

18
src/main/java/ru/ulstu/extractor/service/TimeSeriesService.java → src/main/java/ru/ulstu/extractor/ts/service/TimeSeriesService.java
View File

@ -3,7 +3,7 @@
* You may use, distribute and modify this code, please write to: romanov73@gmail.com. * You may use, distribute and modify this code, please write to: romanov73@gmail.com.
*/ */
package ru.ulstu.extractor.service; package ru.ulstu.extractor.ts.service;
import org.json.JSONObject; import org.json.JSONObject;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -11,14 +11,18 @@ import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.ulstu.extractor.http.HttpService; import ru.ulstu.extractor.http.HttpService;
import ru.ulstu.extractor.http.JsonTimeSeries; import ru.ulstu.extractor.http.JsonTimeSeries;
import ru.ulstu.extractor.model.TimeSeries; import ru.ulstu.extractor.ts.model.TimeSeries;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.repository.TimeSeriesRepository; import ru.ulstu.extractor.ts.repository.TimeSeriesRepository;
import ru.ulstu.extractor.repository.TimeSeriesValueRepository; import ru.ulstu.extractor.ts.repository.TimeSeriesValueRepository;
import ru.ulstu.extractor.ts.TimeSeriesDateMapper; import ru.ulstu.extractor.ts.util.TimeSeriesDateMapper;
import javax.transaction.Transactional; import javax.transaction.Transactional;
import java.util.*; import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service

6
src/main/java/ru/ulstu/extractor/ts/TimeSeriesDateMapper.java → src/main/java/ru/ulstu/extractor/ts/util/TimeSeriesDateMapper.java
View File

@ -1,8 +1,8 @@
package ru.ulstu.extractor.ts; package ru.ulstu.extractor.ts.util;
import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.lang3.time.DateUtils;
import ru.ulstu.extractor.model.TimeSeries; import ru.ulstu.extractor.ts.model.TimeSeries;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;

6
src/test/java/ru/ulstu/TimeSeriesMapperTest.java
View File

@ -2,9 +2,9 @@ package ru.ulstu;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import ru.ulstu.extractor.model.TimeSeries; import ru.ulstu.extractor.ts.model.TimeSeries;
import ru.ulstu.extractor.model.TimeSeriesValue; import ru.ulstu.extractor.ts.model.TimeSeriesValue;
import ru.ulstu.extractor.ts.TimeSeriesDateMapper; import ru.ulstu.extractor.ts.util.TimeSeriesDateMapper;
import java.util.Arrays; import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;