From c0c4e2d90165f32a1667ab56564e64d2f4c2fe62 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 7 Dec 2015 13:28:59 +0000 Subject: [PATCH] Rename github package as functionality is not specific to triage --- .../spring/issuebot/{triage => }/github/Comment.java | 2 +- .../issuebot/{triage => }/github/GitHubOperations.java | 2 +- .../issuebot/{triage => }/github/GitHubTemplate.java | 2 +- .../io/spring/issuebot/{triage => }/github/Issue.java | 2 +- .../io/spring/issuebot/{triage => }/github/Label.java | 2 +- .../issuebot/{triage => }/github/LinkParser.java | 2 +- .../spring/issuebot/{triage => }/github/Milestone.java | 2 +- .../io/spring/issuebot/{triage => }/github/Page.java | 2 +- .../issuebot/{triage => }/github/RegexLinkParser.java | 2 +- .../issuebot/{triage => }/github/StandardPage.java | 2 +- .../io/spring/issuebot/{triage => }/github/User.java | 2 +- .../issuebot/triage/LabelApplyingTriageListener.java | 4 ++-- .../io/spring/issuebot/triage/RepositoryMonitor.java | 6 +++--- .../io/spring/issuebot/triage/TriageConfiguration.java | 4 ++-- .../java/io/spring/issuebot/triage/TriageListener.java | 2 +- .../filter/CommentedByCollaboratorTriageFilter.java | 8 ++++---- .../issuebot/triage/filter/DelegatingTriageFilter.java | 2 +- .../issuebot/triage/filter/LabelledTriageFilter.java | 2 +- .../triage/filter/MilestoneAppliedTriageFilter.java | 2 +- .../filter/OpenedByCollaboratorTriageFilter.java | 2 +- .../issuebot/triage/filter/StandardTriageFilters.java | 2 +- .../io/spring/issuebot/triage/filter/TriageFilter.java | 2 +- .../{triage => }/github/GitHubTemplateTests.java | 8 +++++++- .../{triage => }/github/RegexLinkParserTests.java | 5 ++++- .../triage/LabelApplyingTriageListenerTests.java | 4 ++-- .../spring/issuebot/triage/RepositoryMonitorTests.java | 6 +++--- .../CommentedByCollaboratorTriageFilterTests.java | 10 +++++----- .../triage/filter/DelegatingTriageFilterTests.java | 2 +- .../triage/filter/LabelledTriageFilterTests.java | 4 ++-- .../filter/MilestoneAppliedTriageFilterTests.java | 4 ++-- .../filter/OpenedByCollaboratorTriageFilterTests.java | 4 ++-- 31 files changed, 57 insertions(+), 48 deletions(-) rename src/main/java/io/spring/issuebot/{triage => }/github/Comment.java (96%) rename src/main/java/io/spring/issuebot/{triage => }/github/GitHubOperations.java (97%) rename src/main/java/io/spring/issuebot/{triage => }/github/GitHubTemplate.java (99%) rename src/main/java/io/spring/issuebot/{triage => }/github/Issue.java (97%) rename src/main/java/io/spring/issuebot/{triage => }/github/Label.java (96%) rename src/main/java/io/spring/issuebot/{triage => }/github/LinkParser.java (96%) rename src/main/java/io/spring/issuebot/{triage => }/github/Milestone.java (96%) rename src/main/java/io/spring/issuebot/{triage => }/github/Page.java (95%) rename src/main/java/io/spring/issuebot/{triage => }/github/RegexLinkParser.java (97%) rename src/main/java/io/spring/issuebot/{triage => }/github/StandardPage.java (97%) rename src/main/java/io/spring/issuebot/{triage => }/github/User.java (96%) rename src/test/java/io/spring/issuebot/{triage => }/github/GitHubTemplateTests.java (96%) rename src/test/java/io/spring/issuebot/{triage => }/github/RegexLinkParserTests.java (93%) diff --git a/src/main/java/io/spring/issuebot/triage/github/Comment.java b/src/main/java/io/spring/issuebot/github/Comment.java similarity index 96% rename from src/main/java/io/spring/issuebot/triage/github/Comment.java rename to src/main/java/io/spring/issuebot/github/Comment.java index 209d014..481fc56 100644 --- a/src/main/java/io/spring/issuebot/triage/github/Comment.java +++ b/src/main/java/io/spring/issuebot/github/Comment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.issuebot.triage.github; +package io.spring.issuebot.github; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/spring/issuebot/triage/github/GitHubOperations.java b/src/main/java/io/spring/issuebot/github/GitHubOperations.java similarity index 97% rename from src/main/java/io/spring/issuebot/triage/github/GitHubOperations.java rename to src/main/java/io/spring/issuebot/github/GitHubOperations.java index 46a7a9b..f273455 100644 --- a/src/main/java/io/spring/issuebot/triage/github/GitHubOperations.java +++ b/src/main/java/io/spring/issuebot/github/GitHubOperations.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.issuebot.triage.github; +package io.spring.issuebot.github; /** * Operations that can be performed against the GitHub API. diff --git a/src/main/java/io/spring/issuebot/triage/github/GitHubTemplate.java b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java similarity index 99% rename from src/main/java/io/spring/issuebot/triage/github/GitHubTemplate.java rename to src/main/java/io/spring/issuebot/github/GitHubTemplate.java index 08b6c5f..a619096 100644 --- a/src/main/java/io/spring/issuebot/triage/github/GitHubTemplate.java +++ b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.issuebot.triage.github; +package io.spring.issuebot.github; import java.io.IOException; import java.net.URI; diff --git a/src/main/java/io/spring/issuebot/triage/github/Issue.java b/src/main/java/io/spring/issuebot/github/Issue.java similarity index 97% rename from src/main/java/io/spring/issuebot/triage/github/Issue.java rename to src/main/java/io/spring/issuebot/github/Issue.java index 7c111c8..c296855 100644 --- a/src/main/java/io/spring/issuebot/triage/github/Issue.java +++ b/src/main/java/io/spring/issuebot/github/Issue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.issuebot.triage.github; +package io.spring.issuebot.github; import java.util.List; diff --git a/src/main/java/io/spring/issuebot/triage/github/Label.java b/src/main/java/io/spring/issuebot/github/Label.java similarity index 96% rename from src/main/java/io/spring/issuebot/triage/github/Label.java rename to src/main/java/io/spring/issuebot/github/Label.java index 3ea202b..97ed045 100644 --- a/src/main/java/io/spring/issuebot/triage/github/Label.java +++ b/src/main/java/io/spring/issuebot/github/Label.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.issuebot.triage.github; +package io.spring.issuebot.github; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/spring/issuebot/triage/github/LinkParser.java b/src/main/java/io/spring/issuebot/github/LinkParser.java similarity index 96% rename from src/main/java/io/spring/issuebot/triage/github/LinkParser.java rename to src/main/java/io/spring/issuebot/github/LinkParser.java index 2b90f43..c8c7978 100644 --- a/src/main/java/io/spring/issuebot/triage/github/LinkParser.java +++ b/src/main/java/io/spring/issuebot/github/LinkParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.issuebot.triage.github; +package io.spring.issuebot.github; import java.util.Map; diff --git a/src/main/java/io/spring/issuebot/triage/github/Milestone.java b/src/main/java/io/spring/issuebot/github/Milestone.java similarity index 96% rename from src/main/java/io/spring/issuebot/triage/github/Milestone.java rename to src/main/java/io/spring/issuebot/github/Milestone.java index ce58a4f..320ed81 100644 --- a/src/main/java/io/spring/issuebot/triage/github/Milestone.java +++ b/src/main/java/io/spring/issuebot/github/Milestone.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.issuebot.triage.github; +package io.spring.issuebot.github; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/spring/issuebot/triage/github/Page.java b/src/main/java/io/spring/issuebot/github/Page.java similarity index 95% rename from src/main/java/io/spring/issuebot/triage/github/Page.java rename to src/main/java/io/spring/issuebot/github/Page.java index 6b90866..fca5a07 100644 --- a/src/main/java/io/spring/issuebot/triage/github/Page.java +++ b/src/main/java/io/spring/issuebot/github/Page.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.issuebot.triage.github; +package io.spring.issuebot.github; import java.util.List; diff --git a/src/main/java/io/spring/issuebot/triage/github/RegexLinkParser.java b/src/main/java/io/spring/issuebot/github/RegexLinkParser.java similarity index 97% rename from src/main/java/io/spring/issuebot/triage/github/RegexLinkParser.java rename to src/main/java/io/spring/issuebot/github/RegexLinkParser.java index 8f8095c..a987302 100644 --- a/src/main/java/io/spring/issuebot/triage/github/RegexLinkParser.java +++ b/src/main/java/io/spring/issuebot/github/RegexLinkParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.issuebot.triage.github; +package io.spring.issuebot.github; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/io/spring/issuebot/triage/github/StandardPage.java b/src/main/java/io/spring/issuebot/github/StandardPage.java similarity index 97% rename from src/main/java/io/spring/issuebot/triage/github/StandardPage.java rename to src/main/java/io/spring/issuebot/github/StandardPage.java index af1a68e..803f136 100644 --- a/src/main/java/io/spring/issuebot/triage/github/StandardPage.java +++ b/src/main/java/io/spring/issuebot/github/StandardPage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.issuebot.triage.github; +package io.spring.issuebot.github; import java.util.List; import java.util.function.Supplier; diff --git a/src/main/java/io/spring/issuebot/triage/github/User.java b/src/main/java/io/spring/issuebot/github/User.java similarity index 96% rename from src/main/java/io/spring/issuebot/triage/github/User.java rename to src/main/java/io/spring/issuebot/github/User.java index b3c22d7..e9993fd 100644 --- a/src/main/java/io/spring/issuebot/triage/github/User.java +++ b/src/main/java/io/spring/issuebot/github/User.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.issuebot.triage.github; +package io.spring.issuebot.github; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/io/spring/issuebot/triage/LabelApplyingTriageListener.java b/src/main/java/io/spring/issuebot/triage/LabelApplyingTriageListener.java index faf0a91..8cbf235 100644 --- a/src/main/java/io/spring/issuebot/triage/LabelApplyingTriageListener.java +++ b/src/main/java/io/spring/issuebot/triage/LabelApplyingTriageListener.java @@ -16,8 +16,8 @@ package io.spring.issuebot.triage; -import io.spring.issuebot.triage.github.GitHubOperations; -import io.spring.issuebot.triage.github.Issue; +import io.spring.issuebot.github.GitHubOperations; +import io.spring.issuebot.github.Issue; /** * A {@link TriageListener} that applies a label to any issues that require triage. diff --git a/src/main/java/io/spring/issuebot/triage/RepositoryMonitor.java b/src/main/java/io/spring/issuebot/triage/RepositoryMonitor.java index 69f2c10..ecb64d2 100644 --- a/src/main/java/io/spring/issuebot/triage/RepositoryMonitor.java +++ b/src/main/java/io/spring/issuebot/triage/RepositoryMonitor.java @@ -22,11 +22,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.Scheduled; +import io.spring.issuebot.github.GitHubOperations; +import io.spring.issuebot.github.Issue; +import io.spring.issuebot.github.Page; import io.spring.issuebot.triage.filter.TriageFilter; import io.spring.issuebot.triage.filter.TriageFilters; -import io.spring.issuebot.triage.github.GitHubOperations; -import io.spring.issuebot.triage.github.Issue; -import io.spring.issuebot.triage.github.Page; /** * Central class for monitoring the configured repositories and labeling issues as waiting diff --git a/src/main/java/io/spring/issuebot/triage/TriageConfiguration.java b/src/main/java/io/spring/issuebot/triage/TriageConfiguration.java index 74221cb..f1f2804 100644 --- a/src/main/java/io/spring/issuebot/triage/TriageConfiguration.java +++ b/src/main/java/io/spring/issuebot/triage/TriageConfiguration.java @@ -20,9 +20,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; +import io.spring.issuebot.github.GitHubTemplate; +import io.spring.issuebot.github.RegexLinkParser; import io.spring.issuebot.triage.filter.StandardTriageFilters; -import io.spring.issuebot.triage.github.GitHubTemplate; -import io.spring.issuebot.triage.github.RegexLinkParser; /** * Central configuration for the beans involved in identifying issues that require triage. diff --git a/src/main/java/io/spring/issuebot/triage/TriageListener.java b/src/main/java/io/spring/issuebot/triage/TriageListener.java index 8fb31f2..b64a488 100644 --- a/src/main/java/io/spring/issuebot/triage/TriageListener.java +++ b/src/main/java/io/spring/issuebot/triage/TriageListener.java @@ -16,7 +16,7 @@ package io.spring.issuebot.triage; -import io.spring.issuebot.triage.github.Issue; +import io.spring.issuebot.github.Issue; /** * A {@code TriageListener} is notified of issues that require triage. diff --git a/src/main/java/io/spring/issuebot/triage/filter/CommentedByCollaboratorTriageFilter.java b/src/main/java/io/spring/issuebot/triage/filter/CommentedByCollaboratorTriageFilter.java index c2bf51f..0da76ec 100644 --- a/src/main/java/io/spring/issuebot/triage/filter/CommentedByCollaboratorTriageFilter.java +++ b/src/main/java/io/spring/issuebot/triage/filter/CommentedByCollaboratorTriageFilter.java @@ -22,10 +22,10 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.spring.issuebot.triage.github.Comment; -import io.spring.issuebot.triage.github.GitHubOperations; -import io.spring.issuebot.triage.github.Issue; -import io.spring.issuebot.triage.github.Page; +import io.spring.issuebot.github.Comment; +import io.spring.issuebot.github.GitHubOperations; +import io.spring.issuebot.github.Issue; +import io.spring.issuebot.github.Page; /** * A {@code TriageFilter} that considers an issue has having been triaged if a diff --git a/src/main/java/io/spring/issuebot/triage/filter/DelegatingTriageFilter.java b/src/main/java/io/spring/issuebot/triage/filter/DelegatingTriageFilter.java index 82cb51a..f45da0d 100644 --- a/src/main/java/io/spring/issuebot/triage/filter/DelegatingTriageFilter.java +++ b/src/main/java/io/spring/issuebot/triage/filter/DelegatingTriageFilter.java @@ -21,7 +21,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.spring.issuebot.triage.github.Issue; +import io.spring.issuebot.github.Issue; /** * A {@link TriageFilter} that delegates to one or more filters. diff --git a/src/main/java/io/spring/issuebot/triage/filter/LabelledTriageFilter.java b/src/main/java/io/spring/issuebot/triage/filter/LabelledTriageFilter.java index 48be9a0..3a2959d 100644 --- a/src/main/java/io/spring/issuebot/triage/filter/LabelledTriageFilter.java +++ b/src/main/java/io/spring/issuebot/triage/filter/LabelledTriageFilter.java @@ -19,7 +19,7 @@ package io.spring.issuebot.triage.filter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.spring.issuebot.triage.github.Issue; +import io.spring.issuebot.github.Issue; /** * A {@link TriageFilter} that considers an issue as having been triaged if any labels diff --git a/src/main/java/io/spring/issuebot/triage/filter/MilestoneAppliedTriageFilter.java b/src/main/java/io/spring/issuebot/triage/filter/MilestoneAppliedTriageFilter.java index a50bea8..3e2b772 100644 --- a/src/main/java/io/spring/issuebot/triage/filter/MilestoneAppliedTriageFilter.java +++ b/src/main/java/io/spring/issuebot/triage/filter/MilestoneAppliedTriageFilter.java @@ -19,7 +19,7 @@ package io.spring.issuebot.triage.filter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.spring.issuebot.triage.github.Issue; +import io.spring.issuebot.github.Issue; /** * A {@link TriageFilter} that considers an issue as having been triaged if a milestone diff --git a/src/main/java/io/spring/issuebot/triage/filter/OpenedByCollaboratorTriageFilter.java b/src/main/java/io/spring/issuebot/triage/filter/OpenedByCollaboratorTriageFilter.java index 8b4e0b9..8b4bdea 100644 --- a/src/main/java/io/spring/issuebot/triage/filter/OpenedByCollaboratorTriageFilter.java +++ b/src/main/java/io/spring/issuebot/triage/filter/OpenedByCollaboratorTriageFilter.java @@ -22,7 +22,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.spring.issuebot.triage.github.Issue; +import io.spring.issuebot.github.Issue; /** * A {@link TriageFilter} that considers an issue as having been triaged if it was opened diff --git a/src/main/java/io/spring/issuebot/triage/filter/StandardTriageFilters.java b/src/main/java/io/spring/issuebot/triage/filter/StandardTriageFilters.java index 075dcbd..3babf92 100644 --- a/src/main/java/io/spring/issuebot/triage/filter/StandardTriageFilters.java +++ b/src/main/java/io/spring/issuebot/triage/filter/StandardTriageFilters.java @@ -18,8 +18,8 @@ package io.spring.issuebot.triage.filter; import java.util.Arrays; +import io.spring.issuebot.github.GitHubOperations; import io.spring.issuebot.triage.MonitoredRepository; -import io.spring.issuebot.triage.github.GitHubOperations; /** * Standard implementation of {@code TriageFilters}. diff --git a/src/main/java/io/spring/issuebot/triage/filter/TriageFilter.java b/src/main/java/io/spring/issuebot/triage/filter/TriageFilter.java index a64a7e3..e41acda 100644 --- a/src/main/java/io/spring/issuebot/triage/filter/TriageFilter.java +++ b/src/main/java/io/spring/issuebot/triage/filter/TriageFilter.java @@ -16,7 +16,7 @@ package io.spring.issuebot.triage.filter; -import io.spring.issuebot.triage.github.Issue; +import io.spring.issuebot.github.Issue; /** * A {@code TriageFilter} is used to identify issues which are waiting for triage. diff --git a/src/test/java/io/spring/issuebot/triage/github/GitHubTemplateTests.java b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java similarity index 96% rename from src/test/java/io/spring/issuebot/triage/github/GitHubTemplateTests.java rename to src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java index 1f60cdf..d40dc02 100644 --- a/src/test/java/io/spring/issuebot/triage/github/GitHubTemplateTests.java +++ b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.issuebot.triage.github; +package io.spring.issuebot.github; import java.util.Arrays; import java.util.Date; @@ -33,6 +33,12 @@ import org.springframework.test.web.client.response.DefaultResponseCreator; import org.springframework.util.Base64Utils; import org.springframework.web.client.RestTemplate; +import io.spring.issuebot.github.Comment; +import io.spring.issuebot.github.GitHubTemplate; +import io.spring.issuebot.github.Issue; +import io.spring.issuebot.github.Page; +import io.spring.issuebot.github.RegexLinkParser; + import static org.hamcrest.Matchers.equalToIgnoringCase; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; diff --git a/src/test/java/io/spring/issuebot/triage/github/RegexLinkParserTests.java b/src/test/java/io/spring/issuebot/github/RegexLinkParserTests.java similarity index 93% rename from src/test/java/io/spring/issuebot/triage/github/RegexLinkParserTests.java rename to src/test/java/io/spring/issuebot/github/RegexLinkParserTests.java index bc2a31d..21fc5e0 100644 --- a/src/test/java/io/spring/issuebot/triage/github/RegexLinkParserTests.java +++ b/src/test/java/io/spring/issuebot/github/RegexLinkParserTests.java @@ -14,12 +14,15 @@ * limitations under the License. */ -package io.spring.issuebot.triage.github; +package io.spring.issuebot.github; import java.util.Map; import org.junit.Test; +import io.spring.issuebot.github.LinkParser; +import io.spring.issuebot.github.RegexLinkParser; + import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; diff --git a/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java b/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java index 0c73516..6324fcb 100644 --- a/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java +++ b/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java @@ -18,8 +18,8 @@ package io.spring.issuebot.triage; import org.junit.Test; -import io.spring.issuebot.triage.github.GitHubOperations; -import io.spring.issuebot.triage.github.Issue; +import io.spring.issuebot.github.GitHubOperations; +import io.spring.issuebot.github.Issue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/src/test/java/io/spring/issuebot/triage/RepositoryMonitorTests.java b/src/test/java/io/spring/issuebot/triage/RepositoryMonitorTests.java index 4483fc6..f120cef 100644 --- a/src/test/java/io/spring/issuebot/triage/RepositoryMonitorTests.java +++ b/src/test/java/io/spring/issuebot/triage/RepositoryMonitorTests.java @@ -20,11 +20,11 @@ import java.util.Arrays; import org.junit.Test; +import io.spring.issuebot.github.GitHubOperations; +import io.spring.issuebot.github.Issue; +import io.spring.issuebot.github.Page; import io.spring.issuebot.triage.filter.TriageFilter; import io.spring.issuebot.triage.filter.TriageFilters; -import io.spring.issuebot.triage.github.GitHubOperations; -import io.spring.issuebot.triage.github.Issue; -import io.spring.issuebot.triage.github.Page; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; diff --git a/src/test/java/io/spring/issuebot/triage/filter/CommentedByCollaboratorTriageFilterTests.java b/src/test/java/io/spring/issuebot/triage/filter/CommentedByCollaboratorTriageFilterTests.java index e3cfa73..1648f9a 100644 --- a/src/test/java/io/spring/issuebot/triage/filter/CommentedByCollaboratorTriageFilterTests.java +++ b/src/test/java/io/spring/issuebot/triage/filter/CommentedByCollaboratorTriageFilterTests.java @@ -21,11 +21,11 @@ import java.util.Collections; import org.junit.Test; -import io.spring.issuebot.triage.github.Comment; -import io.spring.issuebot.triage.github.GitHubOperations; -import io.spring.issuebot.triage.github.Issue; -import io.spring.issuebot.triage.github.Page; -import io.spring.issuebot.triage.github.User; +import io.spring.issuebot.github.Comment; +import io.spring.issuebot.github.GitHubOperations; +import io.spring.issuebot.github.Issue; +import io.spring.issuebot.github.Page; +import io.spring.issuebot.github.User; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; diff --git a/src/test/java/io/spring/issuebot/triage/filter/DelegatingTriageFilterTests.java b/src/test/java/io/spring/issuebot/triage/filter/DelegatingTriageFilterTests.java index 21c45d8..d620841 100644 --- a/src/test/java/io/spring/issuebot/triage/filter/DelegatingTriageFilterTests.java +++ b/src/test/java/io/spring/issuebot/triage/filter/DelegatingTriageFilterTests.java @@ -20,7 +20,7 @@ import java.util.Arrays; import org.junit.Test; -import io.spring.issuebot.triage.github.Issue; +import io.spring.issuebot.github.Issue; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; diff --git a/src/test/java/io/spring/issuebot/triage/filter/LabelledTriageFilterTests.java b/src/test/java/io/spring/issuebot/triage/filter/LabelledTriageFilterTests.java index d26e760..8f89deb 100644 --- a/src/test/java/io/spring/issuebot/triage/filter/LabelledTriageFilterTests.java +++ b/src/test/java/io/spring/issuebot/triage/filter/LabelledTriageFilterTests.java @@ -21,8 +21,8 @@ import java.util.Collections; import org.junit.Test; -import io.spring.issuebot.triage.github.Issue; -import io.spring.issuebot.triage.github.Label; +import io.spring.issuebot.github.Issue; +import io.spring.issuebot.github.Label; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; diff --git a/src/test/java/io/spring/issuebot/triage/filter/MilestoneAppliedTriageFilterTests.java b/src/test/java/io/spring/issuebot/triage/filter/MilestoneAppliedTriageFilterTests.java index 579b491..0708a91 100644 --- a/src/test/java/io/spring/issuebot/triage/filter/MilestoneAppliedTriageFilterTests.java +++ b/src/test/java/io/spring/issuebot/triage/filter/MilestoneAppliedTriageFilterTests.java @@ -18,8 +18,8 @@ package io.spring.issuebot.triage.filter; import org.junit.Test; -import io.spring.issuebot.triage.github.Issue; -import io.spring.issuebot.triage.github.Milestone; +import io.spring.issuebot.github.Issue; +import io.spring.issuebot.github.Milestone; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; diff --git a/src/test/java/io/spring/issuebot/triage/filter/OpenedByCollaboratorTriageFilterTests.java b/src/test/java/io/spring/issuebot/triage/filter/OpenedByCollaboratorTriageFilterTests.java index 4760244..85034d9 100644 --- a/src/test/java/io/spring/issuebot/triage/filter/OpenedByCollaboratorTriageFilterTests.java +++ b/src/test/java/io/spring/issuebot/triage/filter/OpenedByCollaboratorTriageFilterTests.java @@ -20,8 +20,8 @@ import java.util.Arrays; import org.junit.Test; -import io.spring.issuebot.triage.github.Issue; -import io.spring.issuebot.triage.github.User; +import io.spring.issuebot.github.Issue; +import io.spring.issuebot.github.User; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat;