- * All exceptions related to the application should be subclasses of this one. - */ -public class FormManagerException extends RuntimeException { - - protected FormManagerException() { - } - - public FormManagerException(String message) { - super(message); - } - - public FormManagerException(String message, Throwable cause) { - super(message, cause); - } - - public FormManagerException(Throwable cause) { - super(cause); - } -} diff --git a/src/main/java/cz/cvut/kbss/study/exception/NotFoundException.java b/src/main/java/cz/cvut/kbss/study/exception/NotFoundException.java index a0cff039..4d672946 100644 --- a/src/main/java/cz/cvut/kbss/study/exception/NotFoundException.java +++ b/src/main/java/cz/cvut/kbss/study/exception/NotFoundException.java @@ -1,6 +1,6 @@ package cz.cvut.kbss.study.exception; -public class NotFoundException extends FormManagerException { +public class NotFoundException extends RecordManagerException { public NotFoundException(String message) { super(message); diff --git a/src/main/java/cz/cvut/kbss/study/exception/PersistenceException.java b/src/main/java/cz/cvut/kbss/study/exception/PersistenceException.java index 82b2541e..e3af88af 100644 --- a/src/main/java/cz/cvut/kbss/study/exception/PersistenceException.java +++ b/src/main/java/cz/cvut/kbss/study/exception/PersistenceException.java @@ -3,7 +3,7 @@ /** * General exception marking an error in the persistence layer. */ -public class PersistenceException extends FormManagerException { +public class PersistenceException extends RecordManagerException { public PersistenceException(String message) { super(message); diff --git a/src/main/java/cz/cvut/kbss/study/exception/RecordManagerException.java b/src/main/java/cz/cvut/kbss/study/exception/RecordManagerException.java new file mode 100644 index 00000000..1cdbf085 --- /dev/null +++ b/src/main/java/cz/cvut/kbss/study/exception/RecordManagerException.java @@ -0,0 +1,24 @@ +package cz.cvut.kbss.study.exception; + +/** + * Application-specific exception. + *
+ * All exceptions related to the application should be subclasses of this one. + */ +public class RecordManagerException extends RuntimeException { + + protected RecordManagerException() { + } + + public RecordManagerException(String message) { + super(message); + } + + public RecordManagerException(String message, Throwable cause) { + super(message, cause); + } + + public RecordManagerException(Throwable cause) { + super(cause); + } +} diff --git a/src/main/java/cz/cvut/kbss/study/exception/ValidationException.java b/src/main/java/cz/cvut/kbss/study/exception/ValidationException.java index 8e8e15f7..dbcd41b0 100644 --- a/src/main/java/cz/cvut/kbss/study/exception/ValidationException.java +++ b/src/main/java/cz/cvut/kbss/study/exception/ValidationException.java @@ -3,7 +3,7 @@ /** * High-level exception marking a validated object invalid. */ -public class ValidationException extends FormManagerException { +public class ValidationException extends RecordManagerException { private final String messageId; diff --git a/src/main/java/cz/cvut/kbss/study/exception/WebServiceIntegrationException.java b/src/main/java/cz/cvut/kbss/study/exception/WebServiceIntegrationException.java index 81d37040..e6507086 100644 --- a/src/main/java/cz/cvut/kbss/study/exception/WebServiceIntegrationException.java +++ b/src/main/java/cz/cvut/kbss/study/exception/WebServiceIntegrationException.java @@ -3,7 +3,7 @@ /** * Exception thrown when access to other application's web services fails. */ -public class WebServiceIntegrationException extends FormManagerException { +public class WebServiceIntegrationException extends RecordManagerException { public WebServiceIntegrationException(String message) { super(message); diff --git a/src/main/java/cz/cvut/kbss/study/security/AuthenticationSuccess.java b/src/main/java/cz/cvut/kbss/study/security/AuthenticationSuccess.java index a7d700b2..fc7c6c42 100644 --- a/src/main/java/cz/cvut/kbss/study/security/AuthenticationSuccess.java +++ b/src/main/java/cz/cvut/kbss/study/security/AuthenticationSuccess.java @@ -1,7 +1,7 @@ package cz.cvut.kbss.study.security; import com.fasterxml.jackson.databind.ObjectMapper; -import cz.cvut.kbss.study.exception.FormManagerException; +import cz.cvut.kbss.study.exception.RecordManagerException; import cz.cvut.kbss.study.security.model.LoginStatus; import cz.cvut.kbss.study.service.ConfigReader; import cz.cvut.kbss.study.util.ConfigParam; @@ -99,7 +99,7 @@ private void addSameSiteCookieAttribute(HttpServletResponse response) { SameSiteValue sameSiteValue = SameSiteValue.getValue(configValue) .orElseThrow( - () -> new FormManagerException( + () -> new RecordManagerException( "Could not recognize " + ConfigParam.SECURITY_SAME_SITE + " parameter value '" + configValue + "', as it is not one of the values " + Arrays.toString(SameSiteValue.values()) + "." diff --git a/src/main/java/cz/cvut/kbss/study/util/Utils.java b/src/main/java/cz/cvut/kbss/study/util/Utils.java index f9a41bf3..c549a274 100644 --- a/src/main/java/cz/cvut/kbss/study/util/Utils.java +++ b/src/main/java/cz/cvut/kbss/study/util/Utils.java @@ -1,6 +1,6 @@ package cz.cvut.kbss.study.util; -import cz.cvut.kbss.study.exception.FormManagerException; +import cz.cvut.kbss.study.exception.RecordManagerException; import java.io.*; import java.net.URI; @@ -22,14 +22,14 @@ public static String loadQuery(String queryFileName) { final InputStream is = Utils.class.getClassLoader().getResourceAsStream( Constants.QUERY_DIRECTORY + File.separator + queryFileName); if (is == null) { - throw new FormManagerException( + throw new RecordManagerException( "Initialization exception. Query file not found in " + Constants.QUERY_DIRECTORY + File.separator + queryFileName); } try (final BufferedReader in = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))) { return in.lines().collect(Collectors.joining("\n")); } catch (IOException e) { - throw new FormManagerException("Initialization exception. Unable to load query!", e); + throw new RecordManagerException("Initialization exception. Unable to load query!", e); } }