fix: remove unnecessary LccnNormalizerStructureB (#722)

Co-authored-by: pkjacob <[email protected]>
folio-org · Jan 6, 2025 · ada7406 · ada7406
1 parent 0f3183e
commit ada7406
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 139 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -23,7 +23,7 @@
 * Fix the "Invalid reference" appears after updating ownership ([MSEARCH-915](https://folio-org.atlassian.net/browse/MSEARCH-915))
 
 ### Tech Dept
-* Description ([ISSUE](https://folio-org.atlassian.net/browse/ISSUE))
+* Remove unnecessary LccnNormalizerStructureB ([MSEARCH-926](https://folio-org.atlassian.net/browse/MSEARCH-926))
 
 ### Dependencies
 * Bump `opensearch` from `2.17.1` to `2.18.0` fixing protobuf-java CVE-2024-7254 ([MSEARCH-889](https://folio-org.atlassian.net/browse/MSEARCH-889))

diff --git a/src/main/java/org/folio/search/service/lccn/LccnNormalizerStructureB.java b/src/main/java/org/folio/search/service/lccn/LccnNormalizerStructureB.java
diff --git a/src/main/java/org/folio/search/service/setter/linkeddata/common/LinkedDataLccnProcessor.java b/src/main/java/org/folio/search/service/setter/linkeddata/common/LinkedDataLccnProcessor.java
@@ -14,14 +14,12 @@
 import org.folio.search.domain.dto.LinkedDataIdentifier;
 import org.folio.search.service.lccn.LccnNormalizer;
 import org.folio.search.service.setter.FieldProcessor;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 @Component
 @RequiredArgsConstructor
 public class LinkedDataLccnProcessor implements FieldProcessor<List<LinkedDataIdentifier>, Set<String>> {
 
-  @Qualifier("lccnNormalizerStructureB")
   private final LccnNormalizer lccnNormalizer;
 
   @Override

diff --git a/src/test/java/org/folio/search/controller/SearchLinkedDataInstanceIT.java b/src/test/java/org/folio/search/controller/SearchLinkedDataInstanceIT.java
@@ -200,7 +200,7 @@ void searchByLinkedDataInstance_parameterized_singleResult(int index, String que
       .andExpect(jsonPath(toHubAap(toParentWork(), 1), is("hubAAP2")))
       .andExpect(jsonPath(toIdValue(toRootContent(), 0), is("1234567890123")))
       .andExpect(jsonPath(toIdType(toRootContent(), 0), is("ISBN")))
-      .andExpect(jsonPath(toIdValue(toRootContent(), 1), is("  2023-202345/AC/r932")))
+      .andExpect(jsonPath(toIdValue(toRootContent(), 1), is("  2023202345")))
       .andExpect(jsonPath(toIdType(toRootContent(), 1), is("LCCN")))
       .andExpect(jsonPath(toLanguage(toParentWork(), 0), is("eng")))
       .andExpect(jsonPath(toLanguage(toParentWork(), 1), is("rus")))

diff --git a/src/test/java/org/folio/search/controller/SearchLinkedDataWorkIT.java b/src/test/java/org/folio/search/controller/SearchLinkedDataWorkIT.java
@@ -210,7 +210,7 @@ void searchByLinkedDataWork_parameterized_singleResult(int index, String query)
       .andExpect(jsonPath(toFormat(toInstance()), is("Monograph")))
       .andExpect(jsonPath(toIdValue(toInstance(), 0), is("1234567890123")))
       .andExpect(jsonPath(toIdType(toInstance(), 0), is("ISBN")))
-      .andExpect(jsonPath(toIdValue(toInstance(), 1), is("  2023-202345/AC/r932")))
+      .andExpect(jsonPath(toIdValue(toInstance(), 1), is("  2023202345")))
       .andExpect(jsonPath(toIdType(toInstance(), 1), is("LCCN")))
       .andExpect(jsonPath(toNoteValue(toInstance(), 0), is("first instance note")))
       .andExpect(jsonPath(toNoteType(toInstance(), 0), is("firstInstanceNoteType")))

diff --git a/src/test/java/org/folio/search/service/lccn/LccnNormalizerStructurebTest.java b/src/test/java/org/folio/search/service/lccn/LccnNormalizerStructurebTest.java
diff --git a/src/test/resources/samples/linked-data/instance.json b/src/test/resources/samples/linked-data/instance.json
@@ -33,7 +33,7 @@
       "type": "ISBN"
     },
     {
-      "value": "  2023-202345/AC/r932",
+      "value": "  2023202345",
       "type": "LCCN"
     }
   ],

diff --git a/src/test/resources/samples/linked-data/work.json b/src/test/resources/samples/linked-data/work.json
@@ -105,7 +105,7 @@
           "type": "ISBN"
         },
         {
-          "value": "  2023-202345/AC/r932",
+          "value": "  2023202345",
           "type": "LCCN"
         }
       ],