bugfix in VersionableEntity, added ArticleCachStrategyTest

diff --git a/.gitattributes b/.gitattributes
index 1e884c827cdfcc320029c4512d2d7ed2824c3081..e9d8d14d9262591dd91f5f2997c2d90f67ef3fbb 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -2125,6 +2125,7 @@ cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/description/TaxonDesc
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/ZoologicalNameCacheStrategyTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/ArticleDefaultCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/CdDvdDefaultCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseDefaultCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/DefaultMatchStrategyTest.java -text

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VersionableEntity.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VersionableEntity.java
index 42201dbc9cc30d74d61e21985b7c86110c314e62..97ab52fa4205ab56dcad62fe86650490bf745a34 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VersionableEntity.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VersionableEntity.java
@@ -132,19 +132,6 @@ public abstract class VersionableEntity extends CdmBase {
                return true;
        }
 
-       
-       /** Overrides {@link eu.etaxonomy.cdm.model.common.CdmBase#hashCode()}
-        *  See {@link http://www.hibernate.org/109.html}, {@link http://www.geocities.com/technofundo/tech/java/equalhash.html} 
-        * or {@link http://www.ibm.com/developerworks/java/library/j-jtp05273.html}
-        * for more information about equals and hashcode. 
-        */
-        @Override
-       public int hashCode() {
-                  int hashCode = 7;
-                  hashCode = 29 * hashCode + this.getUuid().hashCode();
-                  //hashCode = 29 * hashCode + this.getCreated().hashCode();
-                  return hashCode;
-       }
         
 //********************** CLONE *****************************************/
        

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Generic.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Generic.java
index 12e586e4b70f1d42f167ea0f198ff8f7cdecf88d..e991c3eee8bf58fa0d519577d0088e3c371bec0e 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Generic.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Generic.java
@@ -14,14 +14,11 @@ import javax.persistence.Entity;
 import javax.persistence.Transient;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.log4j.Logger;
 import org.hibernate.envers.Audited;
-import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
 import org.springframework.beans.factory.annotation.Configurable;
 
@@ -101,6 +98,7 @@ public class Generic extends PublicationBase<INomenclaturalReferenceCacheStrateg
         * @see #Generic()
         * @see eu.etaxonomy.cdm.strategy.cache.reference.GenericDefaultCacheStrategy
         */
+       @Deprecated
        public static Generic NewInstance(){
                return new Generic();
        }

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/ArticleDefaultCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/ArticleDefaultCacheStrategyTest.java
new file mode 100644 (file)
index 0000000..6b370f1
--- /dev/null
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/ArticleDefaultCacheStrategyTest.java
@@ -0,0 +1,47 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.cdm.strategy.cache.reference;\r
+\r
+\r
+import org.junit.Assert;\r
+import org.junit.Before;\r
+import org.junit.BeforeClass;\r
+import org.junit.Test;\r
+\r
+/**\r
+ * @author a.mueller\r
+ * @date 16.06.2010\r
+ *\r
+ */\r
+public class ArticleDefaultCacheStrategyTest {\r
+\r
+       /**\r
+        * @throws java.lang.Exception\r
+        */\r
+       @BeforeClass\r
+       public static void setUpBeforeClass() throws Exception {\r
+       }\r
+\r
+       /**\r
+        * @throws java.lang.Exception\r
+        */\r
+       @Before\r
+       public void setUp() throws Exception {\r
+       }\r
+       \r
+//**************************** TESTS ***********************************\r
+\r
+       \r
+       @Test\r
+       public void testGetTitleCache(){\r
+               Assert.fail();\r
+       }\r
+       \r
+}\r