lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Set old sql translator as a fallback in eclipseLink (#2387)

Browse Source 
* Set old sql translator as a fallback in eclipseLink

Signed-off-by: strailov <Stanislav.Trailov@bosch.io>

* small refactor

Signed-off-by: strailov <Stanislav.Trailov@bosch.io>

* fix minor code smell

Signed-off-by: strailov <Stanislav.Trailov@bosch.io>

---------

Signed-off-by: strailov <Stanislav.Trailov@bosch.io>
This commit is contained in:
Stanislav Trailov
2025-05-02 12:18:00 +03:00
committed by GitHub
parent 546088e88e
commit 5e72ea4522
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hawkbit-repository/hawkbit-repository-jpa-eclipselink/src/main/java/org/eclipse/hawkbit/repository/jpa/HawkbitEclipseLinkJpaDialect.java
View File

@@ -69,6 +69,8 @@ class HawkbitEclipseLinkJpaDialect extends EclipseLinkJpaDialect {
codes.setDataIntegrityViolationCodes(DATA_INTEGRITY_VIOLATION_CODES);
SQL_EXCEPTION_TRANSLATOR.setSqlErrorCodes(codes);
// explicitly set old translator as a fallback (uses Subclass translator by default)
SQL_EXCEPTION_TRANSLATOR.setFallbackTranslator(new SQLStateSQLExceptionTranslator());
}
@Override

7
hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/RestConfiguration.java
View File

@@ -96,6 +96,7 @@ public class RestConfiguration {
private static final HttpStatus DEFAULT_RESPONSE_STATUS = HttpStatus.INTERNAL_SERVER_ERROR;
private static final String MESSAGE_FORMATTER_SEPARATOR = " ";
private static final String LOG_EXCEPTION_FORMAT = "Handling exception {} of request {}";
static {
ERROR_TO_HTTP_STATUS.put(SpServerError.SP_REPO_ENTITY_NOT_EXISTS, HttpStatus.NOT_FOUND);
@@ -278,7 +279,7 @@ public class RestConfiguration {
if (log.isDebugEnabled()) {
logRequest(request, ex);
} else {
log.error("Handling exception {} of request {}", ex.getClass().getName(), request.getRequestURL());
log.error(LOG_EXCEPTION_FORMAT, ex.getClass().getName(), request.getRequestURL());
}
final ExceptionInfo response = new ExceptionInfo();
@@ -298,9 +299,9 @@ public class RestConfiguration {
// -> logging.level.org.eclipse.hawkbit.rest.RestConfiguration=TRACE
private void logRequest(final HttpServletRequest request, final Exception ex) {
if (log.isTraceEnabled()) {
log.trace("Handling exception {} of request {}", ex.getClass().getName(), request.getRequestURL(), ex);
log.trace(LOG_EXCEPTION_FORMAT, ex.getClass().getName(), request.getRequestURL(), ex);
} else {
log.debug("Handling exception {} of request {}", ex.getClass().getName(), request.getRequestURL());
log.debug(LOG_EXCEPTION_FORMAT, ex.getClass().getName(), request.getRequestURL());
}
}