diff --git a/pom.xml b/pom.xml index f6b5b09..95e0e92 100644 --- a/pom.xml +++ b/pom.xml @@ -32,11 +32,6 @@ org.apache.httpcomponents httpclient - - org.projectlombok - lombok - provided - org.springframework.boot spring-boot-starter-web diff --git a/src/main/java/io/spring/issuebot/GitHubProperties.java b/src/main/java/io/spring/issuebot/GitHubProperties.java index 4b5a99d..1409b53 100644 --- a/src/main/java/io/spring/issuebot/GitHubProperties.java +++ b/src/main/java/io/spring/issuebot/GitHubProperties.java @@ -18,9 +18,6 @@ package io.spring.issuebot; import java.util.List; -import lombok.Getter; -import lombok.Setter; - import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; @@ -30,8 +27,6 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty; * @author Andy Wilkinson */ @ConfigurationProperties(prefix = "issuebot.github") -@Getter -@Setter public class GitHubProperties { @NestedConfigurationProperty @@ -40,11 +35,25 @@ public class GitHubProperties { @NestedConfigurationProperty private Credentials credentials = new Credentials(); + public Repository getRepository() { + return this.repository; + } + + public void setRepository(Repository repository) { + this.repository = repository; + } + + public Credentials getCredentials() { + return this.credentials; + } + + public void setCredentials(Credentials credentials) { + this.credentials = credentials; + } + /** * Configuration for a GitHub repository. */ - @Getter - @Setter public static class Repository { /** @@ -62,13 +71,35 @@ public class GitHubProperties { */ private List collaborators; + public String getOrganization() { + return this.organization; + } + + public void setOrganization(String organization) { + this.organization = organization; + } + + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public List getCollaborators() { + return this.collaborators; + } + + public void setCollaborators(List collaborators) { + this.collaborators = collaborators; + } + } /** * Configuration for the credentials used to authenticate with GitHub. */ - @Getter - @Setter public static class Credentials { /** @@ -81,6 +112,22 @@ public class GitHubProperties { */ private String password; + public String getUsername() { + return this.username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return this.password; + } + + public void setPassword(String password) { + this.password = password; + } + } } diff --git a/src/main/java/io/spring/issuebot/MonitoredRepository.java b/src/main/java/io/spring/issuebot/MonitoredRepository.java index c61bff8..a472d96 100644 --- a/src/main/java/io/spring/issuebot/MonitoredRepository.java +++ b/src/main/java/io/spring/issuebot/MonitoredRepository.java @@ -16,16 +16,11 @@ package io.spring.issuebot; -import lombok.Getter; -import lombok.RequiredArgsConstructor; - /** * A repository that should be monitored. * * @author Andy Wilkinson */ -@RequiredArgsConstructor -@Getter public class MonitoredRepository { /** @@ -38,4 +33,17 @@ public class MonitoredRepository { */ private final String name; + public MonitoredRepository(String organization, String name) { + this.organization = organization; + this.name = name; + } + + public String getOrganization() { + return this.organization; + } + + public String getName() { + return this.name; + } + } diff --git a/src/main/java/io/spring/issuebot/feedback/FeedbackProperties.java b/src/main/java/io/spring/issuebot/feedback/FeedbackProperties.java index 8fa33c6..e27d1da 100644 --- a/src/main/java/io/spring/issuebot/feedback/FeedbackProperties.java +++ b/src/main/java/io/spring/issuebot/feedback/FeedbackProperties.java @@ -16,9 +16,6 @@ package io.spring.issuebot.feedback; -import lombok.Getter; -import lombok.Setter; - import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -28,8 +25,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties * * @author Andy Wilkinson */ -@Getter -@Setter @ConfigurationProperties(prefix = "issuebot.feedback") final class FeedbackProperties { @@ -59,4 +54,44 @@ final class FeedbackProperties { */ private String closeComment; + public String getRequiredLabel() { + return this.requiredLabel; + } + + public void setRequiredLabel(String requiredLabel) { + this.requiredLabel = requiredLabel; + } + + public String getProvidedLabel() { + return this.providedLabel; + } + + public void setProvidedLabel(String providedLabel) { + this.providedLabel = providedLabel; + } + + public String getReminderLabel() { + return this.reminderLabel; + } + + public void setReminderLabel(String reminderLabel) { + this.reminderLabel = reminderLabel; + } + + public String getReminderComment() { + return this.reminderComment; + } + + public void setReminderComment(String reminderComment) { + this.reminderComment = reminderComment; + } + + public String getCloseComment() { + return this.closeComment; + } + + public void setCloseComment(String closeComment) { + this.closeComment = closeComment; + } + } diff --git a/src/main/java/io/spring/issuebot/github/Comment.java b/src/main/java/io/spring/issuebot/github/Comment.java index 229b0b6..d7a697d 100644 --- a/src/main/java/io/spring/issuebot/github/Comment.java +++ b/src/main/java/io/spring/issuebot/github/Comment.java @@ -20,14 +20,12 @@ import java.time.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; /** * A comment that has been made on a GitHub issue. * * @author Andy Wilkinson */ -@Getter public final class Comment { private final User user; @@ -47,4 +45,12 @@ public final class Comment { this.creationTime = creationTime; } + public User getUser() { + return this.user; + } + + public OffsetDateTime getCreationTime() { + return this.creationTime; + } + } diff --git a/src/main/java/io/spring/issuebot/github/Event.java b/src/main/java/io/spring/issuebot/github/Event.java index b9e2e2e..0409b8b 100644 --- a/src/main/java/io/spring/issuebot/github/Event.java +++ b/src/main/java/io/spring/issuebot/github/Event.java @@ -20,14 +20,12 @@ import java.time.OffsetDateTime; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; /** * An event that has been performed on an {@link Issue}. * * @author Andy Wilkinson */ -@Getter public class Event { private final Type type; @@ -51,6 +49,18 @@ public class Event { this.label = label; } + public Type getType() { + return this.type; + } + + public OffsetDateTime getCreationTime() { + return this.creationTime; + } + + public Label getLabel() { + return this.label; + } + /** * The type of an {@link Event}. * diff --git a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java index 291ac1a..22eaa45 100644 --- a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java +++ b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java @@ -128,7 +128,7 @@ public class GitHubTemplate implements GitHubOperations { return null; } ResponseEntity contents = this.rest.getForEntity(url, type); - return new StandardPage(Arrays.asList(contents.getBody()), + return new StandardPage<>(Arrays.asList(contents.getBody()), () -> getPage(getNextUrl(contents), type)); } diff --git a/src/main/java/io/spring/issuebot/github/Issue.java b/src/main/java/io/spring/issuebot/github/Issue.java index 0bff474..4f2d1de 100644 --- a/src/main/java/io/spring/issuebot/github/Issue.java +++ b/src/main/java/io/spring/issuebot/github/Issue.java @@ -20,8 +20,6 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AccessLevel; -import lombok.Getter; /** * A GitHub issue. @@ -30,28 +28,20 @@ import lombok.Getter; */ public class Issue { - @Getter(AccessLevel.PACKAGE) private final String url; - @Getter(AccessLevel.PACKAGE) private final String commentsUrl; - @Getter(AccessLevel.PACKAGE) private final String eventsUrl; - @Getter(AccessLevel.PACKAGE) private final String labelsUrl; - @Getter private final User user; - @Getter private List