From e850e1c8ff20cf6542b82c772a73b85ee76c5405 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Wed, 3 Dec 2014 21:12:05 +0000 Subject: [PATCH] minor changes --- .../src/main/java/eu/etaxonomy/cdm/hibernate/DOIUserType.java | 4 ---- .../src/main/java/eu/etaxonomy/cdm/model/common/CdmBase.java | 2 +- .../eu/etaxonomy/cdm/model/description/DescriptionBase.java | 4 ++-- .../etaxonomy/cdm/persistence/dao/common/ICdmGenericDao.java | 4 +--- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/DOIUserType.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/DOIUserType.java index 562b5fe9a6..6638c2ba8a 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/DOIUserType.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/DOIUserType.java @@ -91,10 +91,6 @@ public class DOIUserType extends AbstractUserType implements UserType { } } - - /* (non-Javadoc) - * @see org.jadira.usertype.dateandtime.shared.spi.AbstractSingleColumnUserType#returnedClass() - */ @Override public Class returnedClass() { return DOI.class; diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/CdmBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/CdmBase.java index 949435b2e7..b399710c9b 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/CdmBase.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/CdmBase.java @@ -106,9 +106,9 @@ public abstract class CdmBase implements Serializable, ICdmBase, Cloneable{ @XmlAttribute(required = true) @XmlJavaTypeAdapter(UUIDAdapter.class) + @XmlID @Type(type="uuidUserType") @NaturalId // This has the effect of placing a "unique" constraint on the database column - @XmlID @Column(length=36) //TODO needed? Type UUID will always assure that is exactly 36 @Match(MatchMode.IGNORE) @NotNull diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionBase.java index 255bcd3a78..ac0acfb2bf 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionBase.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionBase.java @@ -334,9 +334,9 @@ public abstract class DescriptionBase result; try{ - result = (DescriptionBase)super.clone(); + result = (DescriptionBase)super.clone(); //working set result.workingSets = new HashSet(); diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmGenericDao.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmGenericDao.java index 41e13990c5..c7a3732c05 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmGenericDao.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmGenericDao.java @@ -10,7 +10,6 @@ package eu.etaxonomy.cdm.persistence.dao.common; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.UUID; @@ -21,7 +20,6 @@ import org.springframework.dao.DataAccessException; import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.metadata.CdmMetaData; -import eu.etaxonomy.cdm.model.metadata.CdmMetaData.MetaDataPropertyName; import eu.etaxonomy.cdm.strategy.match.IMatchStrategy; import eu.etaxonomy.cdm.strategy.match.IMatchable; import eu.etaxonomy.cdm.strategy.match.MatchException; @@ -205,7 +203,7 @@ public interface ICdmGenericDao { */ public boolean containsValue(PersistentCollection col, Object element); - Set getReferencingObjectsForDeletion(CdmBase referencedCdmBase); + public Set getReferencingObjectsForDeletion(CdmBase referencedCdmBase); public void createFullSampleData(); } -- 2.34.1