Merge pull request #6874 from ORCID/TrimOrgData

Trim org data

Author: cryptalith

orcid-core/src/main/java/org/orcid/core/manager/impl/OrgManagerImpl.java

@@ -9,6 +9,7 @@
 import org.orcid.core.manager.OrgManager;
 import org.orcid.core.manager.SourceManager;
 import org.orcid.core.manager.read_only.ClientDetailsManagerReadOnly;
+import org.orcid.core.utils.OrcidStringUtils;
 import org.orcid.jaxb.model.common_v2.OrganizationHolder;
 import org.orcid.jaxb.model.message.Iso3166Country;
 import org.orcid.jaxb.model.message.Organization;
@@ -20,7 +21,6 @@
 import org.orcid.persistence.jpa.entities.OrgEntity;
 import org.orcid.persistence.jpa.entities.ProfileEntity;
 import org.orcid.persistence.jpa.entities.SourceEntity;
-import org.orcid.core.utils.OrcidStringUtils;
 
 import au.com.bytecode.opencsv.CSVWriter;
 
@@ -157,10 +157,10 @@ public OrgEntity getOrgEntity(OrganizationHolder holder) {
 
         OrgEntity orgEntity = new OrgEntity();
         org.orcid.jaxb.model.common_v2.Organization organization = holder.getOrganization();
-        orgEntity.setName(organization.getName());
+        orgEntity.setName(organization.getName().trim());
         org.orcid.jaxb.model.common_v2.OrganizationAddress address = organization.getAddress();
-        orgEntity.setCity(address.getCity());
-        orgEntity.setRegion(address.getRegion() != null ? address.getRegion() : "");
+        orgEntity.setCity(address.getCity().trim());
+        orgEntity.setRegion(address.getRegion() != null ? address.getRegion().trim() : "");
         orgEntity.setCountry(address.getCountry().value());
         if (organization.getDisambiguatedOrganization() != null && organization.getDisambiguatedOrganization().getDisambiguatedOrganizationIdentifier() != null) {
             OrgDisambiguatedEntity disambiguatedOrg = orgDisambiguatedDao.findBySourceIdAndSourceType(

orcid-core/src/main/java/org/orcid/core/manager/v3/impl/OrgManagerImpl.java

@@ -154,10 +154,10 @@ public OrgEntity getOrgEntity(OrganizationHolder holder) {
 
     private OrgEntity getOrgEntity(org.orcid.jaxb.model.v3.release.common.Organization organization) {
         OrgEntity orgEntity = new OrgEntity();
-        orgEntity.setName(organization.getName());
+        orgEntity.setName(organization.getName().trim());
         org.orcid.jaxb.model.v3.release.common.OrganizationAddress address = organization.getAddress();
-        orgEntity.setCity(address.getCity());
-        orgEntity.setRegion(address.getRegion() != null ? address.getRegion() : "");
+        orgEntity.setCity(address.getCity().trim());
+        orgEntity.setRegion(address.getRegion() != null ? address.getRegion().trim() : "");
         orgEntity.setCountry(address.getCountry().name());
 
         if (organization.getDisambiguatedOrganization() != null && organization.getDisambiguatedOrganization().getDisambiguatedOrganizationIdentifier() != null) {
@@ -275,6 +275,4 @@ private void updatePeerReviewOrgReferences(OrgEntity orgToReference, Long previo
             peerReviewDao.merge(p);
         });
     }
-
-
 }