From: Andreas Kohlbecker <a.kohlbecker@bgbm.org>
Date: Tue, 26 Jan 2021 11:34:06 +0000 (+0100)
Subject: ref #9395 findByAccessionNumber() -> findByGeneticAccessionNumber(), preserving old... 
X-Git-Tag: 5.19.0^2~5
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/8195f008e7148d866dd1a5aad1c8ffc94c94d2df?hp=e793ebfba921ff46f3c9db1215aea083fdca5f1f

ref #9395 findByAccessionNumber() -> findByGeneticAccessionNumber(), preserving old method as deprecated
---

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 2ac52c6364..cd323d3850 100644
--- 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 7723fd0272..561d69cce7 100644
--- 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
      * graph in which the {@link DerivedUnit} with the specified <code>findByAccessionNumber</code>
      * is found.
+     *
+     * @deprecated method name unclear and thus replaced by {@link #findByGeneticAccessionNumber(String, List)}
      */
+    @Deprecated
     SpecimenOrObservationBaseDTO findByAccessionNumber(String accessionNumberString, List<OrderHint> orderHints);
 
+    /**
+     * Collects the <code>FieldUnits</code> which are at the root of the derivation event
+     * graph in which the {@link DnaSample} with the specified <code>accessionNumberString</code>
+     * is found.
+     */
+    SpecimenOrObservationBaseDTO findByGeneticAccessionNumber(String dnaAccessionNumber, List<OrderHint> orderHints);
+
 
     List<SpecimenOrObservationBaseDTO> listRootUnitDTOsByAssociatedTaxon(Set<TaxonRelationshipEdge> includedRelationships,
             UUID associatedTaxonUuid, List<String> propertyPaths);
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 70adb48189..c826b709b7 100644
--- 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 38f7ad283a..4aa1fc4ec4 100644
--- 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);