Merge branch 'develop' into 'master'

Develop

See merge request !121

VERSION.txt

+2.2.1 Added a fail-safe check for simulating tool incorrect input files.
 22.12-rc.1 Changed sandboxId type to string, added automatic check if logging works for training events and commands.
 2.1.3 Fix create, update and clone for training definitions
 2.1.2 Fix authorization requirements for various training definition/instance functions, trim access codes on instance creation, removed stack trace from errors, it is no longer possible to create/edit non-local instances without setting the pool.

src/main/java/cz/muni/ics/kypo/training/adaptive/facade/SankeySimulatorFacade.java

@@ -56,7 +56,7 @@ public class SankeySimulatorFacade {
         try {
             return processInstanceZip(zipFile);
         } catch (IOException e) {
-            throw new BadRequestException("The file was not processed. Unsupported data format", e);
+            throw new BadRequestException("The file was not processed. Unsupported data format. Please provide a zip file of adaptive training instance", e);
         }
     }
 
@@ -122,9 +122,13 @@ public class SankeySimulatorFacade {
         } catch (IOException e) {
             zis.closeEntry();
             zis.close();
-            throw new BadRequestException("The file was not processed. Unsupported data format", e);
+            throw new BadRequestException("The file was not processed. Unsupported data format. Please provide a zip file of adaptive training instance", e);
         }
         String cacheKey = instanceSimulatorService.cacheTraineesPerformance(traineesIdentification, questionnaireActions, trainingEvents, sandboxUseractions, trainingDefinition, trainingInstanceInfo);
+
+        if (trainingDefinition.getId() == null || trainingDefinition.getTitle() == null) {
+            throw new BadRequestException("The file was not processed. Unsupported data format. Please provide a zip file of adaptive training instance");
+        }
         return new InstanceSimulatorDTO(sankeyDiagramDTO, trainingDefinition, cacheKey);
     }