ref #9395 findByAccessionNumber() -> findByGeneticAccessionNumber(), preserving old...

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceListController.java
index 2ac52c6364ff6e5f86ded95c05496106967ecde5..cd323d38503d6389e78ca6bbca30aef9f0349e09 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceListController.java
@@ -225,7 +225,7 @@ public class OccurrenceListController extends AbstractIdentifiableListController
             HttpServletResponse response) throws IOException {
         logger.info("doGetByGeneticAccessionNumber() - " + requestPathAndQuery(request));
 
-       SpecimenOrObservationBaseDTO sobDto = service.findByAccessionNumber(accessionNumber, null);
+       SpecimenOrObservationBaseDTO sobDto = service.findByGeneticAccessionNumber(accessionNumber, null);
        if(sobDto == null ) {
            response.setHeader("Failure", "No DNA available for accession number ");
            HttpStatusMessage.create("No DNA available for accession number " + accessionNumber, 400).send(response);

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IOccurrenceService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IOccurrenceService.java
index 7723fd0272eb30d8b8c3c50cd97d366de591af90..561d69cce7d7d3bc823b41a1c047ef05dd07dac6 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IOccurrenceService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IOccurrenceService.java
@@ -701,9 +701,19 @@ public interface IOccurrenceService
      * Collects the <code>FieldUnits</code> which are at the root of the derivation event\r
      * graph in which the {@link DerivedUnit} with the specified <code>findByAccessionNumber</code>\r
      * is found.\r
+     *\r
+     * @deprecated method name unclear and thus replaced by {@link #findByGeneticAccessionNumber(String, List)}\r
      */\r
+    @Deprecated\r
     SpecimenOrObservationBaseDTO findByAccessionNumber(String accessionNumberString, List<OrderHint> orderHints);\r
 \r
+    /**\r
+     * Collects the <code>FieldUnits</code> which are at the root of the derivation event\r
+     * graph in which the {@link DnaSample} with the specified <code>accessionNumberString</code>\r
+     * is found.\r
+     */\r
+    SpecimenOrObservationBaseDTO findByGeneticAccessionNumber(String dnaAccessionNumber, List<OrderHint> orderHints);\r
+\r
 \r
     List<SpecimenOrObservationBaseDTO> listRootUnitDTOsByAssociatedTaxon(Set<TaxonRelationshipEdge> includedRelationships,\r
             UUID associatedTaxonUuid, List<String> propertyPaths);\r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
index 70adb48189717f0e3c92f68a9f8355ae406e7de9..c826b709b7838fe6e3cb12688caaf24aabce4b68 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java
@@ -579,7 +579,14 @@ public class OccurrenceServiceImpl
 
     @Override
     @Transactional
+    @Deprecated
     public  SpecimenOrObservationBaseDTO findByAccessionNumber(String accessionNumberString, List<OrderHint> orderHints)  {
+        return findByAccessionNumber(accessionNumberString, orderHints);
+    }
+
+    @Override
+    @Transactional
+    public  SpecimenOrObservationBaseDTO findByGeneticAccessionNumber(String accessionNumberString, List<OrderHint> orderHints)  {
 
         DnaSample dnaSample = dao.findByGeneticAccessionNumber(accessionNumberString, null);
         DerivedUnitDTO derivedUnitDTO;

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java
index 38f7ad283a36a597295e28ca3c7ab4bb689f32b6..4aa1fc4ec49a4dbffe2b5b569ada389ce3073c77 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceTest.java
@@ -1171,7 +1171,7 @@ public class OccurrenceServiceTest extends CdmTransactionalIntegrationTest {
         assertTrue(ignoreAssignmentStatusSpecimens.contains(derivedUnit1));
         assertTrue(ignoreAssignmentStatusSpecimens.contains(tissue));
 
-        SpecimenOrObservationBaseDTO findByAccessionNumber = occurrenceService.findByAccessionNumber("ACC_DNA",  null);
+        SpecimenOrObservationBaseDTO findByAccessionNumber = occurrenceService.findByGeneticAccessionNumber("ACC_DNA",  null);
 
         assertNotNull(findByAccessionNumber);
         // logger.setLevel(Level.TRACE);