From 8127ca8ddb5417294fd56e17d39340ed8d8d4cc7 Mon Sep 17 00:00:00 2001 From: Andreas Kohlbecker Date: Mon, 12 Jan 2009 16:44:38 +0000 Subject: [PATCH] added @Qualifier to help autowiring in cdmlib-remote --- .../cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java | 1 + .../dao/hibernate/common/AnnotatableDaoImpl.java | 2 ++ .../dao/hibernate/description/DescriptionDaoImpl.java | 4 ++++ .../dao/hibernate/name/TaxonNameDaoHibernateImpl.java | 4 ++++ .../hibernate/occurrence/OccurrenceDaoHibernateImpl.java | 5 +++-- .../dao/hibernate/reference/ReferenceDaoHibernateImpl.java | 6 +++++- .../dao/hibernate/taxon/TaxonDaoHibernateImpl.java | 6 +++++- 7 files changed, 24 insertions(+), 4 deletions(-) diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java index 09ab6756cd..280d48413c 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java @@ -28,6 +28,7 @@ import eu.etaxonomy.cdm.persistence.dao.hibernate.common.IdentifiableDaoBase; @Repository public class AgentDaoImpl extends IdentifiableDaoBase implements IAgentDao{ + @SuppressWarnings("unused") private static final Logger logger = Logger.getLogger(AgentDaoImpl.class); diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotatableDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotatableDaoImpl.java index a271577f67..d13904be87 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotatableDaoImpl.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotatableDaoImpl.java @@ -13,6 +13,7 @@ import java.util.List; import org.apache.log4j.Logger; import org.hibernate.Query; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Repository; import eu.etaxonomy.cdm.model.common.AnnotatableEntity; @@ -26,6 +27,7 @@ import eu.etaxonomy.cdm.persistence.dao.common.IAnnotatableDao; * @version 1.0 */ @Repository +@Qualifier("annotatableDaoImpl") public class AnnotatableDaoImpl extends CdmEntityDaoBase implements IAnnotatableDao { private static Logger logger = Logger.getLogger(AnnotatableDaoImpl.class); diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java index e3d24690bb..4cb369cfa7 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoImpl.java @@ -18,6 +18,7 @@ import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Repository; import eu.etaxonomy.cdm.model.description.DescriptionBase; @@ -35,7 +36,10 @@ import eu.etaxonomy.cdm.persistence.dao.hibernate.common.IdentifiableDaoBase; @Repository +@Qualifier("descriptionDaoImpl") public class DescriptionDaoImpl extends IdentifiableDaoBase implements IDescriptionDao{ + + @SuppressWarnings("unused") private static final Logger logger = Logger.getLogger(DescriptionDaoImpl.class); public DescriptionDaoImpl() { diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java index fe8c9b3b96..9eeca2ca05 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java @@ -16,6 +16,7 @@ import org.hibernate.Criteria; import org.hibernate.Query; import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Repository; import eu.etaxonomy.cdm.model.name.BotanicalName; @@ -35,8 +36,11 @@ import eu.etaxonomy.cdm.persistence.dao.name.ITaxonNameDao; * */ @Repository +@Qualifier("taxonNameDaoHibernateImpl") public class TaxonNameDaoHibernateImpl extends IdentifiableDaoBase implements ITaxonNameDao { + + @SuppressWarnings("unused") private static final Logger logger = Logger.getLogger(TaxonNameDaoHibernateImpl.class); public TaxonNameDaoHibernateImpl() { diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/occurrence/OccurrenceDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/occurrence/OccurrenceDaoHibernateImpl.java index 3a785345aa..fe041fd8c4 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/occurrence/OccurrenceDaoHibernateImpl.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/occurrence/OccurrenceDaoHibernateImpl.java @@ -27,8 +27,9 @@ import eu.etaxonomy.cdm.persistence.dao.occurrence.IOccurrenceDao; @Repository public class OccurrenceDaoHibernateImpl extends IdentifiableDaoBase implements IOccurrenceDao { - - static Logger logger = Logger.getLogger(TaxonDaoHibernateImpl.class); + + @SuppressWarnings("unused") + private static final Logger logger = Logger.getLogger(TaxonDaoHibernateImpl.class); public OccurrenceDaoHibernateImpl() { super(SpecimenOrObservationBase.class); diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImpl.java index 4f87986114..c332abebca 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImpl.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImpl.java @@ -9,6 +9,7 @@ package eu.etaxonomy.cdm.persistence.dao.hibernate.reference; import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Repository; import eu.etaxonomy.cdm.model.reference.ReferenceBase; @@ -20,8 +21,11 @@ import eu.etaxonomy.cdm.persistence.dao.reference.IReferenceDao; * */ @Repository +@Qualifier("referenceDaoHibernateImpl") public class ReferenceDaoHibernateImpl extends IdentifiableDaoBase implements IReferenceDao { - static Logger logger = Logger.getLogger(ReferenceDaoHibernateImpl.class); + + @SuppressWarnings("unused") + private static final Logger logger = Logger.getLogger(ReferenceDaoHibernateImpl.class); public ReferenceDaoHibernateImpl() { super(ReferenceBase.class); diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java index c1d833ae46..db6d8c1865 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java @@ -21,6 +21,7 @@ import org.hibernate.Query; import org.hibernate.criterion.Criterion; import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Repository; @@ -57,8 +58,11 @@ import eu.etaxonomy.cdm.persistence.fetch.CdmFetch; * @version 1.0 */ @Repository +@Qualifier("taxonDaoHibernateImpl") public class TaxonDaoHibernateImpl extends IdentifiableDaoBase implements ITaxonDao { - static Logger logger = Logger.getLogger(TaxonDaoHibernateImpl.class); + + @SuppressWarnings("unused") + private static final Logger logger = Logger.getLogger(TaxonDaoHibernateImpl.class); public TaxonDaoHibernateImpl() { super(TaxonBase.class); -- 2.34.1