add factory method to CdmLightExportConfigurator

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightExportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightExportConfigurator.java
index 4ff2fab613c571694cab942b36be4af465777373..a0e859aa024a54a14ae5b805b73de65a4708b6c3 100755 (executable)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightExportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/cdmLight/CdmLightExportConfigurator.java
@@ -11,6 +11,7 @@ package eu.etaxonomy.cdm.io.cdmLight;
 import java.io.File;
 import java.util.Comparator;
 
+import eu.etaxonomy.cdm.database.ICdmDataSource;
 import eu.etaxonomy.cdm.ext.geo.CondensedDistributionConfiguration;
 import eu.etaxonomy.cdm.io.common.CsvIOConfigurator;
 import eu.etaxonomy.cdm.io.common.ExportConfiguratorBase;
@@ -61,10 +62,21 @@ public class CdmLightExportConfigurator
     private String keywords;
     private String licence;
 
-    /**
-     * @param transformer
-     */
-    public CdmLightExportConfigurator(IExportTransformer transformer) {
+
+    public static CdmLightExportConfigurator NewInstance(){
+        CdmLightExportConfigurator result = new CdmLightExportConfigurator(null);
+        return result;
+    }
+
+    public static CdmLightExportConfigurator NewInstance(ICdmDataSource source, File destination){
+        CdmLightExportConfigurator result = new CdmLightExportConfigurator(null);
+        result.setSource(source);
+        result.setDestination(destination);
+        return result;
+    }
+
+    //TODO AM: do we need the transformer parameter here?
+    private CdmLightExportConfigurator(IExportTransformer transformer) {
         super(transformer);
         this.resultType = ExportResultType.MAP_BYTE_ARRAY;
         this.setTarget(TARGET.EXPORT_DATA);

diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/cdmLight/out/CdmLightExportTest.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/cdmLight/out/CdmLightExportTest.java
index 4e3c617280ffa1893f2613ca9d09d0b20edb98b0..e71e8ed8586ca00af98a5c742f3bc291d4aba6a6 100755 (executable)
--- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/cdmLight/out/CdmLightExportTest.java
+++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/cdmLight/out/CdmLightExportTest.java
@@ -106,7 +106,7 @@ public class CdmLightExportTest extends CdmTransactionalIntegrationTest{
         })
         public void testSubTree(){
 
-            CdmLightExportConfigurator config = new CdmLightExportConfigurator(null);
+            CdmLightExportConfigurator config = CdmLightExportConfigurator.NewInstance();
 //            config.setCreateCondensedDistributionString(false);
             config.setTaxonNodeFilter(TaxonNodeFilter.NewSubtreeInstance(UUID.fromString("f8c9933a-fe3a-42ce-8a92-000e27bfdfac")));
 
@@ -175,7 +175,7 @@ public class CdmLightExportTest extends CdmTransactionalIntegrationTest{
         })
         public void testFullTreeWithUnpublished(){
 
-            CdmLightExportConfigurator config = new CdmLightExportConfigurator(null);
+            CdmLightExportConfigurator config = CdmLightExportConfigurator.NewInstance();
             config.setTarget(TARGET.EXPORT_DATA);
             config.getTaxonNodeFilter().setIncludeUnpublished(true);
 
@@ -265,7 +265,7 @@ public class CdmLightExportTest extends CdmTransactionalIntegrationTest{
         })
         public void testFullData(){
 
-            CdmLightExportConfigurator config = new CdmLightExportConfigurator(null);
+            CdmLightExportConfigurator config = CdmLightExportConfigurator.NewInstance();
             config.setTarget(TARGET.EXPORT_DATA);
 
             ExportResult result = defaultExport.invoke(config);
@@ -321,7 +321,7 @@ public class CdmLightExportTest extends CdmTransactionalIntegrationTest{
             commitAndStartNewTransaction();
 
 
-            CdmLightExportConfigurator config = new CdmLightExportConfigurator(null);
+            CdmLightExportConfigurator config = CdmLightExportConfigurator.NewInstance();
             config.setTarget(TARGET.EXPORT_DATA);
 
             ExportResult result = defaultExport.invoke(config);