diff --git a/src/main/java/org/openepics/names/service/exception/DataConflictException.java b/src/main/java/org/openepics/names/exception/DataConflictException.java similarity index 96% rename from src/main/java/org/openepics/names/service/exception/DataConflictException.java rename to src/main/java/org/openepics/names/exception/DataConflictException.java index 85ea1ec7a623df7e41e3b19627dc29261e4cd825..e275ec6fe771db5ed5883cd4465320a81b2104d9 100644 --- a/src/main/java/org/openepics/names/service/exception/DataConflictException.java +++ b/src/main/java/org/openepics/names/exception/DataConflictException.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -package org.openepics.names.service.exception; +package org.openepics.names.exception; /** * Exception class to assist in handling of service layer exceptions. diff --git a/src/main/java/org/openepics/names/service/exception/DataDeletedException.java b/src/main/java/org/openepics/names/exception/DataDeletedException.java similarity index 96% rename from src/main/java/org/openepics/names/service/exception/DataDeletedException.java rename to src/main/java/org/openepics/names/exception/DataDeletedException.java index f3f04ef4a69529397292e4f1b0707c68e45d0776..3b5acaea72dac9cf619464661bf78a920954a948 100644 --- a/src/main/java/org/openepics/names/service/exception/DataDeletedException.java +++ b/src/main/java/org/openepics/names/exception/DataDeletedException.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -package org.openepics.names.service.exception; +package org.openepics.names.exception; /** * Exception class to assist in handling of service layer exceptions. diff --git a/src/main/java/org/openepics/names/service/exception/DataExistException.java b/src/main/java/org/openepics/names/exception/DataExistException.java similarity index 96% rename from src/main/java/org/openepics/names/service/exception/DataExistException.java rename to src/main/java/org/openepics/names/exception/DataExistException.java index 6a33e4ddb6a6adb1340504372a75476104255057..e08cf237652a249e8073185c57b23f254934fd8d 100644 --- a/src/main/java/org/openepics/names/service/exception/DataExistException.java +++ b/src/main/java/org/openepics/names/exception/DataExistException.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -package org.openepics.names.service.exception; +package org.openepics.names.exception; /** * Exception class to assist in handling of service layer exceptions. diff --git a/src/main/java/org/openepics/names/service/exception/DataNotAvailableException.java b/src/main/java/org/openepics/names/exception/DataNotAvailableException.java similarity index 96% rename from src/main/java/org/openepics/names/service/exception/DataNotAvailableException.java rename to src/main/java/org/openepics/names/exception/DataNotAvailableException.java index 0ef14183dceb7e2ab3de4fe2b5c4636a5c9c3d91..2e5b10a707afe454217f3a7b195f3dbd413021c3 100644 --- a/src/main/java/org/openepics/names/service/exception/DataNotAvailableException.java +++ b/src/main/java/org/openepics/names/exception/DataNotAvailableException.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -package org.openepics.names.service.exception; +package org.openepics.names.exception; /** * Exception class to assist in handling of service layer exceptions. diff --git a/src/main/java/org/openepics/names/service/exception/DataNotCorrectException.java b/src/main/java/org/openepics/names/exception/DataNotCorrectException.java similarity index 96% rename from src/main/java/org/openepics/names/service/exception/DataNotCorrectException.java rename to src/main/java/org/openepics/names/exception/DataNotCorrectException.java index 43e9fda644c9eccd80a15a3382b13511da7c0363..dc5c5610ff7de5ffc4838a59e1df4605732c643b 100644 --- a/src/main/java/org/openepics/names/service/exception/DataNotCorrectException.java +++ b/src/main/java/org/openepics/names/exception/DataNotCorrectException.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -package org.openepics.names.service.exception; +package org.openepics.names.exception; /** * Exception class to assist in handling of service layer exceptions. diff --git a/src/main/java/org/openepics/names/service/exception/DataNotFoundException.java b/src/main/java/org/openepics/names/exception/DataNotFoundException.java similarity index 96% rename from src/main/java/org/openepics/names/service/exception/DataNotFoundException.java rename to src/main/java/org/openepics/names/exception/DataNotFoundException.java index 966a8abce4baaedf3d48b571a10a4b057801d5a4..e3bf485da01e42e2dea905510b1e7bc4137e3ac2 100644 --- a/src/main/java/org/openepics/names/service/exception/DataNotFoundException.java +++ b/src/main/java/org/openepics/names/exception/DataNotFoundException.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -package org.openepics.names.service.exception; +package org.openepics.names.exception; /** * Exception class to assist in handling of service layer exceptions. diff --git a/src/main/java/org/openepics/names/service/exception/DataNotValidException.java b/src/main/java/org/openepics/names/exception/DataNotValidException.java similarity index 96% rename from src/main/java/org/openepics/names/service/exception/DataNotValidException.java rename to src/main/java/org/openepics/names/exception/DataNotValidException.java index 6a2f78fdf0784896b1ccbc259373746913615eed..90f2a7d91ef9db9e8427aa5bb9131601ec802546 100644 --- a/src/main/java/org/openepics/names/service/exception/DataNotValidException.java +++ b/src/main/java/org/openepics/names/exception/DataNotValidException.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -package org.openepics.names.service.exception; +package org.openepics.names.exception; /** * Exception class to assist in handling of service layer exceptions. diff --git a/src/main/java/org/openepics/names/service/exception/InputNotAvailableException.java b/src/main/java/org/openepics/names/exception/InputNotAvailableException.java similarity index 96% rename from src/main/java/org/openepics/names/service/exception/InputNotAvailableException.java rename to src/main/java/org/openepics/names/exception/InputNotAvailableException.java index 6ae21c1bf6149831b99adb4bf469f7b2db62965a..36746bd30e176a1dc0e326307e2f9e8a3d933b10 100644 --- a/src/main/java/org/openepics/names/service/exception/InputNotAvailableException.java +++ b/src/main/java/org/openepics/names/exception/InputNotAvailableException.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -package org.openepics.names.service.exception; +package org.openepics.names.exception; /** * Exception class to assist in handling of service layer exceptions. diff --git a/src/main/java/org/openepics/names/service/exception/InputNotCorrectException.java b/src/main/java/org/openepics/names/exception/InputNotCorrectException.java similarity index 96% rename from src/main/java/org/openepics/names/service/exception/InputNotCorrectException.java rename to src/main/java/org/openepics/names/exception/InputNotCorrectException.java index e61e92e989eb23301a6abef281c5f2d7817b90b9..e18a4835979978d7f09dced8a12f7856ff219a7c 100644 --- a/src/main/java/org/openepics/names/service/exception/InputNotCorrectException.java +++ b/src/main/java/org/openepics/names/exception/InputNotCorrectException.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -package org.openepics.names.service.exception; +package org.openepics.names.exception; /** * Exception class to assist in handling of service layer exceptions. diff --git a/src/main/java/org/openepics/names/service/exception/InputNotEmptyException.java b/src/main/java/org/openepics/names/exception/InputNotEmptyException.java similarity index 96% rename from src/main/java/org/openepics/names/service/exception/InputNotEmptyException.java rename to src/main/java/org/openepics/names/exception/InputNotEmptyException.java index f27e96a835209fd2290f93eba56ca4c885550c64..4504d3df59aa39d3c3fd4f8dac6a8d9b38d8de55 100644 --- a/src/main/java/org/openepics/names/service/exception/InputNotEmptyException.java +++ b/src/main/java/org/openepics/names/exception/InputNotEmptyException.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -package org.openepics.names.service.exception; +package org.openepics.names.exception; /** * Exception class to assist in handling of service layer exceptions. diff --git a/src/main/java/org/openepics/names/service/exception/InputNotValidException.java b/src/main/java/org/openepics/names/exception/InputNotValidException.java similarity index 96% rename from src/main/java/org/openepics/names/service/exception/InputNotValidException.java rename to src/main/java/org/openepics/names/exception/InputNotValidException.java index aeb7b592d471b998a3c7c20cfee7441241da869c..8e81c370d7b7d280dd18e70f9ffd5b3bdab98ed4 100644 --- a/src/main/java/org/openepics/names/service/exception/InputNotValidException.java +++ b/src/main/java/org/openepics/names/exception/InputNotValidException.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -package org.openepics.names.service.exception; +package org.openepics.names.exception; /** * Exception class to assist in handling of service layer exceptions. diff --git a/src/main/java/org/openepics/names/service/exception/ServiceException.java b/src/main/java/org/openepics/names/exception/ServiceException.java similarity index 97% rename from src/main/java/org/openepics/names/service/exception/ServiceException.java rename to src/main/java/org/openepics/names/exception/ServiceException.java index 60f3ff25c22e6e82b5468657dfdf9a4683d8f723..a0bf606cf81acbb1ce5b6985ec983ec8877049cf 100644 --- a/src/main/java/org/openepics/names/service/exception/ServiceException.java +++ b/src/main/java/org/openepics/names/exception/ServiceException.java @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -package org.openepics.names.service.exception; +package org.openepics.names.exception; /** * Exception class to assist in handling of service layer exceptions. diff --git a/src/main/java/org/openepics/names/rest/controller/GlobalControllerExceptionHandler.java b/src/main/java/org/openepics/names/exception/handler/GlobalControllerExceptionHandler.java similarity index 80% rename from src/main/java/org/openepics/names/rest/controller/GlobalControllerExceptionHandler.java rename to src/main/java/org/openepics/names/exception/handler/GlobalControllerExceptionHandler.java index 47282d1502714950378e3f73dafb21b1352c358e..3ad405efa8367e7cfe75d428717ad5712d3e9c2e 100644 --- a/src/main/java/org/openepics/names/rest/controller/GlobalControllerExceptionHandler.java +++ b/src/main/java/org/openepics/names/exception/handler/GlobalControllerExceptionHandler.java @@ -16,22 +16,22 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -package org.openepics.names.rest.controller; +package org.openepics.names.exception.handler; import org.apache.commons.lang3.StringUtils; +import org.openepics.names.exception.DataConflictException; +import org.openepics.names.exception.DataDeletedException; +import org.openepics.names.exception.DataExistException; +import org.openepics.names.exception.DataNotAvailableException; +import org.openepics.names.exception.DataNotCorrectException; +import org.openepics.names.exception.DataNotFoundException; +import org.openepics.names.exception.DataNotValidException; +import org.openepics.names.exception.InputNotAvailableException; +import org.openepics.names.exception.InputNotCorrectException; +import org.openepics.names.exception.InputNotEmptyException; +import org.openepics.names.exception.InputNotValidException; +import org.openepics.names.exception.ServiceException; import org.openepics.names.rest.beans.response.Response; -import org.openepics.names.service.exception.DataConflictException; -import org.openepics.names.service.exception.DataDeletedException; -import org.openepics.names.service.exception.DataExistException; -import org.openepics.names.service.exception.DataNotAvailableException; -import org.openepics.names.service.exception.DataNotCorrectException; -import org.openepics.names.service.exception.DataNotFoundException; -import org.openepics.names.service.exception.DataNotValidException; -import org.openepics.names.service.exception.InputNotAvailableException; -import org.openepics.names.service.exception.InputNotCorrectException; -import org.openepics.names.service.exception.InputNotEmptyException; -import org.openepics.names.service.exception.InputNotValidException; -import org.openepics.names.service.exception.ServiceException; import org.openepics.names.util.TextUtil; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/org/openepics/names/rest/controller/NamesController.java b/src/main/java/org/openepics/names/rest/controller/NamesController.java index b6b997d05d3860535cb42def6300f2bc5aabd36d..814922d994ec39301ca1ffc8e8f3f14a422de97f 100644 --- a/src/main/java/org/openepics/names/rest/controller/NamesController.java +++ b/src/main/java/org/openepics/names/rest/controller/NamesController.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import org.openepics.names.exception.ServiceException; import org.openepics.names.rest.api.v1.INames; import org.openepics.names.rest.beans.FieldName; import org.openepics.names.rest.beans.element.NameElement; @@ -33,7 +34,6 @@ import org.openepics.names.rest.beans.response.ResponseBooleanList; import org.openepics.names.rest.beans.response.ResponsePageNameElements; import org.openepics.names.service.LogService; import org.openepics.names.service.NamesService; -import org.openepics.names.service.exception.ServiceException; import org.openepics.names.util.ExcelUtil; import org.openepics.names.util.TextUtil; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/openepics/names/rest/controller/StructuresController.java b/src/main/java/org/openepics/names/rest/controller/StructuresController.java index 7712f0f4702f3fa9fb163dcbdd639dd470f651be..68d51237164ecc9e9a7c9cc4cd643ab93122b215 100644 --- a/src/main/java/org/openepics/names/rest/controller/StructuresController.java +++ b/src/main/java/org/openepics/names/rest/controller/StructuresController.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import org.openepics.names.exception.ServiceException; import org.openepics.names.rest.api.v1.IStructures; import org.openepics.names.rest.beans.FieldStructure; import org.openepics.names.rest.beans.Status; @@ -35,7 +36,6 @@ import org.openepics.names.rest.beans.response.ResponseBooleanList; import org.openepics.names.rest.beans.response.ResponsePageStructureElements; import org.openepics.names.service.LogService; import org.openepics.names.service.StructuresService; -import org.openepics.names.service.exception.ServiceException; import org.openepics.names.util.ExcelUtil; import org.openepics.names.util.TextUtil; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/org/openepics/names/service/LogService.java b/src/main/java/org/openepics/names/service/LogService.java index 6448ad97bebec057a11617cc03d7770bd9f6d4f1..ebcc9c43397a048b6876a4494f749b0e6d625ff6 100644 --- a/src/main/java/org/openepics/names/service/LogService.java +++ b/src/main/java/org/openepics/names/service/LogService.java @@ -22,7 +22,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.apache.commons.lang3.StringUtils; -import org.openepics.names.service.exception.ServiceException; +import org.openepics.names.exception.ServiceException; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/src/main/java/org/openepics/names/util/ExcelUtil.java b/src/main/java/org/openepics/names/util/ExcelUtil.java index 7bda187c01c68a615f0c2b7027d970368f65c18f..1215d107ae86d86a2106b62d9bade2f7af5d4d17 100644 --- a/src/main/java/org/openepics/names/util/ExcelUtil.java +++ b/src/main/java/org/openepics/names/util/ExcelUtil.java @@ -44,6 +44,7 @@ import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.openepics.names.exception.ServiceException; import org.openepics.names.rest.beans.Type; import org.openepics.names.rest.beans.element.NameElement; import org.openepics.names.rest.beans.element.NameElementCommand; @@ -51,7 +52,6 @@ import org.openepics.names.rest.beans.element.StructureElement; import org.openepics.names.rest.beans.element.StructureElementCommand; import org.openepics.names.rest.beans.response.ResponsePageNameElements; import org.openepics.names.rest.beans.response.ResponsePageStructureElements; -import org.openepics.names.service.exception.ServiceException; import org.springframework.web.multipart.MultipartFile; import com.google.common.collect.Lists; diff --git a/src/main/java/org/openepics/names/util/ExceptionUtil.java b/src/main/java/org/openepics/names/util/ExceptionUtil.java index 4f4122e6cb9e4c0910e201e7ac27b136e7ec3dcf..baa184d37827ff4d8c5b8d62151eeca83ebb22cf 100644 --- a/src/main/java/org/openepics/names/util/ExceptionUtil.java +++ b/src/main/java/org/openepics/names/util/ExceptionUtil.java @@ -18,17 +18,17 @@ package org.openepics.names.util; -import org.openepics.names.service.exception.DataConflictException; -import org.openepics.names.service.exception.DataDeletedException; -import org.openepics.names.service.exception.DataExistException; -import org.openepics.names.service.exception.DataNotAvailableException; -import org.openepics.names.service.exception.DataNotCorrectException; -import org.openepics.names.service.exception.DataNotFoundException; -import org.openepics.names.service.exception.DataNotValidException; -import org.openepics.names.service.exception.InputNotAvailableException; -import org.openepics.names.service.exception.InputNotCorrectException; -import org.openepics.names.service.exception.InputNotEmptyException; -import org.openepics.names.service.exception.InputNotValidException; +import org.openepics.names.exception.DataConflictException; +import org.openepics.names.exception.DataDeletedException; +import org.openepics.names.exception.DataExistException; +import org.openepics.names.exception.DataNotAvailableException; +import org.openepics.names.exception.DataNotCorrectException; +import org.openepics.names.exception.DataNotFoundException; +import org.openepics.names.exception.DataNotValidException; +import org.openepics.names.exception.InputNotAvailableException; +import org.openepics.names.exception.InputNotCorrectException; +import org.openepics.names.exception.InputNotEmptyException; +import org.openepics.names.exception.InputNotValidException; /** * Utility class to assist in handling of exceptions. diff --git a/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java b/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java index 37bbd99b356ea2236f2aa76e30134b0199c1e49f..059d405c952557a2546c04a558aece08c41b9369 100644 --- a/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java +++ b/src/main/java/org/openepics/names/util/ValidateStructureElementUtil.java @@ -21,6 +21,7 @@ import java.util.List; import java.util.UUID; import org.apache.commons.lang3.StringUtils; +import org.openepics.names.exception.DataConflictException; import org.openepics.names.repository.model.Discipline; import org.openepics.names.repository.model.System; import org.openepics.names.repository.model.SystemGroup; @@ -28,7 +29,6 @@ import org.openepics.names.rest.beans.FieldStructure; import org.openepics.names.rest.beans.Status; import org.openepics.names.rest.beans.Type; import org.openepics.names.rest.beans.element.StructureElementCommand; -import org.openepics.names.service.exception.DataConflictException; import com.google.common.collect.Lists; diff --git a/src/test/java/org/openepics/names/util/ExceptionUtilTest.java b/src/test/java/org/openepics/names/util/ExceptionUtilTest.java index 95ff730f03f6d72980412fbbbc00891173f17572..623776f363ffe3f4b0d7ef740e676a4720ef77d8 100644 --- a/src/test/java/org/openepics/names/util/ExceptionUtilTest.java +++ b/src/test/java/org/openepics/names/util/ExceptionUtilTest.java @@ -23,16 +23,16 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import org.junit.jupiter.api.Test; -import org.openepics.names.service.exception.DataConflictException; -import org.openepics.names.service.exception.DataDeletedException; -import org.openepics.names.service.exception.DataExistException; -import org.openepics.names.service.exception.DataNotAvailableException; -import org.openepics.names.service.exception.DataNotCorrectException; -import org.openepics.names.service.exception.DataNotFoundException; -import org.openepics.names.service.exception.DataNotValidException; -import org.openepics.names.service.exception.InputNotAvailableException; -import org.openepics.names.service.exception.InputNotCorrectException; -import org.openepics.names.service.exception.InputNotValidException; +import org.openepics.names.exception.DataConflictException; +import org.openepics.names.exception.DataDeletedException; +import org.openepics.names.exception.DataExistException; +import org.openepics.names.exception.DataNotAvailableException; +import org.openepics.names.exception.DataNotCorrectException; +import org.openepics.names.exception.DataNotFoundException; +import org.openepics.names.exception.DataNotValidException; +import org.openepics.names.exception.InputNotAvailableException; +import org.openepics.names.exception.InputNotCorrectException; +import org.openepics.names.exception.InputNotValidException; /** * Unit tests for ExceptionUtil class. diff --git a/src/test/java/org/openepics/names/util/ValidateUtilTest.java b/src/test/java/org/openepics/names/util/ValidateUtilTest.java index c09227955056f1656ebecac84fa361a2ca7ed1bd..ca1d6d6db7e6cf002f70d1a10deb1da1500258c4 100644 --- a/src/test/java/org/openepics/names/util/ValidateUtilTest.java +++ b/src/test/java/org/openepics/names/util/ValidateUtilTest.java @@ -24,8 +24,8 @@ import static org.junit.jupiter.api.Assertions.fail; import java.util.UUID; import org.junit.jupiter.api.Test; +import org.openepics.names.exception.InputNotAvailableException; import org.openepics.names.rest.beans.Type; -import org.openepics.names.service.exception.InputNotAvailableException; /** * Unit tests for ValidateUtil class.