Merge "Remove Singleton annotation from ResumeProjectImport"
diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/ResumeCopyProject.java b/src/main/java/com/googlesource/gerrit/plugins/importer/ResumeCopyProject.java
index 884ba53..6977a91 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ResumeCopyProject.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ResumeCopyProject.java
@@ -48,7 +48,7 @@
@RequiresCapability(CopyProjectCapability.ID)
class ResumeCopyProject implements RestModifyView<ProjectResource, Input>,
UiAction<ProjectResource> {
- private final ResumeProjectImport resumeProjectImport;
+ private final Provider<ResumeProjectImport> resumeProjectImport;
private final ProjectsCollection projectsCollection;
private final Provider<CurrentUser> currentUserProvider;
private final String pluginName;
@@ -57,7 +57,7 @@
@Inject
ResumeCopyProject(
- ResumeProjectImport resumeProjectImport,
+ Provider<ResumeProjectImport> resumeProjectImport,
ProjectsCollection projectsCollection,
Provider<CurrentUser> currentUserProvider,
@PluginName String pluginName,
@@ -84,7 +84,7 @@
ImportProjectResource projectResource =
projectsCollection.parse(new ConfigResource(),
IdString.fromDecoded(rsrc.getName()));
- return resumeProjectImport.apply(projectResource, in);
+ return resumeProjectImport.get().apply(projectResource, in);
}
@Override
diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/ResumeProjectImport.java b/src/main/java/com/googlesource/gerrit/plugins/importer/ResumeProjectImport.java
index b05eaf3..75ab643 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ResumeProjectImport.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ResumeProjectImport.java
@@ -34,7 +34,6 @@
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import com.google.inject.Provider;
-import com.google.inject.Singleton;
import com.googlesource.gerrit.plugins.importer.ResumeProjectImport.Input;
@@ -43,7 +42,6 @@
import java.io.IOException;
import java.io.Writer;
-@Singleton
@RequiresCapability(ImportCapability.ID)
public class ResumeProjectImport implements RestModifyView<ImportProjectResource, Input> {
public static class Input {
