Skip to content

DIUTILS-9: Fix IndexOutOfBoundsException on MARC 005 field replace in addOrReplaceControlField #83

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

Merged
Aliaksandr-Fedasiuk merged 2 commits into from
Sep 30, 2026
Merged

DIUTILS-9: Fix IndexOutOfBoundsException on MARC 005 field replace in addOrReplaceControlField #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53f9897
DIUTILS-9: Fix IndexOutOfBoundsException on MARC 005 field replace in…
Aliaksandr-Fedasiuk Sep 30, 2026
10d070e
DIUTILS-9: Test: Keep Replaced Control Field At Original Position
Aliaksandr-Fedasiuk Sep 30, 2026
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
15 changes: 8 additions & 7 deletions data-import-support/src/main/java/org/folio/dataimport/util/marc/MarcFieldEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,17 @@ private MarcFieldEditor() {
* @param replace if true, replaces an existing field with the same tag; if false, appends a new field
*/
public static void addOrReplaceControlField(Record marcRecord, String tag, String value, boolean replace) {
var newControlField = MarcFactory.newInstance().newControlField(tag, value);
ControlField newField = MarcFactory.newInstance().newControlField(tag, value);
if (replace) {
ControlField existing = (ControlField) marcRecord.getVariableField(tag);
if (existing != null) {
marcRecord.removeVariableField(existing);
List<ControlField> controlFields = marcRecord.getControlFields();
for (int i = 0; i < controlFields.size(); i++) {
if (tag.equals(controlFields.get(i).getTag())) {
controlFields.set(i, newField);
return;
}
}
marcRecord.addVariableField(newControlField);
} else {
marcRecord.addVariableField(newControlField);
}
marcRecord.addVariableField(newField);
}

/**
Expand Down
21 changes: 21 additions & 0 deletions data-import-support/src/test/java/org/folio/dataimport/util/marc/MarcFieldEditorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,27 @@ void shouldReplaceControlFieldInPlace_whenReplaceIsTrueAndFieldExists() {
assertThat(MarcFieldEditor.getControlFieldValue(marcRecord, "005")).isEqualTo("new-value");
}

@DisplayName("should keep the replaced control field at its original position, not append it at the end — "
+ "regression guard against removeVariableField+addVariableField which would move the field to the tail")
@Test
void shouldKeepReplacedControlFieldAtOriginalPosition_notAppendedAtEnd() {
// arrange: realistic fixture with 001 < 005 < 008 — same order as parsedMarcRecord.json used in
// AdditionalFieldsUtilTest; 005 sits between two other control fields
Record marcRecord = newRecord();
marcRecord.addVariableField(FACTORY.newControlField("001", "ybp7406411"));
marcRecord.addVariableField(FACTORY.newControlField("005", "20120404100627.6"));
marcRecord.addVariableField(FACTORY.newControlField("008", "120329s2011 sz a"));

// act
MarcFieldEditor.addOrReplaceControlField(marcRecord, "005", "20240909120000.0", true);

// assert: 005 is still at index 1 (between 001 and 008), not moved to the end
List<ControlField> controlFields = marcRecord.getControlFields();
assertThat(controlFields).hasSize(3);
assertThat(controlFields.stream().map(VariableField::getTag)).containsExactly("001", "005", "008");
assertThat(MarcFieldEditor.getControlFieldValue(marcRecord, "005")).isEqualTo("20240909120000.0");
}

@DisplayName("should create a new ff-indicator data field and add the subfield when no matching field exists")
@Test
void shouldCreateNewDataField_whenNoExistingFieldMatchesIndicators() {
Expand Down
Loading