Refactor packages

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.news.NewsService;
+import ru.ulstu.news.service.NewsService;
 
 @Controller
 public class IndexController {

src/main/java/ru/ulstu/meeting/Meeting.java

@@ -9,7 +9,7 @@ import jakarta.persistence.Transient;
 import jakarta.validation.constraints.NotEmpty;
 import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.model.BaseEntity;
-import ru.ulstu.news.News;
+import ru.ulstu.news.model.News;
 
 import java.util.Date;
 

src/main/java/ru/ulstu/meeting/MeetingService.java

@@ -5,8 +5,8 @@ import jakarta.validation.constraints.NotNull;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
-import ru.ulstu.news.News;
+import ru.ulstu.news.model.News;
-import ru.ulstu.news.NewsService;
+import ru.ulstu.news.service.NewsService;
 
 @Service
 public class MeetingService {

src/main/java/ru/ulstu/news/controller/NewsController.java

@@ -4,7 +4,7 @@
  *
  */
 
-package ru.ulstu.news;
+package ru.ulstu.news.controller;
 
 import jakarta.validation.Valid;
 import org.springframework.data.domain.Page;
@@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import ru.ulstu.model.OffsetablePageRequest;
 import ru.ulstu.model.UserRoleConstants;
+import ru.ulstu.news.model.News;
+import ru.ulstu.news.service.NewsService;
 
 import java.util.List;
 import java.util.Optional;

src/main/java/ru/ulstu/news/model/News.java

@@ -1,4 +1,4 @@
-package ru.ulstu.news;
+package ru.ulstu.news.model;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Lob;

src/main/java/ru/ulstu/news/repository/NewsRepository.java

@@ -1,8 +1,9 @@
-package ru.ulstu.news;
+package ru.ulstu.news.repository;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import ru.ulstu.news.model.News;
 
 import java.util.List;
 

src/main/java/ru/ulstu/news/service/NewsService.java

@@ -1,4 +1,4 @@
-package ru.ulstu.news;
+package ru.ulstu.news.service;
 
 import jakarta.transaction.Transactional;
 import jakarta.validation.constraints.NotNull;
@@ -6,6 +6,8 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import ru.ulstu.meeting.Meeting;
+import ru.ulstu.news.model.News;
+import ru.ulstu.news.repository.NewsRepository;
 
 import java.util.Date;
 import java.util.List;

src/main/resources/templates/news.html

@@ -45,6 +45,5 @@
            th:text=${pageNumber}
            th:class="${pageNumber == news.number+1} ? active"></a>
     </div>
-
 </div>
 </html>