Skip to content

Commit 5bcc080

Browse files
markush81damianszczepanik
authored andcommitted
some review comments fixed
1 parent 1413b8a commit 5bcc080

File tree

9 files changed

+31
-29
lines changed

9 files changed

+31
-29
lines changed

src/main/java/jenkins/plugins/office365connector/ActionableBuilder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import hudson.model.Job;
2020
import hudson.model.Result;
2121
import hudson.model.Run;
22-
import jenkins.plugins.office365connector.model.Action;
22+
import jenkins.plugins.office365connector.model.CardAction;
2323
import jenkins.plugins.office365connector.model.adaptivecard.AdaptiveCardAction;
2424
import jenkins.plugins.office365connector.model.messagecard.PotentialAction;
2525
import jenkins.scm.api.SCMHead;
@@ -36,7 +36,7 @@ public class ActionableBuilder {
3636

3737
private final Run run;
3838
private final FactsBuilder factsBuilder;
39-
private final List<Action> potentialActions = new ArrayList<>();
39+
private final List<CardAction> potentialActions = new ArrayList<>();
4040
private final boolean isAdaptiveCards;
4141

4242
public ActionableBuilder(Run run, FactsBuilder factsBuilder, boolean isAdaptiveCards) {
@@ -45,7 +45,7 @@ public ActionableBuilder(Run run, FactsBuilder factsBuilder, boolean isAdaptiveC
4545
this.isAdaptiveCards = isAdaptiveCards;
4646
}
4747

48-
public List<Action> buildActionable() {
48+
public List<CardAction> buildActionable() {
4949

5050
pullRequestActionable();
5151
buildViewBuild();
@@ -80,7 +80,7 @@ private void pullRequestActionable() {
8080
ObjectMetadataAction oma = job.getAction(ObjectMetadataAction.class);
8181
if (oma != null) {
8282
String urlString = oma.getObjectUrl();
83-
Action viewPRPotentialAction = isAdaptiveCards ? null : new PotentialAction(viewHeader, urlString);
83+
CardAction viewPRPotentialAction = isAdaptiveCards ? new AdaptiveCardAction(viewHeader, urlString) : new PotentialAction(viewHeader, urlString);
8484
potentialActions.add(viewPRPotentialAction);
8585
factsBuilder.addFact(titleHeader, oma.getObjectDisplayName());
8686
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public interface Card {
66

77
public Object toPaylod();
88

9-
void setAction(List<Action> actions);
9+
void setAction(List<CardAction> actions);
1010

1111
void setThemeColor(String cardThemeColor);
1212

src/main/java/jenkins/plugins/office365connector/model/Action.java renamed to src/main/java/jenkins/plugins/office365connector/model/CardAction.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import java.util.List;
44

5-
public interface Action {
5+
public interface CardAction {
66

77
void setName(String name);
88

9-
void setTarget(List<String> target);
9+
void setTargets(List<String> targets);
1010

1111
String getName();
1212
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import com.google.gson.annotations.SerializedName;
77
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
88
import hudson.model.Result;
9-
import jenkins.plugins.office365connector.model.Action;
109
import jenkins.plugins.office365connector.model.Card;
10+
import jenkins.plugins.office365connector.model.CardAction;
1111
import jenkins.plugins.office365connector.model.Section;
1212

1313
public class AdaptiveCard implements Card {
@@ -22,7 +22,7 @@ public class AdaptiveCard implements Card {
2222
@SerializedName("msTeams")
2323
private final MsTeams msteams = new MsTeams();
2424
private final List<AdaptiveCardElement> body;
25-
private List<Action> actions;
25+
private List<CardAction> actions;
2626

2727
public AdaptiveCard(final String summary, final Section section, Result result) {
2828
this.body = new ArrayList<>();
@@ -69,7 +69,7 @@ public List<AdaptiveCardElement> getBody() {
6969
return body;
7070
}
7171

72-
public List<Action> getActions() {
72+
public List<CardAction> getActions() {
7373
return actions;
7474
}
7575

@@ -79,13 +79,13 @@ public Object toPaylod() {
7979
}
8080

8181
@Override
82-
public void setAction(final List<Action> actions) {
82+
public void setAction(final List<CardAction> actions) {
8383
this.actions = actions;
8484
}
8585

8686
@Override
8787
public void setThemeColor(final String cardThemeColor) {
88-
88+
// intentionally empty, unused with AdaptiveCard format
8989
}
9090

9191
@Override

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import java.util.List;
44

5-
public class AdaptiveCardAction implements jenkins.plugins.office365connector.model.Action {
5+
import jenkins.plugins.office365connector.model.CardAction;
6+
7+
public class AdaptiveCardAction implements CardAction {
68

79
private String type = "Action.OpenUrl";
810

@@ -45,8 +47,8 @@ public void setName(final String name) {
4547
}
4648

4749
@Override
48-
public void setTarget(final List<String> target) {
49-
target.stream().findFirst().ifPresent(this::setUrl);
50+
public void setTargets(final List<String> targets) {
51+
targets.stream().findFirst().ifPresent(this::setUrl);
5052
}
5153

5254
@Override

src/main/java/jenkins/plugins/office365connector/model/messagecard/MessageCard.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import java.util.Arrays;
1818
import java.util.List;
1919

20-
import jenkins.plugins.office365connector.model.Action;
20+
import jenkins.plugins.office365connector.model.CardAction;
2121
import jenkins.plugins.office365connector.model.Card;
2222
import jenkins.plugins.office365connector.model.Section;
2323

@@ -32,7 +32,7 @@ public class MessageCard implements Card {
3232
// even plugin needs only single 'section' connector API expects arrays
3333
private List<jenkins.plugins.office365connector.model.Section> sections;
3434

35-
private List<Action> potentialAction;
35+
private List<CardAction> potentialAction;
3636

3737
public MessageCard(String summary, Section section) {
3838
this.summary = summary;
@@ -55,11 +55,11 @@ public String getThemeColor() {
5555
return themeColor;
5656
}
5757

58-
public void setAction(List<Action> potentialActions) {
58+
public void setAction(List<CardAction> potentialActions) {
5959
this.potentialAction = potentialActions;
6060
}
6161

62-
public List<Action> getAction() {
62+
public List<CardAction> getAction() {
6363
return this.potentialAction;
6464
}
6565

src/main/java/jenkins/plugins/office365connector/model/messagecard/PotentialAction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
import com.google.gson.annotations.SerializedName;
1919
import hudson.Util;
20-
import jenkins.plugins.office365connector.model.Action;
20+
import jenkins.plugins.office365connector.model.CardAction;
2121

2222
/**
2323
* @author srhebbar
2424
*/
25-
public class PotentialAction implements Action {
25+
public class PotentialAction implements CardAction {
2626

2727
@SerializedName("@context")
2828
private String context = "http://schema.org";
@@ -58,8 +58,8 @@ public List<String> getTarget() {
5858
}
5959

6060
@Override
61-
public void setTarget(List<String> target) {
62-
this.target = target;
61+
public void setTargets(List<String> targets) {
62+
this.target = targets;
6363
}
6464

6565
public String getContext() {

src/test/java/jenkins/plugins/office365connector/ActionablePotentialActionBuilderTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import hudson.model.AbstractProject;
1212
import hudson.model.TaskListener;
1313
import jenkins.plugins.office365connector.helpers.SCMHeadBuilder;
14-
import jenkins.plugins.office365connector.model.Action;
14+
import jenkins.plugins.office365connector.model.CardAction;
1515
import jenkins.scm.api.SCMHead;
1616
import jenkins.scm.api.metadata.ContributorMetadataAction;
1717
import jenkins.scm.api.metadata.ObjectMetadataAction;
@@ -64,11 +64,11 @@ public void buildActionable_OnEmptyAction_ReturnsEmptyList() {
6464
// from @Before
6565

6666
// when
67-
List<Action> potentialActions = actionableBuilder.buildActionable();
67+
List<CardAction> potentialActions = actionableBuilder.buildActionable();
6868

6969
// then
7070
assertThat(potentialActions).hasSize(1);
71-
Action potentialAction = potentialActions.get(0);
71+
CardAction potentialAction = potentialActions.get(0);
7272
assertThat(potentialAction.getName()).isEqualTo("View Build");
7373
}
7474

@@ -133,7 +133,7 @@ public void pullRequestActionable_OnContributorMetadataAction_AddsFact() throws
133133
// then
134134
assertThat(factsBuilder.collect()).hasSize(1);
135135

136-
List<Action> potentialActions = FieldReflection.getFieldValue(actionableBuilder.getClass().getDeclaredField("potentialActions"), actionableBuilder);
136+
List<CardAction> potentialActions = FieldReflection.getFieldValue(actionableBuilder.getClass().getDeclaredField("potentialActions"), actionableBuilder);
137137
assertThat(potentialActions).hasSize(1);
138138
}
139139

@@ -164,7 +164,7 @@ public void pullRequestActionable_OnObjectMetadataAction_DoesNotAddFact() throws
164164
// then
165165
assertThat(factsBuilder.collect()).hasSize(1);
166166

167-
List<Action> potentialActions = FieldReflection.getFieldValue(actionableBuilder.getClass().getDeclaredField("potentialActions"), actionableBuilder);
167+
List<CardAction> potentialActions = FieldReflection.getFieldValue(actionableBuilder.getClass().getDeclaredField("potentialActions"), actionableBuilder);
168168
assertThat(potentialActions).isEmpty();
169169
}
170170

src/test/java/jenkins/plugins/office365connector/model/messagecard/PotentialActionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void getTarget_ReturnsTarget() {
4848
PotentialAction potentialAction = new PotentialAction("name", "url");
4949

5050
// then
51-
potentialAction.setTarget(target);
51+
potentialAction.setTargets(target);
5252

5353
// then
5454
assertThat(potentialAction.getTarget()).isEqualTo(target);

0 commit comments

Comments
 (0)