Use javax.inject.Inject instead of com.google.inject.Inject
The Guice team is discouraging use of its specific annotation where possible, to increase JSR330 compliance. Leave optional injection alone for now, which needs to be manually replaced with OptionalBinder. Change-Id: I4f53a518ba6f36fd67af12f3540dc44cbad07ff8
This commit is contained in:
@@ -40,7 +40,6 @@ import com.google.gerrit.server.git.GitRepositoryManager;
|
||||
import com.google.gerrit.server.git.MetaDataUpdate;
|
||||
import com.google.gerrit.server.git.ProjectConfig;
|
||||
import com.google.gerrit.server.group.SystemGroupBackend;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
import org.eclipse.jgit.errors.RepositoryNotFoundException;
|
||||
@@ -51,6 +50,8 @@ import org.eclipse.jgit.lib.Repository;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
/** Creates the {@code All-Projects} repository and initial ACLs. */
|
||||
public class AllProjectsCreator {
|
||||
private final GitRepositoryManager mgr;
|
||||
|
||||
@@ -25,7 +25,6 @@ import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
|
||||
import com.google.gerrit.server.git.GitRepositoryManager;
|
||||
import com.google.gerrit.server.git.MetaDataUpdate;
|
||||
import com.google.gerrit.server.git.ProjectConfig;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
import org.eclipse.jgit.errors.RepositoryNotFoundException;
|
||||
@@ -34,6 +33,8 @@ import org.eclipse.jgit.lib.Repository;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
/** Creates the {@code All-Users} repository. */
|
||||
public class AllUsersCreator {
|
||||
private final GitRepositoryManager mgr;
|
||||
|
||||
@@ -25,7 +25,6 @@ import com.google.gerrit.server.config.ConfigUtil;
|
||||
import com.google.gerrit.server.config.GerritServerConfig;
|
||||
import com.google.gerrit.server.config.SitePaths;
|
||||
import com.google.gwtorm.jdbc.SimpleDataSource;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
import com.google.inject.ProvisionException;
|
||||
import com.google.inject.Singleton;
|
||||
@@ -38,6 +37,7 @@ import java.lang.reflect.InvocationTargetException;
|
||||
import java.sql.SQLException;
|
||||
import java.util.Properties;
|
||||
|
||||
import javax.inject.Inject;
|
||||
import javax.sql.DataSource;
|
||||
|
||||
/** Provides access to the DataSource. */
|
||||
|
||||
@@ -16,13 +16,14 @@ package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.gerrit.server.config.GerritServerConfig;
|
||||
import com.google.gerrit.server.config.SitePaths;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
import org.eclipse.jgit.lib.Config;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
class H2 extends BaseDataSourceType {
|
||||
|
||||
protected final Config cfg;
|
||||
|
||||
@@ -16,10 +16,11 @@ package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.gerrit.server.config.ConfigUtil;
|
||||
import com.google.gerrit.server.config.GerritServerConfig;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
import org.eclipse.jgit.lib.Config;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
class JDBC extends BaseDataSourceType {
|
||||
|
||||
protected final Config cfg;
|
||||
|
||||
@@ -18,12 +18,13 @@ import static com.google.gerrit.server.schema.JdbcUtil.hostname;
|
||||
|
||||
import com.google.gerrit.server.config.ConfigSection;
|
||||
import com.google.gerrit.server.config.GerritServerConfig;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
import org.eclipse.jgit.lib.Config;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
class MaxDb extends BaseDataSourceType {
|
||||
|
||||
private Config cfg;
|
||||
|
||||
@@ -19,10 +19,11 @@ import static com.google.gerrit.server.schema.JdbcUtil.port;
|
||||
|
||||
import com.google.gerrit.server.config.ConfigSection;
|
||||
import com.google.gerrit.server.config.GerritServerConfig;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
import org.eclipse.jgit.lib.Config;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
class MySql extends BaseDataSourceType {
|
||||
|
||||
private Config cfg;
|
||||
|
||||
@@ -19,10 +19,11 @@ import static com.google.gerrit.server.schema.JdbcUtil.port;
|
||||
|
||||
import com.google.gerrit.server.config.ConfigSection;
|
||||
import com.google.gerrit.server.config.GerritServerConfig;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
import org.eclipse.jgit.lib.Config;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Oracle extends BaseDataSourceType {
|
||||
private Config cfg;
|
||||
|
||||
|
||||
@@ -19,12 +19,13 @@ import static com.google.gerrit.server.schema.JdbcUtil.port;
|
||||
|
||||
import com.google.gerrit.server.config.ConfigSection;
|
||||
import com.google.gerrit.server.config.GerritServerConfig;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
import org.eclipse.jgit.lib.Config;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
class PostgreSQL extends BaseDataSourceType {
|
||||
|
||||
private Config cfg;
|
||||
|
||||
@@ -17,11 +17,11 @@ package com.google.gerrit.server.schema;
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gwtorm.jdbc.Database;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
import com.google.inject.ProvisionException;
|
||||
import com.google.inject.name.Named;
|
||||
|
||||
import javax.inject.Inject;
|
||||
import javax.sql.DataSource;
|
||||
|
||||
/** Provides the {@code Database<ReviewDb>} database handle. */
|
||||
|
||||
@@ -27,7 +27,6 @@ import com.google.gerrit.server.config.SitePaths;
|
||||
import com.google.gwtorm.jdbc.JdbcExecutor;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
import org.eclipse.jgit.lib.PersonIdent;
|
||||
@@ -36,6 +35,8 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Collections;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
/** Creates the current database schema and populates initial code rows. */
|
||||
public class SchemaCreator {
|
||||
private final @SitePath
|
||||
|
||||
@@ -20,7 +20,6 @@ import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gerrit.server.config.SitePaths;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.gwtorm.server.SchemaFactory;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
@@ -29,6 +28,8 @@ import java.io.IOException;
|
||||
import java.sql.SQLException;
|
||||
import java.util.Collections;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
/** Creates or updates the current database schema. */
|
||||
public class SchemaUpdater {
|
||||
private final SchemaFactory<ReviewDb> schema;
|
||||
|
||||
@@ -21,11 +21,12 @@ import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gerrit.server.config.SitePaths;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.gwtorm.server.SchemaFactory;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Module;
|
||||
import com.google.inject.Provider;
|
||||
import com.google.inject.ProvisionException;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
/** Validates the current schema version. */
|
||||
public class SchemaVersionCheck implements LifecycleListener {
|
||||
public static Module module () {
|
||||
|
||||
@@ -14,10 +14,11 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
import com.google.inject.ProvisionException;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_52 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_52() {
|
||||
|
||||
@@ -49,7 +49,6 @@ import com.google.gerrit.server.group.SystemGroupBackend;
|
||||
import com.google.gerrit.server.schema.Schema_77.LegacyLabelTypes;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
@@ -67,6 +66,8 @@ import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
class Schema_53 extends SchemaVersion {
|
||||
private final GitRepositoryManager mgr;
|
||||
private final PersonIdent serverUser;
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_54 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_54(Provider<Schema_53> prior) {
|
||||
|
||||
@@ -20,7 +20,6 @@ import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gerrit.server.git.GitRepositoryManager;
|
||||
import com.google.gerrit.server.git.LocalDiskRepositoryManager;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import org.eclipse.jgit.lib.Constants;
|
||||
@@ -30,6 +29,8 @@ import org.eclipse.jgit.util.FS;
|
||||
import java.io.File;
|
||||
import java.util.Collections;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_55 extends SchemaVersion {
|
||||
private final GitRepositoryManager mgr;
|
||||
|
||||
|
||||
@@ -18,7 +18,6 @@ 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.git.GitRepositoryManager;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import org.eclipse.jgit.lib.Constants;
|
||||
@@ -32,6 +31,8 @@ import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_56 extends SchemaVersion {
|
||||
private final GitRepositoryManager mgr;
|
||||
private final Set<String> keysOne;
|
||||
|
||||
@@ -32,7 +32,6 @@ import com.google.gerrit.server.git.MetaDataUpdate;
|
||||
import com.google.gerrit.server.git.ProjectConfig;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
@@ -47,6 +46,8 @@ import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.util.Collections;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_57 extends SchemaVersion {
|
||||
private final SitePaths site;
|
||||
private final GitRepositoryManager mgr;
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_58 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_58(Provider<Schema_57> prior) {
|
||||
|
||||
@@ -17,12 +17,13 @@ package com.google.gerrit.server.schema;
|
||||
import com.google.gerrit.reviewdb.client.Change;
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import java.util.List;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_59 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_59(Provider<Schema_58> prior) {
|
||||
|
||||
@@ -20,7 +20,6 @@ import com.google.gerrit.reviewdb.client.PatchSet;
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.gwtorm.server.ResultSet;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import java.util.LinkedList;
|
||||
@@ -28,6 +27,8 @@ import java.util.List;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
|
||||
public class Schema_60 extends SchemaVersion {
|
||||
@Inject
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_61 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_61(Provider<Schema_60> prior) {
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_62 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_62(Provider<Schema_61> prior) {
|
||||
|
||||
@@ -17,12 +17,13 @@ package com.google.gerrit.server.schema;
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.gwtorm.schema.sql.DialectPostgreSQL;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_63 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_63(Provider<Schema_62> prior) {
|
||||
|
||||
@@ -29,7 +29,6 @@ import com.google.gerrit.server.git.MetaDataUpdate;
|
||||
import com.google.gerrit.server.git.ProjectConfig;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
@@ -42,6 +41,8 @@ import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
import java.util.List;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_64 extends SchemaVersion {
|
||||
private final AllProjectsName allProjects;
|
||||
private final GitRepositoryManager mgr;
|
||||
|
||||
@@ -41,7 +41,6 @@ import com.google.gerrit.server.git.VersionedMetaData.BatchMetaDataUpdate;
|
||||
import com.google.gerrit.server.util.TimeUtil;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
@@ -62,6 +61,8 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.TimeZone;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_65 extends SchemaVersion {
|
||||
private final AllProjectsName allProjects;
|
||||
private final GitRepositoryManager mgr;
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_66 extends SchemaVersion {
|
||||
|
||||
@Inject
|
||||
|
||||
@@ -22,7 +22,6 @@ import com.google.gerrit.reviewdb.client.AccountGroup;
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import java.sql.ResultSet;
|
||||
@@ -33,6 +32,8 @@ import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_67 extends SchemaVersion {
|
||||
|
||||
@Inject
|
||||
|
||||
@@ -16,12 +16,13 @@ package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_68 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_68(Provider<Schema_67> prior) {
|
||||
|
||||
@@ -31,7 +31,6 @@ import com.google.gerrit.server.git.MetaDataUpdate;
|
||||
import com.google.gerrit.server.git.ProjectConfig;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
@@ -48,6 +47,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.inject.Inject;
|
||||
import javax.naming.NamingException;
|
||||
import javax.naming.ldap.LdapName;
|
||||
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_70 extends SchemaVersion {
|
||||
@Inject
|
||||
protected Schema_70(Provider<Schema_69> prior) {
|
||||
|
||||
@@ -16,12 +16,13 @@ package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
|
||||
public class Schema_71 extends SchemaVersion {
|
||||
@Inject
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_72 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_72(Provider<Schema_71> prior) {
|
||||
|
||||
@@ -16,12 +16,13 @@ package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
|
||||
public class Schema_73 extends SchemaVersion {
|
||||
@Inject
|
||||
|
||||
@@ -21,7 +21,6 @@ import com.google.gerrit.reviewdb.client.AccountGroupByIdAud;
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import java.sql.Connection;
|
||||
@@ -32,6 +31,8 @@ import java.sql.Statement;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
/* Handles copying all entries from AccountGroupIncludes(Audit) to the new tables */
|
||||
public class Schema_74 extends SchemaVersion {
|
||||
@Inject
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_75 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_75(Provider<Schema_74> prior) {
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_76 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_76(Provider<Schema_75> prior) {
|
||||
|
||||
@@ -35,7 +35,6 @@ import com.google.gwtorm.schema.sql.DialectMySQL;
|
||||
import com.google.gwtorm.schema.sql.DialectPostgreSQL;
|
||||
import com.google.gwtorm.schema.sql.SqlDialect;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
@@ -51,6 +50,8 @@ import java.sql.Statement;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_77 extends SchemaVersion {
|
||||
private final GitRepositoryManager mgr;
|
||||
private final AllProjectsName allProjects;
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_78 extends SchemaVersion {
|
||||
|
||||
@Inject
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_79 extends SchemaVersion {
|
||||
|
||||
@Inject
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_80 extends SchemaVersion {
|
||||
|
||||
@Inject
|
||||
|
||||
@@ -25,7 +25,6 @@ import com.google.gerrit.server.git.GitRepositoryManager;
|
||||
import com.google.gerrit.server.git.MetaDataUpdate;
|
||||
import com.google.gerrit.server.git.ProjectConfig;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
@@ -38,6 +37,8 @@ import java.io.FileFilter;
|
||||
import java.io.IOException;
|
||||
import java.sql.SQLException;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_81 extends SchemaVersion {
|
||||
|
||||
private final File pluginsDir;
|
||||
|
||||
@@ -21,7 +21,6 @@ import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.gwtorm.schema.sql.DialectMySQL;
|
||||
import com.google.gwtorm.schema.sql.SqlDialect;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import java.sql.SQLException;
|
||||
@@ -29,6 +28,8 @@ import java.sql.Statement;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_82 extends SchemaVersion {
|
||||
|
||||
private Map<String,String> tables = ImmutableMap.of(
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_83 extends SchemaVersion {
|
||||
|
||||
@Inject
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_84 extends SchemaVersion {
|
||||
|
||||
@Inject
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_85 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_85(Provider<Schema_84> prior) {
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_86 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_86(Provider<Schema_85> prior) {
|
||||
|
||||
@@ -19,7 +19,6 @@ import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gerrit.server.group.SystemGroupBackend;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import java.sql.ResultSet;
|
||||
@@ -29,6 +28,8 @@ import java.util.Collections;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_87 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_87(Provider<Schema_86> prior) {
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_88 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_88(Provider<Schema_87> prior) {
|
||||
|
||||
@@ -20,12 +20,13 @@ import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.gwtorm.schema.sql.DialectMySQL;
|
||||
import com.google.gwtorm.schema.sql.SqlDialect;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_89 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_89(Provider<Schema_88> prior) {
|
||||
|
||||
@@ -16,12 +16,13 @@ package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_90 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_90(Provider<Schema_89> prior) {
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_91 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_91(Provider<Schema_90> prior) {
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_92 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_92(Provider<Schema_91> prior) {
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_93 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_93(Provider<Schema_92> prior) {
|
||||
|
||||
@@ -16,12 +16,13 @@ package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_94 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_94(Provider<Schema_93> prior) {
|
||||
|
||||
@@ -16,7 +16,6 @@ package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gwtorm.server.OrmException;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
@@ -24,6 +23,8 @@ import org.eclipse.jgit.errors.ConfigInvalidException;
|
||||
import java.io.IOException;
|
||||
import java.sql.SQLException;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_95 extends SchemaVersion {
|
||||
private final AllUsersCreator allUsersCreator;
|
||||
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_96 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_96(Provider<Schema_95> prior) {
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_97 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_97(Provider<Schema_96> prior) {
|
||||
|
||||
@@ -16,12 +16,13 @@ package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.gerrit.reviewdb.server.ReviewDb;
|
||||
import com.google.gwtorm.jdbc.JdbcSchema;
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_98 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_98(Provider<Schema_97> prior) {
|
||||
|
||||
@@ -14,9 +14,10 @@
|
||||
|
||||
package com.google.gerrit.server.schema;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.google.inject.Provider;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class Schema_99 extends SchemaVersion {
|
||||
@Inject
|
||||
Schema_99(Provider<Schema_98> prior) {
|
||||
|
||||
Reference in New Issue
Block a user