Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

notify: rename IssueUpdater to IssueNotifier #650

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -29,6 +29,7 @@ module {
opens 'org.openjdk.skara.bots.notify' to 'org.junit.platform.commons'
opens 'org.openjdk.skara.bots.notify.mailinglist' to 'org.junit.platform.commons'
opens 'org.openjdk.skara.bots.notify.json' to 'org.junit.platform.commons'
opens 'org.openjdk.skara.bots.notify.issue' to 'org.junit.platform.commons'
}
}

@@ -36,7 +36,7 @@

uses org.openjdk.skara.bots.notify.NotifierFactory;
provides org.openjdk.skara.bots.notify.NotifierFactory with
org.openjdk.skara.bots.notify.issue.IssueUpdaterFactory,
org.openjdk.skara.bots.notify.issue.IssueNotifierFactory,
org.openjdk.skara.bots.notify.json.JsonNotifierFactory,
org.openjdk.skara.bots.notify.mailinglist.MailingListNotifierFactory,
org.openjdk.skara.bots.notify.slack.SlackNotifierFactory;
@@ -33,24 +33,24 @@
import java.util.*;
import java.util.logging.Logger;

public class IssueUpdater implements PullRequestUpdateConsumer {
class IssueNotifier implements PullRequestUpdateConsumer {
private final IssueProject issueProject;
private final boolean reviewLink;
private final URI reviewIcon;
private final boolean commitLink;
private final URI commitIcon;
private final Logger log = Logger.getLogger("org.openjdk.skara.bots.notify");

IssueUpdater(IssueProject issueProject, boolean reviewLink, URI reviewIcon, boolean commitLink, URI commitIcon) {
IssueNotifier(IssueProject issueProject, boolean reviewLink, URI reviewIcon, boolean commitLink, URI commitIcon) {
this.issueProject = issueProject;
this.reviewLink = reviewLink;
this.reviewIcon = reviewIcon;
this.commitLink = commitLink;
this.commitIcon = commitIcon;
}

public static IssueUpdaterBuilder newBuilder() {
return new IssueUpdaterBuilder();
static IssueNotifierBuilder newBuilder() {
return new IssueNotifierBuilder();
}

@Override
@@ -27,39 +27,39 @@
import java.net.URI;
import java.util.Map;

public class IssueUpdaterBuilder {
class IssueNotifierBuilder {
private IssueProject issueProject;
private boolean reviewLink = true;
private URI reviewIcon = null;
private boolean commitLink = true;
private URI commitIcon = null;

public IssueUpdaterBuilder issueProject(IssueProject issueProject) {
IssueNotifierBuilder issueProject(IssueProject issueProject) {
this.issueProject = issueProject;
return this;
}

public IssueUpdaterBuilder reviewLink(boolean reviewLink) {
IssueNotifierBuilder reviewLink(boolean reviewLink) {
this.reviewLink = reviewLink;
return this;
}

public IssueUpdaterBuilder reviewIcon(URI reviewIcon) {
IssueNotifierBuilder reviewIcon(URI reviewIcon) {
this.reviewIcon = reviewIcon;
return this;
}

public IssueUpdaterBuilder commitLink(boolean commitLink) {
IssueNotifierBuilder commitLink(boolean commitLink) {
this.commitLink = commitLink;
return this;
}

public IssueUpdaterBuilder commitIcon(URI commitIcon) {
IssueNotifierBuilder commitIcon(URI commitIcon) {
this.commitIcon = commitIcon;
return this;
}

public IssueUpdater build() {
return new IssueUpdater(issueProject, reviewLink, reviewIcon, commitLink, commitIcon);
IssueNotifier build() {
return new IssueNotifier(issueProject, reviewLink, reviewIcon, commitLink, commitIcon);
}
}
}
@@ -6,7 +6,7 @@

import java.net.URI;

public class IssueUpdaterFactory implements NotifierFactory {
public class IssueNotifierFactory implements NotifierFactory {
@Override
public String name() {
return "issue";
@@ -15,27 +15,27 @@ public String name() {
@Override
public Notifier create(BotConfiguration botConfiguration, JSONObject notifierConfiguration) {
var issueProject = botConfiguration.issueProject(notifierConfiguration.get("project").asString());
var issueUpdaterBuilder = IssueUpdater.newBuilder()
.issueProject(issueProject);
var builder = IssueNotifier.newBuilder()
.issueProject(issueProject);

if (notifierConfiguration.contains("reviews")) {
if (notifierConfiguration.get("reviews").contains("icon")) {
issueUpdaterBuilder.reviewIcon(URI.create(notifierConfiguration.get("reviews").get("icon").asString()));
builder.reviewIcon(URI.create(notifierConfiguration.get("reviews").get("icon").asString()));
}
}
if (notifierConfiguration.contains("commits")) {
if (notifierConfiguration.get("commits").contains("icon")) {
issueUpdaterBuilder.commitIcon(URI.create(notifierConfiguration.get("commits").get("icon").asString()));
builder.commitIcon(URI.create(notifierConfiguration.get("commits").get("icon").asString()));
}
}

if (notifierConfiguration.contains("reviewlink")) {
issueUpdaterBuilder.reviewLink(notifierConfiguration.get("reviewlink").asBoolean());
builder.reviewLink(notifierConfiguration.get("reviewlink").asBoolean());
}
if (notifierConfiguration.contains("commitlink")) {
issueUpdaterBuilder.commitLink(notifierConfiguration.get("commitlink").asBoolean());
builder.commitLink(notifierConfiguration.get("commitlink").asBoolean());
}

return issueUpdaterBuilder.build();
return builder.build();
}
}
@@ -20,10 +20,10 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package org.openjdk.skara.bots.notify;
package org.openjdk.skara.bots.notify.issue;

import org.junit.jupiter.api.*;
import org.openjdk.skara.bots.notify.issue.IssueUpdater;
import org.openjdk.skara.bots.notify.*;
import org.openjdk.skara.json.JSON;
import org.openjdk.skara.test.*;

@@ -35,7 +35,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openjdk.skara.bots.notify.UpdaterTests.*;

public class IssueUpdaterTests {
public class IssueNotifierTests {
@Test
void testIssueIdempotence(TestInfo testInfo) throws IOException {
try (var credentials = new HostCredentials(testInfo);
@@ -53,7 +53,7 @@ void testIssueIdempotence(TestInfo testInfo) throws IOException {

var issueProject = credentials.getIssueProject();
var commitIcon = URI.create("http://www.example.com/commit.png");
var updater = IssueUpdater.newBuilder()
var updater = IssueNotifier.newBuilder()
.issueProject(issueProject)
.reviewLink(false)
.commitIcon(commitIcon)
@@ -123,7 +123,7 @@ void testPullRequest(TestInfo testInfo) throws IOException {

var issueProject = credentials.getIssueProject();
var reviewIcon = URI.create("http://www.example.com/review.png");
var updater = IssueUpdater.newBuilder()
var updater = IssueNotifier.newBuilder()
.issueProject(issueProject)
.reviewIcon(reviewIcon)
.commitLink(false)
@@ -224,7 +224,7 @@ void testPullRequestNoReview(TestInfo testInfo) throws IOException {

var issueProject = credentials.getIssueProject();
var reviewIcon = URI.create("http://www.example.com/review.png");
var updater = IssueUpdater.newBuilder()
var updater = IssueNotifier.newBuilder()
.issueProject(issueProject)
.reviewLink(false)
.reviewIcon(reviewIcon)
@@ -283,7 +283,7 @@ void testPullRequestPROnly(TestInfo testInfo) throws IOException {

var issueProject = credentials.getIssueProject();
var reviewIcon = URI.create("http://www.example.com/review.png");
var updater = IssueUpdater.newBuilder()
var updater = IssueNotifier.newBuilder()
.issueProject(issueProject)
.reviewIcon(reviewIcon)
.commitLink(true)