use strings for rankClass (#2615 und #3544)

diff --git a/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceTest.java b/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceTest.java
index 546897035e804281366ffae5621cbeba1bf21951..9b4515f9d4f9b1f02d8922c2ca7424cb0fed6d5e 100644 (file)
--- a/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceTest.java
+++ b/cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/geo/EditGeoServiceTest.java
@@ -83,13 +83,6 @@ public class EditGeoServiceTest extends CdmIntegrationTest {
 //             initializer.initialize();\r
 //     }\r
 \r
-    /**\r
-     * @throws java.lang.Exception\r
-     */\r
-    @AfterClass\r
-    public static void tearDownAfterClass() throws Exception {\r
-    }\r
-\r
     /**\r
      * @throws java.lang.Exception\r
      */\r
@@ -100,12 +93,6 @@ public class EditGeoServiceTest extends CdmIntegrationTest {
         editMapServiceUri = new URI(EDIT_MAPSERVICE_URI_STING);\r
     }\r
 \r
-    /**\r
-     * @throws java.lang.Exception\r
-     */\r
-    @After\r
-    public void tearDown() throws Exception {\r
-    }\r
 \r
 //******************************************** TESTS**************\r
     @Test\r

diff --git a/cdmlib-ext/src/test/resources/dbscripts/001-cdm.h2.sql b/cdmlib-ext/src/test/resources/dbscripts/001-cdm.h2.sql
index 35f404d1b5dbeed88f9cf8944f8de9d553d80f3a..98082d7ed9571a66da3b987e5f84438d2a363b6f 100644 (file)
--- a/cdmlib-ext/src/test/resources/dbscripts/001-cdm.h2.sql
+++ b/cdmlib-ext/src/test/resources/dbscripts/001-cdm.h2.sql
@@ -867,7 +867,7 @@ CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE(
     TITLECACHE VARCHAR(255),
     URI CLOB,
     ISO639_1 VARCHAR(2),
-    RANKCLASS INTEGER,
+    RANKCLASS VARCHAR(4) NOT NULL,
     ISTECHNICAL BOOLEAN,
     ORDERINDEX INTEGER,
     SYMMETRICAL BOOLEAN,
@@ -923,7 +923,7 @@ CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_AUD(
     VOCABULARY_ID INTEGER,
     ORDERINDEX INTEGER,
     ISO639_1 VARCHAR(2),
-    RANKCLASS INTEGER,
+    RANKCLASS VARCHAR(4) NOT NULL,
     SUPPORTSCATEGORICALDATA BOOLEAN,
     SUPPORTSCOMMONTAXONNAME BOOLEAN,
     SUPPORTSDISTRIBUTION BOOLEAN,

diff --git a/cdmlib-io/src/test/resources/dbscripts/001-cdm.h2.sql b/cdmlib-io/src/test/resources/dbscripts/001-cdm.h2.sql
index 35f404d1b5dbeed88f9cf8944f8de9d553d80f3a..98082d7ed9571a66da3b987e5f84438d2a363b6f 100644 (file)
--- a/cdmlib-io/src/test/resources/dbscripts/001-cdm.h2.sql
+++ b/cdmlib-io/src/test/resources/dbscripts/001-cdm.h2.sql
@@ -867,7 +867,7 @@ CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE(
     TITLECACHE VARCHAR(255),
     URI CLOB,
     ISO639_1 VARCHAR(2),
-    RANKCLASS INTEGER,
+    RANKCLASS VARCHAR(4) NOT NULL,
     ISTECHNICAL BOOLEAN,
     ORDERINDEX INTEGER,
     SYMMETRICAL BOOLEAN,
@@ -923,7 +923,7 @@ CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_AUD(
     VOCABULARY_ID INTEGER,
     ORDERINDEX INTEGER,
     ISO639_1 VARCHAR(2),
-    RANKCLASS INTEGER,
+    RANKCLASS VARCHAR(4) NOT NULL,
     SUPPORTSCATEGORICALDATA BOOLEAN,
     SUPPORTSCOMMONTAXONNAME BOOLEAN,
     SUPPORTSDISTRIBUTION BOOLEAN,

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java
index 1eac5955f35ecee767197161e4a90d51c747eec5..46f689ec421884926e3f5a44b02fb1e67c7336af 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermBase.java
@@ -73,7 +73,7 @@ public abstract class TermBase extends IdentifiableEntity<IIdentifiableEntityCac
         */
        @XmlAttribute(name ="TermType")
        @Column(name="termType")
-       @NotNull
+//     @NotNull
 //     @Enumerated  //TODO use UserType
     @Type(type = "eu.etaxonomy.cdm.hibernate.EnumUserType",
             parameters = {@org.hibernate.annotations.Parameter(name  = "enumClass", value = "eu.etaxonomy.cdm.model.common.TermType")}

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java
index f4be70a87b6823a42670d85da93feb1a1fd74fa7..5677280b25c417a025ee3f3583bf195e9da04405 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java
@@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.log4j.Logger;
+import org.hibernate.annotations.Type;
 import org.hibernate.envers.Audited;
 import org.hibernate.search.annotations.Indexed;
 
@@ -175,6 +176,9 @@ public class Rank extends OrderedTermBase<Rank> {
        @XmlAttribute(name ="RankClass")
        @NotNull
        @Enumerated  //TODO use UserType 
+           @Type(type = "eu.etaxonomy.cdm.hibernate.EnumUserType",
+               parameters = {@org.hibernate.annotations.Parameter(name="enumClass", value="eu.etaxonomy.cdm.model.name.RankClass")}
+       )
        private RankClass rankClass;
 
 

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java
index 3cf6c0dceb6c84c47cc0f3da5fcd23bb9b464591..b66bfe9d7dd472a91749f8f7e86dc9fb0618b3f8 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java
@@ -111,6 +111,7 @@ public class PersistentTermInitializer extends DefaultTermInitializer {
             logger.info("PersistentTermInitializer.omit == false, initializing " + VocabularyEnum.values().length + " term classes");\r
 \r
             TransactionStatus txStatus = transactionManager.getTransaction(txDefinition);\r
+//            TermVocabulary v = vocabularyDao.findByUuid(UUID.fromString("45ac7043-7f5e-4f37-92f2-3874aaaef2de"));\r
             for(VocabularyEnum vocabularyType : VocabularyEnum.values()) {\r
                 //Class<? extends DefinedTermBase<?>> clazz = vocabularyType.getClazz();\r
                 UUID vocabularyUuid = firstPass(vocabularyType,terms);\r

diff --git a/cdmlib-persistence/src/test/resources/dbscripts/001-cdm.h2.sql b/cdmlib-persistence/src/test/resources/dbscripts/001-cdm.h2.sql
index 35f404d1b5dbeed88f9cf8944f8de9d553d80f3a..98082d7ed9571a66da3b987e5f84438d2a363b6f 100644 (file)
--- a/cdmlib-persistence/src/test/resources/dbscripts/001-cdm.h2.sql
+++ b/cdmlib-persistence/src/test/resources/dbscripts/001-cdm.h2.sql
@@ -867,7 +867,7 @@ CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE(
     TITLECACHE VARCHAR(255),
     URI CLOB,
     ISO639_1 VARCHAR(2),
-    RANKCLASS INTEGER,
+    RANKCLASS VARCHAR(4) NOT NULL,
     ISTECHNICAL BOOLEAN,
     ORDERINDEX INTEGER,
     SYMMETRICAL BOOLEAN,
@@ -923,7 +923,7 @@ CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_AUD(
     VOCABULARY_ID INTEGER,
     ORDERINDEX INTEGER,
     ISO639_1 VARCHAR(2),
-    RANKCLASS INTEGER,
+    RANKCLASS VARCHAR(4) NOT NULL,
     SUPPORTSCATEGORICALDATA BOOLEAN,
     SUPPORTSCOMMONTAXONNAME BOOLEAN,
     SUPPORTSDISTRIBUTION BOOLEAN,

diff --git a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml
index 94f465fa79d2007bbb2032792f5afedf4739019e..2fd57b6519ffdab995f1abcd5a427d5b621eaf47 100644 (file)
Binary files a/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml and b/cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml differ

diff --git a/cdmlib-services/src/test/resources/dbscripts/001-cdm.h2.sql b/cdmlib-services/src/test/resources/dbscripts/001-cdm.h2.sql
index 35f404d1b5dbeed88f9cf8944f8de9d553d80f3a..98082d7ed9571a66da3b987e5f84438d2a363b6f 100644 (file)
--- a/cdmlib-services/src/test/resources/dbscripts/001-cdm.h2.sql
+++ b/cdmlib-services/src/test/resources/dbscripts/001-cdm.h2.sql
@@ -867,7 +867,7 @@ CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE(
     TITLECACHE VARCHAR(255),
     URI CLOB,
     ISO639_1 VARCHAR(2),
-    RANKCLASS INTEGER,
+    RANKCLASS VARCHAR(4) NOT NULL,
     ISTECHNICAL BOOLEAN,
     ORDERINDEX INTEGER,
     SYMMETRICAL BOOLEAN,
@@ -923,7 +923,7 @@ CREATE CACHED TABLE PUBLIC.DEFINEDTERMBASE_AUD(
     VOCABULARY_ID INTEGER,
     ORDERINDEX INTEGER,
     ISO639_1 VARCHAR(2),
-    RANKCLASS INTEGER,
+    RANKCLASS VARCHAR(4) NOT NULL,
     SUPPORTSCATEGORICALDATA BOOLEAN,
     SUPPORTSCOMMONTAXONNAME BOOLEAN,
     SUPPORTSDISTRIBUTION BOOLEAN,