refactoring done: improved formatting, using Util.fixNull for checking mentions, using hamcrest.matchers.isEmptyString, new method makeUsernameClickable

Author: Ammar Zain

src/main/java/jenkins/plugins/office365connector/model/Mention.java

@@ -26,7 +26,7 @@ public String getText() {
         return text;
     }
 
-    public String getType(){
+    public String getType() {
         return type;
     }
 
@@ -50,7 +50,11 @@ public void setMentioned(Mentioned mentioned) {
     public static Mention fromMentioned(Mentioned mentioned) {
         Mention mention = new Mention();
         mention.setMentioned(mentioned);
-        mention.setText("<at>" + mentioned.getName() + "</at>");
+        mention.setText(makeUsernameClickable(mentioned.getName()));
         return mention;
     }
-}
+
+    private static String makeUsernameClickable(String username) {
+        return "<at>" + username + "</at>";
+    }
+}

src/main/java/jenkins/plugins/office365connector/model/adaptivecard/MsTeams.java

@@ -25,4 +25,4 @@ public List<Mention> getMentions() {
     public void setMentions(List<Mention> mentions) {
         this.mentions = mentions;
     }
-}
+}

src/main/java/jenkins/plugins/office365connector/workflow/StepParameters.java

@@ -18,6 +18,8 @@
 import java.util.List;
 import java.util.ArrayList;
 
+import hudson.Util;
+
 import org.kohsuke.stapler.DataBoundSetter;
 
 import jenkins.plugins.office365connector.model.FactDefinition;
@@ -75,8 +77,6 @@ public List<Mentioned> getMentions() {
 
     @DataBoundSetter
     public void setMentions(List<Mentioned> mentions) {
-        if (mentions != null) {
-            this.mentions = mentions;
-        }
+        this.mentions = Util.fixNull(mentions);
     }
-}
+}

src/test/java/jenkins/plugins/office365connector/model/MentionTest.java

@@ -11,16 +11,6 @@
  */
 class MentionTest {
 
-    @Test
-    void defaultConstructor_FieldsAreNull() {
-        // given / when
-        Mention mention = new Mention();
-
-        // then
-        assertThat(mention.getText(), equalTo(null));
-        assertThat(mention.getMentioned(), equalTo(null));
-    }
-
     @Test
     void setText_SetsExactText() {
         // given
@@ -64,4 +54,4 @@ void fromMentioned_CreatesMentionWithExactValues() {
         assertThat(mention.getMentioned(), equalTo(mentioned));
         assertThat(mention.getText(), equalTo("<at>Tester Testing</at>"));
     }
-}
+}

src/test/java/jenkins/plugins/office365connector/model/MentionedTest.java

@@ -4,6 +4,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.isEmptyString;
 
 /**
  * Tests for Mentioned class.
@@ -17,8 +18,8 @@ void defaultConstructor_SetsFieldsToEmptyString() {
         Mentioned m = new Mentioned();
 
         // then
-        assertThat(m.getId(), equalTo(""));
-        assertThat(m.getName(), equalTo(""));
+        assertThat(m.getId(), isEmptyString());
+        assertThat(m.getName(), isEmptyString());
     }
 
     @Test
@@ -27,45 +28,22 @@ void setId_SetsIdCorrectly() {
         Mentioned m = new Mentioned();
 
         // when
-        m.setId("tester.testing@test.com");
+        String id = "tester.testing@test.com";
+        m.setId(id);
 
         // then
-        assertThat(m.getId(), equalTo("tester.testing@test.com"));
+        assertThat(m.getId(), equalTo(id));
     }
 
     @Test
     void setName_SetsNameCorrectly() {
         // given
         Mentioned m = new Mentioned();
 
-        // when
-        m.setName("tester testing");
-
-        // then
-        assertThat(m.getName(), equalTo("tester testing"));
-    }
-
-    @Test
-    void setId_AllowsNull_ConvertsToEmptyString() {
-        // given
-        Mentioned m = new Mentioned();
-
-        // when
-        m.setId(null);
-
-        // then
-        assertThat(m.getId(), equalTo(""));
-    }
-
-    @Test
-    void setName_AllowsNull_ConvertsToEmptyString() {
-        // given
-        Mentioned m = new Mentioned();
-
-        // when
-        m.setName(null);
+        String name = "tester testing";
+        m.setName(name);
 
         // then
-        assertThat(m.getName(), equalTo(""));
+        assertThat(m.getName(), equalTo(name));
     }
 }