allow saving FullDataGenerator data through API (preliminary)

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmGenericDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmGenericDao.java
index d74b432696e3c8ec4fb03dc143a28f617c433c4f..41e13990c5fc3670f16f960efef25059e6735ae7 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmGenericDao.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmGenericDao.java
@@ -206,4 +206,6 @@ public interface ICdmGenericDao {
     public boolean containsValue(PersistentCollection col, Object element);
 
        Set<CdmBase> getReferencingObjectsForDeletion(CdmBase referencedCdmBase);
+
+       public void createFullSampleData();
 }

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImpl.java
index e7228924a873fe98fe8bbc1c5d7717c5ea4f0db1..a4dcdf05a52b9f79bc4ccbfed393982c6eaaef6b 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImpl.java
@@ -69,6 +69,7 @@ import org.springframework.stereotype.Repository;
 
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.common.DoubleResult;
+import eu.etaxonomy.cdm.datagenerator.FullCoverageDataGenerator;
 import eu.etaxonomy.cdm.hibernate.DOIUserType;
 import eu.etaxonomy.cdm.hibernate.EnumUserType;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
@@ -1279,7 +1280,12 @@ public class CdmGenericDaoImpl extends CdmEntityDaoBase<CdmBase> implements ICdm
     public boolean containsValue(PersistentCollection col, Object element) {           
        return contains(col, element);
     }
-    
+
+       @Override
+       public void createFullSampleData() {
+               FullCoverageDataGenerator dataGenerator = new FullCoverageDataGenerator();
+               dataGenerator.fillWithData(getSession());
+       }
 
 }
 

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/datagenerator/FullCoverageDataGenerator.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/datagenerator/FullCoverageDataGenerator.java
index 32f3a9b45b9f108cc9f3b244c0863c5d19433619..25bd5d201969b1cf7c946a706eb6d84c1616476c 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/datagenerator/FullCoverageDataGenerator.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/datagenerator/FullCoverageDataGenerator.java
@@ -150,6 +150,10 @@ public class FullCoverageDataGenerator {
                createReference(cdmBases);\r
                \r
                createTaxon(cdmBases);\r
+               \r
+               for (CdmBase cdmBase: cdmBases){\r
+                       session.save(cdmBase);\r
+               }\r
        }\r
 \r
 \r
@@ -174,7 +178,7 @@ public class FullCoverageDataGenerator {
                contact.addEmailAddress("a@b.de");\r
                contact.addFaxNumber("f:010-123456");\r
                contact.addPhoneNumber("p:090-987654");\r
-               contact.addUrl(URI.create("http:\\\\www.abc.de").toString());\r
+               contact.addUrl(URI.create("http://www.abc.de").toString());\r
                \r
                //Address\r
                Address address = Address.NewInstance(Country.GERMANY(), "locality", "pobox", "12345", "region", "street", locality);\r
@@ -349,9 +353,9 @@ public class FullCoverageDataGenerator {
        \r
        \r
        private void createMedia(List<CdmBase> cdmBases){\r
-               AudioFile audioFile = AudioFile.NewInstance(URI.create("http:\\a.b.de"), 22);\r
-               ImageFile imageFile = ImageFile.NewInstance(URI.create("http:\\b.c.de"), 44, 467, 55);\r
-               MovieFile movieFile = MovieFile.NewInstance(URI.create("http:\\b.c.de"), 67);\r
+               AudioFile audioFile = AudioFile.NewInstance(URI.create("http://a.b.de"), 22);\r
+               ImageFile imageFile = ImageFile.NewInstance(URI.create("http://b.c.de"), 44, 467, 55);\r
+               MovieFile movieFile = MovieFile.NewInstance(URI.create("http://b.c.de"), 67);\r
                MediaRepresentation mediaRepresentation = MediaRepresentation.NewInstance("mime", "media"); \r
        \r
                mediaRepresentation.addRepresentationPart(movieFile);\r
@@ -493,7 +497,7 @@ public class FullCoverageDataGenerator {
                reference.setInstitution(institution);\r
                reference.setIsbn("1234556");\r
                reference.setIssn("issn");\r
-               reference.setDoi(DOI.fromRegistrantCodeAndSuffix("registrantCode", "suffix"));\r
+               reference.setDoi(DOI.fromRegistrantCodeAndSuffix("14356", "suffix"));\r
                reference.setReferenceAbstract("referenceAbstract");\r
                reference.setOrganization("organization");\r
                reference.setPages("123-134");\r
@@ -504,7 +508,7 @@ public class FullCoverageDataGenerator {
 //             reference.setSeriesPart("series");\r
                reference.setSeriesPart("seriesPart");\r
                reference.setVolume("vol. 3");\r
-               reference.setUri(URI.create("http:\\rer.abc.de"));\r
+               reference.setUri(URI.create("http://rer.abc.de"));\r
                \r
                Reference<?> journal = ReferenceFactory.newJournal();\r
                reference.setInJournal(journal);\r
@@ -667,7 +671,7 @@ public class FullCoverageDataGenerator {
                \r
                //Rights\r
                Rights rights = Rights.NewInstance("right", Language.ENGLISH());\r
-               rights.setUri(URI.create("http:\\rights.abc.de"));\r
+               rights.setUri(URI.create("http://rights.abc.de"));\r
                rights.setAbbreviatedText("abbrev");\r
                rights.setType(RightsType.COPYRIGHT());\r
                Person owner = Person.NewTitledInstance("Owner");\r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/CommonServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/CommonServiceImpl.java
index e8c78941e0c732d37dafd1de47f967c802315033..9368e169cdb921e63bd310c742ec7def4a8eb253 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/CommonServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/CommonServiceImpl.java
@@ -302,6 +302,10 @@ public class CommonServiceImpl extends ServiceBase<OriginalSourceBase,IOriginalS
     public boolean containsValue(PersistentCollection col, Object element) {\r
        return genericDao.containsValue(col, element);\r
     }\r
-    \r
-   \r
+\r
+       @Override\r
+       @Transactional(readOnly = false)\r
+       public void createFullSampleData() {\r
+               genericDao.createFullSampleData();\r
+       }\r
 }\r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ICommonService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ICommonService.java
index 4fed0ef725069937cfe2f817a6d6c1e34d2a89bb..b41a231aa0e65e4513e303ca212a8bd7f386de98 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ICommonService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ICommonService.java
@@ -183,8 +183,13 @@ public interface ICommonService extends IService<OriginalSourceBase>{
         */
        public boolean containsValue(PersistentCollection col, Object element);
 
-       Set<CdmBase> getReferencingObjectsForDeletion(CdmBase referencedCdmBase);
+       public Set<CdmBase> getReferencingObjectsForDeletion(CdmBase referencedCdmBase);
        
+       /**
+        * Preliminary, may be moved to test later
+        */
+       @Deprecated
+       public void createFullSampleData();
        
        
 }
\ No newline at end of file