From f3c47be4ddf841676cd55cf602d2d9c79c12065f Mon Sep 17 00:00:00 2001
From: Wayne Beaton <wayne.beaton@eclipse-foundation.org>
Date: Mon, 11 Dec 2023 14:17:29 -0500
Subject: [PATCH] Refactor: Rename and generalise
---
.classpath | 13 +++++++++++++
.settings/org.eclipse.jdt.core.prefs | 2 +-
pom.xml | 4 ++--
.../ip/project/code/InitialContributionProcess.java | 4 ++--
...nReviewTaskFinder.java => ReviewTaskFinder.java} | 9 ++++-----
.../code/context/ProjectCodeReviewModule.java | 4 ++--
6 files changed, 24 insertions(+), 12 deletions(-)
rename src/main/java/org/eclipse/dash/ip/project/code/{InitialContributionReviewTaskFinder.java => ReviewTaskFinder.java} (98%)
diff --git a/.classpath b/.classpath
index 4559ca0..8ec68a3 100644
--- a/.classpath
+++ b/.classpath
@@ -23,5 +23,18 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="optional" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="test" value="true"/>
+ <attribute name="optional" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index b5490a0..2af1e7b 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -4,5 +4,5 @@ org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
-org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=11
diff --git a/pom.xml b/pom.xml
index 2006410..f0ff142 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,13 +29,13 @@
<dependencies>
<dependency>
<groupId>org.eclipse.dash</groupId>
- <artifactId>org.eclipse.dash.licenses</artifactId>
+ <artifactId>org.eclipse.dash.licenses.core</artifactId>
<version>1.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.dash</groupId>
<artifactId>eclipse-api-for-java</artifactId>
- <version>1.0.2-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
diff --git a/src/main/java/org/eclipse/dash/ip/project/code/InitialContributionProcess.java b/src/main/java/org/eclipse/dash/ip/project/code/InitialContributionProcess.java
index 4cb35a6..0b40593 100644
--- a/src/main/java/org/eclipse/dash/ip/project/code/InitialContributionProcess.java
+++ b/src/main/java/org/eclipse/dash/ip/project/code/InitialContributionProcess.java
@@ -32,11 +32,11 @@ public class InitialContributionProcess {
});
}
- private void run(Consumer<InitialContributionReviewTaskFinder> doit) {
+ private void run(Consumer<ReviewTaskFinder> doit) {
logger.info("Starting the processor.");
Injector injector = Guice.createInjector(new ProjectCodeReviewModule());
- var scanner = injector.getInstance(InitialContributionReviewTaskFinder.class);
+ var scanner = injector.getInstance(ReviewTaskFinder.class);
doit.accept(scanner);
}
diff --git a/src/main/java/org/eclipse/dash/ip/project/code/InitialContributionReviewTaskFinder.java b/src/main/java/org/eclipse/dash/ip/project/code/ReviewTaskFinder.java
similarity index 98%
rename from src/main/java/org/eclipse/dash/ip/project/code/InitialContributionReviewTaskFinder.java
rename to src/main/java/org/eclipse/dash/ip/project/code/ReviewTaskFinder.java
index a6e4500..a3cc7c6 100644
--- a/src/main/java/org/eclipse/dash/ip/project/code/InitialContributionReviewTaskFinder.java
+++ b/src/main/java/org/eclipse/dash/ip/project/code/ReviewTaskFinder.java
@@ -12,7 +12,6 @@ package org.eclipse.dash.ip.project.code;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Objects;
@@ -32,8 +31,8 @@ import org.slf4j.LoggerFactory;
import jakarta.inject.Inject;
-public class InitialContributionReviewTaskFinder {
- final Logger logger = LoggerFactory.getLogger(InitialContributionReviewTaskFinder.class);
+public class ReviewTaskFinder {
+ final Logger logger = LoggerFactory.getLogger(ReviewTaskFinder.class);
@Inject
EclipseApi api;
@@ -45,7 +44,7 @@ public class InitialContributionReviewTaskFinder {
GitLabApi gitlabApi;
@Inject
- InitialContributionReviewTaskFinder initialContribution;
+ ReviewTaskFinder initialContribution;
public Stream<CreateReviewTask> tasks() {
return Stream.concat(initialContributionTasks(), adHocReviewTasks());
@@ -166,7 +165,7 @@ public class InitialContributionReviewTaskFinder {
return null;
}
- abstract class CreateReviewTask {
+ public abstract class CreateReviewTask {
Issue issue;
Project project;
diff --git a/src/main/java/org/eclipse/dash/ip/project/code/context/ProjectCodeReviewModule.java b/src/main/java/org/eclipse/dash/ip/project/code/context/ProjectCodeReviewModule.java
index 87b3cae..cb12523 100644
--- a/src/main/java/org/eclipse/dash/ip/project/code/context/ProjectCodeReviewModule.java
+++ b/src/main/java/org/eclipse/dash/ip/project/code/context/ProjectCodeReviewModule.java
@@ -15,7 +15,7 @@ import java.util.function.Consumer;
import org.eclipse.dash.api.EclipseApi;
import org.eclipse.dash.api.EclipseApi.HttpService;
-import org.eclipse.dash.ip.project.code.InitialContributionReviewTaskFinder;
+import org.eclipse.dash.ip.project.code.ReviewTaskFinder;
import org.eclipse.dash.ip.project.code.RepositoryService;
import org.eclipse.dash.licenses.IProxySettings;
import org.eclipse.dash.licenses.ISettings;
@@ -61,7 +61,7 @@ public class ProjectCodeReviewModule extends AbstractModule {
bind(RepositoryService.class).toInstance(new RepositoryService());
- bind(InitialContributionReviewTaskFinder.class).toInstance(new InitialContributionReviewTaskFinder());
+ bind(ReviewTaskFinder.class).toInstance(new ReviewTaskFinder());
}
static String getGitLabUrl() {
--
GitLab