Adapt web app to test result collection marshalling

[gpl/argeo-slc.git] / org.argeo.slc.server / src / main / java / org / argeo / slc / web / mvc / XsltMarshallerView.java

diff --git a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java
index dfb4713eaddaffb76f616958a7c82b3e3f46ed32..127188b842a8caf112ea357dc6e18751d4c11eb4 100644 (file)
--- a/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java
+++ b/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/XsltMarshallerView.java
@@ -5,19 +5,18 @@ import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMResult;\r
 import javax.xml.transform.dom.DOMSource;\r
 \r
+import org.argeo.slc.core.SlcException;\r
 import org.springframework.oxm.Marshaller;\r
 import org.springframework.web.servlet.view.xslt.XsltView;\r
 import org.w3c.dom.Document;\r
 \r
-import org.argeo.slc.core.test.tree.TreeTestResult;\r
-\r
 public class XsltMarshallerView extends XsltView {\r
 \r
        private Marshaller marshaller;\r
 \r
        @Override\r
        protected Class<?>[] getSourceTypes() {\r
-               return new Class[] { TreeTestResult.class };\r
+               return new Class[] { Object.class };\r
        }\r
 \r
        @Override\r
@@ -25,6 +24,9 @@ public class XsltMarshallerView extends XsltView {
                Document document = DocumentBuilderFactory.newInstance()\r
                                .newDocumentBuilder().newDocument();\r
                DOMResult result = new DOMResult(document);\r
+               if (!marshaller.supports(source.getClass()))\r
+                       throw new SlcException("Object of type " + source.getClass()\r
+                                       + " not supported.");\r
                marshaller.marshal(source, result);\r
                return new DOMSource(result.getNode());\r
        }\r