Use ObjectList everywhere

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

diff --git a/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/it/webapp/SimpleScenarioTest.java b/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/it/webapp/SimpleScenarioTest.java
index 16e4239226af2cb6beaadcb6383a8a9017b1a91f..1659e80954e8f2fbd0593e01d4b9d0300c2558d8 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/it/webapp/SimpleScenarioTest.java
+++ b/integration-tests/org.argeo.slc.it.webapp/src/test/java/org/argeo/slc/it/webapp/SimpleScenarioTest.java
@@ -1,31 +1,28 @@
 package org.argeo.slc.it.webapp;
 
 import org.argeo.slc.Condition;
-import org.argeo.slc.core.test.tree.TreeTestResultList;
-import org.argeo.slc.process.SlcExecution;
+import org.argeo.slc.msg.ObjectList;
 import org.argeo.slc.server.client.SlcServerHttpClient;
 import org.argeo.slc.server.unit.AbstractHttpClientTestCase;
 
 public class SimpleScenarioTest extends AbstractHttpClientTestCase {
        public void testSimpleScenario() throws Exception {
                String moduleName = "org.argeo.slc.demo.basic";
-               SlcExecution slcExecution = getHttpClient().startFlowDefault(
-                               moduleName, "main", null);
+               getHttpClient().startFlowDefault(moduleName, "main", null);
 
                getHttpClient().callServiceSafe(SlcServerHttpClient.LIST_RESULTS, null,
-                               new Condition<TreeTestResultList>() {
+                               new Condition<ObjectList>() {
 
-                                       public Boolean check(TreeTestResultList obj) {
-                                               return obj.getList().size() == 3;
+                                       public Boolean check(ObjectList obj) {
+                                               return obj.getObjects().size() == 3;
                                        }
                                }, null);
-               
-               
+
                getHttpClient().callServiceSafe(SlcServerHttpClient.LIST_RESULTS, null,
-                               new Condition<TreeTestResultList>() {
+                               new Condition<ObjectList>() {
 
-                                       public Boolean check(TreeTestResultList obj) {
-                                               return obj.getList().size() == 3;
+                                       public Boolean check(ObjectList obj) {
+                                               return obj.getObjects().size() == 3;
                                        }
                                }, null);
        }

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/ResultAttributes.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/ResultAttributes.java
index ec09ce51f2ec851eb7c3a9750cd3a2b8104348ce..706a97caa0675b9c858a6a66dd579f4f89faf4da 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/ResultAttributes.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/ResultAttributes.java
@@ -1,5 +1,6 @@
 package org.argeo.slc.core.test.tree;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Hashtable;
@@ -8,7 +9,9 @@ import java.util.Map;
 
 import org.argeo.slc.core.attachment.SimpleAttachment;
 
-public class ResultAttributes {
+public class ResultAttributes implements Serializable {
+       private static final long serialVersionUID = 1L;
+
        private String uuid = null;
        private Date closeDate = null;
        private Map<String, String> attributes = new Hashtable<String, String>();

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/ResultAttributesList.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/ResultAttributesList.java
deleted file mode 100644 (file)
index bd8d564..0000000
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/ResultAttributesList.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.argeo.slc.core.test.tree;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.argeo.slc.msg.ObjectList;
-
-/** @deprecated user {@link ObjectList} instead. */
-public class ResultAttributesList {
-       private List<ResultAttributes> list = new ArrayList<ResultAttributes>();
-
-       public ResultAttributesList() {
-               super();
-       }
-
-       public ResultAttributesList(List<ResultAttributes> list) {
-               super();
-               this.list = list;
-       }
-
-       public List<ResultAttributes> getList() {
-               return list;
-       }
-
-       public void setList(List<ResultAttributes> list) {
-               this.list = list;
-       }
-
-}

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultList.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultList.java
deleted file mode 100644 (file)
index 587ad83..0000000
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultList.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.argeo.slc.core.test.tree;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.argeo.slc.msg.ObjectList;
-
-/**
- * List of results. Used for marshaling.
- * 
- * @deprecated Should be replaced by a standard {@link ObjectList}.
- */
-public class TreeTestResultList {
-       private List<TreeTestResult> list = new ArrayList<TreeTestResult>();
-
-       public TreeTestResultList() {
-               super();
-       }
-
-       public TreeTestResultList(List<TreeTestResult> list) {
-               super();
-               this.list = list;
-       }
-
-       public List<TreeTestResult> getList() {
-               return list;
-       }
-
-       public void setList(List<TreeTestResult> list) {
-               this.list = list;
-       }
-
-}

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/MarshallerView.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/MarshallerView.java
index 61bafce94b57fd2834bd37c2ff942b0de08b64c6..da559a1da33ae4fdec033a03fc4103b82eda8d19 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/MarshallerView.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/MarshallerView.java
@@ -25,6 +25,7 @@ public class MarshallerView extends AbstractView {
        }
 
        @Override
+       @SuppressWarnings(value={"unchecked"})
        protected void renderMergedOutputModel(Map model,
                        HttpServletRequest request, HttpServletResponse response)
                        throws Exception {

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/WebSlcEventListenerRegister.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/WebSlcEventListenerRegister.java
index a3da141dd5781d26283feaa37e717e78b12e2679..e2aaa310d1e22c1ea576f3b7fef184c666452356 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/WebSlcEventListenerRegister.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/WebSlcEventListenerRegister.java
@@ -5,16 +5,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.msg.event.SlcEventListenerDescriptor;
 import org.argeo.slc.msg.event.SlcEventListenerRegister;
 import org.springframework.web.context.request.RequestContextHolder;
 
 public class WebSlcEventListenerRegister implements SlcEventListenerRegister,
                Serializable {
-       private final static Log log = LogFactory
-                       .getLog(WebSlcEventListenerRegister.class);
        public final static String ATTR_EVENT_LISTENER = "slcEventListener";
 
        static final long serialVersionUID = 1l;

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/attachment/GetAttachmentHandler.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/attachment/GetAttachmentHandler.java
index 7591a7b5248ce57f49d3cd08344afe0220c0c1ae..caeb68b0eb6a59d7b6ad4782d365ec2ca8f198e8 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/attachment/GetAttachmentHandler.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/attachment/GetAttachmentHandler.java
@@ -7,7 +7,6 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r
 \r
-import org.apache.commons.io.FileUtils;\r
 import org.apache.commons.io.FilenameUtils;\r
 import org.argeo.slc.core.attachment.AttachmentsStorage;\r
 import org.argeo.slc.core.attachment.SimpleAttachment;\r

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ListResultAttributesController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ListResultAttributesController.java
index 073d5cda4dd99966be5ffea89f3321ea85cc1a13..36d717670bcbb520de6911eacd41797763f5a4ec 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ListResultAttributesController.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ListResultAttributesController.java
@@ -6,8 +6,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;\r
 \r
 import org.argeo.slc.core.test.tree.ResultAttributes;\r
-import org.argeo.slc.core.test.tree.ResultAttributesList;\r
 import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;\r
+import org.argeo.slc.msg.ObjectList;\r
 import org.argeo.slc.web.mvc.AbstractServiceController;\r
 import org.springframework.web.servlet.ModelAndView;\r
 \r
@@ -28,7 +28,7 @@ public class ListResultAttributesController extends AbstractServiceController {
                List<ResultAttributes> resultAttributes = testResultCollectionDao\r
                                .listResultAttributes(collectionId);\r
 \r
-               modelAndView.addObject("resultAttributesList",\r
-                               new ResultAttributesList(resultAttributes));\r
+               modelAndView.addObject("resultAttributesList", new ObjectList(\r
+                               resultAttributes));\r
        }\r
 }\r

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ListResultsController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ListResultsController.java
index c22cd7725d5ed06498decfcd16085e8b0b33ec8a..5cd9da043f7dd9051a7f3c4c08ff97347bcb149c 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ListResultsController.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ListResultsController.java
@@ -8,8 +8,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;\r
 \r
 import org.argeo.slc.core.test.tree.TreeTestResult;\r
-import org.argeo.slc.core.test.tree.TreeTestResultList;\r
 import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;\r
+import org.argeo.slc.msg.ObjectList;\r
 import org.argeo.slc.web.mvc.AbstractServiceController;\r
 import org.springframework.web.servlet.ModelAndView;\r
 \r
@@ -23,6 +23,7 @@ public class ListResultsController extends AbstractServiceController {
        }\r
 \r
        @Override\r
+       @SuppressWarnings(value={"unchecked"})\r
        protected void handleServiceRequest(HttpServletRequest request,\r
                        HttpServletResponse response, ModelAndView modelAndView)\r
                        throws Exception {\r
@@ -41,7 +42,7 @@ public class ListResultsController extends AbstractServiceController {
                List<TreeTestResult> resultAttributes = testResultCollectionDao\r
                                .listResults(collectionId, attributes);\r
 \r
-               modelAndView.addObject("resultList", new TreeTestResultList(\r
+               modelAndView.addObject("resultList", new ObjectList(\r
                                resultAttributes));\r
        }\r
 }\r

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultExcelView.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultExcelView.java
index ac3a0d2a9c0d54d9017f3e3a560b939a4d6007f3..86dfd35b62a3a229ec203ca8e9d89f2ef845bab0 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultExcelView.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultExcelView.java
@@ -18,6 +18,7 @@ import org.argeo.slc.test.TestResultPart;
 import org.springframework.web.servlet.view.document.AbstractJExcelView;
 
 public class ResultExcelView extends AbstractJExcelView {
+       @SuppressWarnings(value={"unchecked"})
        protected void buildExcelDocument(Map model, WritableWorkbook workbook,
                        HttpServletRequest request, HttpServletResponse response) {
                try {

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultPdfView.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultPdfView.java
index 1c4ea5124da4cc2bf01312ae612c5292f093f28c..d758d47d4ed7eb41f19e6b8dd066d1e7f73b77bb 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultPdfView.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/ResultPdfView.java
@@ -23,6 +23,7 @@ import com.lowagie.text.pdf.PdfWriter;
 public class ResultPdfView extends AbstractPdfView {
 
        @Override
+       @SuppressWarnings(value={"unchecked"})
        protected void buildPdfDocument(Map model, Document document,
                        PdfWriter writer, HttpServletRequest request,
                        HttpServletResponse response) throws Exception {

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/runtime/ListAgentsController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/runtime/ListAgentsController.java
index 03e2af1533e4ad8424213a6105a4298194e8d29d..296a209fd351614907ccdb960fc12b6981e372fe 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/runtime/ListAgentsController.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/runtime/ListAgentsController.java
@@ -1,7 +1,6 @@
 package org.argeo.slc.web.mvc.runtime;\r
 \r
 import java.util.List;\r
-import java.util.Vector;\r
 \r
 import javax.servlet.http.HttpServletRequest;\r
 import javax.servlet.http.HttpServletResponse;\r

diff --git a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml
index b5246c47c8e4703f56695ca2872c7403570be77d..0712515c891a90494afac0d9fbb0a765358662fa 100644 (file)
--- a/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml
+++ b/runtime/org.argeo.slc.support.castor/src/main/resources/org/argeo/slc/castor/msg.xml
@@ -29,15 +29,6 @@
                </field>
        </class>
 
-       <class name="org.argeo.slc.core.test.tree.TreeTestResultList">
-               <map-to ns-uri="http://argeo.org/projects/slc/schemas"
-                       ns-prefix="slc" />
-               <field name="list" collection="arraylist"
-                       type="org.argeo.slc.core.test.tree.TreeTestResult">
-                       <bind-xml auto-naming="deriveByClass" />
-               </field>
-       </class>
-
        <!-- TESTS -->
        <class name="org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest">
                <map-to ns-uri="http://argeo.org/projects/slc/schemas"
@@ -105,15 +96,6 @@
                </field>
        </class>
 
-       <class name="org.argeo.slc.core.test.tree.ResultAttributesList">
-               <map-to ns-uri="http://argeo.org/projects/slc/schemas"
-                       ns-prefix="slc" />
-               <field name="list" collection="arraylist"
-                       type="org.argeo.slc.core.test.tree.ResultAttributes">
-                       <bind-xml auto-naming="deriveByClass" />
-               </field>
-       </class>
-
        <class name="org.argeo.slc.core.test.tree.ResultAttributes">
                <map-to ns-uri="http://argeo.org/projects/slc/schemas"
                        ns-prefix="slc" />