From cc955991f56b647c0ecd5f338dd3d7b857cd8787 Mon Sep 17 00:00:00 2001
From: Lars Johansson <lars.johansson@ess.eu>
Date: Tue, 30 Aug 2022 10:27:04 +0200
Subject: [PATCH] Refactor exception handling
---
.../exception/DataConflictException.java | 2 +-
.../exception/DataDeletedException.java | 2 +-
.../exception/DataExistException.java | 2 +-
.../exception/DataNotAvailableException.java | 2 +-
.../exception/DataNotCorrectException.java | 2 +-
.../exception/DataNotFoundException.java | 2 +-
.../exception/DataNotValidException.java | 2 +-
.../exception/InputNotAvailableException.java | 2 +-
.../exception/InputNotCorrectException.java | 2 +-
.../exception/InputNotEmptyException.java | 2 +-
.../exception/InputNotValidException.java | 2 +-
.../exception/ServiceException.java | 2 +-
.../GlobalControllerExceptionHandler.java | 26 +++++++++----------
.../rest/controller/NamesController.java | 2 +-
.../rest/controller/StructuresController.java | 2 +-
.../openepics/names/service/LogService.java | 2 +-
.../org/openepics/names/util/ExcelUtil.java | 2 +-
.../openepics/names/util/ExceptionUtil.java | 22 ++++++++--------
.../util/ValidateStructureElementUtil.java | 2 +-
.../names/util/ExceptionUtilTest.java | 20 +++++++-------
.../names/util/ValidateUtilTest.java | 2 +-
21 files changed, 52 insertions(+), 52 deletions(-)
rename src/main/java/org/openepics/names/{service => }/exception/DataConflictException.java (96%)
rename src/main/java/org/openepics/names/{service => }/exception/DataDeletedException.java (96%)
rename src/main/java/org/openepics/names/{service => }/exception/DataExistException.java (96%)
rename src/main/java/org/openepics/names/{service => }/exception/DataNotAvailableException.java (96%)
rename src/main/java/org/openepics/names/{service => }/exception/DataNotCorrectException.java (96%)
rename src/main/java/org/openepics/names/{service => }/exception/DataNotFoundException.java (96%)
rename src/main/java/org/openepics/names/{service => }/exception/DataNotValidException.java (96%)
rename src/main/java/org/openepics/names/{service => }/exception/InputNotAvailableException.java (96%)
rename src/main/java/org/openepics/names/{service => }/exception/InputNotCorrectException.java (96%)
rename src/main/java/org/openepics/names/{service => }/exception/InputNotEmptyException.java (96%)
rename src/main/java/org/openepics/names/{service => }/exception/InputNotValidException.java (96%)
rename src/main/java/org/openepics/names/{service => }/exception/ServiceException.java (97%)
rename src/main/java/org/openepics/names/{rest/controller => exception/handler}/GlobalControllerExceptionHandler.java (80%)
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 85ea1ec7..e275ec6f 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 f3f04ef4..3b5acaea 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 6a33e4dd..e08cf237 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 0ef14183..2e5b10a7 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 43e9fda6..dc5c5610 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 966a8abc..e3bf485d 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 6a2f78fd..90f2a7d9 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 6ae21c1b..36746bd3 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 e61e92e9..e18a4835 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 f27e96a8..4504d3df 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 aeb7b592..8e81c370 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 60f3ff25..a0bf606c 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 47282d15..3ad405ef 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 b6b997d0..814922d9 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 7712f0f4..68d51237 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 6448ad97..ebcc9c43 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 7bda187c..1215d107 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 4f4122e6..baa184d3 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 37bbd99b..059d405c 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 95ff730f..623776f3 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 c0922795..ca1d6d6d 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.
--
GitLab