opendev/gerrit
Code Issues Proposed changes

Refactor ReloadSubmitQueueOp to be a singleton

Browse Source 
Assisted inject pattern is unnecessary as it doesn't get any arguments.
Remove it and move ReloadSubmitQueueOp into singleton scope.

Change-Id: Iebb9f3cfc627607adb9cdbd5640fcee495daa20a
This commit is contained in:
David Ostrovsky
2014-06-11 10:27:24 +02:00
committed by David Ostrovsky
parent 990662d0b8
commit 00b1bc4426
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
View File

@@ -82,7 +82,6 @@ import com.google.gerrit.server.git.MergeQueue;
import com.google.gerrit.server.git.MergeUtil;
import com.google.gerrit.server.git.NotesBranchUtil;
import com.google.gerrit.server.git.ReceivePackInitializer;
import com.google.gerrit.server.git.ReloadSubmitQueueOp;
import com.google.gerrit.server.git.TagCache;
import com.google.gerrit.server.git.TransferConfig;
import com.google.gerrit.server.git.validators.CommitValidationListener;
@@ -227,7 +226,6 @@ public class GerritGlobalModule extends FactoryModule {
bind(ApprovalsUtil.class);
bind(ChangeMergeQueue.class).in(SINGLETON);
bind(MergeQueue.class).to(ChangeMergeQueue.class).in(SINGLETON);
factory(ReloadSubmitQueueOp.Factory.class);
bind(RuntimeInstance.class)
.toProvider(VelocityRuntimeProvider.class)

9
gerrit-server/src/main/java/com/google/gerrit/server/config/MasterNodeStartup.java
View File

@@ -38,12 +38,12 @@ public class MasterNodeStartup extends LifecycleModule {
static class Lifecycle implements LifecycleListener {
private static final int INITIAL_DELAY_S = 15;
private final ReloadSubmitQueueOp.Factory submit;
private final ReloadSubmitQueueOp submit;
private final long delay;
private volatile ScheduledFuture<?> handle;
@Inject
Lifecycle(ReloadSubmitQueueOp.Factory submit,
Lifecycle(ReloadSubmitQueueOp submit,
@GerritServerConfig Config config) {
this.submit = submit;
this.delay = ConfigUtil.getTimeUnit(config,
@@ -54,10 +54,9 @@ public class MasterNodeStartup extends LifecycleModule {
@Override
public void start() {
if (delay > 0) {
handle = submit.create()
.startWithFixedDelay(INITIAL_DELAY_S, delay, SECONDS);
handle = submit.startWithFixedDelay(INITIAL_DELAY_S, delay, SECONDS);
} else {
handle = submit.create().start(INITIAL_DELAY_S, SECONDS);
handle = submit.start(INITIAL_DELAY_S, SECONDS);
}
}

6
gerrit-server/src/main/java/com/google/gerrit/server/git/ReloadSubmitQueueOp.java
View File

@@ -20,17 +20,15 @@ import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gwtorm.server.OrmException;
import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashSet;
@Singleton
public class ReloadSubmitQueueOp extends DefaultQueueOp {
public interface Factory {
ReloadSubmitQueueOp create();
}
private static final Logger log =
LoggerFactory.getLogger(ReloadSubmitQueueOp.class);