ref #6630 and ref #6368 remove generics from TaxonName

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / validation / constraint / NoDuplicateNamesValidator.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/validation/constraint/NoDuplicateNamesValidator.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/validation/constraint/NoDuplicateNamesValidator.java
index d11e59fad19ee465f01f6dba5356281336c3a567..daa9880820f042efdedc7f275f30dbab9db92fa7 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/validation/constraint/NoDuplicateNamesValidator.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/validation/constraint/NoDuplicateNamesValidator.java
@@ -19,12 +19,11 @@ import javax.validation.ConstraintValidatorContext;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import eu.etaxonomy.cdm.api.service.INameService;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.validation.annotation.NoDuplicateNames;
 
 public class NoDuplicateNamesValidator implements
-               ConstraintValidator<NoDuplicateNames,NonViralName> {
+               ConstraintValidator<NoDuplicateNames,TaxonName> {
 
        private static Set<String> includeProperties;
 
@@ -54,11 +53,11 @@ public class NoDuplicateNamesValidator implements
        public void initialize(NoDuplicateNames noDuplicateNames) { }
 
     @Override
-       public boolean isValid(NonViralName name, ConstraintValidatorContext constraintContext) {
+       public boolean isValid(TaxonName name, ConstraintValidatorContext constraintContext) {
                if(name == null) {
                        return true;
                } else {
-                       List<TaxonNameBase> matchingNonViralNames = nameService.list(name, includeProperties, null, null, null, null);
+                       List<TaxonName> matchingNonViralNames = nameService.list(name, includeProperties, null, null, null, null);
                        if(matchingNonViralNames.size() > 0) {
                                if(matchingNonViralNames.size() == 1 && matchingNonViralNames.get(0).equals(name)) {
                                        return true;