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

fixed imports

Browse source
This commit is contained in:
anhefti 2019-11-14 14:48:36 +01:00
parent 12b4776b87
commit 33bd16d55a
3 changed files with 47 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ch/ethz/seb/sebserver/gui/content/SebExamConfigImport.java
View file

@ -154,6 +154,9 @@ public final class SebExamConfigImport {
action.pageContext());
}
return true;
} else {
formHandle.getContext().notifyError(configuration.getError());
return true;
}
} else {
formHandle.getContext().publishPageMessage(

6
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/ExamConfigImportHandler.java
View file

@ -296,6 +296,12 @@ public class ExamConfigImportHandler extends DefaultHandler {
final String attrName,
final ConfigurationAttribute attribute) {
// no or blank value
if (StringUtils.isBlank(top.value)) {
saveValue(attrName, attribute, top.listIndex, null);
return;
}
final String[] names = StringUtils.split(top.valueName, Constants.LIST_SEPARATOR);
final String[] values = StringUtils.split(top.value, Constants.LIST_SEPARATOR);
final String[] columns = StringUtils.split(attribute.getResources(), Constants.EMBEDDED_LIST_SEPARATOR);

47
src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ConfigurationNodeController.java
View file

@ -12,6 +12,7 @@ import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import javax.servlet.ServletOutputStream;
@ -21,6 +22,7 @@ import javax.validation.Valid;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.mybatis.dynamic.sql.SqlTable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -38,10 +40,12 @@ import org.springframework.web.bind.annotation.RestController;
import ch.ethz.seb.sebserver.gbl.api.API;
import ch.ethz.seb.sebserver.gbl.api.APIMessage;
import ch.ethz.seb.sebserver.gbl.api.EntityType;
import ch.ethz.seb.sebserver.gbl.api.POSTMapper;
import ch.ethz.seb.sebserver.gbl.api.authorization.PrivilegeType;
import ch.ethz.seb.sebserver.gbl.model.Domain;
import ch.ethz.seb.sebserver.gbl.model.Domain.EXAM;
import ch.ethz.seb.sebserver.gbl.model.EntityKey;
import ch.ethz.seb.sebserver.gbl.model.Page;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigCopyInfo;
import ch.ethz.seb.sebserver.gbl.model.sebconfig.ConfigKey;
@ -260,7 +264,22 @@ public class ConfigurationNodeController extends EntityController<ConfigurationN
.flatMap(this.configurationDAO::getFollowupConfiguration)
.getOrThrow();
return doImport(password, request, followup);
final Result<Configuration> doImport = doImport(password, request, followup);
if (doImport.hasError()) {
// rollback of the new configuration
this.configurationNodeDAO.delete(new HashSet<>(Arrays.asList(new EntityKey(
followup.configurationNodeId,
EntityType.CONFIGURATION_NODE))));
final Throwable rootCause = ExceptionUtils.getRootCause(doImport.getError());
return new ResponseEntity<>(
Arrays.asList(APIMessage.ErrorMessage.UNEXPECTED.of(rootCause.getMessage())),
Utils.createJsonContentHeader(),
HttpStatus.BAD_REQUEST);
} else {
return doImport;
}
}
@RequestMapping(
@ -285,7 +304,19 @@ public class ConfigurationNodeController extends EntityController<ConfigurationN
.flatMap(this.configurationDAO::restoreToDefaultValues)
.getOrThrow();
return doImport(password, request, newConfig);
final Result<Configuration> doImport = doImport(password, request, newConfig);
if (doImport.hasError()) {
// rollback of the existing values
this.configurationDAO.undo(newConfig.configurationNodeId);
final Throwable rootCause = ExceptionUtils.getRootCause(doImport.getError());
return new ResponseEntity<>(
Arrays.asList(APIMessage.ErrorMessage.UNEXPECTED.of(rootCause.getMessage())),
Utils.createJsonContentHeader(),
HttpStatus.BAD_REQUEST);
} else {
return doImport;
}
}
@RequestMapping(
@ -474,30 +505,28 @@ public class ConfigurationNodeController extends EntityController<ConfigurationN
return node;
}
private Object doImport(
private Result<Configuration> doImport(
final String password,
final HttpServletRequest request,
final Configuration configuration) throws IOException {
final InputStream inputStream = new BufferedInputStream(request.getInputStream());
try {
return this.sebExamConfigService.importFromSEBFile(
final Configuration result = this.sebExamConfigService.importFromSEBFile(
configuration,
inputStream,
password)
.getOrThrow();
return Result.of(result);
} catch (final Exception e) {
// NOTE: It seems that this has to be manually closed on error case
// We expected that this is closed by the API but if this manual close is been left
// some left-overs will affect strange behavior.
// TODO: find a better solution for this
IOUtils.closeQuietly(inputStream);
return new ResponseEntity<>(
Arrays.asList(APIMessage.ErrorMessage.UNEXPECTED.of(e.getMessage())),
Utils.createJsonContentHeader(),
HttpStatus.BAD_REQUEST);
return Result.ofError(e);
}
}