From 9f24d9a08aed393807ace80d493ad65f62477642 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Wed, 9 Jul 2014 14:39:51 +0000 Subject: [PATCH] move MockCdmCacher to TermLoader --- .gitattributes | 2 +- .../eu/etaxonomy/cdm/model/common/DefaultTermInitializer.java | 2 +- .../eu/etaxonomy/cdm/model/common/init}/MockCdmCacher.java | 3 ++- .../eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java | 2 -- 4 files changed, 4 insertions(+), 5 deletions(-) rename cdmlib-model/src/{test/java/eu/etaxonomy/cdm/model => main/java/eu/etaxonomy/cdm/model/common/init}/MockCdmCacher.java (98%) diff --git a/.gitattributes b/.gitattributes index b03d06be43..39c4f0f937 100644 --- a/.gitattributes +++ b/.gitattributes @@ -777,6 +777,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VocabularyEnum.java -te cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/WrongTermTypeException.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/ITermInitializer.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/ITermLoader.java -text +cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/MockCdmCacher.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/TermLoader.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/TermNotFoundException.java -text cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/package-info.java -text @@ -1108,7 +1109,6 @@ cdmlib-model/src/main/resources/update/update_term_r2.4.2.1-r2.4.2.2.mysql.sql - cdmlib-model/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java -text cdmlib-model/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java -text cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/DatabaseInitialiser.java -text -cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/MockCdmCacher.java -text cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/AgentValidationTest.java -text cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/InstitutionalMembershipTest.java -text cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/TeamTest.java -text diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializer.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializer.java index a2608d1d7f..8053668ebf 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializer.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializer.java @@ -15,9 +15,9 @@ import java.util.UUID; import org.apache.log4j.Logger; -import eu.etaxonomy.cdm.model.MockCdmCacher; import eu.etaxonomy.cdm.model.common.init.ITermInitializer; import eu.etaxonomy.cdm.model.common.init.ITermLoader; +import eu.etaxonomy.cdm.model.common.init.MockCdmCacher; import eu.etaxonomy.cdm.model.common.init.TermLoader; /** diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/MockCdmCacher.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/MockCdmCacher.java similarity index 98% rename from cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/MockCdmCacher.java rename to cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/MockCdmCacher.java index 224ef43490..a0ba51e2fa 100644 --- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/MockCdmCacher.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/MockCdmCacher.java @@ -1,4 +1,4 @@ -package eu.etaxonomy.cdm.model; +package eu.etaxonomy.cdm.model.common.init; import java.util.Set; import java.util.UUID; @@ -11,6 +11,7 @@ import net.sf.ehcache.config.PersistenceConfiguration; import net.sf.ehcache.config.PersistenceConfiguration.Strategy; import net.sf.ehcache.store.MemoryStoreEvictionPolicy; +import eu.etaxonomy.cdm.model.ICdmCacher; import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.cdm.model.common.Language; diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java index 0ed841f7a0..93fc9405c6 100644 --- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java +++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java @@ -20,13 +20,11 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import eu.etaxonomy.cdm.model.MockCdmCacher; import eu.etaxonomy.cdm.model.agent.Person; import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.cdm.model.name.Rank; import eu.etaxonomy.cdm.model.reference.Reference; import eu.etaxonomy.cdm.model.reference.ReferenceFactory; -import eu.etaxonomy.cdm.model.reference.ReferenceType; import eu.etaxonomy.cdm.model.taxon.Taxon; /** -- 2.34.1