Additional annotations for sdd import and export components and a test to show how...

diff --git a/.gitattributes b/.gitattributes
index a133fbeffb2d3dd3b46ee8cd4ba268ee572fb24b..aecc2d6432786f6c60a49faf3a9b64a705b7407f 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -645,6 +645,7 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTransformer.java -text
 cdmlib-io/src/main/resources/log4j.properties -text
 cdmlib-io/src/site/site.xml -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/CdmImporterTest.java -text
+cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/test/function/TestDatabase.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java -text
 cdmlib-io/src/test/resources/dbscripts/001_cdm.ddl -text
@@ -655,6 +656,7 @@ cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dataset.xsd -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/CdmImporterTest-input.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/CdmImporterTest.testImport-result.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/CdmImporterTest.xml -text
+cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest-input.xml -text
 cdmlib-io/src/test/resources/unitils.properties -text
 cdmlib-model/LICENSE.TXT -text
 cdmlib-model/README.TXT -text

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDCdmExporter.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDCdmExporter.java
index c0ed8100f815c2db93246b5937302109471d45a1..3ff214866037cc891b034ea4f0ac227d884fac3b 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDCdmExporter.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDCdmExporter.java
@@ -16,6 +16,7 @@ import java.util.Map;
 import java.util.Set;\r
 \r
 import org.apache.log4j.Logger;\r
+import org.springframework.stereotype.Component;\r
 import org.springframework.transaction.TransactionStatus;\r
 \r
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
@@ -41,6 +42,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
  * @author h.fradin (from a.babadshanjan)\r
  * @created 10.12.2008\r
  */\r
+@Component\r
 public class SDDCdmExporter extends CdmIoBase<IExportConfigurator> implements ICdmIO<IExportConfigurator> {\r
 // public class CdmExporter extends CdmIoBase implements ICdmIoExport {\r
 // TODO: public class CdmExporter extends CdmIoBase implements ICdmIO {\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIO.java
index 55cb1c6d3301e1056f36e4b22631d6f9005616ce..a8415eb805704a7909760203604962b999a6a515 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIO.java
@@ -18,6 +18,7 @@ import org.apache.log4j.Logger;
 import org.jdom.Element;\r
 import org.jdom.Namespace;\r
 import org.joda.time.DateTime;\r
+import org.springframework.stereotype.Component;\r
 import org.springframework.transaction.TransactionStatus;\r
 \r
 import eu.etaxonomy.cdm.api.service.IDescriptionService;\r
@@ -63,7 +64,7 @@ import eu.etaxonomy.cdm.model.reference.Generic;
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 \r
-\r
+@Component\r
 public class SDDDescriptionIO extends SDDIoBase implements ICdmIO<IImportConfigurator> {\r
        private static final Logger logger = Logger.getLogger(SDDDescriptionIO.class);\r
 \r

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest.java
new file mode 100644 (file)
index 0000000..1e2f87d
--- /dev/null
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest.java
@@ -0,0 +1,37 @@
+package eu.etaxonomy.cdm.io.sdd;\r
+\r
+import static org.junit.Assert.assertNotNull;\r
+\r
+import java.net.URL;\r
+\r
+import org.junit.Before;\r
+import org.junit.Test;\r
+import org.unitils.spring.annotation.SpringBeanByType;\r
+\r
+import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
+import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTest;\r
+\r
+public class SDDDescriptionIOTest extends CdmTransactionalIntegrationTest {\r
+       \r
+       @SpringBeanByType\r
+       SDDDescriptionIO sddDescriptionIo;\r
+       \r
+       private IImportConfigurator configurator;\r
+       \r
+       @Before\r
+       public void setUp() {\r
+               URL url = this.getClass().getResource("/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest-input.xml");\r
+               configurator = SDDImportConfigurator.NewInstance(url.toString(), null);\r
+       }\r
+       \r
+       @Test\r
+       public void testInit() {\r
+               assertNotNull("sddDescriptionIo should not be null",sddDescriptionIo);\r
+       }\r
+       \r
+       @Test\r
+       public void testDoInvoke() {\r
+               sddDescriptionIo.doInvoke(configurator, null);\r
+       }\r
+\r
+}\r

diff --git a/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest-input.xml b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest-input.xml
new file mode 100644 (file)
index 0000000..f6acc33
--- /dev/null
+++ b/cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest-input.xml
@@ -0,0 +1,3 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<DataSets xmlns="http://rs.tdwg.org/UBIF/2006/">
+</DataSets>