From 39a0f2bbfd621c3d8ab4204d65321fab59fc402d Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Wed, 1 Jul 2009 15:54:38 +0000 Subject: [PATCH] Use ObjectList everywhere git-svn-id: https://svn.argeo.org/slc/trunk@2657 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../slc/it/webapp/SimpleScenarioTest.java | 21 +++++------- .../slc/core/test/tree/ResultAttributes.java | 5 ++- .../core/test/tree/ResultAttributesList.java | 29 ---------------- .../core/test/tree/TreeTestResultList.java | 33 ------------------- .../org/argeo/slc/web/mvc/MarshallerView.java | 1 + .../web/mvc/WebSlcEventListenerRegister.java | 4 --- .../mvc/attachment/GetAttachmentHandler.java | 1 - .../ListResultAttributesController.java | 6 ++-- .../web/mvc/result/ListResultsController.java | 5 +-- .../slc/web/mvc/result/ResultExcelView.java | 1 + .../slc/web/mvc/result/ResultPdfView.java | 1 + .../web/mvc/runtime/ListAgentsController.java | 1 - .../resources/org/argeo/slc/castor/msg.xml | 18 ---------- 13 files changed, 22 insertions(+), 104 deletions(-) delete mode 100644 runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/ResultAttributesList.java delete mode 100644 runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/tree/TreeTestResultList.java 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 16e423922..1659e8095 100644 --- 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() { + new Condition() { - 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() { + new Condition() { - 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 ec09ce51f..706a97caa 100644 --- 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 attributes = new Hashtable(); 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 index bd8d56455..000000000 --- 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 list = new ArrayList(); - - public ResultAttributesList() { - super(); - } - - public ResultAttributesList(List list) { - super(); - this.list = list; - } - - public List getList() { - return list; - } - - public void setList(List 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 index 587ad8396..000000000 --- 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 list = new ArrayList(); - - public TreeTestResultList() { - super(); - } - - public TreeTestResultList(List list) { - super(); - this.list = list; - } - - public List getList() { - return list; - } - - public void setList(List 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 61bafce94..da559a1da 100644 --- 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 a3da141dd..e2aaa310d 100644 --- 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 7591a7b52..caeb68b0e 100644 --- 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; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.argeo.slc.core.attachment.AttachmentsStorage; import org.argeo.slc.core.attachment.SimpleAttachment; 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 073d5cda4..36d717670 100644 --- 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; import org.argeo.slc.core.test.tree.ResultAttributes; -import org.argeo.slc.core.test.tree.ResultAttributesList; import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao; +import org.argeo.slc.msg.ObjectList; import org.argeo.slc.web.mvc.AbstractServiceController; import org.springframework.web.servlet.ModelAndView; @@ -28,7 +28,7 @@ public class ListResultAttributesController extends AbstractServiceController { List resultAttributes = testResultCollectionDao .listResultAttributes(collectionId); - modelAndView.addObject("resultAttributesList", - new ResultAttributesList(resultAttributes)); + modelAndView.addObject("resultAttributesList", new ObjectList( + resultAttributes)); } } 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 c22cd7725..5cd9da043 100644 --- 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; import org.argeo.slc.core.test.tree.TreeTestResult; -import org.argeo.slc.core.test.tree.TreeTestResultList; import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao; +import org.argeo.slc.msg.ObjectList; import org.argeo.slc.web.mvc.AbstractServiceController; import org.springframework.web.servlet.ModelAndView; @@ -23,6 +23,7 @@ public class ListResultsController extends AbstractServiceController { } @Override + @SuppressWarnings(value={"unchecked"}) protected void handleServiceRequest(HttpServletRequest request, HttpServletResponse response, ModelAndView modelAndView) throws Exception { @@ -41,7 +42,7 @@ public class ListResultsController extends AbstractServiceController { List resultAttributes = testResultCollectionDao .listResults(collectionId, attributes); - modelAndView.addObject("resultList", new TreeTestResultList( + modelAndView.addObject("resultList", new ObjectList( resultAttributes)); } } 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 ac3a0d2a9..86dfd35b6 100644 --- 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 1c4ea5124..d758d47d4 100644 --- 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 03e2af153..296a209fd 100644 --- 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; import java.util.List; -import java.util.Vector; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; 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 b5246c47c..0712515c8 100644 --- 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 @@ - - - - - - - - - - - - - - -- 2.39.2