diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/checks/DowngradeSEBSettingsCheck.java b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/checks/DowngradeSEBSettingsCheck.java index 06a84392..b8cbe533 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/checks/DowngradeSEBSettingsCheck.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/checks/DowngradeSEBSettingsCheck.java @@ -139,7 +139,7 @@ public class DowngradeSEBSettingsCheck implements DBIntegrityCheck { "DELETE FROM "+ schemaName +".flyway_schema_history WHERE version > " + lastMigrationVersion); prepareStatement.execute(); - INIT_LOGGER.info(" ---> Deleted {} entries from table flyway_schema_history", deletedOrientation); + INIT_LOGGER.info(" ---> Deleted entries from table flyway_schema_history until version: {}", lastMigrationVersion); return "Successfully deleted SEB Settings attributes: " + allNames; } catch (final Exception e) { diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/DAOLoggingSupport.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/DAOLoggingSupport.java index a755da9f..c89c421a 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/DAOLoggingSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/DAOLoggingSupport.java @@ -31,4 +31,9 @@ public final class DAOLoggingSupport { result.onError(error -> log.error("Unexpected error. Object processing is skipped: ", error))); } + public static Stream logMinAndSkipOnError(final Result result) { + return Result.skipOnError( + result.onError(error -> log.error("Unexpected error. Object processing is skipped: {}", error.getMessage()))); + } + } diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationAttributeDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationAttributeDAOImpl.java index b453def9..d4b476ea 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationAttributeDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationAttributeDAOImpl.java @@ -120,7 +120,7 @@ public class ConfigurationAttributeDAOImpl implements ConfigurationAttributeDAO .execute() .stream() .map(ConfigurationAttributeDAOImpl::toDomainModel) - .flatMap(DAOLoggingSupport::logAndSkipOnError) + .flatMap(DAOLoggingSupport::logMinAndSkipOnError) .filter(predicate) .collect(Collectors.toList())); } @@ -153,7 +153,7 @@ public class ConfigurationAttributeDAOImpl implements ConfigurationAttributeDAO .execute() .stream() .map(ConfigurationAttributeDAOImpl::toDomainModel) - .flatMap(DAOLoggingSupport::logAndSkipOnError) + .flatMap(DAOLoggingSupport::logMinAndSkipOnError) .collect(Collectors.toList())); } diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 3873d6c2..f72ee382 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -1355,6 +1355,7 @@ sebserver.examconfig.props.label.allowPDFPlugIn.tooltip=The Adobe Acrobat Reader sebserver.examconfig.props.label.downloadAndOpenSebConfig=Download and open SEB Config Files sebserver.examconfig.props.label.downloadAndOpenSebConfig.tooltip=Download and open .seb config files regardless if downloading and opening other file types is allowed sebserver.examconfig.props.label.allowCustomDownloadLocation=Allow user to select custom download / upload directory +sebserver.examconfig.props.label.allowCustomDownUploadLocation=Allow user to select custom download / upload directory sebserver.examconfig.props.group.sessionHandling=Session Handling