opendev/gerrit
Code Issues Proposed changes

Delete the unused SystemConfigProvider

Browse Source 
We no longer need to inject the SystemConfig record into any part
of the code, so remove.

Change-Id: I49a6849639b754fb1b9d1964c7d79e76e407a480
This commit is contained in:
Shawn O. Pearce
2011-06-17 08:06:05 -07:00
parent 34f38cf679
commit d8e1ab6071
9 changed files with 42 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryDatabase.java
View File

@@ -22,7 +22,6 @@ import com.google.gerrit.server.GerritPersonIdentProvider;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.SitePath;
import com.google.gerrit.server.config.SystemConfigProvider;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.LocalDiskRepositoryManager;
import com.google.gerrit.server.schema.Current;
@@ -35,7 +34,6 @@ import com.google.gwtorm.jdbc.SimpleDataSource;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Key;
import com.google.inject.Provider;
import junit.framework.TestCase;
@@ -177,12 +175,13 @@ public class InMemoryDatabase implements SchemaFactory<ReviewDb> {
}
}
public SystemConfig getSystemConfig() {
return new SystemConfigProvider(this, new Provider<SchemaVersion>() {
public SchemaVersion get() {
return schemaVersion;
}
}).get();
public SystemConfig getSystemConfig() throws OrmException {
final ReviewDb c = open();
try {
return c.systemConfig().get(new SystemConfig.Key());
} finally {
c.close();
}
}
public CurrentSchemaVersion getSchemaVersion() throws OrmException {