Changed the package for all REST model classes [comixed#482]

comixed-rest-api/src/main/java/org/comixedproject/auditlog/AuditableEndpointAspect.java

@@ -28,7 +28,7 @@
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.comixedproject.model.auditlog.RestAuditLogEntry;
-import org.comixedproject.net.ApiResponse;
+import org.comixedproject.model.net.ApiResponse;
 import org.comixedproject.service.auditlog.RestAuditLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;

comixed-rest-api/src/main/java/org/comixedproject/controller/comic/ComicController.java

@@ -36,11 +36,11 @@
 import org.comixedproject.model.comic.ComicFormat;
 import org.comixedproject.model.comic.Page;
 import org.comixedproject.model.comic.ScanType;
+import org.comixedproject.model.net.GetLibraryUpdatesRequest;
+import org.comixedproject.model.net.GetLibraryUpdatesResponse;
+import org.comixedproject.model.net.UndeleteMultipleComicsRequest;
+import org.comixedproject.model.net.UndeleteMultipleComicsResponse;
 import org.comixedproject.model.user.LastReadDate;
-import org.comixedproject.net.GetLibraryUpdatesRequest;
-import org.comixedproject.net.GetLibraryUpdatesResponse;
-import org.comixedproject.net.UndeleteMultipleComicsRequest;
-import org.comixedproject.net.UndeleteMultipleComicsResponse;
 import org.comixedproject.repositories.comic.ComicFormatRepository;
 import org.comixedproject.repositories.comic.ScanTypeRepository;
 import org.comixedproject.service.comic.ComicException;

comixed-rest-api/src/main/java/org/comixedproject/controller/comic/PageController.java

@@ -31,9 +31,9 @@
 import org.comixedproject.model.comic.Page;
 import org.comixedproject.model.comic.PageType;
 import org.comixedproject.model.library.DuplicatePage;
-import org.comixedproject.net.SetBlockingStateRequest;
-import org.comixedproject.net.SetDeletedStateRequest;
-import org.comixedproject.net.SetPageTypeRequest;
+import org.comixedproject.model.net.SetBlockingStateRequest;
+import org.comixedproject.model.net.SetDeletedStateRequest;
+import org.comixedproject.model.net.SetPageTypeRequest;
 import org.comixedproject.service.comic.PageCacheService;
 import org.comixedproject.service.comic.PageException;
 import org.comixedproject.service.comic.PageService;

comixed-rest-api/src/main/java/org/comixedproject/controller/core/AuditLogController.java

@@ -25,10 +25,10 @@
 import org.comixedproject.auditlog.AuditableEndpoint;
 import org.comixedproject.controller.ComiXedControllerException;
 import org.comixedproject.model.auditlog.RestAuditLogEntry;
+import org.comixedproject.model.net.ApiResponse;
+import org.comixedproject.model.net.GetRestAuditLogResponse;
+import org.comixedproject.model.net.GetTaskAuditLogResponse;
 import org.comixedproject.model.tasks.TaskAuditLogEntry;
-import org.comixedproject.net.ApiResponse;
-import org.comixedproject.net.GetRestAuditLogResponse;
-import org.comixedproject.net.GetTaskAuditLogResponse;
 import org.comixedproject.service.ComiXedServiceException;
 import org.comixedproject.service.auditlog.RestAuditLogService;
 import org.comixedproject.service.task.TaskService;

comixed-rest-api/src/main/java/org/comixedproject/controller/file/FileController.java

@@ -28,9 +28,9 @@
 import org.comixedproject.controller.comic.ComicController;
 import org.comixedproject.handlers.ComicFileHandlerException;
 import org.comixedproject.model.file.FileDetails;
-import org.comixedproject.net.GetAllComicsUnderRequest;
-import org.comixedproject.net.ImportComicFilesRequest;
-import org.comixedproject.net.ImportComicFilesResponse;
+import org.comixedproject.model.net.GetAllComicsUnderRequest;
+import org.comixedproject.model.net.ImportComicFilesRequest;
+import org.comixedproject.model.net.ImportComicFilesResponse;
 import org.comixedproject.service.comic.ComicService;
 import org.comixedproject.service.file.FileService;
 import org.comixedproject.task.model.QueueComicsWorkerTask;

comixed-rest-api/src/main/java/org/comixedproject/controller/library/LibraryController.java

@@ -26,8 +26,8 @@
 import org.comixedproject.model.archives.ArchiveType;
 import org.comixedproject.model.comic.Comic;
 import org.comixedproject.model.library.ReadingList;
+import org.comixedproject.model.net.*;
 import org.comixedproject.model.user.LastReadDate;
-import org.comixedproject.net.*;
 import org.comixedproject.service.comic.ComicService;
 import org.comixedproject.service.library.LibraryException;
 import org.comixedproject.service.library.LibraryService;

comixed-rest-api/src/main/java/org/comixedproject/controller/library/ReadingListController.java

@@ -24,7 +24,7 @@
 import java.util.List;
 import lombok.extern.log4j.Log4j2;
 import org.comixedproject.model.library.ReadingList;
-import org.comixedproject.net.*;
+import org.comixedproject.model.net.*;
 import org.comixedproject.repositories.library.ReadingListRepository;
 import org.comixedproject.service.comic.ComicException;
 import org.comixedproject.service.library.NoSuchReadingListException;

comixed-rest-api/src/main/java/org/comixedproject/controller/scraping/ScrapingController.java

@@ -23,9 +23,9 @@
 import lombok.extern.log4j.Log4j2;
 import org.comixedproject.controller.ComiXedControllerException;
 import org.comixedproject.model.comic.Comic;
-import org.comixedproject.net.ComicScrapeRequest;
-import org.comixedproject.net.GetScrapingIssueRequest;
-import org.comixedproject.net.GetVolumesRequest;
+import org.comixedproject.model.net.ComicScrapeRequest;
+import org.comixedproject.model.net.GetScrapingIssueRequest;
+import org.comixedproject.model.net.GetVolumesRequest;
 import org.comixedproject.scrapers.ScrapingException;
 import org.comixedproject.scrapers.model.ScrapingIssue;
 import org.comixedproject.scrapers.model.ScrapingVolume;

comixed-rest-api/src/main/java/org/comixedproject/controller/user/UserController.java

@@ -22,10 +22,10 @@
 import java.security.Principal;
 import java.util.List;
 import lombok.extern.log4j.Log4j2;
+import org.comixedproject.model.net.SaveUserRequest;
 import org.comixedproject.model.user.ComiXedUser;
 import org.comixedproject.model.user.Preference;
 import org.comixedproject.model.user.Role;
-import org.comixedproject.net.SaveUserRequest;
 import org.comixedproject.service.user.ComiXedUserException;
 import org.comixedproject.service.user.UserService;
 import org.comixedproject.utils.Utils;

comixed-rest-api/src/main/java/org/comixedproject/net/AddComicsToReadingListRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/AddComicsToReadingListRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.ArrayList;

comixed-rest-api/src/main/java/org/comixedproject/net/AddComicsToReadingListResponse.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/AddComicsToReadingListResponse.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

comixed-rest-api/src/main/java/org/comixedproject/net/ApiResponse.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/ApiResponse.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;

comixed-rest-api/src/main/java/org/comixedproject/net/ClearImageCacheResponse.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/ClearImageCacheResponse.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

comixed-rest-api/src/main/java/org/comixedproject/net/ComicScrapeRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/ComicScrapeRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;

comixed-rest-api/src/main/java/org/comixedproject/net/ConsolidateLibraryRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/ConsolidateLibraryRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

comixed-rest-api/src/main/java/org/comixedproject/net/ConvertComicsRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/ConvertComicsRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http:/www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;

comixed-rest-api/src/main/java/org/comixedproject/net/CreateReadingListRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/CreateReadingListRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

comixed-rest-api/src/main/java/org/comixedproject/net/GetAllComicsUnderRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/GetAllComicsUnderRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

comixed-rest-api/src/main/java/org/comixedproject/net/GetComicsRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/GetComicsRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

comixed-rest-api/src/main/java/org/comixedproject/net/GetComicsResponse.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/GetComicsResponse.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;

comixed-rest-api/src/main/java/org/comixedproject/net/GetLibraryUpdatesRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/GetLibraryUpdatesRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

comixed-rest-api/src/main/java/org/comixedproject/net/GetLibraryUpdatesResponse.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/GetLibraryUpdatesResponse.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonView;

comixed-rest-api/src/main/java/org/comixedproject/net/GetRestAuditLogResponse.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/GetRestAuditLogResponse.java

@@ -1,4 +1,4 @@
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;

comixed-rest-api/src/main/java/org/comixedproject/net/GetScrapingIssueRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/GetScrapingIssueRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

comixed-rest-api/src/main/java/org/comixedproject/net/GetTaskAuditLogResponse.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/GetTaskAuditLogResponse.java

@@ -1,4 +1,4 @@
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;

comixed-rest-api/src/main/java/org/comixedproject/net/GetUpdatedComicsRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/GetUpdatedComicsRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

comixed-rest-api/src/main/java/org/comixedproject/net/GetUpdatedComicsResponse.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/GetUpdatedComicsResponse.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;

comixed-rest-api/src/main/java/org/comixedproject/net/GetVolumesRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/GetVolumesRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;

comixed-rest-api/src/main/java/org/comixedproject/net/ImportComicFilesRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/ImportComicFilesRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.ArrayList;

comixed-rest-api/src/main/java/org/comixedproject/net/ImportComicFilesResponse.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/ImportComicFilesResponse.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;

comixed-rest-api/src/main/java/org/comixedproject/net/MoveComicsRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/MoveComicsRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

comixed-rest-api/src/main/java/org/comixedproject/net/MoveComicsResponse.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/MoveComicsResponse.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

comixed-rest-api/src/main/java/org/comixedproject/net/RemoveComicsFromReadingListRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/RemoveComicsFromReadingListRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;

comixed-rest-api/src/main/java/org/comixedproject/net/SaveUserRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/SaveUserRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

comixed-rest-api/src/main/java/org/comixedproject/net/SetBlockingStateRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/SetBlockingStateRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.ArrayList;

comixed-rest-api/src/main/java/org/comixedproject/net/SetDeletedStateRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/SetDeletedStateRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.ArrayList;

comixed-rest-api/src/main/java/org/comixedproject/net/SetPageTypeRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/SetPageTypeRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

comixed-rest-api/src/main/java/org/comixedproject/net/UndeleteMultipleComicsRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/UndeleteMultipleComicsRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.ArrayList;

comixed-rest-api/src/main/java/org/comixedproject/net/UndeleteMultipleComicsResponse.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/UndeleteMultipleComicsResponse.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

comixed-rest-api/src/main/java/org/comixedproject/net/UpdateReadingListRequest.java → comixed-rest-api/src/main/java/org/comixedproject/model/net/UpdateReadingListRequest.java

@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixedproject.net;
+package org.comixedproject.model.net;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

comixed-rest-api/src/test/java/org/comixedproject/auditlog/AuditableEndpointAspectTest.java

@@ -24,7 +24,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.comixedproject.model.auditlog.RestAuditLogEntry;
-import org.comixedproject.net.ApiResponse;
+import org.comixedproject.model.net.ApiResponse;
 import org.comixedproject.service.auditlog.RestAuditLogService;
 import org.junit.Before;
 import org.junit.Test;