Commit 6d0b8b9a authored by Piotr Gawron's avatar Piotr Gawron
Browse files

compilation errors in merge

parent bd806055
Pipeline #20773 failed with stage
in 14 minutes and 35 seconds
......@@ -441,6 +441,7 @@ public class ProjectRestImpl extends BaseRestImpl {
String entryType = (String) data.get("zip-entries[" + fileIndex + "][_type]").get(0);
String filename = (String) data.get("zip-entries[" + fileIndex + "][_filename]").get(0);
String name;
ZipEntryFileType type = ZipEntryFileType.getType(entryType);
switch (type) {
case MAP:
......@@ -451,14 +452,14 @@ public class ProjectRestImpl extends BaseRestImpl {
String mapTypeString = getStringValue(data.get(submodelTypeKey), SubmodelType.UNKNOWN.name());
SubmodelType mapType = SubmodelType.valueOf(mapTypeString);
String name = (String) data.get("zip-entries[" + fileIndex + "][_data][name]").get(0);
name = (String) data.get("zip-entries[" + fileIndex + "][_data][name]").get(0);
Boolean root = getBoolValue(data.get(rootKey), false);
Boolean mapping = getBoolValue(data.get(mappingKey), false);
entry = new ModelZipEntryFile(filename, name, root, mapping, mapType);
break;
case OVERLAY:
String name = getFirstEntry(data, "zip-entries[" + fileIndex + "][_data][name]");
name = getFirstEntry(data, "zip-entries[" + fileIndex + "][_data][name]");
String description = getFirstEntry(data, "zip-entries[" + fileIndex + "][_data][description]");
if (name == null || name.trim().isEmpty()) {
throw new QueryException("zip-entries[" + fileIndex + "][_data][name] cannot be empty");
......
......@@ -282,10 +282,6 @@ abstract public class ControllerIntegrationTest {
return file;
}
protected UploadedFileEntry createFile(String content, User user) {
return createFile(content.getBytes(), user);
}
/**
* Executes lambda function in new thread with separate hibernate session. The
* function returns type <T> which can be void.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment