Imrpove error reporting

[lgpl/argeo-commons.git] / server / runtime / org.argeo.server.core / src / main / java / org / argeo / server / mvc / SerializingView.java

diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java
index 6acecf000203cfb03205f7456c33cdd861b611ef..5957241a314b7edbf6d1fa0c099847547a8d5c7f 100644 (file)
--- a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java
+++ b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/mvc/SerializingView.java
@@ -6,7 +6,8 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.argeo.server.ArgeoServerException;
+import org.argeo.ArgeoException;
+import org.argeo.server.ServerAnswer;
 import org.argeo.server.ServerSerializer;
 import org.springframework.web.servlet.view.AbstractView;
 
@@ -28,19 +29,34 @@ public class SerializingView extends AbstractView implements MvcConstants {
        protected void renderMergedOutputModel(Map model,
                        HttpServletRequest request, HttpServletResponse response)
                        throws Exception {
+               Boolean serverAnswersAsHtml = false;
                final Object answer;
                if (model.size() == 1) {
                        answer = model.values().iterator().next();
                } else if (model.containsKey(ANSWER_MODEL_KEY)) {
                        answer = model.get(ANSWER_MODEL_KEY);
+               } else if (model.containsKey(ANSWER_MODEL_KEY_AS_HTML)) {
+                       answer = model.get(ANSWER_MODEL_KEY_AS_HTML);
+                       serverAnswersAsHtml = true;
                } else if (model.containsKey(viewName)) {
                        answer = model.get(viewName);
                } else {
-                       throw new ArgeoServerException(
-                                       "Model has a size different from 1. Specify a modelKey.");
+                       if (model.size() == 0)
+                               throw new ArgeoException("Model is empty.");
+                       else
+                               throw new ArgeoException(
+                                               "Model has a size different from 1. Specify a modelKey.");
                }
 
-               serializer.serialize(answer, request, response);
+               if ((answer instanceof ServerAnswer) && serverAnswersAsHtml) {
+                       response.setContentType("text/html");
+                       ServerAnswer serverAnswer = (ServerAnswer) answer;
+                       response.getWriter().append("<pre>");
+                       response.getWriter().append(serverAnswer.getMessage());
+                       response.getWriter().append("</pre>");
+               } else {
+                       serializer.serialize(answer, request, response);
+               }
        }
 
        public String getViewName() {