commit a3f1f714dfbd8d28eed91c3725be133234eb4a0c
author Edwin Kempin <edwin.kempin@sap.com> Tue Mar 31 14:38:06 2015 +0200
committer Edwin Kempin <edwin.kempin@sap.com> Wed Apr 01 10:43:54 2015 +0200
tree a1bce38663805214e0416cceaa1944318bf046f9
parent 89280c06c0721064a171913298742a603fbc5f9a

Remove Singleton annotation from ResumeProjectImport

ResumeProjectImport has a member variable that is set per request
hence it cannot be singleton.

Change-Id: I44626a8dc45705a00d3e9d6733ffbbb383f647de
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>

src/main/java/com/googlesource/gerrit/plugins/importer/ResumeCopyProject.java

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 00e22e1..d371ebd 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ResumeCopyProject.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ResumeCopyProject.java
@@ -49,7 +49,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;
@@ -58,7 +58,7 @@
 
   @Inject
   ResumeCopyProject(
-      ResumeProjectImport resumeProjectImport,
+      Provider<ResumeProjectImport> resumeProjectImport,
       ProjectsCollection projectsCollection,
       Provider<CurrentUser> currentUserProvider,
       @PluginName String pluginName,
@@ -85,7 +85,7 @@
     ImportProjectResource projectResource =
         projectsCollection.parse(new ConfigResource(),
             IdString.fromDecoded(rsrc.getName()));
-    return resumeProjectImport.apply(projectResource, in);
+    return resumeProjectImport.get().apply(projectResource, in);
   }
 
   @Override

src/main/java/com/googlesource/gerrit/plugins/importer/ResumeProjectImport.java

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 ad172d4..cbaaa8c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ResumeProjectImport.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ResumeProjectImport.java
@@ -35,7 +35,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;
 
@@ -44,7 +43,6 @@
 import java.io.IOException;
 import java.io.Writer;
 
-@Singleton
 @RequiresCapability(ImportCapability.ID)
 public class ResumeProjectImport implements RestModifyView<ImportProjectResource, Input> {
   public static class Input {