Remove getReviewDbProvider() from RequestContext interface
This method was the source of lots of complexity in reopening ReviewDbs
in background threads and Guice request scopes. Thankfully we don't need
it anymore.
Change-Id: Ifd76484bcf308362c24ca7df38b07f604476c932
diff --git a/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java b/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java
index 9a3e811..f888964 100644
--- a/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java
+++ b/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java
@@ -17,7 +17,6 @@
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.RequestCleanup;
-import com.google.gerrit.server.config.RequestScopedReviewDbProvider;
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestScopePropagator;
@@ -29,7 +28,6 @@
import com.google.inject.OutOfScopeException;
import com.google.inject.Provider;
import com.google.inject.Scope;
-import com.google.inject.util.Providers;
import java.util.HashMap;
import java.util.Map;
@@ -37,9 +35,6 @@
public class AcceptanceTestRequestScope {
private static final Key<RequestCleanup> RC_KEY = Key.get(RequestCleanup.class);
- private static final Key<RequestScopedReviewDbProvider> DB_KEY =
- Key.get(RequestScopedReviewDbProvider.class);
-
public static class Context implements RequestContext {
private final RequestCleanup cleanup = new RequestCleanup();
private final Map<Key<?>, Object> map = new HashMap<>();
@@ -57,7 +52,6 @@
user = u;
created = started = finished = at;
map.put(RC_KEY, cleanup);
- map.put(DB_KEY, new RequestScopedReviewDbProvider(schemaFactory, Providers.of(cleanup)));
}
private Context(Context p, SshSession s, CurrentUser c) {
@@ -78,11 +72,6 @@
return user;
}
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return (RequestScopedReviewDbProvider) map.get(DB_KEY);
- }
-
synchronized <T> T get(Key<T> key, Provider<T> creator) {
@SuppressWarnings("unchecked")
T t = (T) map.get(key);
@@ -112,11 +101,8 @@
private final AcceptanceTestRequestScope atrScope;
@Inject
- Propagator(
- AcceptanceTestRequestScope atrScope,
- ThreadLocalRequestContext local,
- Provider<RequestScopedReviewDbProvider> dbProviderProvider) {
- super(REQUEST, current, local, dbProviderProvider);
+ Propagator(AcceptanceTestRequestScope atrScope, ThreadLocalRequestContext local) {
+ super(REQUEST, current, local);
this.atrScope = atrScope;
}
diff --git a/java/com/google/gerrit/acceptance/InProcessProtocol.java b/java/com/google/gerrit/acceptance/InProcessProtocol.java
index 401d417..570216e 100644
--- a/java/com/google/gerrit/acceptance/InProcessProtocol.java
+++ b/java/com/google/gerrit/acceptance/InProcessProtocol.java
@@ -28,7 +28,6 @@
import com.google.gerrit.server.RemotePeer;
import com.google.gerrit.server.RequestCleanup;
import com.google.gerrit.server.config.GerritRequestModule;
-import com.google.gerrit.server.config.RequestScopedReviewDbProvider;
import com.google.gerrit.server.git.DefaultAdvertiseRefsHook;
import com.google.gerrit.server.git.ReceivePackInitializer;
import com.google.gerrit.server.git.TransferConfig;
@@ -56,7 +55,6 @@
import com.google.inject.Provides;
import com.google.inject.Scope;
import com.google.inject.servlet.RequestScoped;
-import com.google.inject.util.Providers;
import java.io.IOException;
import java.net.SocketAddress;
import java.util.HashMap;
@@ -123,10 +121,8 @@
private static class Propagator extends ThreadLocalRequestScopePropagator<Context> {
@Inject
- Propagator(
- ThreadLocalRequestContext local,
- Provider<RequestScopedReviewDbProvider> dbProviderProvider) {
- super(REQUEST, current, local, dbProviderProvider);
+ Propagator(ThreadLocalRequestContext local) {
+ super(REQUEST, current, local);
}
@Override
@@ -151,8 +147,6 @@
* request.
*/
static class Context implements RequestContext {
- private static final Key<RequestScopedReviewDbProvider> DB_KEY =
- Key.get(RequestScopedReviewDbProvider.class);
private static final Key<RequestCleanup> RC_KEY = Key.get(RequestCleanup.class);
private static final Key<CurrentUser> USER_KEY = Key.get(CurrentUser.class);
@@ -174,7 +168,6 @@
this.project = project;
map = new HashMap<>();
cleanup = new RequestCleanup();
- map.put(DB_KEY, new RequestScopedReviewDbProvider(schemaFactory, Providers.of(cleanup)));
map.put(RC_KEY, cleanup);
IdentifiedUser user = userFactory.create(accountId);
@@ -191,11 +184,6 @@
return get(USER_KEY, null);
}
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return get(DB_KEY, null);
- }
-
private synchronized <T> T get(Key<T> key, Provider<T> creator) {
@SuppressWarnings("unchecked")
T t = (T) map.get(key);
diff --git a/java/com/google/gerrit/acceptance/StandaloneSiteTest.java b/java/com/google/gerrit/acceptance/StandaloneSiteTest.java
index c03c8b6..75fe556 100644
--- a/java/com/google/gerrit/acceptance/StandaloneSiteTest.java
+++ b/java/com/google/gerrit/acceptance/StandaloneSiteTest.java
@@ -25,7 +25,6 @@
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.launcher.GerritLauncher;
import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.util.ManualRequestContext;
@@ -34,7 +33,6 @@
import com.google.gerrit.testing.ConfigSuite;
import com.google.inject.Injector;
import com.google.inject.Module;
-import com.google.inject.Provider;
import java.io.File;
import java.util.Arrays;
import java.util.Collections;
@@ -82,11 +80,6 @@
return ctx.getUser();
}
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return ctx.getReviewDbProvider();
- }
-
public Injector getInjector() {
return server.getTestInjector();
}
diff --git a/java/com/google/gerrit/httpd/HttpRequestContext.java b/java/com/google/gerrit/httpd/HttpRequestContext.java
index 6cc7a17..c30c74c 100644
--- a/java/com/google/gerrit/httpd/HttpRequestContext.java
+++ b/java/com/google/gerrit/httpd/HttpRequestContext.java
@@ -15,30 +15,20 @@
package com.google.gerrit.httpd;
import com.google.gerrit.extensions.registration.DynamicItem;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
-import com.google.gerrit.server.config.RequestScopedReviewDbProvider;
import com.google.gerrit.server.util.RequestContext;
import com.google.inject.Inject;
-import com.google.inject.Provider;
class HttpRequestContext implements RequestContext {
private final DynamicItem<WebSession> session;
- private final RequestScopedReviewDbProvider provider;
@Inject
- HttpRequestContext(DynamicItem<WebSession> session, RequestScopedReviewDbProvider provider) {
+ HttpRequestContext(DynamicItem<WebSession> session) {
this.session = session;
- this.provider = provider;
}
@Override
public CurrentUser getUser() {
return session.get().getUser();
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return provider;
- }
}
diff --git a/java/com/google/gerrit/server/change/EmailReviewComments.java b/java/com/google/gerrit/server/change/EmailReviewComments.java
index 65bef70..bbb1a9f 100644
--- a/java/com/google/gerrit/server/change/EmailReviewComments.java
+++ b/java/com/google/gerrit/server/change/EmailReviewComments.java
@@ -35,11 +35,7 @@
import com.google.gerrit.server.util.LabelVote;
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
-import com.google.gwtorm.server.OrmException;
-import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.ProvisionException;
import com.google.inject.assistedinject.Assisted;
import java.util.List;
import java.util.concurrent.ExecutorService;
@@ -82,7 +78,6 @@
private final ExecutorService sendEmailsExecutor;
private final PatchSetInfoFactory patchSetInfoFactory;
private final CommentSender.Factory commentSenderFactory;
- private final SchemaFactory<ReviewDb> schemaFactory;
private final ThreadLocalRequestContext requestContext;
private final NotifyHandling notify;
@@ -101,7 +96,6 @@
@SendEmailExecutor ExecutorService executor,
PatchSetInfoFactory patchSetInfoFactory,
CommentSender.Factory commentSenderFactory,
- SchemaFactory<ReviewDb> schemaFactory,
ThreadLocalRequestContext requestContext,
@Assisted NotifyHandling notify,
@Assisted ListMultimap<RecipientType, Account.Id> accountsToNotify,
@@ -115,7 +109,6 @@
this.sendEmailsExecutor = executor;
this.patchSetInfoFactory = patchSetInfoFactory;
this.commentSenderFactory = commentSenderFactory;
- this.schemaFactory = schemaFactory;
this.requestContext = requestContext;
this.notify = notify;
this.accountsToNotify = accountsToNotify;
@@ -168,21 +161,4 @@
public CurrentUser getUser() {
return user.getRealUser();
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return new Provider<ReviewDb>() {
- @Override
- public ReviewDb get() {
- if (db == null) {
- try {
- db = schemaFactory.open();
- } catch (OrmException e) {
- throw new ProvisionException("Cannot open ReviewDb", e);
- }
- }
- return db;
- }
- };
- }
}
diff --git a/java/com/google/gerrit/server/config/GerritRequestModule.java b/java/com/google/gerrit/server/config/GerritRequestModule.java
index 6a1103f..6732513 100644
--- a/java/com/google/gerrit/server/config/GerritRequestModule.java
+++ b/java/com/google/gerrit/server/config/GerritRequestModule.java
@@ -26,7 +26,6 @@
@Override
protected void configure() {
bind(RequestCleanup.class).in(RequestScoped.class);
- bind(RequestScopedReviewDbProvider.class);
bind(IdentifiedUser.RequestFactory.class).in(SINGLETON);
}
}
diff --git a/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java b/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java
deleted file mode 100644
index fdb400b..0000000
--- a/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (C) 2009 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.gerrit.server.config;
-
-import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gerrit.server.RequestCleanup;
-import com.google.gwtorm.server.OrmException;
-import com.google.gwtorm.server.SchemaFactory;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.ProvisionException;
-import com.google.inject.servlet.RequestScoped;
-
-/** Provides {@link ReviewDb} database handle live only for this request. */
-@RequestScoped
-public class RequestScopedReviewDbProvider implements Provider<ReviewDb> {
- private final SchemaFactory<ReviewDb> schema;
- private final Provider<RequestCleanup> cleanup;
- private ReviewDb db;
-
- @Inject
- public RequestScopedReviewDbProvider(
- final SchemaFactory<ReviewDb> schema, Provider<RequestCleanup> cleanup) {
- this.schema = schema;
- this.cleanup = cleanup;
- }
-
- @SuppressWarnings("resource")
- @Override
- public ReviewDb get() {
- if (db == null) {
- ReviewDb c;
- try {
- c = schema.open();
- } catch (OrmException e) {
- throw new ProvisionException("Cannot open ReviewDb", e);
- }
- try {
- cleanup
- .get()
- .add(
- () -> {
- c.close();
- db = null;
- });
- } catch (Throwable e) {
- c.close();
- throw new ProvisionException("Cannot defer cleanup of ReviewDb", e);
- }
- db = c;
- }
- return db;
- }
-}
diff --git a/java/com/google/gerrit/server/git/PerThreadRequestScope.java b/java/com/google/gerrit/server/git/PerThreadRequestScope.java
index a4719a9..b7db542 100644
--- a/java/com/google/gerrit/server/git/PerThreadRequestScope.java
+++ b/java/com/google/gerrit/server/git/PerThreadRequestScope.java
@@ -14,7 +14,6 @@
package com.google.gerrit.server.git;
-import com.google.gerrit.server.config.RequestScopedReviewDbProvider;
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestScopePropagator;
@@ -52,10 +51,8 @@
public static class Propagator extends ThreadLocalRequestScopePropagator<Context> {
@Inject
- Propagator(
- ThreadLocalRequestContext local,
- Provider<RequestScopedReviewDbProvider> dbProviderProvider) {
- super(REQUEST, current, local, dbProviderProvider);
+ Propagator(ThreadLocalRequestContext local) {
+ super(REQUEST, current, local);
}
@Override
diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
index b1a0446..1853c53 100644
--- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
+++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
@@ -87,7 +87,6 @@
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.reviewdb.client.RevId;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.CreateGroupPermissionSyncer;
@@ -315,7 +314,6 @@
private final ReplaceOp.Factory replaceOpFactory;
private final RetryHelper retryHelper;
private final RequestScopePropagator requestScopePropagator;
- private final ReviewDb db;
private final Sequences seq;
private final SetHashtagsOp.Factory hashtagsFactory;
private final SubmoduleOp.Factory subOpFactory;
@@ -391,7 +389,6 @@
ReplaceOp.Factory replaceOpFactory,
RetryHelper retryHelper,
RequestScopePropagator requestScopePropagator,
- ReviewDb db,
Sequences seq,
SetHashtagsOp.Factory hashtagsFactory,
SubmoduleOp.Factory subOpFactory,
@@ -412,7 +409,6 @@
this.commitValidatorFactory = commitValidatorFactory;
this.createRefControl = createRefControl;
this.createGroupPermissionSyncer = createGroupPermissionSyncer;
- this.db = db;
this.editUtil = editUtil;
this.hashtagsFactory = hashtagsFactory;
this.indexer = indexer;
diff --git a/java/com/google/gerrit/server/index/change/ChangeIndexer.java b/java/com/google/gerrit/server/index/change/ChangeIndexer.java
index 879f5f6..3bf8fd8 100644
--- a/java/com/google/gerrit/server/index/change/ChangeIndexer.java
+++ b/java/com/google/gerrit/server/index/change/ChangeIndexer.java
@@ -37,14 +37,10 @@
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
-import com.google.gwtorm.server.OrmException;
-import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.OutOfScopeException;
import com.google.inject.Provider;
-import com.google.inject.ProvisionException;
import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject;
-import com.google.inject.util.Providers;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@@ -83,7 +79,6 @@
@Nullable private final ChangeIndexCollection indexes;
@Nullable private final ChangeIndex index;
- private final SchemaFactory<ReviewDb> schemaFactory;
private final ChangeData.Factory changeDataFactory;
private final ThreadLocalRequestContext context;
private final ListeningExecutorService batchExecutor;
@@ -95,7 +90,6 @@
@AssistedInject
ChangeIndexer(
@GerritServerConfig Config cfg,
- SchemaFactory<ReviewDb> schemaFactory,
ChangeData.Factory changeDataFactory,
ThreadLocalRequestContext context,
PluginSetContext<ChangeIndexedListener> indexedListeners,
@@ -104,7 +98,6 @@
@Assisted ListeningExecutorService executor,
@Assisted ChangeIndex index) {
this.executor = executor;
- this.schemaFactory = schemaFactory;
this.changeDataFactory = changeDataFactory;
this.context = context;
this.indexedListeners = indexedListeners;
@@ -117,7 +110,6 @@
@AssistedInject
ChangeIndexer(
- SchemaFactory<ReviewDb> schemaFactory,
@GerritServerConfig Config cfg,
ChangeData.Factory changeDataFactory,
ThreadLocalRequestContext context,
@@ -127,7 +119,6 @@
@Assisted ListeningExecutorService executor,
@Assisted ChangeIndexCollection indexes) {
this.executor = executor;
- this.schemaFactory = schemaFactory;
this.changeDataFactory = changeDataFactory;
this.context = context;
this.indexedListeners = indexedListeners;
@@ -313,7 +304,7 @@
this.id = id;
}
- protected abstract T callImpl(Provider<ReviewDb> db) throws Exception;
+ protected abstract T callImpl() throws Exception;
@Override
public abstract String toString();
@@ -325,27 +316,13 @@
RequestContext newCtx =
new RequestContext() {
@Override
- public Provider<ReviewDb> getReviewDbProvider() {
- Provider<ReviewDb> db = dbRef.get();
- if (db == null) {
- try {
- db = Providers.of(schemaFactory.open());
- } catch (OrmException e) {
- throw new ProvisionException("error opening ReviewDb", e);
- }
- dbRef.set(db);
- }
- return db;
- }
-
- @Override
public CurrentUser getUser() {
throw new OutOfScopeException("No user during ChangeIndexer");
}
};
RequestContext oldCtx = context.setContext(newCtx);
try {
- return callImpl(newCtx.getReviewDbProvider());
+ return callImpl();
} finally {
context.setContext(oldCtx);
Provider<ReviewDb> db = dbRef.get();
@@ -366,7 +343,7 @@
}
@Override
- public Void callImpl(Provider<ReviewDb> db) throws Exception {
+ public Void callImpl() throws Exception {
ChangeData cd = changeDataFactory.create(project, id);
index(cd);
return null;
@@ -410,7 +387,7 @@
}
@Override
- public Boolean callImpl(Provider<ReviewDb> db) throws Exception {
+ public Boolean callImpl() throws Exception {
try {
if (stalenessChecker.isStale(id)) {
indexImpl(changeDataFactory.create(project, id));
diff --git a/java/com/google/gerrit/server/submit/EmailMerge.java b/java/com/google/gerrit/server/submit/EmailMerge.java
index a6b73447..a8fd451 100644
--- a/java/com/google/gerrit/server/submit/EmailMerge.java
+++ b/java/com/google/gerrit/server/submit/EmailMerge.java
@@ -29,12 +29,8 @@
import com.google.gerrit.server.mail.send.MergedSender;
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
-import com.google.gwtorm.server.OrmException;
-import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
import com.google.inject.OutOfScopeException;
-import com.google.inject.Provider;
-import com.google.inject.ProvisionException;
import com.google.inject.assistedinject.Assisted;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
@@ -53,7 +49,6 @@
private final ExecutorService sendEmailsExecutor;
private final MergedSender.Factory mergedSenderFactory;
- private final SchemaFactory<ReviewDb> schemaFactory;
private final ThreadLocalRequestContext requestContext;
private final IdentifiedUser.GenericFactory identifiedUserFactory;
@@ -69,7 +64,6 @@
EmailMerge(
@SendEmailExecutor ExecutorService executor,
MergedSender.Factory mergedSenderFactory,
- SchemaFactory<ReviewDb> schemaFactory,
ThreadLocalRequestContext requestContext,
IdentifiedUser.GenericFactory identifiedUserFactory,
@Assisted Project.NameKey project,
@@ -79,7 +73,6 @@
@Assisted ListMultimap<RecipientType, Account.Id> accountsToNotify) {
this.sendEmailsExecutor = executor;
this.mergedSenderFactory = mergedSenderFactory;
- this.schemaFactory = schemaFactory;
this.requestContext = requestContext;
this.identifiedUserFactory = identifiedUserFactory;
this.project = project;
@@ -128,21 +121,4 @@
}
throw new OutOfScopeException("No user on email thread");
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return new Provider<ReviewDb>() {
- @Override
- public ReviewDb get() {
- if (db == null) {
- try {
- db = schemaFactory.open();
- } catch (OrmException e) {
- throw new ProvisionException("Cannot open ReviewDb", e);
- }
- }
- return db;
- }
- };
- }
}
diff --git a/java/com/google/gerrit/server/util/FallbackRequestContext.java b/java/com/google/gerrit/server/util/FallbackRequestContext.java
index de1555f..7a40dbf 100644
--- a/java/com/google/gerrit/server/util/FallbackRequestContext.java
+++ b/java/com/google/gerrit/server/util/FallbackRequestContext.java
@@ -14,12 +14,9 @@
package com.google.gerrit.server.util;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.AnonymousUser;
import com.google.gerrit.server.CurrentUser;
import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.ProvisionException;
import com.google.inject.Singleton;
/**
@@ -40,14 +37,4 @@
public CurrentUser getUser() {
return user;
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return new Provider<ReviewDb>() {
- @Override
- public ReviewDb get() {
- throw new ProvisionException("Automatic ReviewDb only available in request scope");
- }
- };
- }
}
diff --git a/java/com/google/gerrit/server/util/GuiceRequestScopePropagator.java b/java/com/google/gerrit/server/util/GuiceRequestScopePropagator.java
index 6dd5543..99dd8bf 100644
--- a/java/com/google/gerrit/server/util/GuiceRequestScopePropagator.java
+++ b/java/com/google/gerrit/server/util/GuiceRequestScopePropagator.java
@@ -17,7 +17,6 @@
import com.google.gerrit.common.Nullable;
import com.google.gerrit.server.RemotePeer;
import com.google.gerrit.server.config.CanonicalWebUrl;
-import com.google.gerrit.server.config.RequestScopedReviewDbProvider;
import com.google.inject.Inject;
import com.google.inject.Key;
import com.google.inject.Provider;
@@ -41,9 +40,8 @@
GuiceRequestScopePropagator(
@CanonicalWebUrl @Nullable Provider<String> urlProvider,
@RemotePeer Provider<SocketAddress> remotePeerProvider,
- ThreadLocalRequestContext local,
- Provider<RequestScopedReviewDbProvider> dbProviderProvider) {
- super(ServletScopes.REQUEST, local, dbProviderProvider);
+ ThreadLocalRequestContext local) {
+ super(ServletScopes.REQUEST, local);
this.url = urlProvider != null ? urlProvider.get() : null;
this.peer = remotePeerProvider.get();
}
diff --git a/java/com/google/gerrit/server/util/ManualRequestContext.java b/java/com/google/gerrit/server/util/ManualRequestContext.java
index 620a2bc..008a7ea 100644
--- a/java/com/google/gerrit/server/util/ManualRequestContext.java
+++ b/java/com/google/gerrit/server/util/ManualRequestContext.java
@@ -53,11 +53,6 @@
}
@Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return db;
- }
-
- @Override
public void close() {
requestContext.setContext(old);
db.get().close();
diff --git a/java/com/google/gerrit/server/util/PluginRequestContext.java b/java/com/google/gerrit/server/util/PluginRequestContext.java
index 3f3f647..ec15786 100644
--- a/java/com/google/gerrit/server/util/PluginRequestContext.java
+++ b/java/com/google/gerrit/server/util/PluginRequestContext.java
@@ -14,11 +14,8 @@
package com.google.gerrit.server.util;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.PluginUser;
-import com.google.inject.Provider;
-import com.google.inject.ProvisionException;
/** RequestContext active while plugins load or unload. */
public class PluginRequestContext implements RequestContext {
@@ -32,14 +29,4 @@
public CurrentUser getUser() {
return user;
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return new Provider<ReviewDb>() {
- @Override
- public ReviewDb get() {
- throw new ProvisionException("Automatic ReviewDb only available in request scope");
- }
- };
- }
}
diff --git a/java/com/google/gerrit/server/util/RequestContext.java b/java/com/google/gerrit/server/util/RequestContext.java
index 37fd7bc..04ee5c6 100644
--- a/java/com/google/gerrit/server/util/RequestContext.java
+++ b/java/com/google/gerrit/server/util/RequestContext.java
@@ -14,9 +14,7 @@
package com.google.gerrit.server.util;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
-import com.google.inject.Provider;
/**
* The RequestContext is an interface exposing the fields that are needed by the GerritGlobalModule
@@ -24,6 +22,4 @@
*/
public interface RequestContext {
CurrentUser getUser();
-
- Provider<ReviewDb> getReviewDbProvider();
}
diff --git a/java/com/google/gerrit/server/util/RequestScopePropagator.java b/java/com/google/gerrit/server/util/RequestScopePropagator.java
index e5b0eaf..117d257 100644
--- a/java/com/google/gerrit/server/util/RequestScopePropagator.java
+++ b/java/com/google/gerrit/server/util/RequestScopePropagator.java
@@ -18,10 +18,8 @@
import com.google.common.base.Throwables;
import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.RequestCleanup;
-import com.google.gerrit.server.config.RequestScopedReviewDbProvider;
import com.google.gerrit.server.git.ProjectRunnable;
import com.google.inject.Key;
import com.google.inject.Provider;
@@ -47,15 +45,10 @@
private final Scope scope;
private final ThreadLocalRequestContext local;
- private final Provider<RequestScopedReviewDbProvider> dbProviderProvider;
- protected RequestScopePropagator(
- Scope scope,
- ThreadLocalRequestContext local,
- Provider<RequestScopedReviewDbProvider> dbProviderProvider) {
+ protected RequestScopePropagator(Scope scope, ThreadLocalRequestContext local) {
this.scope = scope;
this.local = local;
- this.dbProviderProvider = dbProviderProvider;
}
/**
@@ -181,11 +174,6 @@
public CurrentUser getUser() {
return context.getUser();
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return dbProviderProvider.get();
- }
});
try {
return callable.call();
diff --git a/java/com/google/gerrit/server/util/ServerRequestContext.java b/java/com/google/gerrit/server/util/ServerRequestContext.java
index af903c4..037645d 100644
--- a/java/com/google/gerrit/server/util/ServerRequestContext.java
+++ b/java/com/google/gerrit/server/util/ServerRequestContext.java
@@ -14,12 +14,9 @@
package com.google.gerrit.server.util;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.InternalUser;
import com.google.inject.Inject;
-import com.google.inject.Provider;
-import com.google.inject.ProvisionException;
/** RequestContext with an InternalUser making the internals visible. */
public class ServerRequestContext implements RequestContext {
@@ -34,14 +31,4 @@
public CurrentUser getUser() {
return user;
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return new Provider<ReviewDb>() {
- @Override
- public ReviewDb get() {
- throw new ProvisionException("Automatic ReviewDb only available in request scope");
- }
- };
- }
}
diff --git a/java/com/google/gerrit/server/util/ThreadLocalRequestContext.java b/java/com/google/gerrit/server/util/ThreadLocalRequestContext.java
index e065c6b..06e93f8 100644
--- a/java/com/google/gerrit/server/util/ThreadLocalRequestContext.java
+++ b/java/com/google/gerrit/server/util/ThreadLocalRequestContext.java
@@ -17,7 +17,6 @@
import com.google.common.base.MoreObjects;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.errors.NotSignedInException;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.inject.AbstractModule;
@@ -63,11 +62,6 @@
}
throw new ProvisionException(NotSignedInException.MESSAGE, new NotSignedInException());
}
-
- @Provides
- ReviewDb provideReviewDb(RequestContext ctx) {
- return ctx.getReviewDbProvider().get();
- }
};
}
diff --git a/java/com/google/gerrit/server/util/ThreadLocalRequestScopePropagator.java b/java/com/google/gerrit/server/util/ThreadLocalRequestScopePropagator.java
index 90fb994..92f5488 100644
--- a/java/com/google/gerrit/server/util/ThreadLocalRequestScopePropagator.java
+++ b/java/com/google/gerrit/server/util/ThreadLocalRequestScopePropagator.java
@@ -14,9 +14,7 @@
package com.google.gerrit.server.util;
-import com.google.gerrit.server.config.RequestScopedReviewDbProvider;
import com.google.inject.OutOfScopeException;
-import com.google.inject.Provider;
import com.google.inject.Scope;
import java.util.concurrent.Callable;
@@ -31,11 +29,8 @@
private final ThreadLocal<C> threadLocal;
protected ThreadLocalRequestScopePropagator(
- Scope scope,
- ThreadLocal<C> threadLocal,
- ThreadLocalRequestContext local,
- Provider<RequestScopedReviewDbProvider> dbProviderProvider) {
- super(scope, local, dbProviderProvider);
+ Scope scope, ThreadLocal<C> threadLocal, ThreadLocalRequestContext local) {
+ super(scope, local);
this.threadLocal = threadLocal;
}
diff --git a/java/com/google/gerrit/sshd/SshScope.java b/java/com/google/gerrit/sshd/SshScope.java
index 99787d8..8590b80 100644
--- a/java/com/google/gerrit/sshd/SshScope.java
+++ b/java/com/google/gerrit/sshd/SshScope.java
@@ -18,7 +18,6 @@
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.RequestCleanup;
-import com.google.gerrit.server.config.RequestScopedReviewDbProvider;
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestScopePropagator;
@@ -29,7 +28,6 @@
import com.google.inject.OutOfScopeException;
import com.google.inject.Provider;
import com.google.inject.Scope;
-import com.google.inject.util.Providers;
import java.util.HashMap;
import java.util.Map;
@@ -37,9 +35,6 @@
public class SshScope {
private static final Key<RequestCleanup> RC_KEY = Key.get(RequestCleanup.class);
- private static final Key<RequestScopedReviewDbProvider> DB_KEY =
- Key.get(RequestScopedReviewDbProvider.class);
-
class Context implements RequestContext {
private final RequestCleanup cleanup = new RequestCleanup();
private final Map<Key<?>, Object> map = new HashMap<>();
@@ -57,7 +52,6 @@
commandLine = c;
created = started = finished = at;
map.put(RC_KEY, cleanup);
- map.put(DB_KEY, new RequestScopedReviewDbProvider(schemaFactory, Providers.of(cleanup)));
}
private Context(Context p, SshSession s, String c) {
@@ -85,11 +79,6 @@
return user;
}
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return (RequestScopedReviewDbProvider) map.get(DB_KEY);
- }
-
synchronized <T> T get(Key<T> key, Provider<T> creator) {
@SuppressWarnings("unchecked")
T t = (T) map.get(key);
@@ -125,11 +114,8 @@
private final SshScope sshScope;
@Inject
- Propagator(
- SshScope sshScope,
- ThreadLocalRequestContext local,
- Provider<RequestScopedReviewDbProvider> dbProviderProvider) {
- super(REQUEST, current, local, dbProviderProvider);
+ Propagator(SshScope sshScope, ThreadLocalRequestContext local) {
+ super(REQUEST, current, local);
this.sshScope = sshScope;
}
diff --git a/java/com/google/gerrit/testing/InMemoryTestEnvironment.java b/java/com/google/gerrit/testing/InMemoryTestEnvironment.java
index a8afdb3..4a9b98f 100644
--- a/java/com/google/gerrit/testing/InMemoryTestEnvironment.java
+++ b/java/com/google/gerrit/testing/InMemoryTestEnvironment.java
@@ -16,7 +16,6 @@
import com.google.gerrit.lifecycle.LifecycleManager;
import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.account.AccountManager;
@@ -24,12 +23,10 @@
import com.google.gerrit.server.schema.SchemaCreator;
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
-import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Provider;
-import com.google.inject.util.Providers;
import org.eclipse.jgit.lib.Config;
import org.junit.rules.MethodRule;
import org.junit.runners.model.FrameworkMethod;
@@ -49,11 +46,9 @@
@Inject private AccountManager accountManager;
@Inject private IdentifiedUser.GenericFactory userFactory;
- @Inject private SchemaFactory<ReviewDb> schemaFactory;
@Inject private SchemaCreator schemaCreator;
@Inject private ThreadLocalRequestContext requestContext;
- private ReviewDb db;
private LifecycleManager lifecycle;
/** Create a test environment using an empty base config. */
@@ -96,11 +91,6 @@
public CurrentUser getUser() {
return user;
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return Providers.of(db);
- }
});
}
@@ -115,7 +105,6 @@
lifecycle.start();
schemaCreator.create();
- db = schemaFactory.open();
// The first user is added to the "Administrators" group. See AccountManager#create().
setApiUser(accountManager.authenticate(AuthRequest.forUser("admin")).getAccountId());
@@ -131,8 +120,5 @@
if (requestContext != null) {
requestContext.setContext(null);
}
- if (db != null) {
- db.close();
- }
}
}
diff --git a/javatests/com/google/gerrit/gpg/GerritPublicKeyCheckerTest.java b/javatests/com/google/gerrit/gpg/GerritPublicKeyCheckerTest.java
index e5578e1..e5f7897 100644
--- a/javatests/com/google/gerrit/gpg/GerritPublicKeyCheckerTest.java
+++ b/javatests/com/google/gerrit/gpg/GerritPublicKeyCheckerTest.java
@@ -33,7 +33,6 @@
import com.google.gerrit.gpg.testing.TestKey;
import com.google.gerrit.lifecycle.LifecycleManager;
import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.ServerInitiated;
@@ -45,13 +44,11 @@
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
import com.google.gerrit.testing.GerritBaseTests;
-import com.google.gerrit.testing.InMemoryDatabase;
import com.google.gerrit.testing.InMemoryModule;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Provider;
-import com.google.inject.util.Providers;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -78,14 +75,11 @@
@Inject private IdentifiedUser.GenericFactory userFactory;
- @Inject private InMemoryDatabase schemaFactory;
-
@Inject private SchemaCreator schemaCreator;
@Inject private ThreadLocalRequestContext requestContext;
private LifecycleManager lifecycle;
- private ReviewDb db;
private Account.Id userId;
private IdentifiedUser user;
private Repository storeRepo;
@@ -109,7 +103,6 @@
injector.injectMembers(this);
lifecycle.start();
- db = schemaFactory.open();
schemaCreator.create();
userId = accountManager.authenticate(AuthRequest.forUser("user")).getAccountId();
// Note: does not match any key in TestKeys.
@@ -124,11 +117,6 @@
public CurrentUser getUser() {
return user;
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return Providers.of(db);
- }
});
storeRepo = new InMemoryRepository(new DfsRepositoryDescription("repo"));
@@ -157,9 +145,6 @@
if (lifecycle != null) {
lifecycle.stop();
}
- if (db != null) {
- db.close();
- }
}
@Test
diff --git a/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java b/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java
index b852bfb..7c4f977 100644
--- a/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java
+++ b/javatests/com/google/gerrit/server/change/LabelNormalizerTest.java
@@ -54,8 +54,6 @@
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
-import com.google.inject.Provider;
-import com.google.inject.util.Providers;
import java.util.List;
import org.eclipse.jgit.lib.Repository;
import org.junit.After;
@@ -93,7 +91,6 @@
lifecycle.add(injector);
lifecycle.start();
- db = schemaFactory.open();
schemaCreator.create();
userId = accountManager.authenticate(AuthRequest.forUser("user")).getAccountId();
user = userFactory.create(userId);
@@ -104,11 +101,6 @@
public CurrentUser getUser() {
return user;
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return Providers.of(db);
- }
});
configureProject();
diff --git a/javatests/com/google/gerrit/server/permissions/RefControlTest.java b/javatests/com/google/gerrit/server/permissions/RefControlTest.java
index bd0316c..bf0d70e 100644
--- a/javatests/com/google/gerrit/server/permissions/RefControlTest.java
+++ b/javatests/com/google/gerrit/server/permissions/RefControlTest.java
@@ -46,7 +46,6 @@
import com.google.gerrit.metrics.MetricMaker;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.account.CapabilityCollection;
import com.google.gerrit.server.account.GroupMembership;
@@ -67,14 +66,11 @@
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
import com.google.gerrit.testing.GerritBaseTests;
-import com.google.gerrit.testing.InMemoryDatabase;
import com.google.gerrit.testing.InMemoryModule;
import com.google.gerrit.testing.InMemoryRepositoryManager;
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
-import com.google.inject.Provider;
-import com.google.inject.util.Providers;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
@@ -196,13 +192,11 @@
private ProjectCache projectCache;
private PermissionCollection.Factory sectionSorter;
private ChangeControl.Factory changeControlFactory;
- private ReviewDb db;
@Inject private PermissionBackend permissionBackend;
@Inject private CapabilityCollection.Factory capabilityCollectionFactory;
@Inject private SchemaCreator schemaCreator;
@Inject private SingleVersionListener singleVersionListener;
- @Inject private InMemoryDatabase schemaFactory;
@Inject private ThreadLocalRequestContext requestContext;
@Inject private DefaultRefFilter.Factory refFilterFactory;
@Inject private TransferConfig transferConfig;
@@ -286,7 +280,6 @@
throw new RuntimeException(e);
}
- db = schemaFactory.open();
singleVersionListener.start();
try {
schemaCreator.create();
@@ -313,11 +306,6 @@
public CurrentUser getUser() {
return null;
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return Providers.of(db);
- }
});
changeControlFactory = injector.getInstance(ChangeControl.Factory.class);
@@ -326,9 +314,6 @@
@After
public void tearDown() {
requestContext.setContext(null);
- if (db != null) {
- db.close();
- }
}
@Test
diff --git a/javatests/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java b/javatests/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
index b0d0849..380075d 100644
--- a/javatests/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
+++ b/javatests/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
@@ -49,7 +49,6 @@
import com.google.gerrit.lifecycle.LifecycleManager;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.AnonymousUser;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.GerritPersonIdent;
@@ -80,11 +79,9 @@
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
import com.google.gerrit.testing.GerritServerTests;
-import com.google.gerrit.testing.InMemoryDatabase;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Provider;
-import com.google.inject.util.Providers;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -118,8 +115,6 @@
@Inject private Provider<AnonymousUser> anonymousUser;
- @Inject protected InMemoryDatabase schemaFactory;
-
@Inject protected SchemaCreator schemaCreator;
@Inject protected ThreadLocalRequestContext requestContext;
@@ -140,7 +135,6 @@
protected LifecycleManager lifecycle;
protected Injector injector;
- protected ReviewDb db;
protected AccountInfo currentUserInfo;
protected CurrentUser admin;
@@ -160,11 +154,9 @@
@After
public void cleanUp() {
lifecycle.stop();
- db.close();
}
protected void setUpDatabase() throws Exception {
- db = schemaFactory.open();
schemaCreator.create();
Account.Id adminId = createAccount("admin", "Administrator", "admin@example.com", true);
@@ -182,11 +174,6 @@
public CurrentUser getUser() {
return requestUser;
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return Providers.of(db);
- }
};
}
@@ -197,11 +184,6 @@
public CurrentUser getUser() {
return anonymousUser.get();
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return Providers.of(db);
- }
});
}
@@ -211,9 +193,6 @@
lifecycle.stop();
}
requestContext.setContext(null);
- if (db != null) {
- db.close();
- }
}
@Test
diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
index ed26bc2..151c5d4 100644
--- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
+++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
@@ -78,7 +78,6 @@
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.PatchSetUtil;
@@ -113,11 +112,9 @@
import com.google.gerrit.testing.InMemoryRepositoryManager;
import com.google.gerrit.testing.InMemoryRepositoryManager.Repo;
import com.google.gerrit.testing.TestTimeUtil;
-import com.google.gwtorm.server.SchemaFactory;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Provider;
-import com.google.inject.util.Providers;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
@@ -167,7 +164,6 @@
@Inject protected ChangeNotes.Factory changeNotesFactory;
@Inject protected Provider<ChangeQueryProcessor> queryProcessorProvider;
@Inject protected SchemaCreator schemaCreator;
- @Inject protected SchemaFactory<ReviewDb> schemaFactory;
@Inject protected Sequences seq;
@Inject protected ThreadLocalRequestContext requestContext;
@Inject protected ProjectCache projectCache;
@@ -176,7 +172,6 @@
protected Injector injector;
protected LifecycleManager lifecycle;
- protected ReviewDb db;
protected Account.Id userId;
protected CurrentUser user;
@@ -214,14 +209,12 @@
@After
public void cleanUp() {
lifecycle.stop();
- db.close();
}
protected void initAfterLifecycleStart() throws Exception {}
protected void setUpDatabase() throws Exception {
schemaCreator.create();
- db = schemaFactory.open();
userId = accountManager.authenticate(AuthRequest.forUser("user")).getAccountId();
String email = "user@example.com";
@@ -241,11 +234,6 @@
public CurrentUser getUser() {
return requestUser;
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return Providers.of(db);
- }
};
}
@@ -260,9 +248,6 @@
lifecycle.stop();
}
requestContext.setContext(null);
- if (db != null) {
- db.close();
- }
}
@Before
diff --git a/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java b/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
index 2906409..8a26a7b 100644
--- a/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
+++ b/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
@@ -34,7 +34,6 @@
import com.google.gerrit.lifecycle.LifecycleManager;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountGroup;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.AnonymousUser;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
@@ -58,11 +57,9 @@
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
import com.google.gerrit.testing.GerritServerTests;
-import com.google.gerrit.testing.InMemoryDatabase;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Provider;
-import com.google.inject.util.Providers;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -89,8 +86,6 @@
@Inject private Provider<AnonymousUser> anonymousUser;
- @Inject protected InMemoryDatabase schemaFactory;
-
@Inject protected SchemaCreator schemaCreator;
@Inject protected ThreadLocalRequestContext requestContext;
@@ -109,7 +104,6 @@
protected LifecycleManager lifecycle;
protected Injector injector;
- protected ReviewDb db;
protected AccountInfo currentUserInfo;
protected CurrentUser user;
@@ -129,11 +123,9 @@
@After
public void cleanUp() {
lifecycle.stop();
- db.close();
}
protected void setUpDatabase() throws Exception {
- db = schemaFactory.open();
schemaCreator.create();
Account.Id userId =
@@ -152,11 +144,6 @@
public CurrentUser getUser() {
return requestUser;
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return Providers.of(db);
- }
};
}
@@ -167,11 +154,6 @@
public CurrentUser getUser() {
return anonymousUser.get();
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return Providers.of(db);
- }
});
}
@@ -183,9 +165,6 @@
if (requestContext != null) {
requestContext.setContext(null);
}
- if (db != null) {
- db.close();
- }
}
@Test
diff --git a/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java b/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java
index 4750353..8f3d7ec 100644
--- a/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java
+++ b/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java
@@ -38,7 +38,6 @@
import com.google.gerrit.lifecycle.LifecycleManager;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.AnonymousUser;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
@@ -56,11 +55,9 @@
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
import com.google.gerrit.testing.GerritServerTests;
-import com.google.gerrit.testing.InMemoryDatabase;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Provider;
-import com.google.inject.util.Providers;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
@@ -86,8 +83,6 @@
@Inject private Provider<AnonymousUser> anonymousUser;
- @Inject protected InMemoryDatabase schemaFactory;
-
@Inject protected SchemaCreator schemaCreator;
@Inject protected ThreadLocalRequestContext requestContext;
@@ -100,7 +95,6 @@
protected LifecycleManager lifecycle;
protected Injector injector;
- protected ReviewDb db;
protected AccountInfo currentUserInfo;
protected CurrentUser user;
@@ -120,11 +114,9 @@
@After
public void cleanUp() {
lifecycle.stop();
- db.close();
}
protected void setUpDatabase() throws Exception {
- db = schemaFactory.open();
schemaCreator.create();
Account.Id userId = createAccount("user", "User", "user@example.com", true);
@@ -142,11 +134,6 @@
public CurrentUser getUser() {
return requestUser;
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return Providers.of(db);
- }
};
}
@@ -157,11 +144,6 @@
public CurrentUser getUser() {
return anonymousUser.get();
}
-
- @Override
- public Provider<ReviewDb> getReviewDbProvider() {
- return Providers.of(db);
- }
});
}
@@ -171,9 +153,6 @@
lifecycle.stop();
}
requestContext.setContext(null);
- if (db != null) {
- db.close();
- }
}
@Test
diff --git a/plugins/replication b/plugins/replication
index 534b041..2054471 160000
--- a/plugins/replication
+++ b/plugins/replication
@@ -1 +1 @@
-Subproject commit 534b041232a196d244b041f35225d6f569e5e084
+Subproject commit 2054471ffae772b9a1179db99416e51aca70e0b1
