Skip to content
Snippets Groups Projects
Commit f3c47be4 authored by Wayne Beaton's avatar Wayne Beaton
Browse files

Refactor: Rename and generalise

parent a600a94b
No related branches found
No related tags found
No related merge requests found
...@@ -23,5 +23,18 @@ ...@@ -23,5 +23,18 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </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"/> <classpathentry kind="output" path="target/classes"/>
</classpath> </classpath>
...@@ -4,5 +4,5 @@ org.eclipse.jdt.core.compiler.compliance=11 ...@@ -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.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore 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 org.eclipse.jdt.core.compiler.source=11
...@@ -29,13 +29,13 @@ ...@@ -29,13 +29,13 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.eclipse.dash</groupId> <groupId>org.eclipse.dash</groupId>
<artifactId>org.eclipse.dash.licenses</artifactId> <artifactId>org.eclipse.dash.licenses.core</artifactId>
<version>1.0.3-SNAPSHOT</version> <version>1.0.3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.dash</groupId> <groupId>org.eclipse.dash</groupId>
<artifactId>eclipse-api-for-java</artifactId> <artifactId>eclipse-api-for-java</artifactId>
<version>1.0.2-SNAPSHOT</version> <version>1.0.3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.inject</groupId> <groupId>com.google.inject</groupId>
......
...@@ -32,11 +32,11 @@ public class InitialContributionProcess { ...@@ -32,11 +32,11 @@ public class InitialContributionProcess {
}); });
} }
private void run(Consumer<InitialContributionReviewTaskFinder> doit) { private void run(Consumer<ReviewTaskFinder> doit) {
logger.info("Starting the processor."); logger.info("Starting the processor.");
Injector injector = Guice.createInjector(new ProjectCodeReviewModule()); Injector injector = Guice.createInjector(new ProjectCodeReviewModule());
var scanner = injector.getInstance(InitialContributionReviewTaskFinder.class); var scanner = injector.getInstance(ReviewTaskFinder.class);
doit.accept(scanner); doit.accept(scanner);
} }
......
...@@ -12,7 +12,6 @@ package org.eclipse.dash.ip.project.code; ...@@ -12,7 +12,6 @@ package org.eclipse.dash.ip.project.code;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import java.util.Objects; import java.util.Objects;
...@@ -32,8 +31,8 @@ import org.slf4j.LoggerFactory; ...@@ -32,8 +31,8 @@ import org.slf4j.LoggerFactory;
import jakarta.inject.Inject; import jakarta.inject.Inject;
public class InitialContributionReviewTaskFinder { public class ReviewTaskFinder {
final Logger logger = LoggerFactory.getLogger(InitialContributionReviewTaskFinder.class); final Logger logger = LoggerFactory.getLogger(ReviewTaskFinder.class);
@Inject @Inject
EclipseApi api; EclipseApi api;
...@@ -45,7 +44,7 @@ public class InitialContributionReviewTaskFinder { ...@@ -45,7 +44,7 @@ public class InitialContributionReviewTaskFinder {
GitLabApi gitlabApi; GitLabApi gitlabApi;
@Inject @Inject
InitialContributionReviewTaskFinder initialContribution; ReviewTaskFinder initialContribution;
public Stream<CreateReviewTask> tasks() { public Stream<CreateReviewTask> tasks() {
return Stream.concat(initialContributionTasks(), adHocReviewTasks()); return Stream.concat(initialContributionTasks(), adHocReviewTasks());
...@@ -166,7 +165,7 @@ public class InitialContributionReviewTaskFinder { ...@@ -166,7 +165,7 @@ public class InitialContributionReviewTaskFinder {
return null; return null;
} }
abstract class CreateReviewTask { public abstract class CreateReviewTask {
Issue issue; Issue issue;
Project project; Project project;
......
...@@ -15,7 +15,7 @@ import java.util.function.Consumer; ...@@ -15,7 +15,7 @@ import java.util.function.Consumer;
import org.eclipse.dash.api.EclipseApi; import org.eclipse.dash.api.EclipseApi;
import org.eclipse.dash.api.EclipseApi.HttpService; 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.ip.project.code.RepositoryService;
import org.eclipse.dash.licenses.IProxySettings; import org.eclipse.dash.licenses.IProxySettings;
import org.eclipse.dash.licenses.ISettings; import org.eclipse.dash.licenses.ISettings;
...@@ -61,7 +61,7 @@ public class ProjectCodeReviewModule extends AbstractModule { ...@@ -61,7 +61,7 @@ public class ProjectCodeReviewModule extends AbstractModule {
bind(RepositoryService.class).toInstance(new RepositoryService()); bind(RepositoryService.class).toInstance(new RepositoryService());
bind(InitialContributionReviewTaskFinder.class).toInstance(new InitialContributionReviewTaskFinder()); bind(ReviewTaskFinder.class).toInstance(new ReviewTaskFinder());
} }
static String getGitLabUrl() { static String getGitLabUrl() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment