summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas <>2024-08-12 07:39:30 +0200
committerThomas <>2024-08-12 07:39:30 +0200
commit0c21fc2e528abb358b4eb35ca61dbcda65bd9374 (patch)
treee4fe11685a971d09bb3eb2f8b88efdd9cd3056ea
parentda1f3a2ce05f713a4c2e5cea0efd2f1de31392ea (diff)
downloadEAAF-Components-0c21fc2e528abb358b4eb35ca61dbcda65bd9374.tar.gz
EAAF-Components-0c21fc2e528abb358b4eb35ca61dbcda65bd9374.tar.bz2
EAAF-Components-0c21fc2e528abb358b4eb35ca61dbcda65bd9374.zip
style(core): re-order methods in some classes
-rw-r--r--eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java125
1 files changed, 62 insertions, 63 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java
index 7ed23619..9b8900da 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java
@@ -327,51 +327,6 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer
}
- private void logExceptionToTechnicalLog(IHandleData errorData) {
- if (errorData.isWriteThrowable()) {
- if (!(errorData.getThrowable() instanceof EaafException)
- || LogLevel.ERROR.equals(errorData.getLogLevel())) {
- log.error(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
-
- } else if (LogLevel.WARN.equals(errorData.getLogLevel())) {
- log.warn(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
-
- } else if (LogLevel.INFO.equals(errorData.getLogLevel())) {
- log.info(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
-
- } else if (LogLevel.DEBUG.equals(errorData.getLogLevel())) {
- log.debug(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
-
- } else {
- log.warn("Get unsupported LogLevelType: {}. Use {} as default",
- errorData.getLogLevel(), LogLevel.ERROR);
- log.error(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
-
- }
-
- } else {
- if (!(errorData.getThrowable() instanceof EaafException)
- || LogLevel.ERROR.equals(errorData.getLogLevel())) {
- log.error(errorData.getPreFormatedErrorMessage());
-
- } else if (LogLevel.WARN.equals(errorData.getLogLevel())) {
- log.warn(errorData.getPreFormatedErrorMessage());
-
- } else if (LogLevel.INFO.equals(errorData.getLogLevel())) {
- log.info(errorData.getPreFormatedErrorMessage());
-
- } else if (LogLevel.DEBUG.equals(errorData.getLogLevel())) {
- log.debug(errorData.getPreFormatedErrorMessage());
-
- } else {
- log.warn("Get unsupported LogLevelType: {}. Use {} as default",
- errorData.getLogLevel(), LogLevel.ERROR);
- log.error(errorData.getPreFormatedErrorMessage());
-
- }
- }
- }
-
@Override
public void forwardToErrorHandler(Pair<IRequest, Throwable> errorToHandle, String errorKey,
final HttpServletRequest req, final HttpServletResponse resp) throws GuiBuildException {
@@ -461,6 +416,26 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer
}
+ /**
+ * Extension point to customize error-response generation.
+ *
+ * @param httpReq Current HTTP request
+ * @param httpResp Current HTTP response
+ * @param msg Error message from exception
+ * @param errorCode internal error-code
+ * @param params Parameters for internal error-code
+ * @param externalErrorCode external error-code
+ * @param errorData full error-data object from central error-handling
+ * @throws EaafException In case of response-generation error
+ */
+ protected void writeErrorResponse(@NonNull final HttpServletRequest httpReq,
+ @NonNull final HttpServletResponse httpResp, @NonNull final String msg, @NonNull final String errorCode,
+ @Nullable final Object[] params, String externalErrorCode, IErrorService.IHandleData errorData)
+ throws EaafException {
+ writeHtmlErrorResponse(httpReq, httpResp, msg, errorCode, params, externalErrorCode, errorData);
+
+ }
+
@PostConstruct
private void initializer() {
log.trace("Initializing {} ...", ProtocolAuthenticationService.class.getName());
@@ -501,27 +476,51 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer
"Requested Auth. protocol processing Class is NULL or does not implement the IAction interface.",
e);
}
-
}
- /**
- * Extension point to customize error-response generation.
- *
- * @param httpReq Current HTTP request
- * @param httpResp Current HTTP response
- * @param msg Error message from exception
- * @param errorCode internal error-code
- * @param params Parameters for internal error-code
- * @param externalErrorCode external error-code
- * @param errorData full error-data object from central error-handling
- * @throws EaafException In case of response-generation error
- */
- protected void writeErrorResponse(@NonNull final HttpServletRequest httpReq,
- @NonNull final HttpServletResponse httpResp, @NonNull final String msg, @NonNull final String errorCode,
- @Nullable final Object[] params, String externalErrorCode, IErrorService.IHandleData errorData)
- throws EaafException {
- writeHtmlErrorResponse(httpReq, httpResp, msg, errorCode, params, externalErrorCode, errorData);
+ private void logExceptionToTechnicalLog(IHandleData errorData) {
+ if (errorData.isWriteThrowable()) {
+ if (!(errorData.getThrowable() instanceof EaafException)
+ || LogLevel.ERROR.equals(errorData.getLogLevel())) {
+ log.error(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
+
+ } else if (LogLevel.WARN.equals(errorData.getLogLevel())) {
+ log.warn(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
+
+ } else if (LogLevel.INFO.equals(errorData.getLogLevel())) {
+ log.info(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
+ } else if (LogLevel.DEBUG.equals(errorData.getLogLevel())) {
+ log.debug(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
+
+ } else {
+ log.warn("Get unsupported LogLevelType: {}. Use {} as default",
+ errorData.getLogLevel(), LogLevel.ERROR);
+ log.error(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
+
+ }
+
+ } else {
+ if (!(errorData.getThrowable() instanceof EaafException)
+ || LogLevel.ERROR.equals(errorData.getLogLevel())) {
+ log.error(errorData.getPreFormatedErrorMessage());
+
+ } else if (LogLevel.WARN.equals(errorData.getLogLevel())) {
+ log.warn(errorData.getPreFormatedErrorMessage());
+
+ } else if (LogLevel.INFO.equals(errorData.getLogLevel())) {
+ log.info(errorData.getPreFormatedErrorMessage());
+
+ } else if (LogLevel.DEBUG.equals(errorData.getLogLevel())) {
+ log.debug(errorData.getPreFormatedErrorMessage());
+
+ } else {
+ log.warn("Get unsupported LogLevelType: {}. Use {} as default",
+ errorData.getLogLevel(), LogLevel.ERROR);
+ log.error(errorData.getPreFormatedErrorMessage());
+
+ }
+ }
}
// private void writeHtmlErrorResponse(@NonNull final HttpServletRequest