From 6a553a3330236faaec9198530aa6c6d8fced8f19 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Mon, 14 Mar 2022 12:20:41 +0400
Subject: [PATCH] #7 -- move news classes to different package

---
 data/db.mv.db                                 | Bin 49152 -> 45056 bytes
 .../ru/ulstu/controller/IndexController.java  |   2 +-
 .../java/ru/ulstu/meeting/MeetingService.java |   2 +-
 .../java/ru/ulstu/{model => news}/News.java   |   3 ++-
 .../{controller => news}/NewsController.java  |   4 +---
 .../{repository => news}/NewsRepository.java  |   3 +--
 .../ulstu/{service => news}/NewsService.java  |   5 ++---
 7 files changed, 8 insertions(+), 11 deletions(-)
 rename src/main/java/ru/ulstu/{model => news}/News.java (97%)
 rename src/main/java/ru/ulstu/{controller => news}/NewsController.java (97%)
 rename src/main/java/ru/ulstu/{repository => news}/NewsRepository.java (86%)
 rename src/main/java/ru/ulstu/{service => news}/NewsService.java (94%)

diff --git a/data/db.mv.db b/data/db.mv.db
index 1c534f284e2845a2346862a6ae7b9e030cd401ca..231f77aadfb0bba9dea517dc39380e13bf954380 100644
GIT binary patch
delta 5372
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

literal 49152
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

diff --git a/src/main/java/ru/ulstu/controller/IndexController.java b/src/main/java/ru/ulstu/controller/IndexController.java
index 9774e53..15eb735 100644
--- a/src/main/java/ru/ulstu/controller/IndexController.java
+++ b/src/main/java/ru/ulstu/controller/IndexController.java
@@ -9,7 +9,7 @@ package ru.ulstu.controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
-import ru.ulstu.service.NewsService;
+import ru.ulstu.news.NewsService;
 
 @Controller
 public class IndexController {
diff --git a/src/main/java/ru/ulstu/meeting/MeetingService.java b/src/main/java/ru/ulstu/meeting/MeetingService.java
index fb92aef..904b54d 100644
--- a/src/main/java/ru/ulstu/meeting/MeetingService.java
+++ b/src/main/java/ru/ulstu/meeting/MeetingService.java
@@ -3,7 +3,7 @@ package ru.ulstu.meeting;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
-import ru.ulstu.service.NewsService;
+import ru.ulstu.news.NewsService;
 
 import javax.validation.constraints.NotNull;
 
diff --git a/src/main/java/ru/ulstu/model/News.java b/src/main/java/ru/ulstu/news/News.java
similarity index 97%
rename from src/main/java/ru/ulstu/model/News.java
rename to src/main/java/ru/ulstu/news/News.java
index f6ab364..002a79b 100644
--- a/src/main/java/ru/ulstu/model/News.java
+++ b/src/main/java/ru/ulstu/news/News.java
@@ -1,7 +1,8 @@
-package ru.ulstu.model;
+package ru.ulstu.news;
 
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.multipart.MultipartFile;
+import ru.ulstu.model.BaseEntity;
 
 import javax.persistence.Entity;
 import javax.persistence.Lob;
diff --git a/src/main/java/ru/ulstu/controller/NewsController.java b/src/main/java/ru/ulstu/news/NewsController.java
similarity index 97%
rename from src/main/java/ru/ulstu/controller/NewsController.java
rename to src/main/java/ru/ulstu/news/NewsController.java
index 139daa5..5d811b4 100644
--- a/src/main/java/ru/ulstu/controller/NewsController.java
+++ b/src/main/java/ru/ulstu/news/NewsController.java
@@ -4,7 +4,7 @@
  *
  */
 
-package ru.ulstu.controller;
+package ru.ulstu.news;
 
 import org.springframework.data.domain.Page;
 import org.springframework.security.access.annotation.Secured;
@@ -17,10 +17,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
-import ru.ulstu.model.News;
 import ru.ulstu.model.OffsetablePageRequest;
 import ru.ulstu.model.UserRoleConstants;
-import ru.ulstu.service.NewsService;
 
 import javax.validation.Valid;
 import java.io.IOException;
diff --git a/src/main/java/ru/ulstu/repository/NewsRepository.java b/src/main/java/ru/ulstu/news/NewsRepository.java
similarity index 86%
rename from src/main/java/ru/ulstu/repository/NewsRepository.java
rename to src/main/java/ru/ulstu/news/NewsRepository.java
index f7f4fcf..fcf5c7f 100644
--- a/src/main/java/ru/ulstu/repository/NewsRepository.java
+++ b/src/main/java/ru/ulstu/news/NewsRepository.java
@@ -1,9 +1,8 @@
-package ru.ulstu.repository;
+package ru.ulstu.news;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
-import ru.ulstu.model.News;
 
 import java.util.List;
 
diff --git a/src/main/java/ru/ulstu/service/NewsService.java b/src/main/java/ru/ulstu/news/NewsService.java
similarity index 94%
rename from src/main/java/ru/ulstu/service/NewsService.java
rename to src/main/java/ru/ulstu/news/NewsService.java
index feac00a..2c55c9c 100644
--- a/src/main/java/ru/ulstu/service/NewsService.java
+++ b/src/main/java/ru/ulstu/news/NewsService.java
@@ -1,10 +1,9 @@
-package ru.ulstu.service;
+package ru.ulstu.news;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
-import ru.ulstu.model.News;
-import ru.ulstu.repository.NewsRepository;
+import ru.ulstu.service.FileUtil;
 
 import javax.validation.constraints.NotNull;
 import java.io.IOException;