From 6df2d78db4be9d55929c625e51fac497b547b88e Mon Sep 17 00:00:00 2001 From: "Darryl L. Pierce" Date: Wed, 22 Jul 2020 16:13:47 -0400 Subject: [PATCH] Fixed rebasing issues after repackaging on other branch [#413] --- .../model/tasks/TaskAuditLogEntry.java | 2 +- .../controller/ComiXedControllerException.java | 2 +- .../scraping/ComicVineScraperController.java | 2 +- .../controller/tasks/TaskController.java | 14 +++++++------- .../authentication/ComiXedWebSecurityConfig.java | 2 +- .../scraping/ComicVineScraperControllerTest.java | 2 +- .../controller/tasks/TaskControllerTest.java | 12 ++++++------ .../service/ComiXedServiceException.java | 2 +- .../comixedproject/service/task/TaskService.java | 3 +++ .../service/task/TaskServiceTest.java | 5 +++++ 10 files changed, 27 insertions(+), 19 deletions(-) rename comixed-rest-api/src/main/java/org/{comixed => comixedproject}/controller/ComiXedControllerException.java (96%) rename comixed-rest-api/src/main/java/org/{comixed => comixedproject}/controller/tasks/TaskController.java (86%) rename comixed-rest-api/src/test/java/org/{comixed => comixedproject}/controller/tasks/TaskControllerTest.java (85%) rename comixed-services/src/main/java/org/{comixed => comixedproject}/service/ComiXedServiceException.java (96%) diff --git a/comixed-library/src/main/java/org/comixedproject/model/tasks/TaskAuditLogEntry.java b/comixed-library/src/main/java/org/comixedproject/model/tasks/TaskAuditLogEntry.java index 9772f89f7..85e87f81e 100644 --- a/comixed-library/src/main/java/org/comixedproject/model/tasks/TaskAuditLogEntry.java +++ b/comixed-library/src/main/java/org/comixedproject/model/tasks/TaskAuditLogEntry.java @@ -26,7 +26,7 @@ import javax.persistence.*; import lombok.Getter; import lombok.Setter; -import org.comixed.views.View; +import org.comixedproject.views.View; /** * TaskAuditLogEntry represents a single entry in the task audit log table. diff --git a/comixed-rest-api/src/main/java/org/comixed/controller/ComiXedControllerException.java b/comixed-rest-api/src/main/java/org/comixedproject/controller/ComiXedControllerException.java similarity index 96% rename from comixed-rest-api/src/main/java/org/comixed/controller/ComiXedControllerException.java rename to comixed-rest-api/src/main/java/org/comixedproject/controller/ComiXedControllerException.java index 6e4f56770..def68930d 100644 --- a/comixed-rest-api/src/main/java/org/comixed/controller/ComiXedControllerException.java +++ b/comixed-rest-api/src/main/java/org/comixedproject/controller/ComiXedControllerException.java @@ -16,7 +16,7 @@ * along with this program. If not, see */ -package org.comixed.controller; +package org.comixedproject.controller; /** * ComiXedControllerException is throw when an error occurs during the processing of a diff --git a/comixed-rest-api/src/main/java/org/comixedproject/controller/scraping/ComicVineScraperController.java b/comixed-rest-api/src/main/java/org/comixedproject/controller/scraping/ComicVineScraperController.java index 5db281d0f..07e0d64dd 100644 --- a/comixed-rest-api/src/main/java/org/comixedproject/controller/scraping/ComicVineScraperController.java +++ b/comixed-rest-api/src/main/java/org/comixedproject/controller/scraping/ComicVineScraperController.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonView; import java.util.List; import lombok.extern.log4j.Log4j2; -import org.comixedproject.controller.RESTException; +import org.comixedproject.controller.ComiXedControllerException; import org.comixedproject.model.comic.Comic; import org.comixedproject.net.ComicScrapeRequest; import org.comixedproject.net.GetScrapingIssueRequest; diff --git a/comixed-rest-api/src/main/java/org/comixed/controller/tasks/TaskController.java b/comixed-rest-api/src/main/java/org/comixedproject/controller/tasks/TaskController.java similarity index 86% rename from comixed-rest-api/src/main/java/org/comixed/controller/tasks/TaskController.java rename to comixed-rest-api/src/main/java/org/comixedproject/controller/tasks/TaskController.java index 296252773..099a73b16 100644 --- a/comixed-rest-api/src/main/java/org/comixed/controller/tasks/TaskController.java +++ b/comixed-rest-api/src/main/java/org/comixedproject/controller/tasks/TaskController.java @@ -16,18 +16,18 @@ * along with this program. If not, see */ -package org.comixed.controller.tasks; +package org.comixedproject.controller.tasks; import com.fasterxml.jackson.annotation.JsonView; import java.util.Date; import java.util.List; import lombok.extern.log4j.Log4j2; -import org.comixed.controller.ComiXedControllerException; -import org.comixed.model.tasks.TaskAuditLogEntry; -import org.comixed.repositories.tasks.TaskAuditLogRepository; -import org.comixed.service.ComiXedServiceException; -import org.comixed.service.task.TaskService; -import org.comixed.views.View; +import org.comixedproject.controller.ComiXedControllerException; +import org.comixedproject.model.tasks.TaskAuditLogEntry; +import org.comixedproject.repositories.tasks.TaskAuditLogRepository; +import org.comixedproject.service.ComiXedServiceException; +import org.comixedproject.service.task.TaskService; +import org.comixedproject.views.View; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/comixed-rest-api/src/main/java/org/comixedproject/web/authentication/ComiXedWebSecurityConfig.java b/comixed-rest-api/src/main/java/org/comixedproject/web/authentication/ComiXedWebSecurityConfig.java index 7c6059c8c..3968d766a 100644 --- a/comixed-rest-api/src/main/java/org/comixedproject/web/authentication/ComiXedWebSecurityConfig.java +++ b/comixed-rest-api/src/main/java/org/comixedproject/web/authentication/ComiXedWebSecurityConfig.java @@ -35,7 +35,7 @@ @Configuration @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) -@ComponentScan("org.comixed.controller") +@ComponentScan("org.comixedprojectcontroller") @Log4j2 public class ComiXedWebSecurityConfig extends WebSecurityConfigurerAdapter { @Autowired private ComiXedAuthenticationEntryPoint unauthorizedHandler; diff --git a/comixed-rest-api/src/test/java/org/comixedproject/controller/scraping/ComicVineScraperControllerTest.java b/comixed-rest-api/src/test/java/org/comixedproject/controller/scraping/ComicVineScraperControllerTest.java index 4b0f0b6ea..e100151f6 100644 --- a/comixed-rest-api/src/test/java/org/comixedproject/controller/scraping/ComicVineScraperControllerTest.java +++ b/comixed-rest-api/src/test/java/org/comixedproject/controller/scraping/ComicVineScraperControllerTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertSame; import java.util.List; -import org.comixedproject.controller.RESTException; +import org.comixedproject.controller.ComiXedControllerException; import org.comixedproject.model.comic.Comic; import org.comixedproject.net.ComicScrapeRequest; import org.comixedproject.net.GetScrapingIssueRequest; diff --git a/comixed-rest-api/src/test/java/org/comixed/controller/tasks/TaskControllerTest.java b/comixed-rest-api/src/test/java/org/comixedproject/controller/tasks/TaskControllerTest.java similarity index 85% rename from comixed-rest-api/src/test/java/org/comixed/controller/tasks/TaskControllerTest.java rename to comixed-rest-api/src/test/java/org/comixedproject/controller/tasks/TaskControllerTest.java index 9e288f65b..a61f71d24 100644 --- a/comixed-rest-api/src/test/java/org/comixed/controller/tasks/TaskControllerTest.java +++ b/comixed-rest-api/src/test/java/org/comixedproject/controller/tasks/TaskControllerTest.java @@ -16,18 +16,18 @@ * along with this program. If not, see */ -package org.comixed.controller.tasks; +package org.comixedproject.controller.tasks; import static junit.framework.TestCase.assertNotNull; import static junit.framework.TestCase.assertSame; import java.util.Date; import java.util.List; -import org.comixed.controller.ComiXedControllerException; -import org.comixed.model.tasks.TaskAuditLogEntry; -import org.comixed.service.ComiXedServiceException; -import org.comixed.service.task.TaskService; -import org.comixed.service.user.UserService; +import org.comixedproject.controller.ComiXedControllerException; +import org.comixedproject.model.tasks.TaskAuditLogEntry; +import org.comixedproject.service.ComiXedServiceException; +import org.comixedproject.service.task.TaskService; +import org.comixedproject.service.user.UserService; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; diff --git a/comixed-services/src/main/java/org/comixed/service/ComiXedServiceException.java b/comixed-services/src/main/java/org/comixedproject/service/ComiXedServiceException.java similarity index 96% rename from comixed-services/src/main/java/org/comixed/service/ComiXedServiceException.java rename to comixed-services/src/main/java/org/comixedproject/service/ComiXedServiceException.java index fb3e6e3f3..7cc279b15 100644 --- a/comixed-services/src/main/java/org/comixed/service/ComiXedServiceException.java +++ b/comixed-services/src/main/java/org/comixedproject/service/ComiXedServiceException.java @@ -16,7 +16,7 @@ * along with this program. If not, see */ -package org.comixed.service; +package org.comixedproject.service; /** * ComiXedServiceException is thrown when a service-level exception occurs. diff --git a/comixed-services/src/main/java/org/comixedproject/service/task/TaskService.java b/comixed-services/src/main/java/org/comixedproject/service/task/TaskService.java index 2bb45c92a..5e1cf0fa1 100644 --- a/comixed-services/src/main/java/org/comixedproject/service/task/TaskService.java +++ b/comixed-services/src/main/java/org/comixedproject/service/task/TaskService.java @@ -21,8 +21,11 @@ import java.util.Date; import java.util.List; import lombok.extern.log4j.Log4j2; +import org.comixedproject.model.tasks.TaskAuditLogEntry; import org.comixedproject.model.tasks.TaskType; +import org.comixedproject.repositories.tasks.TaskAuditLogRepository; import org.comixedproject.repositories.tasks.TaskRepository; +import org.comixedproject.service.ComiXedServiceException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/comixed-services/src/test/java/org/comixedproject/service/task/TaskServiceTest.java b/comixed-services/src/test/java/org/comixedproject/service/task/TaskServiceTest.java index 2a543f062..36b43ce87 100644 --- a/comixed-services/src/test/java/org/comixedproject/service/task/TaskServiceTest.java +++ b/comixed-services/src/test/java/org/comixedproject/service/task/TaskServiceTest.java @@ -20,8 +20,13 @@ import static junit.framework.TestCase.*; +import java.util.Date; +import java.util.List; +import org.comixedproject.model.tasks.TaskAuditLogEntry; import org.comixedproject.model.tasks.TaskType; +import org.comixedproject.repositories.tasks.TaskAuditLogRepository; import org.comixedproject.repositories.tasks.TaskRepository; +import org.comixedproject.service.ComiXedServiceException; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks;