From 6d47448fdd8a34654402f3df67516302ab9809f0 Mon Sep 17 00:00:00 2001 From: pkjacob <121239864+pkjacob@users.noreply.github.com> Date: Wed, 8 Jan 2025 16:19:37 -0500 Subject: [PATCH] MODLD-629: Handle empty subTitle while generating label (#89) --- .../data/mapper/dto/monograph/TopResourceMapperUnit.java | 1 + .../mapper/dto/monograph/common/title/TitleMapperUnit.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/folio/linked/data/mapper/dto/monograph/TopResourceMapperUnit.java b/src/main/java/org/folio/linked/data/mapper/dto/monograph/TopResourceMapperUnit.java index 4bc32aa2..2795389f 100644 --- a/src/main/java/org/folio/linked/data/mapper/dto/monograph/TopResourceMapperUnit.java +++ b/src/main/java/org/folio/linked/data/mapper/dto/monograph/TopResourceMapperUnit.java @@ -34,6 +34,7 @@ protected List getPrimaryMainTitles(List ti .map(PrimaryTitleField.class::cast) .map(PrimaryTitleField::getPrimaryTitle) .map(pt -> join(" ", getFirstValue(pt::getMainTitle), getFirstValue(pt::getSubTitle))) + .map(String::trim) .toList(); } } diff --git a/src/main/java/org/folio/linked/data/mapper/dto/monograph/common/title/TitleMapperUnit.java b/src/main/java/org/folio/linked/data/mapper/dto/monograph/common/title/TitleMapperUnit.java index 00dfa4f9..8fc827e4 100644 --- a/src/main/java/org/folio/linked/data/mapper/dto/monograph/common/title/TitleMapperUnit.java +++ b/src/main/java/org/folio/linked/data/mapper/dto/monograph/common/title/TitleMapperUnit.java @@ -1,5 +1,8 @@ package org.folio.linked.data.mapper.dto.monograph.common.title; +import static java.lang.String.join; +import static org.apache.commons.lang3.StringUtils.isBlank; + import java.util.Set; import org.folio.linked.data.domain.dto.InstanceRequest; import org.folio.linked.data.domain.dto.InstanceResponse; @@ -22,6 +25,6 @@ public Set> supportedParents() { } protected String getLabel(String mainTitle, String subTitle) { - return String.join(" ", mainTitle, subTitle); + return isBlank(subTitle) ? mainTitle : join(" ", mainTitle, subTitle); } }