Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove unnecessary LccnNormalizerStructureB #722

Merged
merged 3 commits into from
Jan 6, 2025
Merged

fix: remove unnecessary LccnNormalizerStructureB #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f6da1b
fix: remove unnecessary LccnNormalizerStructureB
askhat-abishev Dec 24, 2024
ceb3cad
Merge branch 'master' into MSEARCH-926
pkjacob Dec 30, 2024
fc0a8b0
Merge branch 'master' into MSEARCH-926
pkjacob Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
67 changes: 0 additions & 67 deletions src/main/java/org/folio/search/service/lccn/LccnNormalizerStructureB.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/main/java/org/folio/search/service/setter/linkeddata/common/LinkedDataLccnProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/folio/search/controller/SearchLinkedDataInstanceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")))
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/folio/search/controller/SearchLinkedDataWorkIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")))
Expand Down
65 changes: 0 additions & 65 deletions src/test/java/org/folio/search/service/lccn/LccnNormalizerStructurebTest.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/test/resources/samples/linked-data/instance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"type": "ISBN"
},
{
"value": " 2023-202345/AC/r932",
"value": " 2023202345",
"type": "LCCN"
}
],
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/samples/linked-data/work.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"type": "ISBN"
},
{
"value": " 2023-202345/AC/r932",
"value": " 2023202345",
"type": "LCCN"
}
],
Expand Down