Merge branch...

Merge branch '1499-if-invalid-coords-txt-file-the-upload-of-map-is-hanged-on-parsing-data' into 'master'

Resolve "if invalid coords.txt file the upload of map is hanged on parsing data"

Closes #1499

See merge request !1320

CHANGELOG

@@ -24,6 +24,8 @@ minerva (16.0.0~beta.1) stable; urgency=medium
     #1496)
   * Bug fix: chrome autofill is disabled for "Search: " in admin panel tables
   * Bug fix: top map was not selected properly sometimes (#1487)
+  * Bug fix: data overlays in comlex upload prevented error to be propagated
+    to user (#1499)
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Wed, 9 Jun 2021 15:00:00 +0200
 

service/src/main/java/lcsb/mapviewer/services/impl/ProjectService.java

@@ -52,7 +52,8 @@ import lcsb.mapviewer.services.overlay.AnnotatedObjectTreeRow;
 import lcsb.mapviewer.services.search.chemical.IChemicalService;
 import lcsb.mapviewer.services.search.drug.IDrugService;
 import lcsb.mapviewer.services.search.mirna.IMiRNAService;
-import lcsb.mapviewer.services.utils.*;
+import lcsb.mapviewer.services.utils.CreateProjectParams;
+import lcsb.mapviewer.services.utils.EmailSender;
 import lcsb.mapviewer.services.utils.data.BuildInBackgrounds;
 
 /**
@@ -257,7 +258,9 @@ public class ProjectService implements IProjectService {
                 projectBackgroundDao.delete(background);
               } catch (IOException e) {
                 logger.error(
-                    "Problem with removing directory for background: " + background.getId() + "; " + background.getName(), e);
+                    "Problem with removing directory for background: " + background.getId() + "; "
+                        + background.getName(),
+                    e);
               }
             }
             email = project.getNotifyEmail();
@@ -395,6 +398,7 @@ public class ProjectService implements IProjectService {
             handleHibernateExceptionReporting(params, e);
           } catch (Exception e) {
             outOfMemoryBuffer = null;
+            project.getDataOverlays().clear();
             handleCreateProjectException(params, e);
           } catch (OutOfMemoryError oome) {
             // release some memory
@@ -736,7 +740,7 @@ public class ProjectService implements IProjectService {
         }
         ProjectFactory projectFactory = new ProjectFactory(parser);
         projectFactory.create(complexParams, dbProject);
-        for (DataOverlay overlay: dbProject.getDataOverlays()) {
+        for (DataOverlay overlay : dbProject.getDataOverlays()) {
           overlay.setCreator(params.getUser());
         }
       } catch (IOException e) {
@@ -832,7 +836,8 @@ public class ProjectService implements IProjectService {
             ProjectBackground semanticOverlay = semanticLevelOverlays.get(i);
             directory = params.getProjectDir() + "/" + buildInBackground.getDirectorySuffix() + "-" + i + "-"
                 + submodelId + "/";
-            semanticOverlay.addProjectBackgroundImageLayer(new ProjectBackgroundImageLayer(connection.getSubmodel(), directory));
+            semanticOverlay
+                .addProjectBackgroundImageLayer(new ProjectBackgroundImageLayer(connection.getSubmodel(), directory));
           }
         }
         submodelId++;