From cc0fc34502ce28fccabda667b11bcbed9fe493c9 Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Wed, 6 Jul 2016 10:12:03 +0200 Subject: [PATCH] SONAR-6651 Trim SCM logins --- .../main/java/org/sonar/api/batch/scm/BlameLine.java | 7 ++++++- .../java/org/sonar/api/batch/scm/BlameLineTest.java | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/BlameLine.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/BlameLine.java index 3551dc8cbc1..212fc042755 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/BlameLine.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/scm/BlameLine.java @@ -19,6 +19,7 @@ */ package org.sonar.api.batch.scm; +import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; @@ -68,8 +69,12 @@ public class BlameLine { return author; } + /** + * Sets author for this line. + * The string will be trimmed, and null will be set if it is empty. + */ public BlameLine author(@Nullable String author) { - this.author = author; + this.author = StringUtils.trimToNull(author); return this; } diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/scm/BlameLineTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/scm/BlameLineTest.java index c784f9d2222..3c39d8fab6a 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/scm/BlameLineTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/scm/BlameLineTest.java @@ -48,4 +48,15 @@ public class BlameLineTest { assertThat(line1.toString()).contains("revision=1,author=foo"); } + @Test + public void testTrimAuthor() { + BlameLine line1 = new BlameLine().date(null).revision("2").author("foo1"); + BlameLine line2 = new BlameLine().date(null).revision("2").author(" "); + BlameLine line3 = new BlameLine().date(null).revision("2").author(" foo3 "); + + assertThat(line1.author()).isEqualTo("foo1"); + assertThat(line2.author()).isNull(); + assertThat(line3.author()).isEqualTo("foo3"); + } + } -- 2.39.5