Fixed rebasing issues after repackaging on other branch [#413]

comixed · Jul 22, 2020 · 6df2d78 · 6df2d78
1 parent ce4184a
commit 6df2d78
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 19 deletions.
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
@@ -26,7 +26,7 @@
 import javax.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
-import org.comixed.views.View;
+import org.comixedproject.views.View;
 
 /**
  * <code>TaskAuditLogEntry</code> represents a single entry in the task audit log table.

diff --git a/...ontroller/ComiXedControllerException.java → ...ontroller/ComiXedControllerException.java b/...ontroller/ComiXedControllerException.java → ...ontroller/ComiXedControllerException.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixed.controller;
+package org.comixedproject.controller;
 
 /**
  * <code>ComiXedControllerException</code> is throw when an error occurs during the processing of a

diff --git a/...-api/src/main/java/org/comixedproject/controller/scraping/ComicVineScraperController.java b/...-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/...ixed/controller/tasks/TaskController.java → ...ject/controller/tasks/TaskController.java b/...ixed/controller/tasks/TaskController.java → ...ject/controller/tasks/TaskController.java
@@ -16,18 +16,18 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-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/...est-api/src/main/java/org/comixedproject/web/authentication/ComiXedWebSecurityConfig.java b/...est-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/.../src/test/java/org/comixedproject/controller/scraping/ComicVineScraperControllerTest.java b/.../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/.../controller/tasks/TaskControllerTest.java → .../controller/tasks/TaskControllerTest.java b/.../controller/tasks/TaskControllerTest.java → .../controller/tasks/TaskControllerTest.java
@@ -16,18 +16,18 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-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/...ixed/service/ComiXedServiceException.java → ...ject/service/ComiXedServiceException.java b/...ixed/service/ComiXedServiceException.java → ...ject/service/ComiXedServiceException.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses>
  */
 
-package org.comixed.service;
+package org.comixedproject.service;
 
 /**
  * <code>ComiXedServiceException</code> 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
@@ -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
@@ -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;