X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fserver%2Fmvc%2FSerializingView.java;h=1d0e95ec27062b3b5ecc6ad4d930ff49859d057b;hb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;hp=5957241a314b7edbf6d1fa0c099847547a8d5c7f;hpb=390c20b2159a7cfee6978dae1a45ea361722bfc6;p=lgpl%2Fargeo-commons.git

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 5957241a3..1d0e95ec2 100644
--- 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.argeo.server.mvc;
 
 import java.util.Locale;
@@ -9,13 +24,24 @@ 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;
 import org.springframework.web.servlet.view.AbstractView;
 
+/**
+ * Can be used as a standalone {@link View} or using
+ * {@link SerializingViewResolver}
+ */
 public class SerializingView extends AbstractView implements MvcConstants {
 	private final String viewName;
 	private final Locale locale;
 
-	private final ServerSerializer serializer;
+	private ServerSerializer serializer;
+
+	public SerializingView() {
+		this.viewName = null;
+		this.locale = Locale.getDefault();
+	}
 
 	public SerializingView(String viewName, Locale locale,
 			ServerSerializer serializer) {
@@ -24,29 +50,15 @@ public class SerializingView extends AbstractView implements MvcConstants {
 		this.serializer = serializer;
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings( { "unchecked", "restriction" })
 	@Override
 	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 +71,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 (viewName != null && 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;
 	}
@@ -67,4 +112,8 @@ public class SerializingView extends AbstractView implements MvcConstants {
 		return locale;
 	}
 
+	public void setSerializer(ServerSerializer serializer) {
+		this.serializer = serializer;
+	}
+
 }