From: <jos...@us...> - 2009-08-12 14:27:49
|
Revision: 4885 http://geonetwork.svn.sourceforge.net/geonetwork/?rev=4885&view=rev Author: josegar74 Date: 2009-08-12 14:27:36 +0000 (Wed, 12 Aug 2009) Log Message: ----------- Changed ExceptionReport to ResponseReport Modified Paths: -------------- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/config/security-jibx-binding.xml Added Paths: ----------- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/util/ResponseReportFactory.java sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/web/response/ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/web/response/ResponseReport.java sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/java/org/geonetwork/gaap/domain/web/response/ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/java/org/geonetwork/gaap/domain/web/response/ResponseReportTest.java sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/resources/ResponseReportTestData.xml Removed Paths: ------------- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/util/ExceptionReportFactory.java sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/web/exception/ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/web/response/ExceptionReport.java sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/java/org/geonetwork/gaap/domain/web/exception/ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/java/org/geonetwork/gaap/domain/web/response/ExceptionReportTest.java sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/resources/ExceptionReportTestData.xml Modified: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/config/security-jibx-binding.xml =================================================================== --- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/config/security-jibx-binding.xml 2009-08-12 14:13:52 UTC (rev 4884) +++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/config/security-jibx-binding.xml 2009-08-12 14:27:36 UTC (rev 4885) @@ -1,12 +1,14 @@ <binding xmlns:opr="http://geonetwork.org/gaap/domain/operation" xmlns:grp="http://geonetwork.org/gaap/domain/group" xmlns:usr="http://geonetwork.org/gaap/domain/user" + xmlns:res="http://geonetwork.org/gaap/domain/web/response" name="binding"> <namespace uri="http://geonetwork.org/gaap/domain/operation" prefix="opr"/> <namespace uri="http://geonetwork.org/gaap/domain/group" prefix="grp"/> <namespace uri="http://geonetwork.org/gaap/domain/user" prefix="usr"/> - + <namespace uri="http://geonetwork.org/gaap/domain/web/response" prefix="res"/> + <!-- Group --> <mapping ns="http://geonetwork.org/gaap/domain/group" class="org.geonetwork.gaap.domain.group.Group" name="group" ordered="false"> @@ -125,14 +127,16 @@ <value style="element" name="referrer" field="referrer" usage="optional"/> </mapping--> - <!-- ExceptionReport --> - <mapping ns="http://geonetwork.org/gaap/domain/web/exception" prefix="ex" name="ExceptionReport" - class="org.geonetwork.gaap.domain.web.exception.ExceptionReport"> - <namespace uri="http://geonetwork.org/gaap/domain/web/exception" prefix="ex" /> + <!-- ResponseReport --> + <mapping ns="http://geonetwork.org/gaap/domain/web/response" name="ResponseReport" + class="org.geonetwork.gaap.domain.web.response.ResponseReport"> + <namespace uri="http://geonetwork.org/gaap/domain/web/response" prefix="res" /> - <collection ns="http://geonetwork.org/gaap/domain/web/exception" prefix="ex" field="exceptionList" + <value style="attribute" field="status" name="status"/> + + <collection ns="http://geonetwork.org/gaap/domain/web/response" field="exceptionList" create-type="java.util.ArrayList" usage="optional"> - <value name="ExceptionText" ns="http://geonetwork.org/gaap/domain/web/exception" type="java.lang.String" /> + <value name="ExceptionText" ns="http://geonetwork.org/gaap/domain/web/response" type="java.lang.String" /> </collection> </mapping> </binding> \ No newline at end of file Deleted: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/util/ExceptionReportFactory.java =================================================================== --- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/util/ExceptionReportFactory.java 2009-08-12 14:13:52 UTC (rev 4884) +++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/util/ExceptionReportFactory.java 2009-08-12 14:27:36 UTC (rev 4885) @@ -1,20 +0,0 @@ -package org.geonetwork.gaap.domain.util; - -import org.geonetwork.gaap.domain.web.exception.ExceptionReport; - -/** - * Factory class for ExceptionReport test - * - * @author Jose - */ -public class ExceptionReportFactory { - public static ExceptionReport create() { - ExceptionReport er = new ExceptionReport(); - er.addException("Exception 1"); - er.addException("Exception 2"); - er.addException("Exception 3"); - - return er; - } - -} Copied: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/util/ResponseReportFactory.java (from rev 4881, sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/util/ExceptionReportFactory.java) =================================================================== --- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/util/ResponseReportFactory.java (rev 0) +++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/util/ResponseReportFactory.java 2009-08-12 14:27:36 UTC (rev 4885) @@ -0,0 +1,23 @@ +package org.geonetwork.gaap.domain.util; + +import org.geonetwork.gaap.domain.web.response.ResponseReport; +import org.geonetwork.gaap.domain.web.response.ResponseStatusCode; + +/** + * Factory class for ExceptionReport test + * + * @author Jose + */ +public class ResponseReportFactory { + public static ResponseReport create() { + ResponseReport er = new ResponseReport(); + er.setStatus(ResponseStatusCode.ERROR); + + er.addException("Exception 1"); + er.addException("Exception 2"); + er.addException("Exception 3"); + + return er; + } + +} Deleted: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/web/response/ExceptionReport.java =================================================================== --- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/web/exception/ExceptionReport.java 2009-08-12 13:48:45 UTC (rev 4881) +++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/web/response/ExceptionReport.java 2009-08-12 14:27:36 UTC (rev 4885) @@ -1,53 +0,0 @@ -package org.geonetwork.gaap.domain.web.exception; - -import java.util.List; -import java.util.ArrayList; - -public class ExceptionReport { - List<String> exceptionList = new ArrayList<String>(); - - public List<String> getExceptionList() { - return exceptionList; - } - - public void setExceptionList(List<String> exceptionList) { - this.exceptionList = exceptionList; - } - - public void addException(String exception) { - this.exceptionList.add(exception); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - - result = prime * result + ((exceptionList == null) ? 0 : exceptionList.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (!(obj instanceof ExceptionReport)) - return false; - ExceptionReport other = (ExceptionReport) obj; - if (exceptionList == null) { - if (other.exceptionList != null) - return false; - } else if (exceptionList.size() != other.exceptionList.size()) { - return false; - } else { - if (exceptionList.size() > 0) { - return (exceptionList.equals(other.exceptionList)); - } - } - - - return true; - } -} Copied: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/web/response/ResponseReport.java (from rev 4881, sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/web/exception/ExceptionReport.java) =================================================================== --- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/web/response/ResponseReport.java (rev 0) +++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/main/java/org/geonetwork/gaap/domain/web/response/ResponseReport.java 2009-08-12 14:27:36 UTC (rev 4885) @@ -0,0 +1,60 @@ +package org.geonetwork.gaap.domain.web.response; + +import java.util.List; +import java.util.ArrayList; + +public class ResponseReport { + ResponseStatusCode status; + + List<String> exceptionList = new ArrayList<String>(); + + public ResponseReport() { + this.status = ResponseStatusCode.OK; + } + + public ResponseReport(ResponseStatusCode status) { + this.status = status; + } + + public ResponseStatusCode getStatus() { + return status; + } + + public void setStatus(ResponseStatusCode status) { + this.status = status; + } + + public List<String> getExceptionList() { + return exceptionList; + } + + public void setExceptionList(List<String> exceptionList) { + this.exceptionList = exceptionList; + } + + public void addException(String exception) { + this.exceptionList.add(exception); + } + + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + ResponseReport that = (ResponseReport) o; + + if (exceptionList != null ? !exceptionList.equals(that.exceptionList) : that.exceptionList != null) + return false; + if (status != that.status) return false; + + return true; + } + + @Override + public int hashCode() { + int result = status != null ? status.hashCode() : 0; + result = 31 * result + (exceptionList != null ? exceptionList.hashCode() : 0); + return result; + } +} Deleted: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/java/org/geonetwork/gaap/domain/web/response/ExceptionReportTest.java =================================================================== --- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/java/org/geonetwork/gaap/domain/web/exception/ExceptionReportTest.java 2009-08-12 13:48:45 UTC (rev 4881) +++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/java/org/geonetwork/gaap/domain/web/response/ExceptionReportTest.java 2009-08-12 14:27:36 UTC (rev 4885) @@ -1,78 +0,0 @@ -package org.geonetwork.gaap.domain.web.exception; - -import org.junit.Test; -import org.jibx.runtime.*; -import org.geonetwork.gaap.domain.user.User; -import org.geonetwork.gaap.domain.util.UserFactory; -import org.geonetwork.gaap.domain.util.ExceptionReportFactory; -import org.xml.sax.SAXException; -import org.xml.sax.InputSource; -import org.custommonkey.xmlunit.DifferenceListener; -import org.custommonkey.xmlunit.IgnoreTextAndAttributeValuesDifferenceListener; -import org.custommonkey.xmlunit.Diff; - -import java.io.*; - -import junit.framework.TestCase; - -/** - * Test class for ExceptionReport Jibx binding - * - * @author Jose - */ -public class ExceptionReportTest extends TestCase { - @Test - public void testUnmarshall() throws FileNotFoundException, JiBXException { - // get input XML from file system - FileInputStream fis = new FileInputStream(new File("src/test/resources/ExceptionReportTestData.xml")); - - // create JiBX unmarshal context - IBindingFactory bfact = BindingDirectory.getFactory(ExceptionReport.class); - IUnmarshallingContext unMarshallingContext = bfact.createUnmarshallingContext(); - - // unmarshal to ExceptionReport - ExceptionReport unMarshallingResult = (ExceptionReport) unMarshallingContext.unmarshalDocument(fis, "UTF-8"); - - // get expected result from test factory - ExceptionReport expectedResult = ExceptionReportFactory.create(); - - // test equality - assertEquals("Unmarshalling ExceptionReport", expectedResult, unMarshallingResult); - } - - @Test - public void testMarshall() throws JiBXException, SAXException, IOException { - // create a ExceptionReport with some values - ExceptionReport o = ExceptionReportFactory.create(); - - // set up JiBX marshalling context - IBindingFactory bfact = BindingDirectory.getFactory(ExceptionReport.class); - IMarshallingContext marshallingContext = bfact.createMarshallingContext(); - - // marshal to console - nice if you're looking - Writer outConsole = new BufferedWriter(new OutputStreamWriter(System.out)); - marshallingContext.setOutput(outConsole); - marshallingContext.setIndent(3); - marshallingContext.marshalDocument(o, "UTF-8", null); - - // marshal to outputstream - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - Writer out = new BufferedWriter(new OutputStreamWriter(outputStream)); - marshallingContext.setIndent(3); - marshallingContext.setOutput(out); - marshallingContext.marshalDocument(o, "UTF-8", null); - - // convert to InputSource for the comparison test - InputSource marshallingResult = new InputSource(new ByteArrayInputStream(outputStream.toByteArray())); - - // get expected result from filesystem - FileInputStream fis = new FileInputStream(new File("src/test/resources/ExceptionReportTestData.xml")); - InputSource expectedResult = new InputSource(fis); - - // comparison test - DifferenceListener differenceListener = new IgnoreTextAndAttributeValuesDifferenceListener(); - Diff diff = new Diff(expectedResult, marshallingResult); - diff.overrideDifferenceListener(differenceListener); - assertTrue("Marshalled User matches expected XML " + diff, diff.similar()); - } -} Added: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/java/org/geonetwork/gaap/domain/web/response/ResponseReportTest.java =================================================================== --- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/java/org/geonetwork/gaap/domain/web/response/ResponseReportTest.java (rev 0) +++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/java/org/geonetwork/gaap/domain/web/response/ResponseReportTest.java 2009-08-12 14:27:36 UTC (rev 4885) @@ -0,0 +1,76 @@ +package org.geonetwork.gaap.domain.web.response; + +import org.junit.Test; +import org.jibx.runtime.*; +import org.geonetwork.gaap.domain.util.ResponseReportFactory; +import org.xml.sax.SAXException; +import org.xml.sax.InputSource; +import org.custommonkey.xmlunit.DifferenceListener; +import org.custommonkey.xmlunit.IgnoreTextAndAttributeValuesDifferenceListener; +import org.custommonkey.xmlunit.Diff; + +import java.io.*; + +import junit.framework.TestCase; + +/** + * Test class for ExceptionReport Jibx binding + * + * @author Jose + */ +public class ResponseReportTest extends TestCase { + @Test + public void testUnmarshall() throws FileNotFoundException, JiBXException { + // get input XML from file system + FileInputStream fis = new FileInputStream(new File("src/test/resources/ResponseReportTestData.xml")); + + // create JiBX unmarshal context + IBindingFactory bfact = BindingDirectory.getFactory(ResponseReport.class); + IUnmarshallingContext unMarshallingContext = bfact.createUnmarshallingContext(); + + // unmarshal to ExceptionReport + ResponseReport unMarshallingResult = (ResponseReport) unMarshallingContext.unmarshalDocument(fis, "UTF-8"); + + // get expected result from test factory + ResponseReport expectedResult = ResponseReportFactory.create(); + + // test equality + assertEquals("Unmarshalling ExceptionReport", expectedResult, unMarshallingResult); + } + + @Test + public void testMarshall() throws JiBXException, SAXException, IOException { + // create a ExceptionReport with some values + ResponseReport o = ResponseReportFactory.create(); + + // set up JiBX marshalling context + IBindingFactory bfact = BindingDirectory.getFactory(ResponseReport.class); + IMarshallingContext marshallingContext = bfact.createMarshallingContext(); + + // marshal to console - nice if you're looking + Writer outConsole = new BufferedWriter(new OutputStreamWriter(System.out)); + marshallingContext.setOutput(outConsole); + marshallingContext.setIndent(3); + marshallingContext.marshalDocument(o, "UTF-8", null); + + // marshal to outputstream + ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + Writer out = new BufferedWriter(new OutputStreamWriter(outputStream)); + marshallingContext.setIndent(3); + marshallingContext.setOutput(out); + marshallingContext.marshalDocument(o, "UTF-8", null); + + // convert to InputSource for the comparison test + InputSource marshallingResult = new InputSource(new ByteArrayInputStream(outputStream.toByteArray())); + + // get expected result from filesystem + FileInputStream fis = new FileInputStream(new File("src/test/resources/ResponseReportTestData.xml")); + InputSource expectedResult = new InputSource(fis); + + // comparison test + DifferenceListener differenceListener = new IgnoreTextAndAttributeValuesDifferenceListener(); + Diff diff = new Diff(expectedResult, marshallingResult); + diff.overrideDifferenceListener(differenceListener); + assertTrue("Marshalled User matches expected XML " + diff, diff.similar()); + } +} Deleted: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/resources/ExceptionReportTestData.xml =================================================================== --- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/resources/ExceptionReportTestData.xml 2009-08-12 14:13:52 UTC (rev 4884) +++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/resources/ExceptionReportTestData.xml 2009-08-12 14:27:36 UTC (rev 4885) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ex:ExceptionReport xmlns:ex="http://geonetwork.org/gaap/domain/web/exception"> - <ex:ExceptionText>Exception 1</ex:ExceptionText> - - <ex:ExceptionText>Exception 2</ex:ExceptionText> - - <ex:ExceptionText>Exception 3</ex:ExceptionText> -</ex:ExceptionReport> Copied: sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/resources/ResponseReportTestData.xml (from rev 4882, sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/resources/ExceptionReportTestData.xml) =================================================================== --- sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/resources/ResponseReportTestData.xml (rev 0) +++ sandbox/3.0.x/geonetwork-gaap/geonetwork-gaap-domain/src/test/resources/ResponseReportTestData.xml 2009-08-12 14:27:36 UTC (rev 4885) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<res:ResponseReport xmlns:res="http://geonetwork.org/gaap/domain/web/response" status="ERROR"> + <res:ExceptionText>Exception 1</res:ExceptionText> + + <res:ExceptionText>Exception 2</res:ExceptionText> + + <res:ExceptionText>Exception 3</res:ExceptionText> +</res:ResponseReport> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |