cleanup

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferenceResolver.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferenceResolver.java
index 997f4741b4bd94234e2b966f11f1fc3004ecf024..85c0378f113d8c20d32057a1c205df319aadaab0 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferenceResolver.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/PreferenceResolver.java
@@ -119,11 +119,6 @@ public class PreferenceResolver {
         }
     }
 
-    /**
-     * @param subject
-     * @param subject2
-     * @return
-     */
     private static boolean subjectMatches(PreferenceSubject subjectA, PreferenceSubject subjectB) {
         List<String> partsA = subjectA.getParts();
         List<String> partsB = subjectB.getParts();

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmPreferenceLookup.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmPreferenceLookup.java
index 1fe5861791508d03023e5062caea0e7a6ce2b33e..e56bb8e348ca766a20f0b325e0eb9866081e09c8 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmPreferenceLookup.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmPreferenceLookup.java
@@ -21,9 +21,7 @@ import eu.etaxonomy.cdm.persistence.dao.common.IPreferenceDao;
  *
  * @author a.kohlbecker
  * @since Oct 2, 2018
- *
  */
-
 public class CdmPreferenceLookup {
 
     private static CdmPreferenceLookup instance;
@@ -73,6 +71,5 @@ public class CdmPreferenceLookup {
         boolean isOutDated(){
             return System.currentTimeMillis() - updateInterval > time;
         }
-
     }
-}
+}
\ No newline at end of file

diff --git a/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/security_base.xml b/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/security_base.xml
index 76c96c2571f6bf69def5732dfbdf1d42b7c6bb8f..a0a567e63512c0a0af2a168e43f7ef5cae9fb720 100644 (file)
--- a/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/security_base.xml
+++ b/cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/security_base.xml
@@ -9,8 +9,6 @@
     http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.3.xsd
     ">
 
-
-
     <bean id="sessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean" depends-on="tableGeneratorGlobalOverride">
         <property name="implicitNamingStrategy">
           <bean class="org.hibernate.boot.model.naming.ImplicitNamingStrategyComponentPathImpl" />

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotationDaoTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotationDaoTest.java
index db178115377c3484f9886d0ce62cade759fb2395..b0502683ce96929279e859abb5a2d47f8684ad39 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotationDaoTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotationDaoTest.java
@@ -17,6 +17,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
+import org.apache.log4j.Logger;
 import org.junit.Before;
 import org.junit.Test;
 import org.unitils.dbunit.annotation.DataSet;
@@ -33,6 +34,9 @@ import eu.etaxonomy.cdm.test.integration.CdmIntegrationTest;
 @DataSet
 public class AnnotationDaoTest extends CdmIntegrationTest {
 
+    @SuppressWarnings("unused")
+    private static final Logger logger = Logger.getLogger(AnnotationDaoTest.class);
+
        @SpringBeanByType
        private IAnnotationDao annotationDao;
 

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBaseTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBaseTest.java
index ac68b1a0ea1f20c63e261c78a935874e6462f19c..cad22f2c376e3dad32996cdb995f212803d7842a 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBaseTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBaseTest.java
@@ -19,6 +19,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
+import org.apache.log4j.Logger;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -45,6 +46,8 @@ import eu.etaxonomy.cdm.test.integration.CdmTransactionalIntegrationTestWithSecu
  */
 public class CdmEntityDaoBaseTest extends CdmTransactionalIntegrationTestWithSecurity {
 
+    private static final Logger logger = Logger.getLogger(CdmEntityDaoBaseTest.class);
+
     private UUID uuid;
     private TaxonBase<?> cdmBase;
 

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java
index a2e14f5557fb7fe4e52867dc749b0d744e5760e0..bddfc6ef53f887b7d3a69ceb5df1c713010ff4da 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java
@@ -1215,9 +1215,6 @@ public class TaxonDaoHibernateImplTest extends CdmTransactionalIntegrationTest {
         }
     }
 
-
-
-
     @Test
     @DataSet("TaxonDaoHibernateImplTest.testFindDeleted.xml")
     //NOTE: There is a problem with loading AuditEvents if this test runs

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxonGraph/TaxonGraphTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxonGraph/TaxonGraphTest.java
index 22549f3ebf7cf570923b8e4b882fd0354fa2ad53..2598f53686712d690d3b454e93c3d7a3314e5d0d 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxonGraph/TaxonGraphTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxonGraph/TaxonGraphTest.java
@@ -13,6 +13,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
+import org.apache.log4j.Logger;
 import org.hibernate.Session;
 import org.junit.Assert;
 import org.junit.Test;
@@ -45,6 +46,8 @@ import eu.etaxonomy.cdm.test.unitils.CleanSweepInsertLoadStrategy;
  */
 public class TaxonGraphTest extends CdmTransactionalIntegrationTest {
 
+    private static final Logger logger = Logger.getLogger(TaxonGraphTest.class);
+
     enum EventType{
         INSERT, UPDATE;
     }
@@ -215,8 +218,8 @@ public class TaxonGraphTest extends CdmTransactionalIntegrationTest {
         setUuidPref();
 
         TaxonName n_trachelomonas_o_var_d = nameDao.load(uuid_n_trachelomonas_o_var_d);
-
-        List<TaxonGraphEdgeDTO> edges = taxonGraphDao.edges(n_trachelomonas_o_var_d, nameDao.load(uuid_n_trachelomonas), true);
+        TaxonName n_trachelomonas = nameDao.load(uuid_n_trachelomonas);
+        List<TaxonGraphEdgeDTO> edges = taxonGraphDao.edges(n_trachelomonas_o_var_d, n_trachelomonas, true);
         Assert.assertEquals("One edge from 'Trachelomonas oviformis var. duplex' to 'Trachelomonas' expected", 1, edges.size());
         edges = taxonGraphDao.edges(n_trachelomonas_o_var_d, nameDao.load(uuid_n_trachelomonas_o), true);
         Assert.assertEquals("One edge from 'Trachelomonas oviformis var. duplex' to 'Trachelomonas oviformis' expected", 1, edges.size());

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java
index 81078cc1faba62cf57e96484cad665376b7102c9..d3be73516583ae0698f8cb4ed2ce90f851337dc2 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java
@@ -13,18 +13,16 @@ import org.apache.log4j.Logger;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import eu.etaxonomy.cdm.database.CdmDataSourceTest;
-import eu.etaxonomy.cdm.database.DatabaseTypeEnumTest;
+import eu.etaxonomy.cdm.persistence.dao.hibernate.common.AnnotationDaoTest;
 import eu.etaxonomy.cdm.persistence.dao.hibernate.common.CdmEntityDaoBaseTest;
-import eu.etaxonomy.cdm.persistence.dao.hibernate.common.DaoBaseTest;
-import eu.etaxonomy.cdm.persistence.dao.hibernate.common.IdentifiableDaoBaseTest;
-import eu.etaxonomy.cdm.persistence.dao.hibernate.taxon.TaxonDaoHibernateImplTest;
-import eu.etaxonomy.cdm.persistence.dao.hibernate.term.DefinedTermDaoImplTest;
+import eu.etaxonomy.cdm.persistence.dao.hibernate.taxonGraph.TaxonGraphTest;
 
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses(
-        {
+@Suite.SuiteClasses({
+            AnnotationDaoTest.class,
+            CdmEntityDaoBaseTest.class,
+            TaxonGraphTest.class
             //database
 //                     CdmDataSourceTest.class,
 //                     DatabaseEnumTest.class,
@@ -32,8 +30,8 @@ import eu.etaxonomy.cdm.persistence.dao.hibernate.term.DefinedTermDaoImplTest;
             //dao.common
 //                     CdmEntityDaoBaseTest.class,
 //                     DaoBaseTest.class,
-            DefinedTermDaoImplTest.class,
-            IdentifiableDaoBaseTest.class
+//            DefinedTermDaoImplTest.class,
+//            IdentifiableDaoBaseTest.class
 
             //dao.Taxon
 //                     TaxonDaoHibernateImplTest.class
@@ -50,15 +48,19 @@ public class CdmTestSuite {
     public static void consoleRun() {
         org.junit.runner.JUnitCore.runClasses(
                 //database
-                CdmDataSourceTest.class,
-                DatabaseTypeEnumTest.class,
-                //dao.common
+//                CdmDataSourceTest.class,
+//                DatabaseTypeEnumTest.class,
+//                //dao.common
+//                CdmEntityDaoBaseTest.class,
+//                DaoBaseTest.class,
+//                DefinedTermDaoImplTest.class,
+//                IdentifiableDaoBaseTest.class,
+//                //dao.Taxon
+//                TaxonDaoHibernateImplTest.class
+
+                AnnotationDaoTest.class,
                 CdmEntityDaoBaseTest.class,
-                DaoBaseTest.class,
-                DefinedTermDaoImplTest.class,
-                IdentifiableDaoBaseTest.class,
-                //dao.Taxon
-                TaxonDaoHibernateImplTest.class
+                TaxonGraphTest.class
                     );
     }
 }

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/taxonGraph/TaxonGraphHibernateListenerTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/taxonGraph/TaxonGraphHibernateListenerTest.java
index cb44d0b4e9f7cef7364b662d8b2e451f8e761f2c..d7eb2e0b8af6ad5e2c55a29c3cde04077b48ad16 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/taxonGraph/TaxonGraphHibernateListenerTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/taxonGraph/TaxonGraphHibernateListenerTest.java
@@ -152,7 +152,7 @@ public class TaxonGraphHibernateListenerTest extends CdmTransactionalIntegration
     }
 
     /**
-     * Test for TaxonGraphException when TaxonName.nomenclaturalSource == nulll
+     * Test for TaxonGraphException when TaxonName.nomenclaturalSource == null
      */
     @Test
     @DataSet(loadStrategy = CleanSweepInsertLoadStrategy.class, value = "TaxonGraphTest.xml")
@@ -183,7 +183,7 @@ public class TaxonGraphHibernateListenerTest extends CdmTransactionalIntegration
     }
 
     /**
-     * Test for TaxonGraphException when TaxonName.nomenclaturalSource.citation == nulll
+     * Test for TaxonGraphException when TaxonName.nomenclaturalSource.citation == null
      */
     @Test
     @DataSet(loadStrategy = CleanSweepInsertLoadStrategy.class, value = "TaxonGraphTest.xml")

diff --git a/cdmlib-test/src/main/java/eu/etaxonomy/cdm/test/integration/CdmTransactionalIntegrationTest.java b/cdmlib-test/src/main/java/eu/etaxonomy/cdm/test/integration/CdmTransactionalIntegrationTest.java
index 2ea7439c8e592cf2762357a8c2ee2a48218dc304..ec09fc4bd8ad8686be4ffadee52e16e95bd9e84b 100644 (file)
--- a/cdmlib-test/src/main/java/eu/etaxonomy/cdm/test/integration/CdmTransactionalIntegrationTest.java
+++ b/cdmlib-test/src/main/java/eu/etaxonomy/cdm/test/integration/CdmTransactionalIntegrationTest.java
@@ -67,7 +67,7 @@ public abstract class CdmTransactionalIntegrationTest extends CdmIntegrationTest
     /**
      * TransactionStatus for this test. Typical subclasses won't need to use it.
      */
-    private TransactionStatus  transactionStatus;
+    private TransactionStatus transactionStatus;
 
     /**
      * Get the <em>default rollback</em> flag for this test.

diff --git a/cdmlib-test/src/main/java/org/unitils/AlternativeUnitilsJUnit4TestClassRunner.java b/cdmlib-test/src/main/java/org/unitils/AlternativeUnitilsJUnit4TestClassRunner.java
index d4a70632e60635a8fe63807b3cdf199c054d4354..e2e1af3612853e5181d31ab1761ccc848f2f7347 100644 (file)
--- a/cdmlib-test/src/main/java/org/unitils/AlternativeUnitilsJUnit4TestClassRunner.java
+++ b/cdmlib-test/src/main/java/org/unitils/AlternativeUnitilsJUnit4TestClassRunner.java
@@ -18,7 +18,7 @@ import org.junit.runner.notification.RunNotifier;
  * The CDM integration tests can not yet use the {@link org.springframework.test.context.junit4.SpringJUnit4ClassRunner SpringJUnit4ClassRunner}
  * provided by the spring test framework. Due to this it is not possible to use
  * {@code @TestPropertySource(properties = {"myproperty = foo"})} to inject properties into the spring environment which are
- * needed to configure the tests. This <code>ClassRunner</code> is simple alternative which also allows to inject
+ * needed to configure the tests. This <code>ClassRunner</code> is a simple alternative which also allows to inject
  * properties into the spring environments. In contrast to the {@link org.springframework.test.context.junit4.SpringJUnit4ClassRunner SpringJUnit4ClassRunner}
  * it loads the properties from a test resource file named <code>spring-environment.mock.properties</code>
  *