Project

General

Profile

« Previous | Next » 

Revision 8f658368

Added by Andreas Müller almost 3 years ago

ref #4866, ref #9228 fix test and use referenceDao instead of refService internally

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImpl.java
71 71
import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
72 72
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
73 73
import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;
74
import eu.etaxonomy.cdm.persistence.dao.reference.IReferenceDao;
74 75
import eu.etaxonomy.cdm.persistence.dao.taxon.IClassificationDao;
75 76
import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonDao;
76 77
import eu.etaxonomy.cdm.persistence.dao.taxon.ITaxonNodeDao;
......
105 106
    private ITaxonNodeService taxonNodeService;
106 107

  
107 108
    @Autowired
108
    private IReferenceService referenceService;
109
    private IReferenceDao referenceDao;
109 110

  
110 111
    @Autowired
111 112
    private IDefinedTermDao termDao;
......
149 150

  
150 151
        //TODO error handling
151 152
        Reference taxonSecundum = config.isReuseTaxa() || config.isReuseTaxonSecundum() || config.getTaxonSecundumUuid() == null ?
152
                null : referenceService.find(config.getTaxonSecundumUuid());
153
                null : referenceDao.findByUuid(config.getTaxonSecundumUuid());
153 154
        config.setTaxonSecundum(taxonSecundum);
154 155

  
155 156
        Reference parentChildReference = config.isReuseParentChildReference() || config.getParentChildReferenceUuid() == null ?
156
                null : referenceService.find(config.getParentChildReferenceUuid());
157
                null : referenceDao.findByUuid(config.getParentChildReferenceUuid());
157 158
        config.setParentChildReference(parentChildReference);
158 159

  
159 160
        Reference taxonRelationshipReference = config.getRelationTypeToOldTaxon() == null ?
160
                null : referenceService.find(config.getRelationshipReferenceUuid());
161
                null : referenceDao.findByUuid(config.getRelationshipReferenceUuid());
161 162
        config.setRelationshipReference(taxonRelationshipReference);
162 163

  
163 164
        Classification classificationClone = Classification.NewInstance(config.getClassificationName());
......
169 170
                classificationClone.setReference(oldClassificationRef);
170 171
            }
171 172
        }else if (config.getClassificationReferenceUuid() != null) {
172
            Reference classificationReference = referenceService.find(config.getClassificationReferenceUuid());
173
            Reference classificationReference = referenceDao.findByUuid(config.getClassificationReferenceUuid());
173 174
            classificationClone.setReference(classificationReference);
174 175
        }
175 176

  
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.xml
47 47
  <HIBERNATE_SEQUENCES SEQUENCE_NAME="TaxonName" NEXT_VAL="5008"/>
48 48
  <HIBERNATE_SEQUENCES SEQUENCE_NAME="TaxonNode" NEXT_VAL="5009"/>
49 49
  <HIBERNATE_SEQUENCES SEQUENCE_NAME="UserAccount" NEXT_VAL="5001"/>
50
  <AUDITEVENT/>
50 51
</dataset>

Also available in: Unified diff