Add marshaller serializer

git-svn-id: https://svn.argeo.org/commons/trunk@3350 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 5957241a314b7edbf6d1fa0c099847547a8d5c7f..bb411c49d0a92a9c8ba62200abaee5aa9e47feb0 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
@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.argeo.ArgeoException;
 import org.argeo.server.ServerAnswer;
 import org.argeo.server.ServerSerializer;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.servlet.view.AbstractView;
 
 public class SerializingView extends AbstractView implements MvcConstants {
@@ -29,24 +30,10 @@ 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 {
-                       if (model.size() == 0)
-                               throw new ArgeoException("Model is empty.");
-                       else
-                               throw new ArgeoException(
-                                               "Model has a size different from 1. Specify a modelKey.");
-               }
+               Boolean serverAnswersAsHtml = model
+                               .containsKey(ANSWER_MODEL_KEY_AS_HTML);
+
+               final Object answer = findAnswerInModel(model);
 
                if ((answer instanceof ServerAnswer) && serverAnswersAsHtml) {
                        response.setContentType("text/html");
@@ -59,6 +46,39 @@ public class SerializingView extends AbstractView implements MvcConstants {
                }
        }
 
+       @SuppressWarnings("unchecked")
+       protected Object findAnswerInModel(Map model) {
+               if (model.size() == 1) {
+                       return model.values().iterator().next();
+               } else if (model.size() == 2) {
+                       boolean otherIsBindingResult = false;
+                       Object answerValue = null;
+                       for (Object value : model.values()) {
+                               if (value instanceof BindingResult)
+                                       otherIsBindingResult = true;
+                               else
+                                       answerValue = value;
+                       }
+
+                       if (otherIsBindingResult)
+                               return answerValue;
+               }
+
+               if (model.containsKey(ANSWER_MODEL_KEY)) {
+                       return model.get(ANSWER_MODEL_KEY);
+               } else if (model.containsKey(ANSWER_MODEL_KEY_AS_HTML)) {
+                       return model.get(ANSWER_MODEL_KEY_AS_HTML);
+               } else if (model.containsKey(viewName)) {
+                       return model.get(viewName);
+               } else {
+                       if (model.size() == 0)
+                               throw new ArgeoException("Model is empty.");
+                       else
+                               throw new ArgeoException(
+                                               "Model has a size different from 1. Specify a modelKey.");
+               }
+       }
+
        public String getViewName() {
                return viewName;
        }