- Add freemind import exception data on failure.

wise-webapp/src/main/java/com/wisemapping/exceptions/ImportUnexpectedException.java

@@ -0,0 +1,41 @@
+/*
+*    Copyright [2011] [wisemapping]
+*
+*   Licensed under WiseMapping Public License, Version 1.0 (the "License").
+*   It is basically the Apache License, Version 2.0 (the "License") plus the
+*   "powered by wisemapping" text requirement on every single page;
+*   you may not use this file except in compliance with the License.
+*   You may obtain a copy of the license at
+*
+*       http://www.wisemapping.org/license
+*
+*   Unless required by applicable law or agreed to in writing, software
+*   distributed under the License is distributed on an "AS IS" BASIS,
+*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*   See the License for the specific language governing permissions and
+*   limitations under the License.
+*/
+
+package com.wisemapping.exceptions;
+
+import org.jetbrains.annotations.NotNull;
+
+public class ImportUnexpectedException
+        extends WiseMappingException {
+    private byte[] freemindXml;
+
+
+    public ImportUnexpectedException(@NotNull Throwable e, @NotNull byte[] map) {
+        super("Unexpected expected error importing freemind. Please, try latter.", e);
+        this.freemindXml = map;
+    }
+
+    public ImportUnexpectedException(String str, Exception e) {
+        super(str);
+        initCause(e);
+    }
+
+    public byte[] getFreemindXml() {
+        return freemindXml;
+    }
+}

wise-webapp/src/main/java/com/wisemapping/exceptions/WiseMappingException.java

@@ -25,7 +25,7 @@ public class WiseMappingException
     {
         super(str);
     }
-    public WiseMappingException(String str,Exception e)
+    public WiseMappingException(String str,Throwable e)
     {
         super(str);
         initCause(e);

wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java

@@ -19,6 +19,7 @@
 package com.wisemapping.rest;
 
 import com.wisemapping.exceptions.ClientException;
+import com.wisemapping.exceptions.ImportUnexpectedException;
 import com.wisemapping.mail.NotificationService;
 import com.wisemapping.model.User;
 import com.wisemapping.rest.model.RestErrors;
@@ -67,6 +68,16 @@ public class BaseController {
         return ex.getMessage();
     }
 
+
+    @ExceptionHandler(Exception.class)
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    @ResponseBody
+    public String handleImportErrors(@NotNull ImportUnexpectedException ex, @NotNull HttpServletRequest request) {
+        final User user = Utils.getUser();
+        notificationService.reportJavaException(ex, user, new String(ex.getFreemindXml()), request);
+        return ex.getMessage();
+    }
+
     @ExceptionHandler(ValidationException.class)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     public RestErrors handleValidationErrors(@NotNull ValidationException ex) {

wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java

@@ -19,6 +19,7 @@
 package com.wisemapping.rest;
 
 
+import com.wisemapping.exceptions.ImportUnexpectedException;
 import com.wisemapping.exceptions.WiseMappingException;
 import com.wisemapping.importer.ImportFormat;
 import com.wisemapping.importer.Importer;
@@ -401,6 +402,8 @@ public class MindmapController extends BaseController {
         } catch (ImporterException e) {
             // @Todo: This should be an illegal argument exception. Review the all the other cases.
             throw buildValidationException("xml", "The selected file does not seems to be a valid Freemind or WiseMapping file. Contact support in case the problem persists.");
+        } catch (Throwable e) {
+            throw new ImportUnexpectedException(e, freemindXml);
         }
 
         // Save new map ...