zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-455

Browse source
This commit is contained in:
anhefti 2024-03-07 16:33:30 +01:00
parent b1bd21c424
commit 0c04a358f4
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/checks/DowngradeSEBSettingsCheck.java
View file

@ -139,7 +139,7 @@ public class DowngradeSEBSettingsCheck implements DBIntegrityCheck {
"DELETE FROM "+ schemaName +".flyway_schema_history WHERE version > " + lastMigrationVersion); "DELETE FROM "+ schemaName +".flyway_schema_history WHERE version > " + lastMigrationVersion);
prepareStatement.execute(); 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; return "Successfully deleted SEB Settings attributes: " + allNames;
} catch (final Exception e) { } catch (final Exception e) {

5
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/DAOLoggingSupport.java
View file

@ -31,4 +31,9 @@ public final class DAOLoggingSupport {
result.onError(error -> log.error("Unexpected error. Object processing is skipped: ", error))); result.onError(error -> log.error("Unexpected error. Object processing is skipped: ", error)));
} }
public static <T> Stream<T> logMinAndSkipOnError(final Result<T> result) {
return Result.skipOnError(
result.onError(error -> log.error("Unexpected error. Object processing is skipped: {}", error.getMessage())));
}
} }

4
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ConfigurationAttributeDAOImpl.java
View file

@ -120,7 +120,7 @@ public class ConfigurationAttributeDAOImpl implements ConfigurationAttributeDAO
.execute() .execute()
.stream() .stream()
.map(ConfigurationAttributeDAOImpl::toDomainModel) .map(ConfigurationAttributeDAOImpl::toDomainModel)
.flatMap(DAOLoggingSupport::logAndSkipOnError) .flatMap(DAOLoggingSupport::logMinAndSkipOnError)
.filter(predicate) .filter(predicate)
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }
@ -153,7 +153,7 @@ public class ConfigurationAttributeDAOImpl implements ConfigurationAttributeDAO
.execute() .execute()
.stream() .stream()
.map(ConfigurationAttributeDAOImpl::toDomainModel) .map(ConfigurationAttributeDAOImpl::toDomainModel)
.flatMap(DAOLoggingSupport::logAndSkipOnError) .flatMap(DAOLoggingSupport::logMinAndSkipOnError)
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }

1
src/main/resources/messages.properties
View file

@ -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=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.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.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 sebserver.examconfig.props.group.sessionHandling=Session Handling