diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java index 655f07e0ed..89e62569df 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AbstractDaemonTest.java @@ -42,7 +42,6 @@ import com.google.gerrit.testutil.ConfigSuite; import com.google.gerrit.testutil.TempFileUtil; import com.google.gson.Gson; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.util.Providers; import org.apache.http.HttpStatus; @@ -61,6 +60,8 @@ import java.util.Collections; import java.util.EnumSet; import java.util.List; +import javax.inject.Inject; + @RunWith(ConfigSuite.class) public abstract class AbstractDaemonTest { @ConfigSuite.Parameter diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java index 6ee7efad32..463c1653f2 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java @@ -24,7 +24,6 @@ import com.google.gerrit.server.util.ThreadLocalRequestContext; import com.google.gerrit.server.util.ThreadLocalRequestScopePropagator; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.Key; import com.google.inject.OutOfScopeException; import com.google.inject.Provider; @@ -33,6 +32,8 @@ import com.google.inject.util.Providers; import java.util.Map; +import javax.inject.Inject; + /** Guice scopes for state during an Acceptance Test connection. */ public class AcceptanceTestRequestScope { private static final Key RC_KEY = diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/GcAssert.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/GcAssert.java index 4c7289b270..01e18f8766 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/GcAssert.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/GcAssert.java @@ -18,7 +18,6 @@ import static org.junit.Assert.assertTrue; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.inject.Inject; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.Repository; @@ -27,6 +26,8 @@ import java.io.File; import java.io.FilenameFilter; import java.io.IOException; +import javax.inject.Inject; + public class GcAssert { private final GitRepositoryManager repoManager; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/InMemoryTestingDatabaseModule.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/InMemoryTestingDatabaseModule.java index 8548b5ccba..62738bcdc2 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/InMemoryTestingDatabaseModule.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/InMemoryTestingDatabaseModule.java @@ -34,7 +34,6 @@ import com.google.gerrit.testutil.InMemoryRepositoryManager; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmRuntimeException; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.Provides; import com.google.inject.Singleton; import com.google.inject.TypeLiteral; @@ -45,6 +44,8 @@ import org.eclipse.jgit.lib.Config; import java.io.File; +import javax.inject.Inject; + class InMemoryTestingDatabaseModule extends LifecycleModule { private final Config cfg; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/UseGerritConfigAnnotationTest.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/UseGerritConfigAnnotationTest.java index 88d46a49e9..0b5779a4eb 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/UseGerritConfigAnnotationTest.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/UseGerritConfigAnnotationTest.java @@ -17,11 +17,12 @@ package com.google.gerrit.acceptance; import static org.junit.Assert.assertEquals; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import org.eclipse.jgit.lib.Config; import org.junit.Test; +import javax.inject.Inject; + public class UseGerritConfigAnnotationTest extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java index 86d583be28..385528cddf 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java @@ -49,7 +49,6 @@ import com.google.gerrit.server.edit.ChangeEditModifier; import com.google.gerrit.server.edit.ChangeEditUtil; import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.util.Providers; import org.apache.commons.codec.binary.Base64; @@ -70,6 +69,8 @@ import java.util.Date; import java.util.List; import java.util.concurrent.atomic.AtomicLong; +import javax.inject.Inject; + public class ChangeEditIT extends AbstractDaemonTest { private final static String FILE_NAME = "foo"; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/DraftChangeBlockedIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/DraftChangeBlockedIT.java index 20c8f76e73..1668bf0185 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/DraftChangeBlockedIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/DraftChangeBlockedIT.java @@ -26,7 +26,6 @@ import com.google.gerrit.server.git.MetaDataUpdate; import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.project.ProjectCache; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.eclipse.jgit.api.errors.GitAPIException; import org.junit.Before; @@ -34,6 +33,8 @@ import org.junit.Test; import java.io.IOException; +import javax.inject.Inject; + @NoHttpd public class DraftChangeBlockedIT extends AbstractDaemonTest { diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java index 917c28340d..3445190e3f 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmitOnPushIT.java @@ -40,7 +40,6 @@ import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.project.ProjectCache; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -55,6 +54,8 @@ import org.junit.Test; import java.io.IOException; +import javax.inject.Inject; + @NoHttpd public class SubmitOnPushIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/VisibleRefFilterIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/VisibleRefFilterIT.java index d1803c26e5..c04ab164e1 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/VisibleRefFilterIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/VisibleRefFilterIT.java @@ -38,7 +38,6 @@ import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.notedb.NotesMigration; import com.google.gerrit.server.project.Util; import com.google.gerrit.testutil.ConfigSuite; -import com.google.inject.Inject; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.ObjectId; @@ -51,6 +50,8 @@ import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + @RunWith(ConfigSuite.class) public class VisibleRefFilterIT extends AbstractDaemonTest { @ConfigSuite.Config diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CapabilitiesIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CapabilitiesIT.java index 9d22ee49b2..29d45d8612 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CapabilitiesIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CapabilitiesIT.java @@ -32,13 +32,14 @@ import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gerrit.server.project.ProjectCache; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.google.inject.Inject; import org.eclipse.jgit.errors.ConfigInvalidException; import org.junit.Test; import java.io.IOException; +import javax.inject.Inject; + public class CapabilitiesIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java index ab8a5fcd8c..2101f19231 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java @@ -45,7 +45,6 @@ import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.project.PutConfig; import com.google.gson.reflect.TypeToken; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.jcraft.jsch.JSchException; @@ -67,6 +66,8 @@ import java.sql.Timestamp; import java.util.Collections; import java.util.List; +import javax.inject.Inject; + public abstract class AbstractSubmit extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ChangeOwnerIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ChangeOwnerIT.java index 42043cce5c..f1510995ce 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ChangeOwnerIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/ChangeOwnerIT.java @@ -34,7 +34,6 @@ import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gerrit.server.project.ProjectCache; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.apache.http.HttpStatus; import org.eclipse.jgit.api.errors.GitAPIException; @@ -44,6 +43,8 @@ import org.junit.Test; import java.io.IOException; +import javax.inject.Inject; + public class ChangeOwnerIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java index 8a277ca337..d2cfdfe46d 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SuggestReviewersIT.java @@ -36,7 +36,6 @@ import com.google.gerrit.server.git.MetaDataUpdate; import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.project.ProjectCache; import com.google.gson.reflect.TypeToken; -import com.google.inject.Inject; import org.eclipse.jgit.api.errors.GitAPIException; import org.junit.Before; @@ -46,6 +45,8 @@ import java.io.IOException; import java.util.Collections; import java.util.List; +import javax.inject.Inject; + public class SuggestReviewersIT extends AbstractDaemonTest { @Inject private PerformCreateGroup.Factory createGroupFactory; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/CacheOperationsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/CacheOperationsIT.java index deb80666df..818790161a 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/CacheOperationsIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/CacheOperationsIT.java @@ -33,7 +33,6 @@ import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.Util; -import com.google.inject.Inject; import org.apache.http.HttpStatus; import org.junit.Test; @@ -41,6 +40,8 @@ import org.junit.Test; import java.io.IOException; import java.util.Arrays; +import javax.inject.Inject; + public class CacheOperationsIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/FlushCacheIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/FlushCacheIT.java index 31ffd7beab..f7159d20e8 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/FlushCacheIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/FlushCacheIT.java @@ -30,13 +30,14 @@ import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.Util; -import com.google.inject.Inject; import org.apache.http.HttpStatus; import org.junit.Test; import java.io.IOException; +import javax.inject.Inject; + public class FlushCacheIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/AddRemoveGroupMembersIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/AddRemoveGroupMembersIT.java index 3646e57a80..27070a5d52 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/AddRemoveGroupMembersIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/AddRemoveGroupMembersIT.java @@ -42,7 +42,6 @@ import com.google.gson.reflect.TypeToken; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import org.apache.http.HttpStatus; import org.junit.After; @@ -55,6 +54,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + public class AddRemoveGroupMembersIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/CreateGroupIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/CreateGroupIT.java index a6954b28e9..6435b58be7 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/CreateGroupIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/CreateGroupIT.java @@ -26,7 +26,6 @@ import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.group.CreateGroup; import com.google.gerrit.server.group.GroupJson.GroupInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.jcraft.jsch.JSchException; @@ -35,6 +34,8 @@ import org.junit.Test; import java.io.IOException; +import javax.inject.Inject; + public class CreateGroupIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GetGroupIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GetGroupIT.java index 91c9898490..42f972dbb8 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GetGroupIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GetGroupIT.java @@ -21,12 +21,13 @@ import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.group.GroupJson.GroupInfo; -import com.google.inject.Inject; import org.junit.Test; import java.io.IOException; +import javax.inject.Inject; + public class GetGroupIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GroupPropertiesIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GroupPropertiesIT.java index c6309190d3..ad2d6fd246 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GroupPropertiesIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/GroupPropertiesIT.java @@ -32,13 +32,14 @@ import com.google.gerrit.server.group.PutName; import com.google.gerrit.server.group.PutOptions; import com.google.gerrit.server.group.PutOwner; import com.google.gerrit.server.group.SystemGroupBackend; -import com.google.inject.Inject; import org.apache.http.HttpStatus; import org.junit.Test; import java.io.IOException; +import javax.inject.Inject; + public class GroupPropertiesIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/ListGroupsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/ListGroupsIT.java index 8b5dde6465..75455cb872 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/ListGroupsIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/ListGroupsIT.java @@ -31,7 +31,6 @@ import com.google.gerrit.server.group.CreateGroup; import com.google.gerrit.server.group.GroupJson.GroupInfo; import com.google.gson.reflect.TypeToken; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.jcraft.jsch.JSchException; @@ -42,6 +41,8 @@ import java.io.IOException; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + public class ListGroupsIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java index a9bba753e3..e939ea63fe 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateBranchIT.java @@ -25,12 +25,13 @@ import com.google.gerrit.common.data.Permission; import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.git.ProjectConfig; -import com.google.inject.Inject; import org.apache.http.HttpStatus; import org.junit.Before; import org.junit.Test; +import javax.inject.Inject; + public class CreateBranchIT extends AbstractDaemonTest { @Inject private AllProjectsName allProjects; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java index 983198a4ee..b384c6d4bc 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java @@ -39,7 +39,6 @@ import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.jcraft.jsch.JSchException; @@ -56,6 +55,8 @@ import java.io.IOException; import java.util.Collections; import java.util.Set; +import javax.inject.Inject; + public class CreateProjectIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java index 9a5aaa3b08..35c6c6b661 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/DeleteBranchIT.java @@ -25,7 +25,6 @@ import com.google.gerrit.common.data.Permission; import com.google.gerrit.reviewdb.client.Branch; import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.git.ProjectConfig; -import com.google.inject.Inject; import org.apache.http.HttpStatus; import org.junit.Before; @@ -33,6 +32,8 @@ import org.junit.Test; import java.io.IOException; +import javax.inject.Inject; + public class DeleteBranchIT extends AbstractDaemonTest { @Inject private AllProjectsName allProjects; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GarbageCollectionIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GarbageCollectionIT.java index 26585ba8dd..c12b9b8ae3 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GarbageCollectionIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GarbageCollectionIT.java @@ -24,7 +24,6 @@ import com.google.gerrit.acceptance.UseLocalDisk; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.config.AllProjectsName; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.jcraft.jsch.JSchException; @@ -34,6 +33,8 @@ import org.junit.Test; import java.io.IOException; +import javax.inject.Inject; + public class GarbageCollectionIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GetChildProjectIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GetChildProjectIT.java index 10d59d2da9..8a9296b556 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GetChildProjectIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GetChildProjectIT.java @@ -25,7 +25,6 @@ import com.google.gerrit.extensions.common.ProjectInfo; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.project.ProjectCache; -import com.google.inject.Inject; import com.jcraft.jsch.JSchException; @@ -34,6 +33,8 @@ import org.junit.Test; import java.io.IOException; +import javax.inject.Inject; + public class GetChildProjectIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GetCommitIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GetCommitIT.java index d4a5b3db32..192fc9be86 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GetCommitIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GetCommitIT.java @@ -29,7 +29,6 @@ import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.project.ProjectCache; -import com.google.inject.Inject; import org.apache.http.HttpStatus; import org.eclipse.jgit.junit.TestRepository; @@ -40,6 +39,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import javax.inject.Inject; + public class GetCommitIT extends AbstractDaemonTest { @Inject private AllProjectsName allProjects; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListChildProjectsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListChildProjectsIT.java index 466a239ca4..b4fefe7153 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListChildProjectsIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListChildProjectsIT.java @@ -25,7 +25,6 @@ import com.google.gerrit.extensions.common.ProjectInfo; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.config.AllProjectsName; import com.google.gson.reflect.TypeToken; -import com.google.inject.Inject; import com.jcraft.jsch.JSchException; @@ -36,6 +35,8 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; +import javax.inject.Inject; + public class ListChildProjectsIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java index bb3d2e7215..2a7592e657 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ListProjectsIT.java @@ -29,7 +29,6 @@ import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.config.AllUsersName; import com.google.gson.reflect.TypeToken; -import com.google.inject.Inject; import com.jcraft.jsch.JSchException; @@ -40,6 +39,8 @@ import java.io.IOException; import java.util.Arrays; import java.util.Map; +import javax.inject.Inject; + public class ListProjectsIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ProjectLevelConfigIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ProjectLevelConfigIT.java index 3b790b13ee..2f9ba660f4 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ProjectLevelConfigIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/ProjectLevelConfigIT.java @@ -25,7 +25,6 @@ import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.config.AllProjectsNameProvider; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; -import com.google.inject.Inject; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.errors.GitAPIException; @@ -35,6 +34,8 @@ import org.junit.Test; import java.io.IOException; +import javax.inject.Inject; + public class ProjectLevelConfigIT extends AbstractDaemonTest { @Inject private ProjectCache projectCache; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/SetParentIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/SetParentIT.java index 7c6f280341..3dafc8b36d 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/SetParentIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/SetParentIT.java @@ -22,7 +22,6 @@ import com.google.gerrit.acceptance.RestResponse; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.config.AllProjectsNameProvider; import com.google.gerrit.server.project.SetParent; -import com.google.inject.Inject; import com.jcraft.jsch.JSchException; @@ -31,6 +30,8 @@ import org.junit.Test; import java.io.IOException; +import javax.inject.Inject; + public class SetParentIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java index 4a577ccd82..9fca57f9c6 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/GetRelatedIT.java @@ -31,7 +31,6 @@ import com.google.gerrit.server.change.GetRelated.RelatedInfo; import com.google.gerrit.server.edit.ChangeEditModifier; import com.google.gerrit.server.edit.ChangeEditUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.eclipse.jgit.api.ResetCommand.ResetType; import org.eclipse.jgit.api.errors.GitAPIException; @@ -40,6 +39,8 @@ import org.junit.Test; import java.io.IOException; import java.util.List; +import javax.inject.Inject; + public class GetRelatedIT extends AbstractDaemonTest { @Inject private ChangeEditUtil editUtil; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java index 70a0a602ba..5a2180f906 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/PatchListCacheIT.java @@ -33,7 +33,6 @@ import com.google.gerrit.server.patch.PatchListEntry; import com.google.gerrit.server.patch.PatchListKey; import com.google.gerrit.server.patch.PatchListNotAvailableException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.eclipse.jgit.api.ResetCommand.ResetType; import org.eclipse.jgit.api.errors.GitAPIException; @@ -43,6 +42,8 @@ import org.junit.Test; import java.io.IOException; import java.util.List; +import javax.inject.Inject; + public class PatchListCacheIT extends AbstractDaemonTest { private static String SUBJECT_1 = "subject 1"; private static String SUBJECT_2 = "subject 2"; diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/CustomLabelIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/CustomLabelIT.java index 612a32f2d9..7834aa1f31 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/CustomLabelIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/CustomLabelIT.java @@ -37,11 +37,12 @@ import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.Util; -import com.google.inject.Inject; import org.junit.Before; import org.junit.Test; +import javax.inject.Inject; + @NoHttpd public class CustomLabelIT extends AbstractDaemonTest { diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/LabelTypeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/LabelTypeIT.java index 08c6da94d5..7e54e85b1b 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/LabelTypeIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/LabelTypeIT.java @@ -32,13 +32,14 @@ import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.notedb.NotesMigration; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.testutil.ConfigSuite; -import com.google.inject.Inject; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Repository; import org.junit.Before; import org.junit.Test; +import javax.inject.Inject; + @NoHttpd public class LabelTypeIT extends AbstractDaemonTest { @ConfigSuite.Config diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/GarbageCollectionIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/GarbageCollectionIT.java index d32a58f5b0..5820e7f26c 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/GarbageCollectionIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/GarbageCollectionIT.java @@ -29,7 +29,6 @@ import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.git.GarbageCollection; import com.google.gerrit.server.git.GarbageCollectionQueue; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.jcraft.jsch.JSchException; @@ -40,6 +39,8 @@ import java.io.IOException; import java.util.Arrays; import java.util.Locale; +import javax.inject.Inject; + public class GarbageCollectionIT extends AbstractDaemonTest { @Inject diff --git a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/DefaultCacheFactory.java b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/DefaultCacheFactory.java index ae999f6788..47bfdc7801 100644 --- a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/DefaultCacheFactory.java +++ b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/DefaultCacheFactory.java @@ -28,12 +28,13 @@ import com.google.gerrit.server.cache.PersistentCacheFactory; import com.google.gerrit.server.cache.h2.H2CacheImpl.ValueHolder; 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 java.util.concurrent.TimeUnit; +import javax.inject.Inject; + public class DefaultCacheFactory implements MemoryCacheFactory { public static class Module extends LifecycleModule { @Override diff --git a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java index 65bb034eab..dbfe648816 100644 --- a/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java +++ b/gerrit-cache-h2/src/main/java/com/google/gerrit/server/cache/h2/H2CacheFactory.java @@ -28,7 +28,6 @@ import com.google.gerrit.server.cache.h2.H2CacheImpl.ValueHolder; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.plugins.Plugin; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.TypeLiteral; @@ -45,6 +44,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + @Singleton class H2CacheFactory implements PersistentCacheFactory, LifecycleListener { static final Logger log = LoggerFactory.getLogger(H2CacheFactory.class); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicItemProvider.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicItemProvider.java index 9b09d15b6e..f6e620cbe7 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicItemProvider.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicItemProvider.java @@ -15,7 +15,6 @@ package com.google.gerrit.extensions.registration; import com.google.inject.Binding; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Provider; @@ -24,6 +23,8 @@ import com.google.inject.TypeLiteral; import java.util.List; +import javax.inject.Inject; + class DynamicItemProvider implements Provider> { private final TypeLiteral type; private final Key> key; diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicMapProvider.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicMapProvider.java index 2554673fec..e988e06b4a 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicMapProvider.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicMapProvider.java @@ -15,13 +15,14 @@ package com.google.gerrit.extensions.registration; import com.google.inject.Binding; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Provider; import com.google.inject.TypeLiteral; import java.util.List; +import javax.inject.Inject; + class DynamicMapProvider implements Provider> { private final TypeLiteral type; diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSetProvider.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSetProvider.java index 9ea96d4ff1..ee4586f4d5 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSetProvider.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/DynamicSetProvider.java @@ -15,7 +15,6 @@ package com.google.gerrit.extensions.registration; import com.google.inject.Binding; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Provider; import com.google.inject.TypeLiteral; @@ -25,6 +24,8 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicReference; +import javax.inject.Inject; + class DynamicSetProvider implements Provider> { private final TypeLiteral type; diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicTypes.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicTypes.java index 96538e1cfa..78d53bf345 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicTypes.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicTypes.java @@ -16,7 +16,6 @@ package com.google.gerrit.extensions.registration; import com.google.gerrit.extensions.events.LifecycleListener; import com.google.inject.Binding; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.TypeLiteral; @@ -28,6 +27,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.inject.Inject; + /** DO NOT USE */ public class PrivateInternals_DynamicTypes { public static Map, DynamicItem> dynamicItemsOf(Injector src) { diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/WebUiPlugin.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/WebUiPlugin.java index 5cd19815f8..0607eb8d63 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/WebUiPlugin.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/WebUiPlugin.java @@ -16,7 +16,8 @@ package com.google.gerrit.extensions.webui; import com.google.gerrit.extensions.annotations.ExtensionPoint; import com.google.gerrit.extensions.annotations.PluginName; -import com.google.inject.Inject; + +import javax.inject.Inject; /** * Specifies JavaScript to dynamically load into the web UI. diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/AllRequestFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/AllRequestFilter.java index 3b48b65593..2973530963 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/AllRequestFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/AllRequestFilter.java @@ -15,13 +15,13 @@ package com.google.gerrit.httpd; import com.google.gerrit.extensions.registration.DynamicSet; -import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.inject.servlet.ServletModule; import java.io.IOException; import java.util.Iterator; +import javax.inject.Inject; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CanonicalWebUrl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CanonicalWebUrl.java index 901b180bdc..df1a7bba97 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CanonicalWebUrl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/CanonicalWebUrl.java @@ -15,9 +15,9 @@ package com.google.gerrit.httpd; import com.google.gerrit.common.Nullable; -import com.google.inject.Inject; import com.google.inject.Provider; +import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; public class CanonicalWebUrl { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ContainerAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ContainerAuthFilter.java index 91fb6aff7f..73b21071c5 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ContainerAuthFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ContainerAuthFilter.java @@ -22,7 +22,6 @@ import com.google.gerrit.server.AccessPath; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; @@ -30,6 +29,7 @@ import org.eclipse.jgit.lib.Config; import java.io.IOException; import java.util.Locale; +import javax.inject.Inject; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/DirectChangeByCommit.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/DirectChangeByCommit.java index 74dc56f7ef..7e52463939 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/DirectChangeByCommit.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/DirectChangeByCommit.java @@ -9,7 +9,6 @@ import com.google.gerrit.extensions.api.changes.Changes; import com.google.gerrit.extensions.common.ChangeInfo; import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.reviewdb.client.Change; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.slf4j.Logger; @@ -18,6 +17,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.List; +import javax.inject.Inject; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GetUserFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GetUserFilter.java index 94b8f2925c..e06c025415 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GetUserFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GetUserFilter.java @@ -17,7 +17,6 @@ package com.google.gerrit.httpd; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.servlet.ServletModule; @@ -26,6 +25,7 @@ import org.eclipse.jgit.lib.Config; import java.io.IOException; +import javax.inject.Inject; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpModule.java index 4f4c7834f3..20b615483e 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpModule.java @@ -15,9 +15,9 @@ package com.google.gerrit.httpd; import com.google.gerrit.server.config.AuthConfig; -import com.google.inject.Inject; import com.google.inject.servlet.ServletModule; +import javax.inject.Inject; import javax.servlet.Filter; /** Configures Git access over HTTP with authentication. */ diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpServlet.java index 0c4f60cbfd..0d27aebb0e 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitOverHttpServlet.java @@ -37,7 +37,6 @@ import com.google.gerrit.server.git.validators.UploadValidators; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.TypeLiteral; @@ -68,6 +67,7 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitWebConfig.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitWebConfig.java index 9d479770b0..dcec07866d 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitWebConfig.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/GitWebConfig.java @@ -17,7 +17,6 @@ package com.google.gerrit.httpd; import com.google.gerrit.common.data.GitWebType; 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 org.slf4j.Logger; @@ -25,6 +24,8 @@ import org.slf4j.LoggerFactory; import java.io.File; +import javax.inject.Inject; + public class GitWebConfig { private static final Logger log = LoggerFactory.getLogger(GitWebConfig.class); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/H2CacheBasedWebSession.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/H2CacheBasedWebSession.java index 4b68f02708..969d255b1d 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/H2CacheBasedWebSession.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/H2CacheBasedWebSession.java @@ -24,13 +24,13 @@ import com.google.gerrit.server.AnonymousUser; import com.google.gerrit.server.IdentifiedUser.RequestFactory; import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.config.AuthConfig; -import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Provider; import com.google.inject.assistedinject.FactoryModuleBuilder; import com.google.inject.name.Named; import com.google.inject.servlet.RequestScoped; +import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java index 7e1aa28d7e..270bc2118d 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpLogoutServlet.java @@ -24,12 +24,12 @@ import com.google.gerrit.server.account.AccountManager; import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.util.TimeUtil; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRemotePeerProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRemotePeerProvider.java index 9e0b0421e4..fa2f7e3fb4 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRemotePeerProvider.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRemotePeerProvider.java @@ -14,7 +14,6 @@ package com.google.gerrit.httpd; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.ProvisionException; import com.google.inject.servlet.RequestScoped; @@ -24,6 +23,7 @@ import java.net.InetSocketAddress; import java.net.SocketAddress; import java.net.UnknownHostException; +import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; @RequestScoped diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRequestContext.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRequestContext.java index 47593aacd9..00803da450 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRequestContext.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/HttpRequestContext.java @@ -19,9 +19,10 @@ 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; +import javax.inject.Inject; + class HttpRequestContext implements RequestContext { private final DynamicItem session; private final RequestScopedReviewDbProvider provider; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java index 8c469a99e4..9a340e7f98 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java @@ -28,7 +28,6 @@ import com.google.gerrit.server.account.AuthRequest; import com.google.gerrit.server.account.AuthResult; import com.google.gerrit.server.auth.NoSuchUserException; import com.google.gerrit.server.config.AuthConfig; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.apache.commons.codec.binary.Base64; @@ -38,6 +37,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.Locale; +import javax.inject.Inject; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java index 12de3442a0..afa91a685e 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectDigestFilter.java @@ -29,7 +29,6 @@ import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gwtjsonrpc.server.SignedToken; import com.google.gwtjsonrpc.server.XsrfException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -44,6 +43,7 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; +import javax.inject.Inject; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProxyPropertiesProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProxyPropertiesProvider.java index 0e51cc2c52..a169970da4 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProxyPropertiesProvider.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProxyPropertiesProvider.java @@ -16,7 +16,6 @@ package com.google.gerrit.httpd; import com.google.common.base.Strings; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -25,6 +24,8 @@ import org.eclipse.jgit.lib.Config; import java.net.MalformedURLException; import java.net.URL; +import javax.inject.Inject; + @Singleton class ProxyPropertiesProvider implements Provider { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestContextFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestContextFilter.java index b46505f0e1..2d304e7c76 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestContextFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequestContextFilter.java @@ -17,7 +17,6 @@ package com.google.gerrit.httpd; import com.google.gerrit.server.RequestCleanup; import com.google.gerrit.server.util.RequestContext; import com.google.gerrit.server.util.ThreadLocalRequestContext; -import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -25,6 +24,7 @@ import com.google.inject.servlet.ServletModule; import java.io.IOException; +import javax.inject.Inject; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireIdentifiedUserFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireIdentifiedUserFilter.java index 2448d3f4f5..7a5a939dbe 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireIdentifiedUserFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireIdentifiedUserFilter.java @@ -15,12 +15,12 @@ package com.google.gerrit.httpd; import com.google.gerrit.server.CurrentUser; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java index 92809c03f8..b26e8acf18 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RequireSslFilter.java @@ -16,13 +16,13 @@ package com.google.gerrit.httpd; import com.google.gerrit.common.Nullable; import com.google.gerrit.server.config.CanonicalWebUrl; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.servlet.ServletModule; import java.io.IOException; +import javax.inject.Inject; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RunAsFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RunAsFilter.java index 3418354284..b026f28d4c 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RunAsFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/RunAsFilter.java @@ -24,7 +24,6 @@ import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.AccountResolver; import com.google.gerrit.server.config.AuthConfig; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.inject.servlet.ServletModule; @@ -33,6 +32,7 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import javax.inject.Inject; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java index 46519590d5..f5df2c2f11 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java @@ -37,7 +37,6 @@ import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gwtexpui.server.CacheControlFilter; -import com.google.inject.Inject; import com.google.inject.Key; import com.google.inject.Provider; import com.google.inject.internal.UniqueAnnotations; @@ -48,6 +47,7 @@ import org.eclipse.jgit.lib.Constants; import java.io.IOException; +import javax.inject.Inject; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebModule.java index d14fa9ad43..78d0b48d9c 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebModule.java @@ -38,13 +38,14 @@ import com.google.gerrit.server.git.AsyncReceiveCommits; import com.google.gerrit.server.util.GuiceRequestScopePropagator; import com.google.gerrit.server.util.RequestScopePropagator; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.ProvisionException; import com.google.inject.servlet.RequestScoped; import java.net.SocketAddress; +import javax.inject.Inject; + public class WebModule extends LifecycleModule { private final AuthConfig authConfig; private final UrlModule.UrlConfig urlConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java index 24e2c56c09..7f4ad0878d 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSessionManager.java @@ -33,7 +33,6 @@ import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountExternalId; import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.eclipse.jgit.lib.Config; @@ -48,6 +47,8 @@ import java.io.Serializable; import java.security.SecureRandom; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + public class WebSessionManager { private static final Logger log = LoggerFactory.getLogger(WebSessionManager.class); public static final String CACHE_NAME = "web_sessions"; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSshGlueModule.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSshGlueModule.java index eb06617699..3f25eed1c0 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSshGlueModule.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebSshGlueModule.java @@ -16,9 +16,10 @@ package com.google.gerrit.httpd; import com.google.gerrit.server.ssh.SshInfo; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import com.google.inject.Provider; +import javax.inject.Inject; + /** * Pulls objects from the SSH injector over the HTTP injector. *

diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java index 2a3a76b343..fdf802c56f 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccountLoginServlet.java @@ -35,7 +35,6 @@ import com.google.gwtexpui.server.CacheHeaders; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.w3c.dom.Document; @@ -48,6 +47,7 @@ import java.io.Writer; import java.util.List; import java.util.UUID; +import javax.inject.Inject; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java index 5f93a56cee..536fa3736a 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpAuthFilter.java @@ -27,7 +27,6 @@ import com.google.gerrit.reviewdb.client.AccountExternalId; import com.google.gerrit.server.config.AuthConfig; import com.google.gwtexpui.server.CacheHeaders; import com.google.gwtjsonrpc.server.RPCServletUtils; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.util.Base64; @@ -36,6 +35,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.OutputStream; +import javax.inject.Inject; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java index 734addb09e..0296a2da09 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpLoginServlet.java @@ -26,7 +26,6 @@ import com.google.gerrit.server.account.AuthRequest; import com.google.gerrit.server.account.AuthResult; import com.google.gerrit.server.config.AuthConfig; import com.google.gwtexpui.server.CacheHeaders; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.slf4j.Logger; @@ -38,6 +37,7 @@ import org.w3c.dom.NodeList; import java.io.IOException; +import javax.inject.Inject; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertAuthFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertAuthFilter.java index ea9b1c0db9..aff9fe3e50 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertAuthFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertAuthFilter.java @@ -20,7 +20,6 @@ import com.google.gerrit.server.account.AccountException; import com.google.gerrit.server.account.AccountManager; import com.google.gerrit.server.account.AuthRequest; import com.google.gerrit.server.account.AuthResult; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.slf4j.Logger; @@ -31,6 +30,7 @@ import java.security.cert.X509Certificate; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.inject.Inject; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertLoginServlet.java index 8652ef0c71..fd7c597dae 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/HttpsClientSslCertLoginServlet.java @@ -18,12 +18,12 @@ import com.google.gerrit.common.Nullable; import com.google.gerrit.httpd.LoginUrlToken; import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gwtexpui.server.CacheHeaders; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapLoginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapLoginServlet.java index f58a719d08..562045e3cb 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapLoginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/ldap/LdapLoginServlet.java @@ -30,7 +30,6 @@ import com.google.gerrit.server.account.AuthRequest; import com.google.gerrit.server.account.AuthResult; import com.google.gerrit.server.auth.AuthenticationUnavailableException; import com.google.gwtexpui.server.CacheHeaders; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.slf4j.Logger; @@ -40,6 +39,7 @@ import org.w3c.dom.Element; import java.io.IOException; +import javax.inject.Inject; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java index 41aa552cf3..0d5ca6f8ed 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitLogoServlet.java @@ -16,7 +16,6 @@ package com.google.gerrit.httpd.gitweb; import com.google.gerrit.httpd.GitWebConfig; import com.google.gwtexpui.server.CacheHeaders; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.util.IO; @@ -26,6 +25,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebCssServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebCssServlet.java index dcca106c83..4a9042b419 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebCssServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebCssServlet.java @@ -19,13 +19,13 @@ import com.google.gerrit.httpd.HtmlDomUtil; import com.google.gerrit.server.config.SitePaths; import com.google.gwtexpui.server.CacheHeaders; import com.google.gwtjsonrpc.server.RPCServletUtils; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.File; import java.io.IOException; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebJavaScriptServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebJavaScriptServlet.java index d71732a894..1596334765 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebJavaScriptServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebJavaScriptServlet.java @@ -16,7 +16,6 @@ package com.google.gerrit.httpd.gitweb; import com.google.gerrit.httpd.GitWebConfig; import com.google.gwtexpui.server.CacheHeaders; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.util.IO; @@ -26,6 +25,7 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java index 147fe04179..a4739e609f 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/gitweb/GitWebServlet.java @@ -41,7 +41,6 @@ import com.google.gerrit.server.git.LocalDiskRepositoryManager; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; import com.google.gwtexpui.server.CacheHeaders; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -68,6 +67,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import javax.inject.Inject; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java index 90ce8941bc..fc33766461 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java @@ -43,7 +43,6 @@ import com.google.gerrit.server.plugins.ReloadPluginListener; import com.google.gerrit.server.plugins.StartPluginListener; import com.google.gerrit.server.ssh.SshInfo; import com.google.gwtexpui.server.CacheHeaders; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.name.Named; @@ -73,6 +72,7 @@ import java.util.jar.Attributes; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.inject.Inject; import javax.servlet.FilterChain; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java index 9aec609bdd..9f2313c30c 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/CatServlet.java @@ -27,7 +27,6 @@ import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtexpui.server.CacheHeaders; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -52,6 +51,7 @@ import java.security.SecureRandom; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import javax.inject.Inject; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java index 90c5ff4ddf..4d06923043 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPageServlet.java @@ -36,7 +36,6 @@ import com.google.gerrit.server.notedb.NotesMigration; import com.google.gwtexpui.server.CacheHeaders; import com.google.gwtjsonrpc.server.JsonServlet; import com.google.gwtjsonrpc.server.RPCServletUtils; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -56,6 +55,7 @@ import java.io.StringWriter; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java index 79c2aeb598..cc93581fb1 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerritServlet.java @@ -17,13 +17,13 @@ package com.google.gerrit.httpd.raw; import com.google.gerrit.httpd.HtmlDomUtil; import com.google.gwtexpui.server.CacheHeaders; import com.google.gwtjsonrpc.server.RPCServletUtils; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.FileNotFoundException; import java.io.IOException; import java.io.OutputStream; +import javax.inject.Inject; import javax.servlet.ServletContext; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/RobotsServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/RobotsServlet.java index 1d8e74d552..b90c3f007b 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/RobotsServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/RobotsServlet.java @@ -17,7 +17,6 @@ package com.google.gerrit.httpd.raw; import com.google.common.io.ByteStreams; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; @@ -30,6 +29,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import javax.inject.Inject; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java index 83120e0470..941ba0859f 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/SshInfoServlet.java @@ -16,7 +16,6 @@ package com.google.gerrit.httpd.raw; import com.google.gerrit.server.ssh.SshInfo; import com.google.gwtexpui.server.CacheHeaders; -import com.google.inject.Inject; import com.google.inject.Singleton; import com.jcraft.jsch.HostKey; @@ -25,6 +24,7 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.List; +import javax.inject.Inject; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/StaticServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/StaticServlet.java index 52b7a5c932..ff514317b1 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/StaticServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/StaticServlet.java @@ -37,7 +37,6 @@ import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gwtexpui.server.CacheHeaders; import com.google.gwtjsonrpc.server.RPCServletUtils; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; @@ -52,6 +51,7 @@ import java.io.OutputStream; import java.util.Map; import java.util.concurrent.ExecutionException; +import javax.inject.Inject; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ThemeFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ThemeFactory.java index 9e89eee427..0c9d016afb 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ThemeFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ThemeFactory.java @@ -16,10 +16,11 @@ package com.google.gerrit.httpd.raw; import com.google.gerrit.common.data.HostPageData; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import org.eclipse.jgit.lib.Config; +import javax.inject.Inject; + class ThemeFactory { private final Config cfg; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ToolServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ToolServlet.java index 810cc2a016..ab00c20826 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ToolServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/ToolServlet.java @@ -26,7 +26,6 @@ import com.google.gerrit.common.Version; import com.google.gerrit.server.tools.ToolsCatalog; import com.google.gerrit.server.tools.ToolsCatalog.Entry; import com.google.gwtjsonrpc.server.RPCServletUtils; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.w3c.dom.Document; @@ -35,6 +34,7 @@ import org.w3c.dom.Element; import java.io.IOException; import java.io.OutputStream; +import javax.inject.Inject; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/ParameterParser.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/ParameterParser.java index 9183d5c3c2..fd75675790 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/ParameterParser.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/ParameterParser.java @@ -34,7 +34,6 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import com.google.gwtexpui.server.CacheHeaders; -import com.google.inject.Inject; import org.kohsuke.args4j.CmdLineException; @@ -44,6 +43,7 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; +import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java index 142194d72d..5dd64d90ae 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/restapi/RestApiServlet.java @@ -93,7 +93,6 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.MalformedJsonException; import com.google.gwtexpui.server.CacheHeaders; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.util.Providers; @@ -123,6 +122,7 @@ import java.util.Set; import java.util.regex.Pattern; import java.util.zip.GZIPOutputStream; +import javax.inject.Inject; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java index 32b4958575..1b31eb7229 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServlet.java @@ -32,7 +32,6 @@ import com.google.gwtjsonrpc.server.ActiveCall; import com.google.gwtjsonrpc.server.JsonServlet; import com.google.gwtjsonrpc.server.MethodHandle; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,6 +40,7 @@ import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Method; +import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServletProvider.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServletProvider.java index 9361130f61..fffdc5164a 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServletProvider.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/GerritJsonServletProvider.java @@ -16,10 +16,11 @@ package com.google.gerrit.httpd.rpc; import com.google.gwtjsonrpc.common.RemoteJsonService; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Provider; +import javax.inject.Inject; + /** Creates {@link GerritJsonServlet} with a {@link RemoteJsonService}. */ class GerritJsonServletProvider implements Provider { @Inject diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SuggestServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SuggestServiceImpl.java index dcd181cf22..2b84a504a1 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SuggestServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SuggestServiceImpl.java @@ -42,7 +42,6 @@ import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; import com.google.gwtjsonrpc.common.AsyncCallback; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.lib.Config; @@ -55,6 +54,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + class SuggestServiceImpl extends BaseServiceImplementation implements SuggestService { private static final String MAX_SUFFIX = "\u9fa5"; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java index 56a6a507b9..907e4eb09f 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/SystemInfoServiceImpl.java @@ -23,7 +23,6 @@ import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.ssh.SshInfo; import com.google.gwtjsonrpc.common.AsyncCallback; import com.google.gwtjsonrpc.common.VoidResult; -import com.google.inject.Inject; import com.google.inject.Provider; import com.jcraft.jsch.HostKey; @@ -36,6 +35,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import javax.inject.Inject; import javax.servlet.http.HttpServletRequest; class SystemInfoServiceImpl implements SystemInfoService { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/access/AccessRestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/access/AccessRestApiServlet.java index fda64166ce..7daefd53fe 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/access/AccessRestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/access/AccessRestApiServlet.java @@ -16,10 +16,11 @@ package com.google.gerrit.httpd.rpc.access; import com.google.gerrit.httpd.restapi.RestApiServlet; import com.google.gerrit.server.access.AccessCollection; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class AccessRestApiServlet extends RestApiServlet { private static final long serialVersionUID = 1L; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountSecurityImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountSecurityImpl.java index dfdfe9ddad..61f85bcc10 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountSecurityImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountSecurityImpl.java @@ -47,13 +47,14 @@ import com.google.gerrit.server.util.TimeUtil; import com.google.gwtjsonrpc.common.AsyncCallback; import com.google.gwtjsonrpc.common.VoidResult; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import java.util.Collections; import java.util.List; import java.util.Set; +import javax.inject.Inject; + class AccountSecurityImpl extends BaseServiceImplementation implements AccountSecurity { private final ContactStore contactStore; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java index bdb0028d2a..cb651bbe0b 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountServiceImpl.java @@ -36,7 +36,6 @@ import com.google.gwtjsonrpc.common.AsyncCallback; import com.google.gwtjsonrpc.common.VoidResult; import com.google.gwtorm.server.OrmDuplicateKeyException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import java.util.ArrayList; @@ -45,6 +44,8 @@ import java.util.Comparator; import java.util.List; import java.util.Set; +import javax.inject.Inject; + class AccountServiceImpl extends BaseServiceImplementation implements AccountService { private final Provider currentUser; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountsRestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountsRestApiServlet.java index 351d563fea..6e5165a6d0 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountsRestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AccountsRestApiServlet.java @@ -16,10 +16,11 @@ package com.google.gerrit.httpd.rpc.account; import com.google.gerrit.httpd.restapi.RestApiServlet; import com.google.gerrit.server.account.AccountsCollection; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class AccountsRestApiServlet extends RestApiServlet { private static final long serialVersionUID = 1L; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AgreementInfoFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AgreementInfoFactory.java index 712f5a227f..7a4805539b 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AgreementInfoFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/AgreementInfoFactory.java @@ -24,7 +24,6 @@ import com.google.gerrit.httpd.rpc.Handler; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.project.ProjectCache; -import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,6 +32,8 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import javax.inject.Inject; + class AgreementInfoFactory extends Handler { private final Logger log = LoggerFactory.getLogger(getClass()); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/DeleteExternalIds.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/DeleteExternalIds.java index 1d45c7d225..30c49d32b3 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/DeleteExternalIds.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/DeleteExternalIds.java @@ -21,7 +21,6 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountByEmailCache; import com.google.gerrit.server.account.AccountCache; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.util.ArrayList; @@ -31,6 +30,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + class DeleteExternalIds extends Handler> { interface Factory { DeleteExternalIds create(Set keys); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/ExternalIdDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/ExternalIdDetailFactory.java index b97d46acf9..c3e97c1c04 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/ExternalIdDetailFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/account/ExternalIdDetailFactory.java @@ -24,11 +24,12 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.config.AuthConfig; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import java.util.Collections; import java.util.List; +import javax.inject.Inject; + class ExternalIdDetailFactory extends Handler> { interface Factory { ExternalIdDetailFactory create(); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/change/ChangesRestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/change/ChangesRestApiServlet.java index fe810b91b8..9de50a082e 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/change/ChangesRestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/change/ChangesRestApiServlet.java @@ -16,10 +16,11 @@ package com.google.gerrit.httpd.rpc.change; import com.google.gerrit.httpd.restapi.RestApiServlet; import com.google.gerrit.server.change.ChangesCollection; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class ChangesRestApiServlet extends RestApiServlet { private static final long serialVersionUID = 1L; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/change/DeprecatedChangeQueryServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/change/DeprecatedChangeQueryServlet.java index da21c5161a..c3296288df 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/change/DeprecatedChangeQueryServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/change/DeprecatedChangeQueryServlet.java @@ -17,12 +17,12 @@ package com.google.gerrit.httpd.rpc.change; import com.google.gerrit.server.query.change.QueryProcessor; import com.google.gerrit.server.query.change.QueryProcessor.OutputFormat; import com.google.gson.Gson; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailServiceImpl.java index 538275fb06..cca666977f 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/ChangeDetailServiceImpl.java @@ -19,7 +19,8 @@ import com.google.gerrit.common.data.PatchSetDetail; import com.google.gerrit.reviewdb.client.AccountDiffPreference; import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gwtjsonrpc.common.AsyncCallback; -import com.google.inject.Inject; + +import javax.inject.Inject; class ChangeDetailServiceImpl implements ChangeDetailService { private final PatchSetDetailFactory.Factory patchSetDetail; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetDetailFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetDetailFactory.java index 4a673cb651..d85e61b3e6 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetDetailFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/changedetail/PatchSetDetailFactory.java @@ -49,7 +49,6 @@ import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.google.inject.util.Providers; @@ -61,6 +60,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.inject.Inject; + /** Creates a {@link PatchSetDetail} from a {@link PatchSet}. */ class PatchSetDetailFactory extends Handler { diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/config/ConfigRestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/config/ConfigRestApiServlet.java index f951ad37b0..b53ae824cd 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/config/ConfigRestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/config/ConfigRestApiServlet.java @@ -16,10 +16,11 @@ package com.google.gerrit.httpd.rpc.config; import com.google.gerrit.httpd.restapi.RestApiServlet; import com.google.gerrit.server.config.ConfigCollection; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class ConfigRestApiServlet extends RestApiServlet { private static final long serialVersionUID = 1L; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/doc/QueryDocumentationFilter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/doc/QueryDocumentationFilter.java index 002b520115..d9128297aa 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/doc/QueryDocumentationFilter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/doc/QueryDocumentationFilter.java @@ -21,12 +21,12 @@ import com.google.gerrit.httpd.restapi.RestApiServlet; import com.google.gerrit.server.documentation.QueryDocumentationExecutor; import com.google.gerrit.server.documentation.QueryDocumentationExecutor.DocQueryException; import com.google.gerrit.server.documentation.QueryDocumentationExecutor.DocResult; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.IOException; import java.util.List; +import javax.inject.Inject; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/group/GroupsRestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/group/GroupsRestApiServlet.java index 04dc747895..cfa75f1f07 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/group/GroupsRestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/group/GroupsRestApiServlet.java @@ -16,10 +16,11 @@ package com.google.gerrit.httpd.rpc.group; import com.google.gerrit.httpd.restapi.RestApiServlet; import com.google.gerrit.server.group.GroupsCollection; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class GroupsRestApiServlet extends RestApiServlet { private static final long serialVersionUID = 1L; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java index 64d5838117..0dff9b836d 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchDetailServiceImpl.java @@ -28,9 +28,10 @@ import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.patch.PatchScriptFactory; import com.google.gerrit.server.project.ChangeControl; import com.google.gwtjsonrpc.common.AsyncCallback; -import com.google.inject.Inject; import com.google.inject.Provider; +import javax.inject.Inject; + class PatchDetailServiceImpl extends BaseServiceImplementation implements PatchDetailService { private final PatchScriptFactory.Factory patchScriptFactoryFactory; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ChangeProjectAccess.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ChangeProjectAccess.java index d18c16a35a..d65b3abae6 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ChangeProjectAccess.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ChangeProjectAccess.java @@ -30,7 +30,6 @@ import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.server.project.SetParent; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -41,6 +40,8 @@ import org.eclipse.jgit.revwalk.RevCommit; import java.io.IOException; import java.util.List; +import javax.inject.Inject; + class ChangeProjectAccess extends ProjectAccessHandler { interface Factory { ChangeProjectAccess create( diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAccessFactory.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAccessFactory.java index 361561068b..31be6e6dec 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAccessFactory.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAccessFactory.java @@ -37,7 +37,6 @@ import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.server.project.RefControl; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -50,6 +49,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + class ProjectAccessFactory extends Handler { interface Factory { ProjectAccessFactory create(@Assisted Project.NameKey name); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAdminServiceImpl.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAdminServiceImpl.java index c37870160f..bd87238c03 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAdminServiceImpl.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectAdminServiceImpl.java @@ -20,12 +20,13 @@ import com.google.gerrit.common.data.ProjectAdminService; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Project; import com.google.gwtjsonrpc.common.AsyncCallback; -import com.google.inject.Inject; import org.eclipse.jgit.lib.ObjectId; import java.util.List; +import javax.inject.Inject; + class ProjectAdminServiceImpl implements ProjectAdminService { private final ChangeProjectAccess.Factory changeProjectAccessFactory; private final ReviewProjectAccess.Factory reviewProjectAccessFactory; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectsRestApiServlet.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectsRestApiServlet.java index ea3b8b01f0..0761ba41ff 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectsRestApiServlet.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ProjectsRestApiServlet.java @@ -16,10 +16,11 @@ package com.google.gerrit.httpd.rpc.project; import com.google.gerrit.httpd.restapi.RestApiServlet; import com.google.gerrit.server.project.ProjectsCollection; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class ProjectsRestApiServlet extends RestApiServlet { private static final long serialVersionUID = 1L; diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ReviewProjectAccess.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ReviewProjectAccess.java index 51aa2c0cce..4660f5dc8d 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ReviewProjectAccess.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/project/ReviewProjectAccess.java @@ -48,7 +48,6 @@ import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.server.project.SetParent; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -62,6 +61,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.inject.Inject; + public class ReviewProjectAccess extends ProjectAccessHandler { private static final Logger log = LoggerFactory.getLogger(ReviewProjectAccess.class); diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/template/SiteHeaderFooter.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/template/SiteHeaderFooter.java index 321f032ba4..3b69f01fba 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/template/SiteHeaderFooter.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/template/SiteHeaderFooter.java @@ -18,7 +18,6 @@ import com.google.common.base.Strings; import com.google.gerrit.httpd.HtmlDomUtil; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; @@ -30,6 +29,8 @@ import org.w3c.dom.Element; import java.io.File; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class SiteHeaderFooter { private static final Logger log = LoggerFactory.getLogger(SiteHeaderFooter.class); diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java index 583e54fca1..6f990c7560 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java @@ -22,10 +22,11 @@ import com.google.gerrit.server.index.IndexCollection; import com.google.gerrit.server.index.IndexModule; import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.query.change.ChangeData; -import com.google.inject.Inject; import com.google.inject.Provides; import com.google.inject.Singleton; +import javax.inject.Inject; + public class LuceneIndexModule extends LifecycleModule { private final Integer singleVersion; private final int threads; diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java index c3570a1370..d73cdc85b7 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java @@ -25,7 +25,6 @@ import com.google.gerrit.server.index.ChangeSchemas; import com.google.gerrit.server.index.IndexCollection; import com.google.gerrit.server.index.Schema; import com.google.gerrit.server.query.change.ChangeData; -import com.google.inject.Inject; import com.google.inject.ProvisionException; import com.google.inject.Singleton; @@ -42,6 +41,8 @@ import java.util.Collection; import java.util.List; import java.util.TreeMap; +import javax.inject.Inject; + @Singleton class LuceneVersionManager implements LifecycleListener { private static final Logger log = LoggerFactory diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/OnlineReindexer.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/OnlineReindexer.java index d3dc963f80..535d3a87e7 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/OnlineReindexer.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/OnlineReindexer.java @@ -21,7 +21,6 @@ import com.google.gerrit.server.index.ChangeBatchIndexer; import com.google.gerrit.server.index.ChangeIndex; import com.google.gerrit.server.index.IndexCollection; import com.google.gerrit.server.project.ProjectCache; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.slf4j.Logger; @@ -30,6 +29,8 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.List; +import javax.inject.Inject; + public class OnlineReindexer { private static final Logger log = LoggerFactory .getLogger(OnlineReindexer.class); diff --git a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/LoginForm.java b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/LoginForm.java index 395b9f2a7a..4eaee88557 100644 --- a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/LoginForm.java +++ b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/LoginForm.java @@ -30,7 +30,6 @@ import com.google.gerrit.reviewdb.client.AuthType; import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -44,6 +43,7 @@ import java.io.IOException; import java.util.Map; import java.util.Set; +import javax.inject.Inject; import javax.servlet.ServletOutputStream; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServlet; diff --git a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java index 51342f7ed9..859bc72573 100644 --- a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java +++ b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdLoginServlet.java @@ -15,11 +15,11 @@ package com.google.gerrit.httpd.auth.openid; import com.google.gwtexpui.server.CacheHeaders; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java index dc5e1020a2..b430b59a2c 100644 --- a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java +++ b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java @@ -31,7 +31,6 @@ import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gwtorm.client.KeyUtil; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -65,6 +64,7 @@ import java.net.URL; import java.util.List; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/XrdsFilter.java b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/XrdsFilter.java index 92230f687d..228e551d59 100644 --- a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/XrdsFilter.java +++ b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/XrdsFilter.java @@ -1,12 +1,12 @@ package com.google.gerrit.httpd.auth.openid; import com.google.gerrit.server.config.CanonicalWebUrl; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/XrdsServlet.java b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/XrdsServlet.java index 4719a84af2..99fd4bb968 100644 --- a/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/XrdsServlet.java +++ b/gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/XrdsServlet.java @@ -15,12 +15,12 @@ package com.google.gerrit.httpd.auth.openid; import com.google.gerrit.server.config.CanonicalWebUrl; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java index 710aabd39a..d304825f78 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java @@ -32,7 +32,6 @@ import com.google.gerrit.server.securestore.SecureStoreProvider; import com.google.gerrit.server.util.HostPlatform; import com.google.inject.AbstractModule; import com.google.inject.Guice; -import com.google.inject.Inject; import com.google.inject.Module; import org.kohsuke.args4j.Option; @@ -42,6 +41,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + /** Initialize a new Gerrit installation. */ public class Init extends BaseInit { @Option(name = "--batch", usage = "Batch mode; skip interactive prompting") diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/LocalUsernamesToLowerCase.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/LocalUsernamesToLowerCase.java index d208a3cf26..1d39c7ad28 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/LocalUsernamesToLowerCase.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/LocalUsernamesToLowerCase.java @@ -23,7 +23,6 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.schema.SchemaVersionCheck; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.Injector; import org.eclipse.jgit.lib.TextProgressMonitor; @@ -34,6 +33,8 @@ import java.util.Collections; import java.util.List; import java.util.Locale; +import javax.inject.Inject; + /** Converts the local username for all accounts to lower case */ public class LocalUsernamesToLowerCase extends SiteProgram { @Option(name = "--threads", usage = "Number of concurrent threads to run") diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Rulec.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Rulec.java index 17a54d4798..177ef185d4 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Rulec.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Rulec.java @@ -22,7 +22,6 @@ import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.rules.PrologCompiler; import com.google.gerrit.server.config.FactoryModule; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.inject.Inject; import com.google.inject.Injector; import com.googlecode.prolog_cafe.compiler.CompileException; @@ -35,6 +34,8 @@ import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; +import javax.inject.Inject; + /** * Gets rules.pl at refs/meta/config and compiles into jar file called * rules-(sha1 of rules.pl).jar in (site-path)/cache/rules diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java index f84abcee5a..c265d87839 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/HttpLog.java @@ -17,7 +17,6 @@ package com.google.gerrit.pgm.http.jetty; import com.google.gerrit.httpd.GetUserFilter; import com.google.gerrit.server.util.SystemLog; import com.google.gerrit.server.util.TimeUtil; -import com.google.inject.Inject; import org.apache.log4j.AsyncAppender; import org.apache.log4j.Level; @@ -28,6 +27,8 @@ import org.eclipse.jetty.server.RequestLog; import org.eclipse.jetty.server.Response; import org.eclipse.jetty.util.component.AbstractLifeCycle; +import javax.inject.Inject; + /** Writes the {@code httpd_log} file with per-request data. */ class HttpLog extends AbstractLifeCycle implements RequestLog { private static final Logger log = Logger.getLogger(HttpLog.class); diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java index 6cba526d02..4cf3e37503 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java @@ -33,7 +33,6 @@ import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtexpui.linker.server.UserAgentRule; import com.google.gwtexpui.server.CacheHeaders; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Singleton; import com.google.inject.servlet.GuiceFilter; @@ -92,6 +91,7 @@ import java.util.Set; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import javax.inject.Inject; import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterChain; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java index 7730fa5dea..5c5a6338df 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java @@ -26,7 +26,6 @@ import com.google.gerrit.server.git.QueueProvider; import com.google.gerrit.server.git.WorkQueue; import com.google.gerrit.server.git.WorkQueue.CancelableRunnable; import com.google.gerrit.sshd.CommandExecutorQueueProvider; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.servlet.ServletModule; @@ -40,6 +39,7 @@ import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.inject.Inject; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/AllUsersNameOnInitProvider.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/AllUsersNameOnInitProvider.java index de0b75adca..0b2bbd5f4d 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/AllUsersNameOnInitProvider.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/AllUsersNameOnInitProvider.java @@ -18,9 +18,10 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Strings; import com.google.gerrit.pgm.init.api.Section; import com.google.gerrit.server.config.AllUsersNameProvider; -import com.google.inject.Inject; import com.google.inject.Provider; +import javax.inject.Inject; + public class AllUsersNameOnInitProvider implements Provider { private final String name; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java index dc881c6603..ee25399f89 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/BaseInit.java @@ -38,7 +38,6 @@ import com.google.gwtorm.server.StatementExecutor; import com.google.inject.AbstractModule; import com.google.inject.CreationException; import com.google.inject.Guice; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.Provider; @@ -55,6 +54,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import javax.inject.Inject; import javax.sql.DataSource; /** Initialize a new Gerrit installation. */ diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java index 96ab1030e4..ab490e6d75 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java @@ -16,7 +16,6 @@ package com.google.gerrit.pgm.init; import com.google.common.base.Strings; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import org.eclipse.jgit.lib.Config; @@ -25,6 +24,8 @@ import java.net.Socket; import java.net.URI; import java.net.URISyntaxException; +import javax.inject.Inject; + /** Opens the user's web browser to the web UI. */ public class Browser { private final Config cfg; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/H2Initializer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/H2Initializer.java index 88bc790768..1df0424288 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/H2Initializer.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/H2Initializer.java @@ -16,10 +16,11 @@ package com.google.gerrit.pgm.init; import com.google.gerrit.pgm.init.api.Section; import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; import java.io.File; +import javax.inject.Inject; + class H2Initializer implements DatabaseConfigInitializer { private final SitePaths site; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitAuth.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitAuth.java index 83c451000b..a27d36ab87 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitAuth.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitAuth.java @@ -21,9 +21,10 @@ import com.google.gerrit.pgm.init.api.InitStep; import com.google.gerrit.pgm.init.api.Section; import com.google.gerrit.reviewdb.client.AuthType; import com.google.gwtjsonrpc.server.SignedToken; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + /** Initialize the {@code auth} configuration section. */ @Singleton class InitAuth implements InitStep { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitCache.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitCache.java index 4c026ac72f..2a306c203a 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitCache.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitCache.java @@ -19,11 +19,12 @@ import static com.google.gerrit.pgm.init.InitUtil.die; import com.google.gerrit.pgm.init.api.InitStep; import com.google.gerrit.pgm.init.api.Section; import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.File; +import javax.inject.Inject; + /** Initialize the {@code cache} configuration section. */ @Singleton class InitCache implements InitStep { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java index 0fda842f9d..3f3ce2b2e6 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitContainer.java @@ -22,7 +22,6 @@ import com.google.gerrit.pgm.init.api.ConsoleUI; import com.google.gerrit.pgm.init.api.InitStep; import com.google.gerrit.pgm.init.api.Section; import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.internal.storage.file.LockFile; @@ -34,6 +33,8 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.OutputStream; +import javax.inject.Inject; + /** Initialize the {@code container} configuration section. */ @Singleton class InitContainer implements InitStep { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitDatabase.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitDatabase.java index 668b307b24..bd2eff5b3f 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitDatabase.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitDatabase.java @@ -24,7 +24,6 @@ import com.google.gerrit.pgm.init.api.Section; import com.google.gerrit.server.config.SitePaths; import com.google.inject.Binding; import com.google.inject.Guice; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Singleton; @@ -36,6 +35,8 @@ import java.lang.annotation.Annotation; import java.util.List; import java.util.Set; +import javax.inject.Inject; + /** Initialize the {@code database} configuration section. */ @Singleton class InitDatabase implements InitStep { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitGitManager.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitGitManager.java index 264031d36c..781c168b79 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitGitManager.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitGitManager.java @@ -19,11 +19,12 @@ import static com.google.gerrit.pgm.init.InitUtil.die; import com.google.gerrit.pgm.init.api.ConsoleUI; import com.google.gerrit.pgm.init.api.InitStep; import com.google.gerrit.pgm.init.api.Section; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.File; +import javax.inject.Inject; + /** Initialize the GitRepositoryManager configuration section. */ @Singleton class InitGitManager implements InitStep { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitHttpd.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitHttpd.java index 9370a1470a..84e339acbf 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitHttpd.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitHttpd.java @@ -26,7 +26,6 @@ import com.google.gerrit.pgm.init.api.InitStep; import com.google.gerrit.pgm.init.api.Section; import com.google.gerrit.server.config.SitePaths; import com.google.gwtjsonrpc.server.SignedToken; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.File; @@ -34,6 +33,8 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; +import javax.inject.Inject; + /** Initialize the {@code httpd} configuration section. */ @Singleton class InitHttpd implements InitStep { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java index b522d0724a..ddf5a3d9df 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitIndex.java @@ -22,11 +22,12 @@ import com.google.gerrit.pgm.init.api.Section; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.ChangeSchemas; import com.google.gerrit.server.index.IndexModule.IndexType; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; + /** Initialize the {@code index} configuration section. */ @Singleton class InitIndex implements InitStep { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitLabels.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitLabels.java index 5f9aadeac4..e755aa7fcf 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitLabels.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitLabels.java @@ -17,13 +17,14 @@ package com.google.gerrit.pgm.init; import com.google.gerrit.pgm.init.api.AllProjectsConfig; import com.google.gerrit.pgm.init.api.ConsoleUI; import com.google.gerrit.pgm.init.api.InitStep; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; import java.util.Arrays; +import javax.inject.Inject; + @Singleton public class InitLabels implements InitStep { private static final String KEY_LABEL = "label"; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPluginStepsLoader.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPluginStepsLoader.java index 893f00db35..d14cb60a00 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPluginStepsLoader.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPluginStepsLoader.java @@ -22,7 +22,6 @@ import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.plugins.JarPluginProvider; import com.google.gerrit.server.plugins.PluginLoader; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Singleton; @@ -40,6 +39,8 @@ import java.util.List; import java.util.jar.Attributes; import java.util.jar.JarFile; +import javax.inject.Inject; + @Singleton public class InitPluginStepsLoader { private final File pluginsDir; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java index c30d3f5f41..f5bb0c64b3 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java @@ -21,7 +21,6 @@ import com.google.gerrit.pgm.init.api.InitFlags; import com.google.gerrit.pgm.init.api.InitStep; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.plugins.JarPluginProvider; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.File; @@ -32,6 +31,8 @@ import java.util.jar.Attributes; import java.util.jar.JarFile; import java.util.jar.Manifest; +import javax.inject.Inject; + @Singleton public class InitPlugins implements InitStep { public static final String PLUGIN_DIR = "WEB-INF/plugins/"; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSendEmail.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSendEmail.java index e9cc1eda7f..f38f505b89 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSendEmail.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSendEmail.java @@ -22,9 +22,10 @@ import com.google.gerrit.pgm.init.api.InitStep; import com.google.gerrit.pgm.init.api.Section; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.mail.SmtpEmailSender.Encryption; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + /** Initialize the {@code sendemail} configuration section. */ @Singleton class InitSendEmail implements InitStep { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSshd.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSshd.java index 4dc05c5029..0b6e17aa6f 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSshd.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitSshd.java @@ -23,7 +23,6 @@ import com.google.gerrit.pgm.init.api.InitStep; import com.google.gerrit.pgm.init.api.Section; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.util.SocketUtil; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.apache.sshd.common.util.SecurityUtils; @@ -33,6 +32,8 @@ import java.io.File; import java.io.IOException; import java.net.InetSocketAddress; +import javax.inject.Inject; + /** Initialize the {@code sshd} configuration section. */ @Singleton class InitSshd implements InitStep { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java index ea8f0f11a2..ecd2593f21 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Libraries.java @@ -14,7 +14,6 @@ package com.google.gerrit.pgm.init; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -29,6 +28,8 @@ import java.io.Reader; import java.lang.reflect.Field; import java.lang.reflect.Modifier; +import javax.inject.Inject; + /** Standard {@link LibraryDownloader} instances derived from configuration. */ @Singleton class Libraries { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java index 4bf1c886d7..9c0f58ee3f 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/LibraryDownloader.java @@ -20,7 +20,6 @@ import com.google.gerrit.common.Die; import com.google.gerrit.common.IoUtil; import com.google.gerrit.pgm.init.api.ConsoleUI; import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.util.HttpSupport; @@ -43,6 +42,8 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + /** Get optional or required 3rd party library files into $site_path/lib. */ class LibraryDownloader { private final ConsoleUI ui; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java index c172e7b03b..d630f73e03 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/SitePathInitializer.java @@ -28,7 +28,6 @@ import com.google.gerrit.pgm.init.api.InitStep; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.mail.OutgoingEmail; import com.google.inject.Binding; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.TypeLiteral; @@ -36,6 +35,8 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + /** Initialize (or upgrade) an existing site. */ public class SitePathInitializer { private final ConsoleUI ui; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_x.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_x.java index 7b643082bf..4d44b6c061 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_x.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_x.java @@ -24,7 +24,6 @@ import com.google.gerrit.pgm.init.api.InitStep; import com.google.gerrit.pgm.init.api.Section; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.util.SocketUtil; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -41,6 +40,8 @@ import java.util.Arrays; import java.util.Map; import java.util.Properties; +import javax.inject.Inject; + /** Upgrade from a 2.0.x site to a 2.1 site. */ @Singleton class UpgradeFrom2_0_x implements InitStep { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/AllProjectsConfig.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/AllProjectsConfig.java index dfb2f384af..14405c1891 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/AllProjectsConfig.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/AllProjectsConfig.java @@ -18,7 +18,6 @@ import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.git.VersionedMetaData; -import com.google.inject.Inject; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.internal.storage.file.FileRepository; @@ -36,6 +35,8 @@ import org.eclipse.jgit.util.FS; import java.io.File; import java.io.IOException; +import javax.inject.Inject; + public class AllProjectsConfig extends VersionedMetaData { private final String project; private final SitePaths site; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/AllProjectsNameOnInitProvider.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/AllProjectsNameOnInitProvider.java index 956f459247..6815d8df65 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/AllProjectsNameOnInitProvider.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/AllProjectsNameOnInitProvider.java @@ -17,9 +17,10 @@ package com.google.gerrit.pgm.init.api; import com.google.common.base.MoreObjects; import com.google.common.base.Strings; import com.google.gerrit.server.config.AllProjectsNameProvider; -import com.google.inject.Inject; import com.google.inject.Provider; +import javax.inject.Inject; + public class AllProjectsNameOnInitProvider implements Provider { private final String name; diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitFlags.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitFlags.java index 6ef7071ae9..f739d25d38 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitFlags.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/InitFlags.java @@ -16,7 +16,6 @@ package com.google.gerrit.pgm.init.api; import com.google.common.annotations.VisibleForTesting; import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -26,6 +25,8 @@ import org.eclipse.jgit.util.FS; import java.io.IOException; import java.util.List; +import javax.inject.Inject; + /** Global variables used by the 'init' command. */ @Singleton public class InitFlags { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/Section.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/Section.java index a376bb761f..3f3436aaf3 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/Section.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/api/Section.java @@ -17,7 +17,6 @@ package com.google.gerrit.pgm.init.api; import com.google.gerrit.common.Nullable; import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.io.File; @@ -25,6 +24,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Set; +import javax.inject.Inject; + /** Helper to edit a section of the configuration files. */ public class Section { public interface Factory { diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/BatchProgramModule.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/BatchProgramModule.java index 8f9f1f417e..89fc55760a 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/BatchProgramModule.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/BatchProgramModule.java @@ -46,13 +46,14 @@ import com.google.gerrit.server.project.ProjectCacheImpl; import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.SectionSortCache; import com.google.gerrit.server.query.change.ChangeData; -import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.TypeLiteral; import com.google.inject.util.Providers; import java.util.List; +import javax.inject.Inject; + /** * Module for programs that perform batch operations on a site. *

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/LogFileCompressor.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/LogFileCompressor.java index db74ac35de..d07a682f4d 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/LogFileCompressor.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/LogFileCompressor.java @@ -20,7 +20,6 @@ import com.google.gerrit.extensions.events.LifecycleListener; import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.git.WorkQueue; -import com.google.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,6 +32,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.zip.GZIPOutputStream; +import javax.inject.Inject; + /** Compresses the old error logs. */ public class LogFileCompressor implements Runnable { private static final Logger log = diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/PerThreadReviewDbModule.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/PerThreadReviewDbModule.java index eb12937931..3b21da1b88 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/PerThreadReviewDbModule.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/PerThreadReviewDbModule.java @@ -20,13 +20,14 @@ import com.google.gerrit.lifecycle.LifecycleModule; 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.Provider; import com.google.inject.ProvisionException; import java.util.Collections; import java.util.List; +import javax.inject.Inject; + /** * Module to bind a single {@link ReviewDb} instance per thread. *

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteLibraryBasedDataSourceProvider.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteLibraryBasedDataSourceProvider.java index 85691122f9..b528525f44 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteLibraryBasedDataSourceProvider.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteLibraryBasedDataSourceProvider.java @@ -19,13 +19,13 @@ import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.schema.DataSourceProvider; import com.google.gerrit.server.schema.DataSourceType; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; import java.io.File; +import javax.inject.Inject; import javax.sql.DataSource; /** Loads the site library if not yet loaded. */ diff --git a/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/src/main/java/HelloMenu.java b/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/src/main/java/HelloMenu.java index f3c8dea0d6..fffe6f2692 100644 --- a/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/src/main/java/HelloMenu.java +++ b/gerrit-plugin-gwt-archetype/src/main/resources/archetype-resources/src/main/java/HelloMenu.java @@ -16,7 +16,7 @@ package ${package}; import com.google.gerrit.extensions.annotations.PluginName; import com.google.gerrit.extensions.webui.TopMenu; -import com.google.inject.Inject; +import javax.inject.Inject; import java.util.ArrayList; import java.util.Collections; diff --git a/gerrit-server/src/main/java/com/google/gerrit/audit/AuditService.java b/gerrit-server/src/main/java/com/google/gerrit/audit/AuditService.java index 4844045af7..52121e671c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/audit/AuditService.java +++ b/gerrit-server/src/main/java/com/google/gerrit/audit/AuditService.java @@ -18,7 +18,6 @@ import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountGroupById; import com.google.gerrit.reviewdb.client.AccountGroupMember; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.slf4j.Logger; @@ -26,6 +25,8 @@ import org.slf4j.LoggerFactory; import java.util.Collection; +import javax.inject.Inject; + @Singleton public class AuditService { private static final Logger log = LoggerFactory.getLogger(AuditService.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java b/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java index 973149c6d7..b3dd28a74c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java +++ b/gerrit-server/src/main/java/com/google/gerrit/common/ChangeHookRunner.java @@ -54,7 +54,6 @@ import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.server.project.ProjectState; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; @@ -84,6 +83,8 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import javax.inject.Inject; + /** Spawns local executables when a hook action occurs. */ @Singleton public class ChangeHookRunner implements ChangeHooks, LifecycleListener { diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/PrologCompiler.java b/gerrit-server/src/main/java/com/google/gerrit/rules/PrologCompiler.java index 7f6bff4d57..3e64530bfc 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/rules/PrologCompiler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/rules/PrologCompiler.java @@ -19,7 +19,6 @@ import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.util.TimeUtil; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.googlecode.prolog_cafe.compiler.CompileException; @@ -46,6 +45,7 @@ import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; import java.util.jar.Manifest; +import javax.inject.Inject; import javax.tools.Diagnostic; import javax.tools.DiagnosticCollector; import javax.tools.JavaCompiler; diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java b/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java index 029a5d7dfb..d5d97197c1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java +++ b/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java @@ -20,7 +20,6 @@ import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.patch.PatchListCache; import com.google.gerrit.server.patch.PatchSetInfoFactory; import com.google.gerrit.server.project.ProjectCache; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.assistedinject.Assisted; @@ -39,6 +38,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import javax.inject.Inject; + /** * Per-thread Prolog interpreter. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/RulesCache.java b/gerrit-server/src/main/java/com/google/gerrit/rules/RulesCache.java index 5dea6a216d..46b3d14181 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/rules/RulesCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/rules/RulesCache.java @@ -24,7 +24,6 @@ import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.inject.Inject; import com.google.inject.Singleton; import com.googlecode.prolog_cafe.compiler.CompileException; @@ -62,6 +61,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.inject.Inject; + /** * Manages a cache of compiled Prolog rules. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/AnonymousUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/AnonymousUser.java index ff09df5674..5657774645 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/AnonymousUser.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/AnonymousUser.java @@ -20,12 +20,13 @@ import com.google.gerrit.server.account.CapabilityControl; import com.google.gerrit.server.account.GroupMembership; import com.google.gerrit.server.account.ListGroupMembership; import com.google.gerrit.server.group.SystemGroupBackend; -import com.google.inject.Inject; import java.util.Collection; import java.util.Collections; import java.util.Set; +import javax.inject.Inject; + /** An anonymous user who has not yet authenticated. */ public class AnonymousUser extends CurrentUser { @Inject diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalCopier.java b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalCopier.java index b74eb776ae..19d26f6eaf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalCopier.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalCopier.java @@ -37,7 +37,6 @@ import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.query.change.ChangeData; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.ObjectId; @@ -50,6 +49,8 @@ import java.util.NavigableSet; import java.util.SortedSet; import java.util.TreeMap; +import javax.inject.Inject; + /** * Copies approvals between patch sets. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java index d50736028a..135e86140e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java @@ -48,7 +48,6 @@ import com.google.gerrit.server.notedb.ReviewerState; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.sql.Timestamp; @@ -59,6 +58,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + /** * Utility functions to manipulate patchset approvals. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeMessagesUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeMessagesUtil.java index 6a4421992f..6b4b75ba11 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeMessagesUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeMessagesUtil.java @@ -22,12 +22,13 @@ import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gerrit.server.notedb.NotesMigration; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.Collections; import java.util.List; +import javax.inject.Inject; + /** * Utility functions to manipulate ChangeMessages. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java index bf1f869fbd..bc0d6c1dd9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java @@ -52,7 +52,6 @@ import com.google.gerrit.server.util.MagicBranch; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.OrmConcurrencyException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -83,6 +82,8 @@ import java.util.Date; import java.util.List; import java.util.Map; +import javax.inject.Inject; + @Singleton public class ChangeUtil { /** diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java index 2d9bbb91bf..276f305ed6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java @@ -15,7 +15,6 @@ package com.google.gerrit.server; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -23,6 +22,8 @@ import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.UserConfig; +import javax.inject.Inject; + /** Provides {@link PersonIdent} annotated with {@link GerritPersonIdent}. */ @Singleton public class GerritPersonIdentProvider implements Provider { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java index bb16710262..7e99986a6d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java @@ -37,7 +37,6 @@ import com.google.gerrit.server.config.DisableReverseDnsLookup; import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; -import com.google.inject.Inject; import com.google.inject.OutOfScopeException; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -60,6 +59,8 @@ import java.util.List; import java.util.Set; import java.util.TimeZone; +import javax.inject.Inject; + /** An authenticated user. */ public class IdentifiedUser extends CurrentUser { /** Create an IdentifiedUser, ignoring any per-request state. */ diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/InternalUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/InternalUser.java index 6f5618bb7b..ef1a5c8d2e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/InternalUser.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/InternalUser.java @@ -18,12 +18,13 @@ import com.google.gerrit.reviewdb.client.AccountProjectWatch; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.server.account.CapabilityControl; import com.google.gerrit.server.account.GroupMembership; -import com.google.inject.Inject; import java.util.Collection; import java.util.Collections; import java.util.Set; +import javax.inject.Inject; + /** * User identity for plugin code that needs an identity. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java b/gerrit-server/src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java index 5263c6b38d..6c5dc747d2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/MimeUtilFileTypeRegistry.java @@ -16,7 +16,6 @@ package com.google.gerrit.server; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.util.HostPlatform; -import com.google.inject.Inject; import com.google.inject.Singleton; import eu.medsea.mimeutil.MimeException; @@ -35,6 +34,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import javax.inject.Inject; + @Singleton public class MimeUtilFileTypeRegistry implements FileTypeRegistry { private static final String KEY_SAFE = "safe"; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java index e8420b9cbc..36c835b930 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/PatchLineCommentsUtil.java @@ -39,7 +39,6 @@ import com.google.gerrit.server.patch.PatchListCache; import com.google.gerrit.server.patch.PatchListNotAvailableException; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.ObjectId; @@ -53,6 +52,8 @@ import java.util.Collections; import java.util.List; import java.util.Set; +import javax.inject.Inject; + /** * Utility functions to manipulate PatchLineComments. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/PeerDaemonUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/PeerDaemonUser.java index 4d26f024e9..d12d19261d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/PeerDaemonUser.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/PeerDaemonUser.java @@ -18,7 +18,6 @@ import com.google.gerrit.reviewdb.client.AccountProjectWatch; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.server.account.CapabilityControl; import com.google.gerrit.server.account.GroupMembership; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.net.SocketAddress; @@ -26,6 +25,8 @@ import java.util.Collection; import java.util.Collections; import java.util.Set; +import javax.inject.Inject; + /** Identity of a peer daemon process that isn't this JVM. */ public class PeerDaemonUser extends CurrentUser { /** Magic username used by peers when they authenticate. */ diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/PluginUser.java b/gerrit-server/src/main/java/com/google/gerrit/server/PluginUser.java index 490ab07c26..1bd9604a24 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/PluginUser.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/PluginUser.java @@ -15,9 +15,10 @@ package com.google.gerrit.server; import com.google.gerrit.server.account.CapabilityControl; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import javax.inject.Inject; + /** User identity for plugin code that needs an identity. */ public class PluginUser extends InternalUser { public interface Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinksProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinksProvider.java index b9d573a0a6..07ed5b28be 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinksProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinksProvider.java @@ -19,9 +19,10 @@ import com.google.gerrit.extensions.webui.BranchWebLink; import com.google.gerrit.extensions.webui.FileWebLink; import com.google.gerrit.extensions.webui.PatchSetWebLink; import com.google.gerrit.extensions.webui.ProjectWebLink; -import com.google.inject.Inject; import com.google.inject.Provider; +import javax.inject.Inject; + public class WebLinksProvider implements Provider { private final DynamicSet patchSetLinks; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/access/AccessCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/access/AccessCollection.java index aa04b33235..13986d2c83 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/access/AccessCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/access/AccessCollection.java @@ -20,10 +20,11 @@ import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestCollection; import com.google.gerrit.extensions.restapi.RestView; import com.google.gerrit.extensions.restapi.TopLevelResource; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class AccessCollection implements RestCollection { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java b/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java index 5d651aedb6..480848026a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java @@ -44,7 +44,6 @@ import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.server.project.ProjectJson; import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.project.RefControl; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -57,6 +56,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + public class ListAccess implements RestReadView { @Option(name = "--project", aliases = {"-p"}, metaVar = "PROJECT", diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java index 4827ed5d52..bc42e6ed83 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountByEmailCacheImpl.java @@ -23,7 +23,6 @@ import com.google.gerrit.reviewdb.client.AccountExternalId; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.cache.CacheModule; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Singleton; import com.google.inject.TypeLiteral; @@ -36,6 +35,8 @@ import java.util.Collections; import java.util.Set; import java.util.concurrent.ExecutionException; +import javax.inject.Inject; + /** Translates an email address to a set of matching accounts. */ @Singleton public class AccountByEmailCacheImpl implements AccountByEmailCache { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java index a521840bfd..57bcea8f28 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java @@ -27,7 +27,6 @@ import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.util.TimeUtil; 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.Singleton; import com.google.inject.TypeLiteral; @@ -42,6 +41,8 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.ExecutionException; +import javax.inject.Inject; + /** Caches important (but small) account state to avoid database hits. */ @Singleton public class AccountCacheImpl implements AccountCache { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java index 825bd3b1f2..5848005de4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java @@ -25,12 +25,13 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.git.AccountsSection; import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gerrit.server.project.ProjectCache; -import com.google.inject.Inject; import com.google.inject.Provider; import java.util.HashSet; import java.util.Set; +import javax.inject.Inject; + /** Access control management for one account's access to other accounts. */ public class AccountControl { public static class Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfo.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfo.java index 97abbf65f3..4120481f08 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfo.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfo.java @@ -22,7 +22,6 @@ import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.server.account.AccountDirectory.DirectoryException; import com.google.gerrit.server.account.AccountDirectory.FillOptions; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.util.Collection; @@ -32,6 +31,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + public class AccountInfo { public static class Loader { private static final Set DETAILED_OPTIONS = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfoCacheFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfoCacheFactory.java index 32781f0c95..0c37c6faa7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfoCacheFactory.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountInfoCacheFactory.java @@ -17,13 +17,14 @@ package com.google.gerrit.server.account; import com.google.gerrit.common.data.AccountInfo; import com.google.gerrit.common.data.AccountInfoCache; import com.google.gerrit.reviewdb.client.Account; -import com.google.inject.Inject; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.inject.Inject; + /** Efficiently builds an {@link AccountInfoCache}. */ public class AccountInfoCacheFactory { public interface Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java index e31e2e6bcb..cd6555c16a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java @@ -30,7 +30,6 @@ import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.util.TimeUtil; 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; @@ -39,6 +38,8 @@ import org.slf4j.LoggerFactory; import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; +import javax.inject.Inject; + /** Tracks authentication related details for user accounts. */ @Singleton public class AccountManager { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java index 558f8c0e86..b17371d425 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java @@ -19,7 +19,6 @@ import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountExternalId; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -30,6 +29,8 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.inject.Inject; + @Singleton public class AccountResolver { private final Realm realm; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountVisibilityProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountVisibilityProvider.java index d7f7a196ed..1f5fc0b4ff 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountVisibilityProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountVisibilityProvider.java @@ -15,13 +15,14 @@ package com.google.gerrit.server.account; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.lib.Config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.inject.Inject; + public class AccountVisibilityProvider implements Provider { private static final Logger log = LoggerFactory.getLogger(AccountVisibilityProvider.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsCollection.java index 5ef745b27f..2bd5d3a919 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsCollection.java @@ -28,10 +28,11 @@ import com.google.gerrit.server.AnonymousUser; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class AccountsCollection implements RestCollection, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AddSshKey.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/AddSshKey.java index 58c674cf13..f84499134b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/AddSshKey.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/AddSshKey.java @@ -33,7 +33,6 @@ import com.google.gerrit.server.account.GetSshKeys.SshKeyInfo; import com.google.gerrit.server.ssh.SshKeyCache; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -41,6 +40,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.Collections; +import javax.inject.Inject; + @Singleton public class AddSshKey implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/Capabilities.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/Capabilities.java index 95338fe82e..f035dfbf75 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/Capabilities.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/Capabilities.java @@ -23,10 +23,11 @@ import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestView; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.AccountResource.Capability; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton class Capabilities implements ChildCollection { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/CapabilityControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/CapabilityControl.java index 631256a661..d3c9f042a0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/CapabilityControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/CapabilityControl.java @@ -28,7 +28,6 @@ import com.google.gerrit.server.PeerDaemonUser; import com.google.gerrit.server.git.QueueProvider; import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gerrit.server.project.ProjectCache; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.util.ArrayList; @@ -37,6 +36,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.inject.Inject; + /** Access control management for server-wide capabilities. */ public class CapabilityControl { public static interface Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/ChangeUserName.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/ChangeUserName.java index 6dd51e1a0e..28b909263e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/ChangeUserName.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/ChangeUserName.java @@ -27,7 +27,6 @@ import com.google.gerrit.server.ssh.SshKeyCache; import com.google.gwtjsonrpc.common.VoidResult; import com.google.gwtorm.server.OrmDuplicateKeyException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -37,6 +36,8 @@ import java.util.Collections; import java.util.concurrent.Callable; import java.util.regex.Pattern; +import javax.inject.Inject; + /** Operation to change the username of an account. */ public class ChangeUserName implements Callable { private static final Pattern USER_NAME_PATTERN = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateAccount.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateAccount.java index 7537c7090b..f3d2173c4f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateAccount.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateAccount.java @@ -40,7 +40,6 @@ import com.google.gerrit.server.ssh.SshKeyCache; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.OrmDuplicateKeyException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -50,6 +49,8 @@ import java.util.Collections; import java.util.List; import java.util.Set; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.CREATE_ACCOUNT) public class CreateAccount implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateEmail.java index 441213d1e1..f42f5cc7f8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateEmail.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateEmail.java @@ -32,7 +32,6 @@ import com.google.gerrit.server.account.GetEmails.EmailInfo; import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.mail.RegisterNewEmailSender; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -40,6 +39,8 @@ import org.apache.commons.validator.routines.EmailValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.inject.Inject; + public class CreateEmail implements RestModifyView { private final Logger log = LoggerFactory.getLogger(getClass()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java index 938d940ac6..e13c64cfc5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java @@ -19,11 +19,12 @@ import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AuthType; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.config.AuthConfig; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.Set; +import javax.inject.Inject; + @Singleton public class DefaultRealm implements Realm { private final EmailExpander emailExpander; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteActive.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteActive.java index abdaf2394e..a7c2579026 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteActive.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteActive.java @@ -23,12 +23,13 @@ import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.account.DeleteActive.Input; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.Collections; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.MODIFY_ACCOUNT) @Singleton public class DeleteActive implements RestModifyView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteEmail.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteEmail.java index f1e02bd57b..7ba98b7bea 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteEmail.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteEmail.java @@ -27,10 +27,11 @@ import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.DeleteEmail.Input; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class DeleteEmail implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteSshKey.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteSshKey.java index 7df1848fa1..305d01ed3f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteSshKey.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteSshKey.java @@ -20,12 +20,13 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.account.DeleteSshKey.Input; import com.google.gerrit.server.ssh.SshKeyCache; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.Collections; +import javax.inject.Inject; + @Singleton public class DeleteSshKey implements RestModifyView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/Emails.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/Emails.java index a1785628e6..5a1ceb7cb7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/Emails.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/Emails.java @@ -23,10 +23,11 @@ import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestView; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.AccountResource.Email; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class Emails implements ChildCollection, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAccount.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAccount.java index 200595f92d..2a8ea58829 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAccount.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAccount.java @@ -16,9 +16,10 @@ package com.google.gerrit.server.account; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class GetAccount implements RestReadView { private final AccountInfo.Loader.Factory infoFactory; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatar.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatar.java index a96e713816..430f01a955 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatar.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatar.java @@ -21,12 +21,13 @@ import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.avatar.AvatarProvider; -import com.google.inject.Inject; import org.kohsuke.args4j.Option; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + class GetAvatar implements RestReadView { private final DynamicItem avatarProvider; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatarChangeUrl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatarChangeUrl.java index ccff183da0..a3900227f4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatarChangeUrl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatarChangeUrl.java @@ -19,9 +19,10 @@ import com.google.gerrit.extensions.registration.DynamicItem; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.avatar.AvatarProvider; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class GetAvatarChangeUrl implements RestReadView { private final DynamicItem avatarProvider; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetCapabilities.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetCapabilities.java index 4ac65ecbc6..32aac8c651 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetCapabilities.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetCapabilities.java @@ -48,7 +48,6 @@ import com.google.gerrit.server.OutputFormat; import com.google.gerrit.server.account.AccountResource.Capability; import com.google.gerrit.server.git.QueueProvider; import com.google.gson.reflect.TypeToken; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -58,6 +57,8 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + class GetCapabilities implements RestReadView { @Deprecated @Option(name = "--format", usage = "(deprecated) output format") diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDiffPreferences.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDiffPreferences.java index 7169e91af8..ecd13343a8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDiffPreferences.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDiffPreferences.java @@ -23,10 +23,11 @@ import com.google.gerrit.reviewdb.client.AccountDiffPreference.Whitespace; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class GetDiffPreferences implements RestReadView { private final Provider self; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetEmails.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetEmails.java index bf9c9ecfe3..5801fca9aa 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetEmails.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetEmails.java @@ -19,7 +19,6 @@ import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.CurrentUser; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -27,6 +26,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import javax.inject.Inject; + @Singleton public class GetEmails implements RestReadView { private final Provider self; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetGroups.java index d335add1d6..83c6a32ebf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetGroups.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetGroups.java @@ -23,11 +23,12 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.group.GroupJson; import com.google.gerrit.server.group.GroupJson.GroupInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.List; +import javax.inject.Inject; + @Singleton public class GetGroups implements RestReadView { private final GroupControl.Factory groupControlFactory; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetHttpPassword.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetHttpPassword.java index e0800151b9..9b9059e7e2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetHttpPassword.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetHttpPassword.java @@ -18,10 +18,11 @@ import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.CurrentUser; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class GetHttpPassword implements RestReadView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java index 914f1590ac..57f8a28612 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java @@ -34,7 +34,6 @@ import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -48,6 +47,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + @Singleton public class GetPreferences implements RestReadView { private static final Logger log = LoggerFactory.getLogger(GetPreferences.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetSshKeys.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetSshKeys.java index 68464707fe..c7e78d8d73 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetSshKeys.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetSshKeys.java @@ -23,12 +23,13 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.List; +import javax.inject.Inject; + @Singleton public class GetSshKeys implements RestReadView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetUsername.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetUsername.java index 41622cfc19..c3a73e7186 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetUsername.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetUsername.java @@ -18,10 +18,11 @@ import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.CurrentUser; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class GetUsername implements RestReadView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java index b33e3f7b43..db4484bf56 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java @@ -24,7 +24,6 @@ import com.google.gerrit.server.cache.CacheModule; import com.google.gwtorm.server.OrmDuplicateKeyException; 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.Singleton; import com.google.inject.TypeLiteral; @@ -37,6 +36,8 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; +import javax.inject.Inject; + /** Tracks group objects in memory for efficient access. */ @Singleton public class GroupCacheImpl implements GroupCache { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java index ede2431f54..a63f08b11e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java @@ -22,10 +22,11 @@ import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.InternalUser; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + /** Access control management for a group of accounts managed in Gerrit. */ public class GroupControl { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupDetailFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupDetailFactory.java index 889addf2ad..9acba1296b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupDetailFactory.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupDetailFactory.java @@ -24,7 +24,6 @@ import com.google.gerrit.reviewdb.client.AccountGroupById; import com.google.gerrit.reviewdb.client.AccountGroupMember; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.util.ArrayList; @@ -33,6 +32,8 @@ import java.util.Comparator; import java.util.List; import java.util.concurrent.Callable; +import javax.inject.Inject; + public class GroupDetailFactory implements Callable { public interface Factory { GroupDetailFactory create(AccountGroup.Id groupId); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java index 37d407c2c8..7a3930f735 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java @@ -23,7 +23,6 @@ import com.google.gerrit.reviewdb.client.AccountGroupById; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.cache.CacheModule; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Singleton; import com.google.inject.TypeLiteral; @@ -37,6 +36,8 @@ import java.util.List; import java.util.Set; import java.util.concurrent.ExecutionException; +import javax.inject.Inject; + /** Tracks group inclusions in memory for efficient access. */ @Singleton public class GroupIncludeCacheImpl implements GroupIncludeCache { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupInfoCacheFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupInfoCacheFactory.java index e346801011..a56cddb8f4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupInfoCacheFactory.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupInfoCacheFactory.java @@ -18,10 +18,11 @@ import com.google.common.collect.Maps; import com.google.gerrit.common.data.GroupDescription; import com.google.gerrit.common.data.GroupInfoCache; import com.google.gerrit.reviewdb.client.AccountGroup; -import com.google.inject.Inject; import java.util.Map; +import javax.inject.Inject; + /** Efficiently builds a {@link GroupInfoCache}. */ public class GroupInfoCacheFactory { public interface Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java index 3fe9d2560f..394883e372 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java @@ -26,7 +26,6 @@ import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.io.IOException; @@ -34,6 +33,8 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; +import javax.inject.Inject; + public class GroupMembers { public interface Factory { GroupMembers create(CurrentUser currentUser); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/IncludingGroupMembership.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/IncludingGroupMembership.java index 7ef0b0cdbc..f413a8917f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/IncludingGroupMembership.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/IncludingGroupMembership.java @@ -20,13 +20,14 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.IdentifiedUser; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + /** * Group membership checker for the internal group system. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalAccountDirectory.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalAccountDirectory.java index 1e3e4b11db..0260b48268 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalAccountDirectory.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalAccountDirectory.java @@ -27,12 +27,13 @@ import com.google.gerrit.server.account.AccountInfo.AvatarInfo; import com.google.gerrit.server.avatar.AvatarProvider; import com.google.gwtorm.server.OrmException; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.Set; +import javax.inject.Inject; + @Singleton public class InternalAccountDirectory extends AccountDirectory { public static class Module extends AbstractModule { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java index a70f9429a2..c9268b912a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java @@ -24,11 +24,12 @@ import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.project.ProjectControl; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.Collection; +import javax.inject.Inject; + /** Implementation of GroupBackend for the internal group system. */ @Singleton public class InternalGroupBackend implements GroupBackend { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PerformCreateGroup.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/PerformCreateGroup.java index bd533aa174..97522b2bb6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/PerformCreateGroup.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/PerformCreateGroup.java @@ -27,7 +27,6 @@ import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.IdentifiedUser; import com.google.gwtorm.server.OrmDuplicateKeyException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.eclipse.jgit.lib.PersonIdent; @@ -37,6 +36,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import javax.inject.Inject; + public class PerformCreateGroup { public interface Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PerformRenameGroup.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/PerformRenameGroup.java index 3623cc3f47..349f4e49f0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/PerformRenameGroup.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/PerformRenameGroup.java @@ -24,13 +24,14 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.git.RenameGroupOp; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import java.util.Collections; import java.util.Date; import java.util.TimeZone; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + public class PerformRenameGroup { public interface Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutActive.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutActive.java index c7a63e59a5..7f4792299c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutActive.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutActive.java @@ -23,12 +23,13 @@ import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.account.PutActive.Input; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.Collections; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.MODIFY_ACCOUNT) @Singleton public class PutActive implements RestModifyView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutHttpPassword.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutHttpPassword.java index 93b35c674e..7cb37193ea 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutHttpPassword.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutHttpPassword.java @@ -28,7 +28,6 @@ import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.PutHttpPassword.Input; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -38,6 +37,8 @@ import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Collections; +import javax.inject.Inject; + @Singleton public class PutHttpPassword implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutName.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutName.java index 601ee76196..b36e214397 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutName.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutName.java @@ -32,12 +32,13 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.PutName.Input; import com.google.gerrit.server.auth.ldap.LdapRealm; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.Collections; +import javax.inject.Inject; + @Singleton public class PutName implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutPreferred.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutPreferred.java index c49e3be0da..b2f7c93f73 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutPreferred.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/PutPreferred.java @@ -24,12 +24,13 @@ import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.PutPreferred.Input; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.Collections; +import javax.inject.Inject; + @Singleton public class PutPreferred implements RestModifyView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetDiffPreferences.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/SetDiffPreferences.java index d922faf08e..df5ead6f82 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetDiffPreferences.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/SetDiffPreferences.java @@ -25,12 +25,13 @@ import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.GetDiffPreferences.DiffPreferencesInfo; import com.google.gerrit.server.account.SetDiffPreferences.Input; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.Collections; +import javax.inject.Inject; + @Singleton public class SetDiffPreferences implements RestModifyView { static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetPreferences.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/SetPreferences.java index a5e02d2d2f..c4533a0d24 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetPreferences.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/SetPreferences.java @@ -40,7 +40,6 @@ import com.google.gerrit.server.account.SetPreferences.Input; import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.git.MetaDataUpdate; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -51,6 +50,8 @@ import java.io.IOException; import java.util.Collections; import java.util.List; +import javax.inject.Inject; + @Singleton public class SetPreferences implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/SshKeys.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/SshKeys.java index b35c03e4c0..b30a75f365 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/SshKeys.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/SshKeys.java @@ -24,10 +24,11 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class SshKeys implements ChildCollection { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/StarredChanges.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/StarredChanges.java index a3c0d37367..2a04a110d0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/StarredChanges.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/StarredChanges.java @@ -36,7 +36,6 @@ import com.google.gerrit.server.change.ChangesCollection; import com.google.gerrit.server.query.change.QueryChanges; import com.google.gwtorm.server.OrmDuplicateKeyException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -45,6 +44,8 @@ import org.slf4j.LoggerFactory; import java.util.Collections; +import javax.inject.Inject; + @Singleton public class StarredChanges implements ChildCollection, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/UniversalGroupBackend.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/UniversalGroupBackend.java index 1748395dda..049a615a54 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/UniversalGroupBackend.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/UniversalGroupBackend.java @@ -28,7 +28,6 @@ import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.project.ProjectControl; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.slf4j.Logger; @@ -38,6 +37,8 @@ import java.util.Collection; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + /** * Universal implementation of the GroupBackend that works with the injected * set of GroupBackends. diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/GerritApiImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/api/GerritApiImpl.java index 5f581c3d87..9ac8fda794 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/api/GerritApiImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/api/GerritApiImpl.java @@ -18,9 +18,10 @@ import com.google.gerrit.extensions.api.GerritApi; import com.google.gerrit.extensions.api.accounts.Accounts; import com.google.gerrit.extensions.api.changes.Changes; import com.google.gerrit.extensions.api.projects.Projects; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton class GerritApiImpl extends GerritApi.NotImplemented implements GerritApi { private final Accounts accounts; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountApiImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountApiImpl.java index b1fd979b70..40546a1cb7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountApiImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountApiImpl.java @@ -24,9 +24,10 @@ import com.google.gerrit.server.account.StarredChanges; import com.google.gerrit.server.change.ChangeResource; import com.google.gerrit.server.change.ChangesCollection; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import javax.inject.Inject; + public class AccountApiImpl extends AccountApi.NotImplemented implements AccountApi { interface Factory { AccountApiImpl create(AccountResource account); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountsImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountsImpl.java index 0c02c99b21..466f225dec 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountsImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountsImpl.java @@ -25,10 +25,11 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountResource; import com.google.gerrit.server.account.AccountsCollection; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class AccountsImpl extends Accounts.NotImplemented implements Accounts { private final AccountsCollection accounts; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java index 462300c850..6d41c3aace 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java @@ -39,7 +39,6 @@ import com.google.gerrit.server.change.Restore; import com.google.gerrit.server.change.Revert; import com.google.gerrit.server.change.Revisions; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -47,6 +46,8 @@ import java.io.IOException; import java.util.EnumSet; import java.util.Set; +import javax.inject.Inject; + class ChangeApiImpl extends ChangeApi.NotImplemented implements ChangeApi { interface Factory { ChangeApiImpl create(ChangeResource change); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangesImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangesImpl.java index db72c9cffa..ce245fc4e2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangesImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangesImpl.java @@ -36,13 +36,14 @@ import com.google.gerrit.server.change.CreateChange; import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gerrit.server.query.change.QueryChanges; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; import java.util.List; +import javax.inject.Inject; + @Singleton class ChangesImpl implements Changes { private final ChangesCollection changes; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java index c709b3488b..7dd0611de6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java @@ -37,13 +37,14 @@ import com.google.gerrit.server.change.RevisionResource; import com.google.gerrit.server.change.Submit; import com.google.gerrit.server.changedetail.RebaseChange; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; import java.io.IOException; import java.util.Set; +import javax.inject.Inject; + class RevisionApiImpl extends RevisionApi.NotImplemented implements RevisionApi { interface Factory { RevisionApiImpl create(RevisionResource r); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/BranchApiImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/BranchApiImpl.java index f4dc67e6bc..f00bbc345f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/BranchApiImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/BranchApiImpl.java @@ -19,11 +19,12 @@ import com.google.gerrit.extensions.api.projects.BranchInput; import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.server.project.CreateBranch; import com.google.gerrit.server.project.ProjectResource; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.io.IOException; +import javax.inject.Inject; + public class BranchApiImpl extends BranchApi.NotImplemented implements BranchApi { interface Factory { BranchApiImpl create(ProjectResource project, String ref); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/ProjectsImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/ProjectsImpl.java index 86baa1ebb7..0e53a09732 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/ProjectsImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/ProjectsImpl.java @@ -22,13 +22,14 @@ import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.extensions.restapi.UnprocessableEntityException; import com.google.gerrit.server.project.ListProjects; import com.google.gerrit.server.project.ProjectsCollection; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; import java.util.List; +import javax.inject.Inject; + @Singleton class ProjectsImpl extends Projects.NotImplemented implements Projects { private final ProjectsCollection projects; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java index bf74a4afbd..d25a1d884f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.args4j; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.account.GroupCache; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.kohsuke.args4j.CmdLineException; @@ -26,6 +25,8 @@ import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; +import javax.inject.Inject; + public class AccountGroupIdHandler extends OptionHandler { private final GroupCache groupCache; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java index 406ca58b6d..800127181f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java @@ -18,7 +18,6 @@ import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.account.GroupBackends; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.kohsuke.args4j.CmdLineException; @@ -28,6 +27,8 @@ import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; +import javax.inject.Inject; + public class AccountGroupUUIDHandler extends OptionHandler { private final GroupBackend groupBackend; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountIdHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountIdHandler.java index 8e71b88782..4316c66ad0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountIdHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountIdHandler.java @@ -22,7 +22,6 @@ import com.google.gerrit.server.account.AccountResolver; import com.google.gerrit.server.account.AuthRequest; import com.google.gerrit.server.config.AuthConfig; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.kohsuke.args4j.CmdLineException; @@ -32,6 +31,8 @@ import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; +import javax.inject.Inject; + public class AccountIdHandler extends OptionHandler { private final AccountResolver accountResolver; private final AccountManager accountManager; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ChangeIdHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ChangeIdHandler.java index 9c3d052372..4a9d787053 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ChangeIdHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ChangeIdHandler.java @@ -19,7 +19,6 @@ import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.kohsuke.args4j.CmdLineException; @@ -29,6 +28,8 @@ import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; +import javax.inject.Inject; + public class ChangeIdHandler extends OptionHandler { @Inject diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ObjectIdHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ObjectIdHandler.java index b7f2fb9232..40e3f40251 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ObjectIdHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ObjectIdHandler.java @@ -14,7 +14,6 @@ package com.google.gerrit.server.args4j; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.eclipse.jgit.lib.ObjectId; @@ -25,6 +24,8 @@ import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; +import javax.inject.Inject; + public class ObjectIdHandler extends OptionHandler { @Inject diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java index a48568f9fc..beedac37cc 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.args4j; import com.google.gerrit.reviewdb.client.PatchSet; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.kohsuke.args4j.CmdLineException; @@ -25,6 +24,8 @@ import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; +import javax.inject.Inject; + public class PatchSetIdHandler extends OptionHandler { @Inject diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectControlHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectControlHandler.java index 8771c23def..af1128c2d3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectControlHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectControlHandler.java @@ -19,7 +19,6 @@ import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -34,6 +33,8 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import javax.inject.Inject; + public class ProjectControlHandler extends OptionHandler { private static final Logger log = LoggerFactory .getLogger(ProjectControlHandler.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SocketAddressHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SocketAddressHandler.java index 0c20b2d61b..ee3cd3a5b1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SocketAddressHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SocketAddressHandler.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.args4j; import com.google.gerrit.server.util.SocketUtil; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.kohsuke.args4j.CmdLineException; @@ -27,6 +26,8 @@ import org.kohsuke.args4j.spi.Setter; import java.net.SocketAddress; +import javax.inject.Inject; + public class SocketAddressHandler extends OptionHandler { @Inject diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SubcommandHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SubcommandHandler.java index 619ec1f6b7..48198f0312 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SubcommandHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SubcommandHandler.java @@ -14,7 +14,6 @@ package com.google.gerrit.server.args4j; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.kohsuke.args4j.CmdLineException; @@ -24,6 +23,8 @@ import org.kohsuke.args4j.spi.OptionHandler; import org.kohsuke.args4j.spi.Parameters; import org.kohsuke.args4j.spi.Setter; +import javax.inject.Inject; + public class SubcommandHandler extends OptionHandler { @Inject diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/TimestampHandler.java b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/TimestampHandler.java index 8dd42703e1..23dfe1fe77 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/TimestampHandler.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/args4j/TimestampHandler.java @@ -14,7 +14,6 @@ package com.google.gerrit.server.args4j; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.kohsuke.args4j.CmdLineException; @@ -30,6 +29,8 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.TimeZone; +import javax.inject.Inject; + public class TimestampHandler extends OptionHandler { public final static String TIMESTAMP_FORMAT = "yyyyMMdd_HHmm"; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/InternalAuthBackend.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/InternalAuthBackend.java index 0b4baf2432..0e36eafe15 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/InternalAuthBackend.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/InternalAuthBackend.java @@ -18,11 +18,12 @@ import com.google.common.base.Strings; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; import com.google.gerrit.server.config.AuthConfig; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.Locale; +import javax.inject.Inject; + @Singleton public class InternalAuthBackend implements AuthBackend { private final AccountCache accountCache; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java index cc61695faa..38f4a476b8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java @@ -25,7 +25,6 @@ import com.google.gerrit.server.auth.NoSuchUserException; import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.util.ssl.BlindSSLSocketFactory; -import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.inject.name.Named; @@ -43,6 +42,7 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; import javax.naming.CompositeName; import javax.naming.Context; import javax.naming.Name; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapAuthBackend.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapAuthBackend.java index cf68a8bc39..163737875d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapAuthBackend.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapAuthBackend.java @@ -26,7 +26,6 @@ import com.google.gerrit.server.auth.UnknownUserException; import com.google.gerrit.server.auth.UserNotAllowedException; import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import org.eclipse.jgit.lib.Config; import org.slf4j.Logger; @@ -34,6 +33,7 @@ import org.slf4j.LoggerFactory; import java.util.Locale; +import javax.inject.Inject; import javax.naming.NamingException; import javax.naming.directory.DirContext; import javax.security.auth.login.LoginException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java index 7731b7de07..8d7273d292 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java @@ -35,7 +35,6 @@ import com.google.gerrit.server.account.ListGroupMembership; import com.google.gerrit.server.auth.ldap.Helper.LdapSchema; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectControl; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.name.Named; @@ -49,6 +48,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutionException; +import javax.inject.Inject; import javax.naming.InvalidNameException; import javax.naming.NamingException; import javax.naming.directory.DirContext; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java index 22c60b4ada..34900207e1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java @@ -35,7 +35,6 @@ import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.inject.name.Named; @@ -52,6 +51,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutionException; +import javax.inject.Inject; import javax.naming.CompositeName; import javax.naming.Name; import javax.naming.NamingException; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java index bb9a40b115..6c47577464 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java @@ -36,7 +36,6 @@ import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gerrit.server.project.ChangeControl; import com.google.gwtorm.server.AtomicUpdate; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -45,6 +44,8 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class Abandon implements RestModifyView, UiAction { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEdits.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEdits.java index f10d5d5315..53abf1bbbb 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEdits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEdits.java @@ -46,7 +46,6 @@ import com.google.gerrit.server.edit.ChangeEditUtil; import com.google.gerrit.server.patch.PatchListNotAvailableException; import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.assistedinject.Assisted; @@ -55,6 +54,8 @@ import org.kohsuke.args4j.Option; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class ChangeEdits implements ChildCollection, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java index 184f1a843d..169f697738 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java @@ -40,7 +40,6 @@ import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.RefControl; import com.google.gerrit.server.validators.ValidationException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -54,6 +53,8 @@ import java.util.Collections; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + public class ChangeInserter { public static interface Factory { ChangeInserter create(RefControl ctl, Change c, RevCommit rc); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java index 7b5e412fc9..2c406ab990 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java @@ -92,7 +92,6 @@ import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeData.ChangedLines; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import org.slf4j.Logger; @@ -108,6 +107,8 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; +import javax.inject.Inject; + public class ChangeJson { private static final Logger log = LoggerFactory.getLogger(ChangeJson.class); private static final List NO_MESSAGES = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java index 82e0c91729..330bfd1da5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java @@ -34,7 +34,6 @@ import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.query.change.ChangeData; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Singleton; import com.google.inject.name.Named; @@ -55,6 +54,8 @@ import java.io.Serializable; import java.util.Collection; import java.util.concurrent.ExecutionException; +import javax.inject.Inject; + public class ChangeKindCacheImpl implements ChangeKindCache { private static final Logger log = LoggerFactory.getLogger(ChangeKindCacheImpl.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangesCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangesCollection.java index 7cc3027239..eb3292c02a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangesCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangesCollection.java @@ -29,12 +29,13 @@ import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.query.change.QueryChanges; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.List; +import javax.inject.Inject; + @Singleton public class ChangesCollection implements RestCollection, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPick.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPick.java index 889ae1fab3..24ba6d2d64 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPick.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPick.java @@ -32,12 +32,13 @@ import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.project.RefControl; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class CherryPick implements RestModifyView, UiAction { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java index 158f569a19..5527d5cf47 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java @@ -41,7 +41,6 @@ import com.google.gerrit.server.project.RefControl; import com.google.gerrit.server.ssh.NoSshInfo; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -64,6 +63,8 @@ import java.io.IOException; import java.util.List; import java.util.TimeZone; +import javax.inject.Inject; + @Singleton public class CherryPickChange { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Comments.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Comments.java index c987ce8892..52143dcbf4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Comments.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Comments.java @@ -24,10 +24,11 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.PatchLineCommentsUtil; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton class Comments implements ChildCollection { private final DynamicMap> views; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CreateChange.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/CreateChange.java index 8772335291..b8fc25ad93 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/CreateChange.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/CreateChange.java @@ -48,7 +48,6 @@ import com.google.gerrit.server.project.RefControl; import com.google.gerrit.server.ssh.NoSshInfo; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -71,6 +70,8 @@ import java.sql.Timestamp; import java.util.List; import java.util.TimeZone; +import javax.inject.Inject; + @Singleton public class CreateChange implements RestModifyView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CreateDraft.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/CreateDraft.java index b025e65471..66c268c49d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/CreateDraft.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/CreateDraft.java @@ -32,7 +32,6 @@ import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gerrit.server.patch.PatchListCache; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -40,6 +39,8 @@ import java.io.IOException; import java.sql.Timestamp; import java.util.Collections; +import javax.inject.Inject; + @Singleton class CreateDraft implements RestModifyView { private final Provider db; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraft.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraft.java index f7fb3004c2..ffe215d9da 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraft.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraft.java @@ -25,13 +25,14 @@ import com.google.gerrit.server.change.DeleteDraft.Input; import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gerrit.server.patch.PatchListCache; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; import java.util.Collections; +import javax.inject.Inject; + @Singleton class DeleteDraft implements RestModifyView { static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftChange.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftChange.java index 28885db58e..3b989767fa 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftChange.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftChange.java @@ -28,7 +28,6 @@ import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.patch.PatchSetInfoFactory; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -36,6 +35,8 @@ import org.eclipse.jgit.lib.Config; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class DeleteDraftChange implements RestModifyView, UiAction { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftPatchSet.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftPatchSet.java index 46d0ed9240..3835023ea7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftPatchSet.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftPatchSet.java @@ -32,7 +32,6 @@ import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gwtorm.server.AtomicUpdate; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -40,6 +39,8 @@ import org.eclipse.jgit.lib.Config; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class DeleteDraftPatchSet implements RestModifyView, UiAction { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java index e64d3f46ea..370786a3da 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java @@ -36,13 +36,14 @@ import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; import java.util.List; +import javax.inject.Inject; + @Singleton public class DeleteReviewer implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Drafts.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Drafts.java index b0ed7d0439..11e082254c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Drafts.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Drafts.java @@ -25,10 +25,11 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.PatchLineCommentsUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton class Drafts implements ChildCollection { private final DynamicMap> views; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/EditMessage.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/EditMessage.java index af8162746f..b7fbe8e8e3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/EditMessage.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/EditMessage.java @@ -32,7 +32,6 @@ import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.errors.IncorrectObjectTypeException; @@ -41,6 +40,8 @@ import org.eclipse.jgit.lib.PersonIdent; import java.io.IOException; +import javax.inject.Inject; + @Singleton class EditMessage implements RestModifyView, UiAction { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java index 6330e3425d..c8b17d5a67 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java @@ -31,7 +31,6 @@ 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; @@ -44,6 +43,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import javax.inject.Inject; + public class EmailReviewComments implements Runnable, RequestContext { private static final Logger log = LoggerFactory.getLogger(EmailReviewComments.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java index 9a817e3f31..247e0c026f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java @@ -18,7 +18,6 @@ import com.google.gerrit.extensions.restapi.BinaryResult; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.ObjectLoader; @@ -30,6 +29,8 @@ import org.eclipse.jgit.treewalk.TreeWalk; import java.io.IOException; import java.io.OutputStream; +import javax.inject.Inject; + @Singleton public class FileContentUtil { private final GitRepositoryManager repoManager; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java index 6ae87a3faf..360805bea7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java @@ -27,13 +27,14 @@ import com.google.gerrit.server.patch.PatchListCache; import com.google.gerrit.server.patch.PatchListEntry; import com.google.gerrit.server.patch.PatchListKey; import com.google.gerrit.server.patch.PatchListNotAvailableException; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.ObjectId; import java.util.Map; +import javax.inject.Inject; + @Singleton public class FileInfoJson { private final PatchListCache patchListCache; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Files.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Files.java index 3035ce15bc..82be0eae96 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Files.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Files.java @@ -39,7 +39,6 @@ import com.google.gerrit.server.patch.PatchList; import com.google.gerrit.server.patch.PatchListCache; import com.google.gerrit.server.patch.PatchListNotAvailableException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -60,6 +59,8 @@ import java.util.Set; import java.util.SortedSet; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + @Singleton public class Files implements ChildCollection { private final DynamicMap> views; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetArchive.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetArchive.java index d602c47d6d..f8d3ddf5d0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetArchive.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetArchive.java @@ -22,7 +22,6 @@ import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.api.ArchiveCommand; @@ -44,6 +43,8 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + public class GetArchive implements RestReadView { @Singleton public static class AllowedFormats { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetChange.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetChange.java index c50a6efca5..ea0b2d7d7d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetChange.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetChange.java @@ -20,12 +20,13 @@ import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.change.ChangeJson.ChangeInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.kohsuke.args4j.Option; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + public class GetChange implements RestReadView { private final ChangeJson json; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetComment.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetComment.java index 27de91caad..65470fed20 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetComment.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetComment.java @@ -17,9 +17,10 @@ package com.google.gerrit.server.change; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.account.AccountInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton class GetComment implements RestReadView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetCommit.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetCommit.java index 2cd948e7fc..1b87432207 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetCommit.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetCommit.java @@ -21,11 +21,12 @@ import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + @Singleton public class GetCommit implements RestReadView { private final ChangeJson json; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetContent.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetContent.java index 5a73e86693..0ff398bea8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetContent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetContent.java @@ -17,11 +17,12 @@ package com.google.gerrit.server.change; import com.google.gerrit.extensions.restapi.BinaryResult; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestReadView; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class GetContent implements RestReadView { private final FileContentUtil fileContentUtil; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDetail.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDetail.java index 514c12a1c8..3f836c3bec 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDetail.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDetail.java @@ -19,10 +19,11 @@ import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.change.ChangeJson.ChangeInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.kohsuke.args4j.Option; +import javax.inject.Inject; + public class GetDetail implements RestReadView { private final GetChange delegate; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java index d3232cb743..00141b7845 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java @@ -46,7 +46,6 @@ import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.diff.Edit; @@ -65,6 +64,8 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + public class GetDiff implements RestReadView { private final ProjectCache projectCache; private final PatchScriptFactory.Factory patchScriptFactoryFactory; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDraft.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDraft.java index 12c50ae603..4bae673ddf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDraft.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDraft.java @@ -17,9 +17,10 @@ package com.google.gerrit.server.change; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.account.AccountInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton class GetDraft implements RestReadView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetPatch.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetPatch.java index 4a8be84379..03234cb39f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetPatch.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetPatch.java @@ -21,7 +21,6 @@ import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.inject.Inject; import org.eclipse.jgit.diff.DiffFormatter; import org.eclipse.jgit.lib.AbbreviatedObjectId; @@ -40,6 +39,8 @@ import java.util.Locale; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import javax.inject.Inject; + public class GetPatch implements RestReadView { private final GitRepositoryManager repoManager; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java index 077ec6f1b8..41851c13ff 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java @@ -32,7 +32,6 @@ import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.ProjectControl; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -56,6 +55,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + @Singleton public class GetRelated implements RestReadView { private static final Logger log = LoggerFactory.getLogger(GetRelated.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetReview.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetReview.java index 9f98590106..90d5d99a7b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetReview.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetReview.java @@ -19,9 +19,10 @@ import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.change.ChangeJson.ChangeInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class GetReview implements RestReadView { private final GetChange delegate; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetReviewer.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetReviewer.java index c90b3bcf59..b1015d9d59 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetReviewer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetReviewer.java @@ -17,11 +17,12 @@ package com.google.gerrit.server.change; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.change.ReviewerJson.ReviewerInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.List; +import javax.inject.Inject; + @Singleton public class GetReviewer implements RestReadView { private final ReviewerJson json; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/HashtagsUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/HashtagsUtil.java index f7d7125d01..13e0b4e74a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/HashtagsUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/HashtagsUtil.java @@ -30,7 +30,6 @@ import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.validators.HashtagValidationListener; import com.google.gerrit.server.validators.ValidationException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -40,6 +39,8 @@ import java.util.HashSet; import java.util.Set; import java.util.TreeSet; +import javax.inject.Inject; + @Singleton public class HashtagsUtil { private static final CharMatcher LEADER = WHITESPACE.or(CharMatcher.is('#')); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedIn.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedIn.java index e0cdebb89a..bb40eccf3c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedIn.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedIn.java @@ -23,7 +23,6 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.ChangeControl; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -37,6 +36,8 @@ import org.eclipse.jgit.revwalk.RevWalk; import java.io.IOException; import java.util.Collection; +import javax.inject.Inject; + @Singleton class IncludedIn implements RestReadView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Index.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Index.java index 6cf3e0029b..78aa1c2ef5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Index.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Index.java @@ -21,12 +21,13 @@ import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.change.Index.Input; import com.google.gerrit.server.index.ChangeIndexer; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @Singleton public class Index implements RestModifyView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ListComments.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ListComments.java index 146ded8ceb..604e81ba77 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ListComments.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ListComments.java @@ -20,10 +20,11 @@ import com.google.gerrit.server.PatchLineCommentsUtil; import com.google.gerrit.server.account.AccountInfo; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton class ListComments extends ListDrafts { @Inject diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ListDrafts.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ListDrafts.java index b3c36fd42c..9f473e910e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ListDrafts.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ListDrafts.java @@ -25,7 +25,6 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.PatchLineCommentsUtil; import com.google.gerrit.server.account.AccountInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -34,6 +33,8 @@ import java.util.Comparator; import java.util.List; import java.util.Map; +import javax.inject.Inject; + @Singleton class ListDrafts implements RestReadView { protected final Provider db; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ListReviewers.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ListReviewers.java index ca5a55b879..d8d2f30998 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ListReviewers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ListReviewers.java @@ -21,13 +21,14 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.ApprovalsUtil; import com.google.gerrit.server.change.ReviewerJson.ReviewerInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.List; import java.util.Map; +import javax.inject.Inject; + @Singleton class ListReviewers implements RestReadView { private final Provider dbProvider; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityChecker.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityChecker.java index 481e535473..4dc57ee296 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityChecker.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityChecker.java @@ -45,7 +45,6 @@ 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; @@ -61,6 +60,8 @@ import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; +import javax.inject.Inject; + public class MergeabilityChecker implements GitReferenceUpdatedListener { private static final Logger log = LoggerFactory .getLogger(MergeabilityChecker.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java index c17afb8e4e..6e063c9817 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java @@ -34,7 +34,6 @@ import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectCache; import com.google.gwtorm.server.AtomicUpdate; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.errors.IncorrectObjectTypeException; @@ -60,6 +59,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + public class Mergeable implements RestReadView { private static final Logger log = LoggerFactory.getLogger(Mergeable.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java index ab9244c43d..7c3c293423 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java @@ -48,7 +48,6 @@ import com.google.gerrit.server.ssh.SshInfo; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.AtomicUpdate; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.eclipse.jgit.lib.ObjectId; @@ -64,6 +63,8 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.Collections; +import javax.inject.Inject; + public class PatchSetInserter { private static final Logger log = LoggerFactory.getLogger(PatchSetInserter.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostHashtags.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostHashtags.java index fee457c5c1..25a3468547 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostHashtags.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostHashtags.java @@ -22,12 +22,13 @@ import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.server.validators.ValidationException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.IOException; import java.util.Set; +import javax.inject.Inject; + @Singleton public class PostHashtags implements RestModifyView { private HashtagsUtil hashtagsUtil; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java index 2a4d7ca89e..56ca12e57c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java @@ -60,7 +60,6 @@ import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.util.LabelVote; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import org.slf4j.Logger; @@ -74,6 +73,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + public class PostReview implements RestModifyView { private static final Logger log = LoggerFactory.getLogger(PostReview.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java index 48b8855899..fdad885818 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java @@ -53,7 +53,6 @@ import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -67,6 +66,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + @Singleton public class PostReviewers implements RestModifyView { private static final Logger log = LoggerFactory diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Publish.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Publish.java index 88da0949f6..6a4343ffcb 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Publish.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Publish.java @@ -34,7 +34,6 @@ import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException; import com.google.gwtorm.server.AtomicUpdate; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -42,6 +41,8 @@ import org.eclipse.jgit.lib.Config; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class Publish implements RestModifyView, UiAction { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PublishChangeEdit.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PublishChangeEdit.java index b511c20a66..c324d0ddb4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PublishChangeEdit.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PublishChangeEdit.java @@ -31,11 +31,12 @@ import com.google.gerrit.server.edit.ChangeEditUtil; import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class PublishChangeEdit implements ChildCollection, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PutDraft.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PutDraft.java index a3b0614eab..139fac614b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PutDraft.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PutDraft.java @@ -32,7 +32,6 @@ import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gerrit.server.patch.PatchListCache; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -40,6 +39,8 @@ import java.io.IOException; import java.sql.Timestamp; import java.util.Collections; +import javax.inject.Inject; + @Singleton class PutDraft implements RestModifyView { static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PutTopic.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PutTopic.java index 47bb485dd6..556dfe44db 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PutTopic.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PutTopic.java @@ -34,12 +34,13 @@ import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.AtomicUpdate; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class PutTopic implements RestModifyView, UiAction { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java index 63226688e8..b5e115980c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java @@ -31,12 +31,13 @@ import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class Rebase implements RestModifyView, UiAction { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeEdit.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeEdit.java index 8fccfb8c66..d4d9999b00 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeEdit.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeEdit.java @@ -33,12 +33,13 @@ import com.google.gerrit.server.edit.ChangeEditModifier; import com.google.gerrit.server.edit.ChangeEditUtil; import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class RebaseChangeEdit implements ChildCollection, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Restore.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Restore.java index 88e2137371..a8aac17319 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Restore.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Restore.java @@ -36,7 +36,6 @@ import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gerrit.server.project.ChangeControl; import com.google.gwtorm.server.AtomicUpdate; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -45,6 +44,8 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class Restore implements RestModifyView, UiAction { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java index 326c8721d9..6f5c7b49f9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java @@ -34,13 +34,14 @@ import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.ssh.NoSshInfo; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.PersonIdent; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class Revert implements RestModifyView, UiAction { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewed.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewed.java index 120a414fcc..7a92da88f6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewed.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewed.java @@ -20,12 +20,13 @@ import com.google.gerrit.reviewdb.client.AccountPatchReview; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gwtorm.server.OrmDuplicateKeyException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.Collections; +import javax.inject.Inject; + public class Reviewed { public static class Input { } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java index 4612c9672b..f60b959ec4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java @@ -33,7 +33,6 @@ import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.query.change.ChangeData; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -42,6 +41,8 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; +import javax.inject.Inject; + @Singleton public class ReviewerJson { private final Provider db; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerSuggestionCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerSuggestionCache.java index e45814511e..0d00841262 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerSuggestionCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerSuggestionCache.java @@ -20,7 +20,6 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableList; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.server.ReviewDb; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -31,6 +30,8 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; + +import javax.inject.Inject; /** * The suggest oracle may be called many times in rapid succession during the course of one operation. * It would be easy to have a simple Cache> with a short expiration time of 30s. diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewers.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewers.java index 74a886652c..cfdc25107b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewers.java @@ -26,12 +26,13 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.ApprovalsUtil; import com.google.gerrit.server.account.AccountsCollection; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.Collection; +import javax.inject.Inject; + @Singleton public class Reviewers implements ChildCollection { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Revisions.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Revisions.java index ed870c8c5f..edea7a24e8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Revisions.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Revisions.java @@ -32,7 +32,6 @@ import com.google.gerrit.server.edit.ChangeEdit; import com.google.gerrit.server.edit.ChangeEditUtil; import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -40,6 +39,8 @@ import java.io.IOException; import java.util.Collections; import java.util.List; +import javax.inject.Inject; + @Singleton public class Revisions implements ChildCollection { private final DynamicMap> views; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java index 717c045722..d023199a05 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java @@ -62,7 +62,6 @@ import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.AtomicUpdate; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -78,6 +77,8 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import javax.inject.Inject; + @Singleton public class Submit implements RestModifyView, UiAction { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestReviewers.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestReviewers.java index f0f63eb2a7..837905b0dc 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestReviewers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestReviewers.java @@ -41,7 +41,6 @@ import com.google.gerrit.server.group.GroupJson.GroupBaseInfo; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.lib.Config; @@ -54,6 +53,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + public class SuggestReviewers implements RestReadView { private static final String MAX_SUFFIX = "\u9fa5"; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/TestSubmitRule.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/TestSubmitRule.java index 72b3de5924..6622952c2c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/TestSubmitRule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/TestSubmitRule.java @@ -36,7 +36,6 @@ import com.google.gerrit.server.project.RuleEvalException; import com.google.gerrit.server.project.SubmitRuleEvaluator; import com.google.gerrit.server.query.change.ChangeData; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.googlecode.prolog_cafe.lang.Term; @@ -47,6 +46,8 @@ import java.io.ByteArrayInputStream; import java.util.List; import java.util.Map; +import javax.inject.Inject; + public class TestSubmitRule implements RestModifyView { public enum Filters { RUN, SKIP diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/TestSubmitType.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/TestSubmitType.java index 67b1b7682f..08f59c8e79 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/TestSubmitType.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/TestSubmitType.java @@ -29,7 +29,6 @@ import com.google.gerrit.server.change.TestSubmitRule.Input; import com.google.gerrit.server.project.RuleEvalException; import com.google.gerrit.server.project.SubmitRuleEvaluator; import com.google.gerrit.server.query.change.ChangeData; -import com.google.inject.Inject; import com.google.inject.Provider; import com.googlecode.prolog_cafe.lang.SymbolTerm; @@ -40,6 +39,8 @@ import org.kohsuke.args4j.Option; import java.io.ByteArrayInputStream; import java.util.List; +import javax.inject.Inject; + public class TestSubmitType implements RestModifyView { private final Provider db; private final ChangeData.Factory changeDataFactory; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java b/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java index 11e59384de..9134b5c3d8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java @@ -36,7 +36,6 @@ import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -55,6 +54,8 @@ import java.io.IOException; import java.util.List; import java.util.TimeZone; +import javax.inject.Inject; + @Singleton public class RebaseChange { private final ChangeControl.GenericFactory changeControlFactory; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AllProjectsNameProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/AllProjectsNameProvider.java index 73074b75a6..cc7e302d94 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/AllProjectsNameProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/AllProjectsNameProvider.java @@ -14,11 +14,12 @@ package com.google.gerrit.server.config; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.lib.Config; +import javax.inject.Inject; + public class AllProjectsNameProvider implements Provider { public static final String DEFAULT = "All-Projects"; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AllUsersNameProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/AllUsersNameProvider.java index e6ec095e58..71dd5de727 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/AllUsersNameProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/AllUsersNameProvider.java @@ -14,11 +14,12 @@ package com.google.gerrit.server.config; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.lib.Config; +import javax.inject.Inject; + public class AllUsersNameProvider implements Provider { public static final String DEFAULT = "All-Users"; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AnonymousCowardNameProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/AnonymousCowardNameProvider.java index ffa90b6f31..1b343641b8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/AnonymousCowardNameProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/AnonymousCowardNameProvider.java @@ -14,11 +14,12 @@ package com.google.gerrit.server.config; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.lib.Config; +import javax.inject.Inject; + public class AnonymousCowardNameProvider implements Provider { private final String anonymousCoward; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java index b1ec6e4941..b49f1d20b2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java @@ -19,7 +19,6 @@ import com.google.gerrit.reviewdb.client.AuthType; import com.google.gerrit.server.auth.openid.OpenIdProviderPattern; import com.google.gwtjsonrpc.server.SignedToken; import com.google.gwtjsonrpc.server.XsrfException; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; @@ -31,6 +30,8 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + /** Authentication related settings from {@code gerrit.config}. */ @Singleton public class AuthConfig { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthModule.java index ca4a9d2c0d..389bfaed25 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthModule.java @@ -22,7 +22,8 @@ import com.google.gerrit.server.auth.AuthBackend; import com.google.gerrit.server.auth.InternalAuthBackend; import com.google.gerrit.server.auth.ldap.LdapModule; import com.google.inject.AbstractModule; -import com.google.inject.Inject; + +import javax.inject.Inject; public class AuthModule extends AbstractModule { private final AuthType loginType; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CachesCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/CachesCollection.java index 5bff20cfef..f95016c8b0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/CachesCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/CachesCollection.java @@ -27,10 +27,11 @@ import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.extensions.restapi.RestView; 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.Singleton; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.VIEW_CACHES) @Singleton public class CachesCollection implements diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java index 3cce4f0810..faaecd486b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java @@ -14,11 +14,12 @@ package com.google.gerrit.server.config; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.lib.Config; +import javax.inject.Inject; + /** Provides {@link CanonicalWebUrl} from {@code gerrit.canonicalWebUrl}. */ public class CanonicalWebUrlProvider implements Provider { private final String canonicalUrl; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CapabilitiesCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/CapabilitiesCollection.java index 7ce5a88559..cf095d80ba 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/CapabilitiesCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/CapabilitiesCollection.java @@ -19,9 +19,10 @@ import com.google.gerrit.extensions.restapi.ChildCollection; import com.google.gerrit.extensions.restapi.IdString; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestView; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class CapabilitiesCollection implements ChildCollection { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigCollection.java index 72c4f2e92d..6db1667f75 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigCollection.java @@ -20,9 +20,10 @@ import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestCollection; import com.google.gerrit.extensions.restapi.RestView; import com.google.gerrit.extensions.restapi.TopLevelResource; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class ConfigCollection implements RestCollection { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/DisableReverseDnsLookupProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/DisableReverseDnsLookupProvider.java index 8c4271493c..498be93c2f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/DisableReverseDnsLookupProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/DisableReverseDnsLookupProvider.java @@ -14,11 +14,12 @@ package com.google.gerrit.server.config; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.lib.Config; +import javax.inject.Inject; + public class DisableReverseDnsLookupProvider implements Provider { private final boolean disableReverseDnsLookup; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/DownloadConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/DownloadConfig.java index 80031c2ee2..8a73cb5282 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/DownloadConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/DownloadConfig.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.config; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadCommand; import com.google.gerrit.reviewdb.client.AccountGeneralPreferences.DownloadScheme; import com.google.gerrit.reviewdb.client.SystemConfig; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; @@ -27,6 +26,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import javax.inject.Inject; + /** Download protocol from {@code gerrit.config}. */ @Singleton public class DownloadConfig { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java index a55ef84de5..4500d67442 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java @@ -16,11 +16,12 @@ package com.google.gerrit.server.config; import com.google.gerrit.server.account.EmailExpander; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.lib.Config; +import javax.inject.Inject; + class EmailExpanderProvider implements Provider { private final EmailExpander expander; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/FlushCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/FlushCache.java index a7c03be71b..e2b95b9379 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/FlushCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/FlushCache.java @@ -21,10 +21,11 @@ import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.config.FlushCache.Input; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.FLUSH_CACHES) @Singleton public class FlushCache implements RestModifyView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GcConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GcConfig.java index 54096bb086..61a7cf1b5c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GcConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GcConfig.java @@ -14,12 +14,13 @@ package com.google.gerrit.server.config; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.ConfigConstants; +import javax.inject.Inject; + @Singleton public class GcConfig { private final ScheduleConfig scheduleConfig; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java index c6bf1d469a..435db70f6e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java @@ -130,7 +130,6 @@ import com.google.gerrit.server.util.ThreadLocalRequestContext; import com.google.gerrit.server.validators.GroupCreationValidationListener; import com.google.gerrit.server.validators.HashtagValidationListener; import com.google.gerrit.server.validators.ProjectCreationValidationListener; -import com.google.inject.Inject; import com.google.inject.TypeLiteral; import com.google.inject.internal.UniqueAnnotations; @@ -141,6 +140,8 @@ import org.eclipse.jgit.transport.PreUploadHook; import java.util.List; import java.util.Set; +import javax.inject.Inject; + /** Starts global state with standard dependencies. */ public class GerritGlobalModule extends FactoryModule { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java index 4dd9fd4fb3..f97e6279a3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.config; import com.google.gerrit.server.securestore.SecureStore; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.ProvisionException; @@ -28,6 +27,8 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import javax.inject.Inject; + /** Provides {@link Config} annotated with {@link GerritServerConfig}. */ class GerritServerConfigProvider implements Provider { private static final Logger log = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetPreferences.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GetPreferences.java index e915427aee..a7beb6bf49 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetPreferences.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GetPreferences.java @@ -18,7 +18,6 @@ import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.account.GetPreferences.PreferenceInfo; import com.google.gerrit.server.account.VersionedAccountPreferences; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -26,6 +25,8 @@ import org.eclipse.jgit.lib.Repository; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class GetPreferences implements RestReadView { private final AllUsersName allUsersName; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetSummary.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GetSummary.java index 9aa859067b..7954478fbd 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetSummary.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GetSummary.java @@ -19,7 +19,6 @@ import com.google.gerrit.extensions.annotations.RequiresCapability; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.git.WorkQueue; import com.google.gerrit.server.git.WorkQueue.Task; -import com.google.inject.Inject; import org.eclipse.jgit.internal.storage.file.WindowCacheStatAccessor; import org.kohsuke.args4j.Option; @@ -39,6 +38,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) public class GetSummary implements RestReadView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GitReceivePackGroupsProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GitReceivePackGroupsProvider.java index 5e2f71f66a..b3919199a4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GitReceivePackGroupsProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GitReceivePackGroupsProvider.java @@ -18,12 +18,13 @@ import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gerrit.server.util.ServerRequestContext; import com.google.gerrit.server.util.ThreadLocalRequestContext; -import com.google.inject.Inject; import org.eclipse.jgit.lib.Config; import java.util.Collections; +import javax.inject.Inject; + public class GitReceivePackGroupsProvider extends GroupSetProvider { @Inject public GitReceivePackGroupsProvider(GroupBackend gb, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GitUploadPackGroupsProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GitUploadPackGroupsProvider.java index 79cfd88649..00b896c644 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GitUploadPackGroupsProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GitUploadPackGroupsProvider.java @@ -19,10 +19,11 @@ import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.group.SystemGroupBackend; import com.google.gerrit.server.util.ServerRequestContext; import com.google.gerrit.server.util.ThreadLocalRequestContext; -import com.google.inject.Inject; import org.eclipse.jgit.lib.Config; +import javax.inject.Inject; + public class GitUploadPackGroupsProvider extends GroupSetProvider { @Inject public GitUploadPackGroupsProvider(GroupBackend gb, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GroupSetProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GroupSetProvider.java index 5c3ec39524..072b050de5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GroupSetProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GroupSetProvider.java @@ -22,7 +22,6 @@ import com.google.gerrit.server.account.GroupBackends; import com.google.gerrit.server.util.RequestContext; import com.google.gerrit.server.util.ServerRequestContext; import com.google.gerrit.server.util.ThreadLocalRequestContext; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.lib.Config; @@ -31,6 +30,8 @@ import org.slf4j.LoggerFactory; import java.util.Set; +import javax.inject.Inject; + public abstract class GroupSetProvider implements Provider> { private static final Logger log = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ListCaches.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ListCaches.java index df6d86b899..3b73c6b68f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ListCaches.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ListCaches.java @@ -26,7 +26,6 @@ import com.google.gerrit.extensions.registration.DynamicMap; import com.google.gerrit.extensions.restapi.BinaryResult; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.cache.PersistentCache; -import com.google.inject.Inject; import org.kohsuke.args4j.Option; @@ -36,6 +35,8 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.VIEW_CACHES) public class ListCaches implements RestReadView { private final DynamicMap> cacheMap; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ListCapabilities.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ListCapabilities.java index b01ae2f148..1ce293dc9f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ListCapabilities.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ListCapabilities.java @@ -20,7 +20,6 @@ import com.google.gerrit.common.data.GlobalCapability; import com.google.gerrit.extensions.config.CapabilityDefinition; import com.google.gerrit.extensions.registration.DynamicMap; import com.google.gerrit.extensions.restapi.RestReadView; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -29,6 +28,8 @@ import org.slf4j.LoggerFactory; import java.util.Map; +import javax.inject.Inject; + /** List capabilities visible to the calling user. */ @Singleton public class ListCapabilities implements RestReadView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ListTasks.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ListTasks.java index da5beda686..b02d2a4030 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ListTasks.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ListTasks.java @@ -27,7 +27,6 @@ import com.google.gerrit.server.git.WorkQueue.Task; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.server.util.IdGenerator; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -40,6 +39,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + @Singleton public class ListTasks implements RestReadView { private final WorkQueue workQueue; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ListTopMenus.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ListTopMenus.java index 291e48b320..c142c9c1ce 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ListTopMenus.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ListTopMenus.java @@ -18,11 +18,12 @@ import com.google.common.collect.Lists; import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.extensions.webui.TopMenu; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.List; +import javax.inject.Inject; + @Singleton class ListTopMenus implements RestReadView { private final DynamicSet extensions; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/MasterNodeStartup.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/MasterNodeStartup.java index a7360dea8e..3c7cff76cf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/MasterNodeStartup.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/MasterNodeStartup.java @@ -20,13 +20,14 @@ import static java.util.concurrent.TimeUnit.SECONDS; import com.google.gerrit.extensions.events.LifecycleListener; import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.server.git.ReloadSubmitQueueOp; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; import java.util.concurrent.ScheduledFuture; +import javax.inject.Inject; + /** Configuration for a master node in a cluster of servers. */ public class MasterNodeStartup extends LifecycleModule { @Override diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfigFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfigFactory.java index 76f53230f3..d6be0fc81a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfigFactory.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfigFactory.java @@ -22,7 +22,6 @@ import com.google.gerrit.server.plugins.ReloadPluginListener; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -37,6 +36,8 @@ import java.io.File; import java.io.IOException; import java.util.Map; +import javax.inject.Inject; + @Singleton public class PluginConfigFactory implements ReloadPluginListener { private static final Logger log = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/PostCaches.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/PostCaches.java index 7302ea191d..7c5a48fd3a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/PostCaches.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/PostCaches.java @@ -25,12 +25,13 @@ import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.extensions.restapi.UnprocessableEntityException; import com.google.gerrit.server.config.PostCaches.Input; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.FLUSH_CACHES) @Singleton public class PostCaches implements RestModifyView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ProjectConfigEntry.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ProjectConfigEntry.java index 385570bc17..d58be8af69 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ProjectConfigEntry.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ProjectConfigEntry.java @@ -25,7 +25,6 @@ import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.git.MetaDataUpdate; import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.project.ProjectState; -import com.google.inject.Inject; import com.google.inject.ProvisionException; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -38,6 +37,8 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; +import javax.inject.Inject; + @ExtensionPoint public class ProjectConfigEntry { public enum Type { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ProjectOwnerGroupsProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/ProjectOwnerGroupsProvider.java index 0189de3778..0d146a4225 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/ProjectOwnerGroupsProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/ProjectOwnerGroupsProvider.java @@ -17,10 +17,11 @@ package com.google.gerrit.server.config; import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.util.ServerRequestContext; import com.google.gerrit.server.util.ThreadLocalRequestContext; -import com.google.inject.Inject; import org.eclipse.jgit.lib.Config; +import javax.inject.Inject; + /** * Provider of the group(s) which should become owners of a newly created * project. Currently only supports {@code ownerGroup} declarations in the diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java index 4ada7b122b..59f631b03d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java @@ -18,11 +18,12 @@ 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; +import javax.inject.Inject; + /** Provides {@link ReviewDb} database handle live only for this request. */ @RequestScoped public class RequestScopedReviewDbProvider implements Provider { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/SetPreferences.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/SetPreferences.java index e8b2dc5092..9c3b76fdd3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/SetPreferences.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/SetPreferences.java @@ -22,13 +22,14 @@ import com.google.gerrit.server.account.GetPreferences.PreferenceInfo; import com.google.gerrit.server.account.SetPreferences.Input; import com.google.gerrit.server.account.VersionedAccountPreferences; import com.google.gerrit.server.git.MetaDataUpdate; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.errors.ConfigInvalidException; import java.io.IOException; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @Singleton public class SetPreferences implements RestModifyView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePaths.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePaths.java index 9d7c54a1c9..c79abe6397 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePaths.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePaths.java @@ -14,13 +14,14 @@ package com.google.gerrit.server.config; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import javax.inject.Inject; + /** Important paths within a {@link SitePath}. */ @Singleton public final class SitePaths { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TasksCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/TasksCollection.java index b92cfc20b1..c69bc6b405 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/TasksCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/TasksCollection.java @@ -27,10 +27,11 @@ import com.google.gerrit.server.git.WorkQueue.ProjectTask; import com.google.gerrit.server.git.WorkQueue.Task; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class TasksCollection implements ChildCollection { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TopMenuCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/TopMenuCollection.java index 32416c529d..4af8a93299 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/TopMenuCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/TopMenuCollection.java @@ -19,9 +19,10 @@ import com.google.gerrit.extensions.restapi.ChildCollection; import com.google.gerrit.extensions.restapi.IdString; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestView; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton class TopMenuCollection implements ChildCollection { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFootersProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFootersProvider.java index a76b010dd8..1c1c54fd54 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFootersProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFootersProvider.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.config; import com.google.gerrit.reviewdb.client.TrackingId; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -27,6 +26,8 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.PatternSyntaxException; +import javax.inject.Inject; + /** Provides a list of all configured {@link TrackingFooter}s. */ @Singleton public class TrackingFootersProvider implements Provider { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/contact/ContactStoreProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/contact/ContactStoreProvider.java index 835dc40c85..4e0297da6e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/contact/ContactStoreProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/contact/ContactStoreProvider.java @@ -18,7 +18,6 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.ProvisionException; @@ -34,6 +33,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.security.Security; +import javax.inject.Inject; + /** Creates the {@link ContactStore} based on the configuration. */ public class ContactStoreProvider implements Provider { private final Config config; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/contact/HttpContactStoreConnection.java b/gerrit-server/src/main/java/com/google/gerrit/server/contact/HttpContactStoreConnection.java index 471f6a2f81..fe3e26e1db 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/contact/HttpContactStoreConnection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/contact/HttpContactStoreConnection.java @@ -3,7 +3,6 @@ package com.google.gerrit.server.contact; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.FactoryModuleBuilder; @@ -17,6 +16,8 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; +import javax.inject.Inject; + /** {@link ContactStoreConnection} with an underlying {@literal @HttpURLConnection}. */ public class HttpContactStoreConnection implements ContactStoreConnection { public static Module module() { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java b/gerrit-server/src/main/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java index 188e95b69e..4142b7390f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.documentation; import com.google.common.collect.Lists; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.apache.lucene.analysis.standard.StandardAnalyzer; @@ -40,6 +39,8 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import javax.inject.Inject; + @Singleton public class QueryDocumentationExecutor { private static final Logger log = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditJson.java index 276eba6c41..e1ebe589f0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditJson.java @@ -29,7 +29,6 @@ import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.server.CommonConverters; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.change.ChangeJson; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -38,6 +37,8 @@ import org.eclipse.jgit.revwalk.RevCommit; import java.io.IOException; import java.util.Map; +import javax.inject.Inject; + @Singleton public class ChangeEditJson { private final DynamicMap downloadCommands; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditModifier.java b/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditModifier.java index 061ac48810..3e538e4551 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditModifier.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditModifier.java @@ -28,7 +28,6 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gerrit.server.util.TimeUtil; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -61,6 +60,8 @@ import java.io.IOException; import java.util.Map; import java.util.TimeZone; +import javax.inject.Inject; + /** * Utility functions to manipulate change edits. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java index 3767b3298b..e94e78e172 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java @@ -36,7 +36,6 @@ import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -52,6 +51,8 @@ import org.eclipse.jgit.revwalk.RevWalk; import java.io.IOException; import java.util.Map; +import javax.inject.Inject; + /** * Utility functions to manipulate change edits. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java index e72d4654f2..efadf87fdc 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java @@ -59,7 +59,6 @@ import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException; import com.google.gerrit.server.query.change.ChangeData; 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.Singleton; @@ -73,6 +72,8 @@ import java.util.Collection; import java.util.List; import java.util.Map; +import javax.inject.Inject; + @Singleton public class EventFactory { private static final Logger log = LoggerFactory.getLogger(EventFactory.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/GitReferenceUpdated.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/GitReferenceUpdated.java index 9e48e810c6..14cfc974e7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/GitReferenceUpdated.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/GitReferenceUpdated.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.extensions.events; import com.google.gerrit.extensions.events.GitReferenceUpdatedListener; import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.reviewdb.client.Project; -import com.google.inject.Inject; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.RefUpdate; @@ -26,6 +25,8 @@ import org.slf4j.LoggerFactory; import java.util.Collections; +import javax.inject.Inject; + public class GitReferenceUpdated { private static final Logger log = LoggerFactory .getLogger(GitReferenceUpdated.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java index 08bdd4be62..e11ce61670 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/AsyncReceiveCommits.java @@ -20,7 +20,6 @@ import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.git.WorkQueue.Executor; import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.server.util.RequestScopePropagator; -import com.google.inject.Inject; import com.google.inject.PrivateModule; import com.google.inject.Provides; import com.google.inject.Singleton; @@ -42,6 +41,8 @@ import java.util.Collection; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + /** Hook that delegates to {@link ReceiveCommits} in a worker thread. */ public class AsyncReceiveCommits implements PreReceiveHook { private static final Logger log = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java index b97ddb5c99..6c97e29094 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java @@ -22,7 +22,6 @@ import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.project.ProjectControl; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -46,6 +45,8 @@ import java.util.Date; import java.util.List; import java.util.TimeZone; +import javax.inject.Inject; + @Singleton public class BanCommit { /** diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeCache.java index eb4acfc59e..e70f850a47 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeCache.java @@ -23,7 +23,6 @@ import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.cache.CacheModule; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Singleton; import com.google.inject.TypeLiteral; @@ -36,6 +35,8 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; +import javax.inject.Inject; + @Singleton public class ChangeCache implements GitReferenceUpdatedListener { private static final Logger log = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMergeQueue.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMergeQueue.java index e386bc562e..507fda8ce7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMergeQueue.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMergeQueue.java @@ -29,7 +29,6 @@ import com.google.gerrit.server.util.RequestContext; import com.google.gerrit.server.util.RequestScopePropagator; import com.google.gerrit.server.util.TimeUtil; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.OutOfScopeException; import com.google.inject.Provider; @@ -50,6 +49,8 @@ import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + @Singleton public class ChangeMergeQueue implements MergeQueue { private static final Logger log = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java index 24af14d8d8..c09857f2d5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.git; import com.google.common.collect.Sets; import com.google.gerrit.common.data.GarbageCollectionResult; import com.google.gerrit.reviewdb.client.Project; -import com.google.inject.Inject; import org.eclipse.jgit.api.GarbageCollectCommand; import org.eclipse.jgit.api.Git; @@ -36,6 +35,8 @@ import java.util.List; import java.util.Properties; import java.util.Set; +import javax.inject.Inject; + public class GarbageCollection { private static final Logger log = LoggerFactory .getLogger(GarbageCollection.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollectionRunner.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollectionRunner.java index 5e3ca317d8..a09e2c12d5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollectionRunner.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollectionRunner.java @@ -22,7 +22,6 @@ import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.server.config.GcConfig; import com.google.gerrit.server.config.ScheduleConfig; import com.google.gerrit.server.project.ProjectCache; -import com.google.inject.Inject; import com.google.inject.Module; import org.slf4j.Logger; @@ -30,6 +29,8 @@ import org.slf4j.LoggerFactory; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + /** Runnable to enable scheduling gc to run periodically */ public class GarbageCollectionRunner implements Runnable { private static final Logger gcLog = LoggerFactory diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/LabelNormalizer.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/LabelNormalizer.java index 71a68b439d..2a39f57548 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/LabelNormalizer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/LabelNormalizer.java @@ -33,12 +33,13 @@ import com.google.gerrit.reviewdb.client.PatchSetApproval; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.Collection; import java.util.List; +import javax.inject.Inject; + /** * Normalizes votes on labels according to project config and permissions. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java index 1844292b6e..52b955774b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java @@ -23,7 +23,6 @@ import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.notedb.NotesMigration; -import com.google.inject.Inject; import com.google.inject.Singleton; import com.jcraft.jsch.Session; @@ -56,6 +55,8 @@ import java.util.TreeSet; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import javax.inject.Inject; + /** Manages Git repositories stored on the local filesystem. */ @Singleton public class LocalDiskRepositoryManager implements GitRepositoryManager { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java index 8eb0bbbd82..c9300a4bef 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java @@ -68,7 +68,6 @@ import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.AtomicUpdate; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.eclipse.jgit.errors.IncorrectObjectTypeException; @@ -97,6 +96,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + /** * Merges changes in submission order into a single branch. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MetaDataUpdate.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MetaDataUpdate.java index 5e4ffab2a4..45d8e81497 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MetaDataUpdate.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MetaDataUpdate.java @@ -19,7 +19,6 @@ import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; @@ -33,6 +32,8 @@ import org.eclipse.jgit.lib.Repository; import java.io.IOException; +import javax.inject.Inject; + /** Helps with the updating of a {@link VersionedMetaData}. */ public class MetaDataUpdate { public static class User { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/NotesBranchUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/NotesBranchUtil.java index f1b0a78de7..131d4d5e93 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/NotesBranchUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/NotesBranchUtil.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.git; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.extensions.events.GitReferenceUpdated; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException; @@ -43,6 +42,8 @@ import org.eclipse.jgit.revwalk.RevWalk; import java.io.IOException; +import javax.inject.Inject; + /** * A utility class for updating a notes branch with automatic merge of note * trees. diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/PerThreadRequestScope.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/PerThreadRequestScope.java index 608743214d..664035dce7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/PerThreadRequestScope.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/PerThreadRequestScope.java @@ -19,7 +19,6 @@ 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; -import com.google.inject.Inject; import com.google.inject.Key; import com.google.inject.OutOfScopeException; import com.google.inject.Provider; @@ -28,6 +27,8 @@ import com.google.inject.Scope; import java.util.Map; import java.util.concurrent.Callable; +import javax.inject.Inject; + public class PerThreadRequestScope { public interface Scoper { Callable scope(Callable callable); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java index 9013ad93cc..b0c8ec4664 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java @@ -118,7 +118,6 @@ import com.google.gwtorm.server.AtomicUpdate; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -169,6 +168,8 @@ import java.util.concurrent.Callable; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.inject.Inject; + /** Receives change upload using the Git receive-pack protocol. */ public class ReceiveCommits { private static final Logger log = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveConfig.java index 6d37ae09e8..2c2e779791 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveConfig.java @@ -15,11 +15,12 @@ package com.google.gerrit.server.git; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; +import javax.inject.Inject; + @Singleton class ReceiveConfig { final boolean checkMagicRefs; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReloadSubmitQueueOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReloadSubmitQueueOp.java index dd7a85b44f..f9eabf3fd1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReloadSubmitQueueOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReloadSubmitQueueOp.java @@ -19,7 +19,6 @@ import com.google.gerrit.reviewdb.client.Change; 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; @@ -27,6 +26,8 @@ import org.slf4j.LoggerFactory; import java.util.HashSet; +import javax.inject.Inject; + @Singleton public class ReloadSubmitQueueOp extends DefaultQueueOp { private static final Logger log = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/RenameGroupOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/RenameGroupOp.java index a89a89be68..a5950e6e73 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/RenameGroupOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/RenameGroupOp.java @@ -18,7 +18,6 @@ import com.google.gerrit.common.data.GroupReference; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.project.ProjectCache; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -32,6 +31,8 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + public class RenameGroupOp extends DefaultQueueOp { public interface Factory { RenameGroupOp create(@Assisted("author") PersonIdent author, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java index 5a1e50d099..af31e1e9e2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java @@ -29,7 +29,6 @@ import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.util.SubmoduleSectionParser; 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.assistedinject.Assisted; @@ -66,6 +65,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + public class SubmoduleOp { public interface Factory { SubmoduleOp create(Branch.NameKey destBranch, RevCommit mergeTip, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/TagCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/TagCache.java index dec1768df9..e554adeb29 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/TagCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/TagCache.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.git; import com.google.common.cache.Cache; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.cache.CacheModule; -import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Singleton; import com.google.inject.name.Named; @@ -29,6 +28,8 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; +import javax.inject.Inject; + @Singleton public class TagCache { private static final String CACHE_NAME = "git_tags"; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/TransferConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/TransferConfig.java index 8be0a10f74..68baa6425c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/TransferConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/TransferConfig.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.git; import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.project.ProjectState; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; @@ -25,6 +24,8 @@ import org.eclipse.jgit.storage.pack.PackConfig; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + @Singleton public class TransferConfig { private final int timeout; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java index dcc579b01c..a04936b464 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java @@ -20,7 +20,6 @@ import com.google.gerrit.lifecycle.LifecycleModule; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.util.IdGenerator; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; @@ -46,6 +45,8 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import javax.inject.Inject; + /** Delayed execution of tasks using a background thread pool. */ @Singleton public class WorkQueue { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyFactory.java index 091523bdc5..deee0bee2e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyFactory.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyFactory.java @@ -30,7 +30,6 @@ import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -45,6 +44,8 @@ import org.slf4j.LoggerFactory; import java.util.Set; +import javax.inject.Inject; + /** Factory to create a {@link SubmitStrategy} for a {@link SubmitType}. */ @Singleton public class SubmitStrategyFactory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java index cad51743c7..e882828c91 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java @@ -31,7 +31,6 @@ import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.server.project.RefControl; import com.google.gerrit.server.ssh.SshInfo; import com.google.gerrit.server.util.MagicBranch; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.jcraft.jsch.HostKey; @@ -55,6 +54,8 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; +import javax.inject.Inject; + public class CommitValidators { private static final Logger log = LoggerFactory .getLogger(CommitValidators.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java index 6f70d46c75..6db12b4814 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java @@ -34,7 +34,6 @@ import com.google.gerrit.server.git.CommitMergeStatus; import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectState; -import com.google.inject.Inject; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.lib.Repository; @@ -42,6 +41,8 @@ import org.eclipse.jgit.lib.Repository; import java.io.IOException; import java.util.List; +import javax.inject.Inject; + public class MergeValidators { private final DynamicSet mergeValidationListeners; private final ProjectConfigValidator.Factory projectConfigValidatorFactory; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/AddIncludedGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/AddIncludedGroups.java index 361a773ee4..8e6707b9a8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/AddIncludedGroups.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/AddIncludedGroups.java @@ -35,13 +35,14 @@ import com.google.gerrit.server.account.GroupIncludeCache; import com.google.gerrit.server.group.AddIncludedGroups.Input; import com.google.gerrit.server.group.GroupJson.GroupInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.List; import java.util.Map; +import javax.inject.Inject; + @Singleton public class AddIncludedGroups implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/AddMembers.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/AddMembers.java index aaeffd9368..fb17c4d9be 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/AddMembers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/AddMembers.java @@ -40,13 +40,14 @@ import com.google.gerrit.server.account.GroupControl; import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.server.group.AddMembers.Input; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.List; import java.util.Map; +import javax.inject.Inject; + @Singleton public class AddMembers implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/CreateGroup.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/CreateGroup.java index cb8070291f..6151ababaf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/CreateGroup.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/CreateGroup.java @@ -41,7 +41,6 @@ import com.google.gerrit.server.group.GroupJson.GroupInfo; import com.google.gerrit.server.validators.GroupCreationValidationListener; import com.google.gerrit.server.validators.ValidationException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -49,6 +48,8 @@ import org.eclipse.jgit.lib.Config; import java.util.Collections; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.CREATE_GROUP) public class CreateGroup implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java index b921224435..0adb5c7dc0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java @@ -29,7 +29,6 @@ import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.account.UniversalGroupBackend; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import org.slf4j.Logger; @@ -39,6 +38,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import javax.inject.Inject; + class DbGroupMemberAuditListener implements GroupMemberAuditListener { private static final Logger log = org.slf4j.LoggerFactory .getLogger(DbGroupMemberAuditListener.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteIncludedGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteIncludedGroups.java index 74d5946847..57a2ba6266 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteIncludedGroups.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteIncludedGroups.java @@ -34,13 +34,14 @@ import com.google.gerrit.server.account.GroupControl; import com.google.gerrit.server.account.GroupIncludeCache; import com.google.gerrit.server.group.AddIncludedGroups.Input; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.List; import java.util.Map; +import javax.inject.Inject; + @Singleton public class DeleteIncludedGroups implements RestModifyView { private final GroupsCollection groupsCollection; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteMembers.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteMembers.java index 605933b918..e1dee7b9fc 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteMembers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteMembers.java @@ -33,13 +33,14 @@ import com.google.gerrit.server.account.AccountsCollection; import com.google.gerrit.server.account.GroupControl; import com.google.gerrit.server.group.AddMembers.Input; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.List; import java.util.Map; +import javax.inject.Inject; + @Singleton public class DeleteMembers implements RestModifyView { private final AccountsCollection accounts; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetDetail.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/GetDetail.java index 936798d7bb..a5b9258511 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetDetail.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/GetDetail.java @@ -18,9 +18,10 @@ import com.google.gerrit.common.groups.ListGroupsOption; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.group.GroupJson.GroupInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class GetDetail implements RestReadView { private final GroupJson json; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetGroup.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/GetGroup.java index 95042a2bde..5f0de59aea 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetGroup.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/GetGroup.java @@ -17,9 +17,10 @@ package com.google.gerrit.server.group; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.group.GroupJson.GroupInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton class GetGroup implements RestReadView { private final GroupJson json; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetIncludedGroup.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/GetIncludedGroup.java index 5d3853e034..6aba7e8efa 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetIncludedGroup.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/GetIncludedGroup.java @@ -17,9 +17,10 @@ package com.google.gerrit.server.group; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.group.GroupJson.GroupInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class GetIncludedGroup implements RestReadView { private final GroupJson json; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetMember.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/GetMember.java index 2782932e06..3a1bc15570 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetMember.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/GetMember.java @@ -17,9 +17,10 @@ package com.google.gerrit.server.group; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.account.AccountInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class GetMember implements RestReadView { private final AccountInfo.Loader.Factory infoFactory; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetOwner.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/GetOwner.java index 5fc62c6f81..72b6142430 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetOwner.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/GetOwner.java @@ -22,9 +22,10 @@ import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.server.account.GroupControl; import com.google.gerrit.server.group.GroupJson.GroupInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class GetOwner implements RestReadView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupJson.java index 9f851f4648..cbc602d6e4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupJson.java @@ -28,13 +28,14 @@ import com.google.gerrit.server.account.AccountInfo; import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.account.GroupControl; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import java.util.Collection; import java.util.EnumSet; import java.util.List; +import javax.inject.Inject; + public class GroupJson { private final GroupBackend groupBackend; private final GroupControl.Factory groupControlFactory; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupsCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupsCollection.java index 76cd137399..f45f7d98d8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupsCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupsCollection.java @@ -33,10 +33,11 @@ import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.GroupBackend; import com.google.gerrit.server.account.GroupBackends; import com.google.gerrit.server.account.GroupControl; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class GroupsCollection implements RestCollection, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/IncludedGroupsCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/IncludedGroupsCollection.java index 72f17b4ad0..950d93818f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/IncludedGroupsCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/IncludedGroupsCollection.java @@ -29,10 +29,11 @@ import com.google.gerrit.reviewdb.client.AccountGroupById; import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.group.AddIncludedGroups.PutIncludedGroup; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class IncludedGroupsCollection implements ChildCollection, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java index 40d0420f1d..88662d81d6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java @@ -39,7 +39,6 @@ import com.google.gerrit.server.group.GroupJson.GroupInfo; import com.google.gerrit.server.project.ProjectControl; import com.google.gson.reflect.TypeToken; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import org.kohsuke.args4j.Option; @@ -52,6 +51,8 @@ import java.util.Locale; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + /** List groups visible to the calling user. */ public class ListGroups implements RestReadView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java index 671486cfcf..c2adf3961e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListIncludedGroups.java @@ -25,7 +25,6 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.account.GroupControl; import com.google.gerrit.server.group.GroupJson.GroupInfo; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -35,6 +34,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import javax.inject.Inject; + @Singleton public class ListIncludedGroups implements RestReadView { private static final Logger log = org.slf4j.LoggerFactory.getLogger(ListIncludedGroups.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java index c4b2ae2a40..9770209d99 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java @@ -30,7 +30,6 @@ import com.google.gerrit.server.account.AccountInfo; import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.account.GroupDetailFactory; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.kohsuke.args4j.Option; @@ -40,6 +39,8 @@ import java.util.HashSet; import java.util.List; import java.util.Map; +import javax.inject.Inject; + public class ListMembers implements RestReadView { private final GroupCache groupCache; private final GroupDetailFactory.Factory groupDetailFactory; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/MembersCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/MembersCollection.java index fc69a1f6c9..7693acab63 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/MembersCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/MembersCollection.java @@ -29,10 +29,11 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.account.AccountsCollection; import com.google.gerrit.server.group.AddMembers.PutMember; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class MembersCollection implements ChildCollection, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/PutDescription.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/PutDescription.java index c2dc23a820..09b89468f1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/PutDescription.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/PutDescription.java @@ -26,12 +26,13 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.group.PutDescription.Input; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.Collections; +import javax.inject.Inject; + @Singleton public class PutDescription implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/PutName.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/PutName.java index 6d980ae5d2..c2f17b6b9a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/PutName.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/PutName.java @@ -28,9 +28,10 @@ import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.server.account.PerformRenameGroup; import com.google.gerrit.server.group.PutName.Input; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class PutName implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/PutOptions.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/PutOptions.java index 6ed6703d17..3103e03ad4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/PutOptions.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/PutOptions.java @@ -24,12 +24,13 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.group.PutOptions.Input; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.Collections; +import javax.inject.Inject; + @Singleton public class PutOptions implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/PutOwner.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/PutOwner.java index 11d34ab9bb..874e0039d5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/PutOwner.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/PutOwner.java @@ -29,12 +29,13 @@ import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.group.GroupJson.GroupInfo; import com.google.gerrit.server.group.PutOwner.Input; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.util.Collections; +import javax.inject.Inject; + @Singleton public class PutOwner implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeBatchIndexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeBatchIndexer.java index 9a992cf5ed..e95b306b28 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeBatchIndexer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeBatchIndexer.java @@ -40,7 +40,6 @@ import com.google.gerrit.server.git.MultiProgressMonitor.Task; import com.google.gerrit.server.patch.PatchListLoader; import com.google.gerrit.server.query.change.ChangeData; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.diff.DiffFormatter; @@ -75,6 +74,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import javax.inject.Inject; + public class ChangeBatchIndexer { private static final Logger log = LoggerFactory.getLogger(ChangeBatchIndexer.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java index 872179d9d1..590a5b802f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/FieldDef.java @@ -18,10 +18,11 @@ import com.google.common.base.Preconditions; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.TrackingFooters; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.eclipse.jgit.lib.Config; +import javax.inject.Inject; + /** * Definition of a field stored in the secondary index. * diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexCollection.java index 2380c76d7e..66c3e34def 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexCollection.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.index; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import com.google.gerrit.extensions.events.LifecycleListener; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.Collection; @@ -25,6 +24,8 @@ import java.util.Collections; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicReference; +import javax.inject.Inject; + /** Dynamic pointers to the index versions used for searching and writing. */ @Singleton public class IndexCollection implements LifecycleListener { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexRewriteImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexRewriteImpl.java index 40ac213c42..22d0962194 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexRewriteImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexRewriteImpl.java @@ -33,13 +33,14 @@ import com.google.gerrit.server.query.change.ChangeQueryBuilder; import com.google.gerrit.server.query.change.ChangeQueryRewriter; import com.google.gerrit.server.query.change.ChangeStatusPredicate; import com.google.gerrit.server.query.change.OrSource; -import com.google.inject.Inject; import java.util.BitSet; import java.util.EnumSet; import java.util.List; import java.util.Set; +import javax.inject.Inject; + /** Rewriter that pushes boolean logic into the secondary index. */ public class IndexRewriteImpl implements ChangeQueryRewriter { /** Set of all open change statuses. */ diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/AbandonedSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/AbandonedSender.java index 8387f51090..0f107e4031 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/AbandonedSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/AbandonedSender.java @@ -17,9 +17,10 @@ package com.google.gerrit.server.mail; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.AccountProjectWatch.NotifyType; import com.google.gerrit.reviewdb.client.Change; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import javax.inject.Inject; + /** Send notice about a change being abandoned by its owner. */ public class AbandonedSender extends ReplyToChangeSender { public static interface Factory extends diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/AddReviewerSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/AddReviewerSender.java index c181a9c1ea..55d619481d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/AddReviewerSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/AddReviewerSender.java @@ -16,9 +16,10 @@ package com.google.gerrit.server.mail; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.Change; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import javax.inject.Inject; + /** Asks a user to review a change. */ public class AddReviewerSender extends NewChangeSender { public static interface Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java index 5f2ffcb02d..eaa3546997 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CommentSender.java @@ -31,7 +31,6 @@ import com.google.gerrit.server.patch.PatchList; import com.google.gerrit.server.patch.PatchListNotAvailableException; import com.google.gwtorm.client.KeyUtil; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.eclipse.jgit.lib.Repository; @@ -44,6 +43,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import javax.inject.Inject; + /** Send comments, after the author of them hit used Publish Comments in the UI. */ public class CommentSender extends ReplyToChangeSender { private static final Logger log = LoggerFactory diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/CreateChangeSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CreateChangeSender.java index 3c9f39c01e..5c614993fe 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/CreateChangeSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/CreateChangeSender.java @@ -21,12 +21,13 @@ import com.google.gerrit.reviewdb.client.AccountProjectWatch.NotifyType; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.server.mail.ProjectWatch.Watchers; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.inject.Inject; + /** Notify interested parties of a brand new change. */ public class CreateChangeSender extends NewChangeSender { private static final Logger log = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailArguments.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailArguments.java index ebf5ac7ee9..2f86b1238d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailArguments.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailArguments.java @@ -35,13 +35,14 @@ import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeQueryBuilder; import com.google.gerrit.server.ssh.SshAdvertisedAddresses; -import com.google.inject.Inject; import com.google.inject.Provider; import org.apache.velocity.runtime.RuntimeInstance; import java.util.List; +import javax.inject.Inject; + public class EmailArguments { final GitRepositoryManager server; final ProjectCache projectCache; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailSettings.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailSettings.java index 7e44877d7b..982b77472b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailSettings.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailSettings.java @@ -15,11 +15,12 @@ package com.google.gerrit.server.mail; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; +import javax.inject.Inject; + @Singleton class EmailSettings { final boolean includeDiff; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java index 058bbc8313..bb4545a809 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java @@ -22,7 +22,6 @@ import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.config.AnonymousCowardName; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -33,6 +32,8 @@ import org.eclipse.jgit.lib.PersonIdent; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; +import javax.inject.Inject; + /** Creates a {@link FromAddressGenerator} from the {@link GerritServerConfig} */ @Singleton public class FromAddressGeneratorProvider implements diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergeFailSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergeFailSender.java index 3a5f7ebe1d..85f130ed1b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergeFailSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergeFailSender.java @@ -16,9 +16,10 @@ package com.google.gerrit.server.mail; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.Change; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import javax.inject.Inject; + /** Send notice about a change failing to merged. */ public class MergeFailSender extends ReplyToChangeSender { public static interface Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java index 5cb1ba1d9e..2448bfc7dc 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/MergedSender.java @@ -25,9 +25,10 @@ import com.google.gerrit.reviewdb.client.AccountProjectWatch.NotifyType; import com.google.gerrit.reviewdb.client.PatchSetApproval; import com.google.gerrit.server.project.ChangeControl; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import javax.inject.Inject; + /** Send notice about a change successfully merged. */ public class MergedSender extends ReplyToChangeSender { public static interface Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/PatchSetNotificationSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/PatchSetNotificationSender.java index 76b896aabc..a35d233c95 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/PatchSetNotificationSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/PatchSetNotificationSender.java @@ -36,7 +36,6 @@ import com.google.gerrit.server.notedb.ChangeUpdate; import com.google.gerrit.server.patch.PatchSetInfoFactory; import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.lib.ObjectId; @@ -51,6 +50,8 @@ import java.io.IOException; import java.util.Collections; import java.util.List; +import javax.inject.Inject; + public class PatchSetNotificationSender { private static final Logger log = LoggerFactory.getLogger(PatchSetNotificationSender.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java index eb32700c50..94f31d5a03 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java @@ -16,9 +16,10 @@ package com.google.gerrit.server.mail; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.server.IdentifiedUser; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import javax.inject.Inject; + public class RegisterNewEmailSender extends OutgoingEmail { public interface Factory { public RegisterNewEmailSender create(String address); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java index 8412d223a2..d653e7aa2d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/ReplacePatchSetSender.java @@ -18,7 +18,6 @@ import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.AccountProjectWatch.NotifyType; import com.google.gerrit.reviewdb.client.Change; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.util.ArrayList; @@ -27,6 +26,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import javax.inject.Inject; + /** Send notice of new patch sets for reviewers. */ public class ReplacePatchSetSender extends ReplyToChangeSender { public static interface Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RestoredSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RestoredSender.java index 7f464f7e27..633f87edd4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RestoredSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RestoredSender.java @@ -17,9 +17,10 @@ package com.google.gerrit.server.mail; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.AccountProjectWatch.NotifyType; import com.google.gerrit.reviewdb.client.Change; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import javax.inject.Inject; + /** Send notice about a change being restored by its owner. */ public class RestoredSender extends ReplyToChangeSender { public static interface Factory extends diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RevertedSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RevertedSender.java index d1389fb48f..b8fd6bb82c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RevertedSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RevertedSender.java @@ -17,9 +17,10 @@ package com.google.gerrit.server.mail; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.AccountProjectWatch.NotifyType; import com.google.gerrit.reviewdb.client.Change; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; +import javax.inject.Inject; + /** Send notice about a change being reverted. */ public class RevertedSender extends ReplyToChangeSender { public static interface Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/SignedTokenEmailTokenVerifier.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/SignedTokenEmailTokenVerifier.java index 92fffde025..95b7b4683e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/SignedTokenEmailTokenVerifier.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/SignedTokenEmailTokenVerifier.java @@ -20,7 +20,6 @@ import com.google.gwtjsonrpc.server.SignedToken; import com.google.gwtjsonrpc.server.ValidToken; import com.google.gwtjsonrpc.server.XsrfException; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.util.Base64; @@ -29,6 +28,8 @@ import java.io.UnsupportedEncodingException; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.inject.Inject; + /** Verifies the token sent by {@link RegisterNewEmailSender}. */ @Singleton public class SignedTokenEmailTokenVerifier implements EmailTokenVerifier { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java index b1c5955bd4..ec8cf058d5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/SmtpEmailSender.java @@ -21,7 +21,6 @@ import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.util.TimeUtil; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.apache.commons.net.smtp.AuthSMTPClient; @@ -42,6 +41,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + /** Sends email via a nearby SMTP server. */ @Singleton public class SmtpEmailSender implements EmailSender { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/VelocityRuntimeProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/VelocityRuntimeProvider.java index 32098d5ddf..cd634da963 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/VelocityRuntimeProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/VelocityRuntimeProvider.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.mail; import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.ProvisionException; @@ -28,6 +27,8 @@ import org.slf4j.LoggerFactory; import java.util.Properties; +import javax.inject.Inject; + /** Configures Velocity template engine for sending email. */ public class VelocityRuntimeProvider implements Provider { private final SitePaths site; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java index d89651bc8e..32615278f3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java @@ -40,7 +40,6 @@ import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.config.AllUsersNameProvider; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -57,6 +56,8 @@ import java.util.Comparator; import java.util.List; import java.util.Map; +import javax.inject.Inject; + /** View of a single {@link Change} based on the log of its notes branch. */ public class ChangeNotes extends AbstractChangeNotes { static final Ordering PSA_BY_TIME = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilder.java index 3eea41dc9d..c7473da514 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRebuilder.java @@ -40,7 +40,6 @@ import com.google.gerrit.server.patch.PatchListCache; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.lib.BatchRefUpdate; @@ -56,6 +55,8 @@ import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + public class ChangeRebuilder { private static final long TS_WINDOW_MS = TimeUnit.MILLISECONDS.convert(1, TimeUnit.SECONDS); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/CommentsInNotesUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/CommentsInNotesUtil.java index c2e5dfc6f4..c792ddec52 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/CommentsInNotesUtil.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/CommentsInNotesUtil.java @@ -36,7 +36,6 @@ import com.google.gerrit.server.GerritPersonIdent; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.config.AnonymousCowardName; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -68,6 +67,8 @@ import java.util.Collections; import java.util.Date; import java.util.List; +import javax.inject.Inject; + /** * Utility functions to parse PatchLineComments out of a note byte array and * store a list of PatchLineComments in the form of a note (in a byte array). diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DraftCommentNotes.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DraftCommentNotes.java index d40358bbac..5e96d0c3e0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DraftCommentNotes.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DraftCommentNotes.java @@ -29,7 +29,6 @@ import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.config.AllUsersNameProvider; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -40,6 +39,8 @@ import org.eclipse.jgit.revwalk.RevWalk; import java.io.IOException; +import javax.inject.Inject; + /** * View of the draft comments for a single {@link Change} based on the log of * its drafts branch. diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigration.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigration.java index e6d9ff89bc..b5940d1cdf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigration.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigration.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.notedb; import static com.google.common.base.Preconditions.checkArgument; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; @@ -25,6 +24,8 @@ import org.eclipse.jgit.lib.Config; import java.util.HashSet; import java.util.Set; +import javax.inject.Inject; + /** * Holds the current state of the NoteDb migration. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineLoader.java index 4961befe4d..9d92abc922 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineLoader.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineLoader.java @@ -18,7 +18,6 @@ package com.google.gerrit.server.patch; import com.google.common.cache.CacheLoader; import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import org.eclipse.jgit.diff.Edit; import org.eclipse.jgit.diff.MyersDiff; @@ -32,6 +31,8 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; +import javax.inject.Inject; + class IntraLineLoader extends CacheLoader { static final Logger log = LoggerFactory.getLogger(IntraLineLoader.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineWorkerPool.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineWorkerPool.java index 49ae9503ac..af7a56eed8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineWorkerPool.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineWorkerPool.java @@ -19,7 +19,6 @@ import static com.google.gerrit.server.patch.IntraLineLoader.log; import com.google.gerrit.server.config.GerritServerConfig; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; @@ -29,6 +28,8 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import javax.inject.Inject; + @Singleton public class IntraLineWorkerPool { public static class Module extends AbstractModule { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java index 7b7c73108a..64b7dda45f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java @@ -22,7 +22,6 @@ import com.google.gerrit.reviewdb.client.PatchSet; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Singleton; import com.google.inject.name.Named; @@ -32,6 +31,8 @@ import org.eclipse.jgit.lib.ObjectId; import java.util.concurrent.ExecutionException; +import javax.inject.Inject; + /** Provides a cached list of {@link PatchListEntry}. */ @Singleton public class PatchListCacheImpl implements PatchListCache { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java index de36020d85..2dbdb64415 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java @@ -24,7 +24,6 @@ import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.MergeUtil; -import com.google.inject.Inject; import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.diff.DiffFormatter; @@ -70,6 +69,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + public class PatchListLoader extends CacheLoader { static final Logger log = LoggerFactory.getLogger(PatchListLoader.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java index f3137fe8f0..6fdea63a6a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java @@ -26,7 +26,6 @@ import com.google.gerrit.reviewdb.client.Patch; import com.google.gerrit.reviewdb.client.PatchLineComment; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.FileTypeRegistry; -import com.google.inject.Inject; import eu.medsea.mimeutil.MimeType; import eu.medsea.mimeutil.MimeUtil2; @@ -50,6 +49,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import javax.inject.Inject; + class PatchScriptBuilder { static final int MAX_CONTEXT = 5000000; static final int BIG_FILE = 9000; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java index 919b41ad8e..78044e1aaf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java @@ -42,7 +42,6 @@ import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gerrit.server.project.NoSuchChangeException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -59,6 +58,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.Callable; +import javax.inject.Inject; + public class PatchScriptFactory implements Callable { public interface Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java index 340300af19..0970ce065f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java @@ -24,7 +24,6 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.account.AccountByEmailCache; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.errors.MissingObjectException; @@ -40,6 +39,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import javax.inject.Inject; + /** * Factory class creating PatchSetInfo from meta-data found in Git repository. diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/CopyConfigModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/CopyConfigModule.java index 6925dcc602..2db5e90aa3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/CopyConfigModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/CopyConfigModule.java @@ -27,7 +27,6 @@ import com.google.gerrit.server.securestore.SecureStore; import com.google.gerrit.server.securestore.SecureStoreProvider; import com.google.gwtorm.server.SchemaFactory; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import com.google.inject.Provides; import com.google.inject.Singleton; @@ -36,6 +35,8 @@ import org.eclipse.jgit.lib.PersonIdent; import java.io.File; +import javax.inject.Inject; + /** * Copies critical objects from the {@code dbInjector} into a plugin. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/DisablePlugin.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/DisablePlugin.java index d92dce0a16..7d07f896f9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/DisablePlugin.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/DisablePlugin.java @@ -21,9 +21,10 @@ import com.google.gerrit.extensions.restapi.MethodNotAllowedException; import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.server.plugins.DisablePlugin.Input; import com.google.gerrit.server.plugins.ListPlugins.PluginInfo; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @Singleton class DisablePlugin implements RestModifyView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/EnablePlugin.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/EnablePlugin.java index b6f8260e20..ce260e507c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/EnablePlugin.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/EnablePlugin.java @@ -22,12 +22,13 @@ import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.server.plugins.EnablePlugin.Input; import com.google.gerrit.server.plugins.ListPlugins.PluginInfo; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.PrintWriter; import java.io.StringWriter; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @Singleton class EnablePlugin implements RestModifyView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/InstallPlugin.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/InstallPlugin.java index 33e0d124dc..0e23889c9a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/InstallPlugin.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/InstallPlugin.java @@ -25,7 +25,6 @@ import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.extensions.restapi.TopLevelResource; import com.google.gerrit.server.plugins.InstallPlugin.Input; import com.google.gerrit.server.plugins.ListPlugins.PluginInfo; -import com.google.inject.Inject; import java.io.IOException; import java.io.InputStream; @@ -35,6 +34,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.zip.ZipException; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) class InstallPlugin implements RestModifyView { static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarPluginProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarPluginProvider.java index 1ef1d8238e..f397b75533 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarPluginProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarPluginProvider.java @@ -18,7 +18,6 @@ import static com.google.gerrit.server.plugins.PluginLoader.asTemp; import com.google.common.base.MoreObjects; import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; import org.eclipse.jgit.internal.storage.file.FileSnapshot; import org.slf4j.Logger; @@ -38,6 +37,8 @@ import java.util.List; import java.util.jar.JarFile; import java.util.jar.Manifest; +import javax.inject.Inject; + public class JarPluginProvider implements ServerPluginProvider { static final String PLUGIN_TMP_PREFIX = "plugin_"; static final String JAR_EXTENSION = ".jar"; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ListPlugins.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ListPlugins.java index 54f05f05f7..3c19368ed4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ListPlugins.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ListPlugins.java @@ -25,7 +25,6 @@ import com.google.gerrit.extensions.restapi.Url; import com.google.gerrit.server.OutputFormat; import com.google.gson.JsonElement; import com.google.gson.reflect.TypeToken; -import com.google.inject.Inject; import org.kohsuke.args4j.Option; @@ -35,6 +34,8 @@ import java.util.Comparator; import java.util.List; import java.util.Map; +import javax.inject.Inject; + /** List the installed plugins. */ @RequiresCapability(GlobalCapability.VIEW_PLUGINS) public class ListPlugins implements RestReadView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginCleanerTask.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginCleanerTask.java index 606d5daa7e..dab395c953 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginCleanerTask.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginCleanerTask.java @@ -16,12 +16,13 @@ package com.google.gerrit.server.plugins; import com.google.gerrit.server.git.WorkQueue; import com.google.gerrit.server.util.TimeUtil; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + @Singleton class PluginCleanerTask implements Runnable { private final WorkQueue workQueue; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java index 20633d1d6f..717b78224c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java @@ -36,7 +36,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.gerrit.server.plugins.ServerPluginProvider.PluginDescription; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -66,6 +65,8 @@ import java.util.TreeSet; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + @Singleton public class PluginLoader implements LifecycleListener { static final String PLUGIN_TMP_PREFIX = "plugin_"; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginsCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginsCollection.java index a4834ba9f5..62f738c258 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginsCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginsCollection.java @@ -22,10 +22,11 @@ import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestCollection; import com.google.gerrit.extensions.restapi.RestView; import com.google.gerrit.extensions.restapi.TopLevelResource; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class PluginsCollection implements RestCollection, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ReloadPlugin.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ReloadPlugin.java index e9c5aa2c7b..ef3b5f2f3e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ReloadPlugin.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ReloadPlugin.java @@ -21,12 +21,13 @@ import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.server.plugins.ListPlugins.PluginInfo; import com.google.gerrit.server.plugins.ReloadPlugin.Input; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.PrintWriter; import java.io.StringWriter; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @Singleton class ReloadPlugin implements RestModifyView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java index 0e8bd872ef..c1a6df32b1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.plugins; import com.google.gerrit.extensions.registration.DynamicSet; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.internal.storage.file.FileSnapshot; @@ -26,6 +25,8 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + @Singleton class UniversalServerPluginProvider implements ServerPluginProvider { private static final Logger log = LoggerFactory.getLogger(UniversalServerPluginProvider.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/BanCommit.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/BanCommit.java index 930360a1dc..416eca7b60 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/BanCommit.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/BanCommit.java @@ -24,7 +24,6 @@ import com.google.gerrit.extensions.restapi.UnprocessableEntityException; import com.google.gerrit.server.git.BanCommitResult; import com.google.gerrit.server.git.MergeException; import com.google.gerrit.server.project.BanCommit.Input; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.api.errors.ConcurrentRefUpdateException; @@ -34,6 +33,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + @Singleton public class BanCommit implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/BranchesCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/BranchesCollection.java index 3bf3522d37..f5656e70e7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/BranchesCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/BranchesCollection.java @@ -21,7 +21,6 @@ import com.google.gerrit.extensions.restapi.IdString; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestView; import com.google.gerrit.server.project.ListBranches.BranchInfo; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Constants; @@ -29,6 +28,8 @@ import org.eclipse.jgit.lib.Constants; import java.io.IOException; import java.util.List; +import javax.inject.Inject; + @Singleton public class BranchesCollection implements ChildCollection, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java index e93f69c82c..ac8563a5d8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java @@ -34,7 +34,6 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.notedb.ChangeNotes; import com.google.gerrit.server.query.change.ChangeData; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; import com.google.inject.assistedinject.AssistedInject; @@ -55,6 +54,8 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import javax.inject.Inject; + /** Access control management for a user accessing a single change. */ public class ChangeControl { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectsCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectsCollection.java index ca98cf67b2..550675f19c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectsCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectsCollection.java @@ -21,12 +21,13 @@ import com.google.gerrit.extensions.restapi.IdString; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestView; import com.google.gerrit.extensions.restapi.TopLevelResource; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class ChildProjectsCollection implements ChildCollection { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CommentLinkProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/CommentLinkProvider.java index 114ab90a91..bb78f06c38 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/CommentLinkProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/CommentLinkProvider.java @@ -18,7 +18,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.git.ProjectConfig; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.ProvisionException; @@ -27,6 +26,8 @@ import org.eclipse.jgit.lib.Config; import java.util.List; import java.util.Set; +import javax.inject.Inject; + public class CommentLinkProvider implements Provider> { private final Config cfg; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CommitsCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/CommitsCollection.java index e5e7bed21c..d6a0d33816 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/CommitsCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/CommitsCollection.java @@ -21,7 +21,6 @@ import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestView; 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 com.google.inject.Singleton; @@ -34,6 +33,8 @@ import org.eclipse.jgit.revwalk.RevWalk; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class CommitsCollection implements ChildCollection { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateBranch.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateBranch.java index 983549d059..e6516432bb 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateBranch.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateBranch.java @@ -32,7 +32,6 @@ import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.CreateBranch.Input; import com.google.gerrit.server.project.ListBranches.BranchInfo; import com.google.gerrit.server.util.MagicBranch; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -52,6 +51,8 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import javax.inject.Inject; + public class CreateBranch implements RestModifyView { private static final Logger log = LoggerFactory.getLogger(CreateBranch.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateProject.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateProject.java index be7c2729b6..324f112aa0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateProject.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateProject.java @@ -39,7 +39,6 @@ import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.group.GroupsCollection; import com.google.gerrit.server.validators.ProjectCreationValidationListener; import com.google.gerrit.server.validators.ValidationException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -48,6 +47,8 @@ import org.eclipse.jgit.errors.ConfigInvalidException; import java.io.IOException; import java.util.List; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.CREATE_PROJECT) public class CreateProject implements RestModifyView { public static interface Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardsCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardsCollection.java index 38bbba4178..dd561c6852 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardsCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardsCollection.java @@ -35,7 +35,6 @@ import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.UrlEncoded; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gson.annotations.SerializedName; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -52,6 +51,8 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.List; +import javax.inject.Inject; + @Singleton class DashboardsCollection implements ChildCollection, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteBranch.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteBranch.java index 14069bd7c6..5c9d2b5f8f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteBranch.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteBranch.java @@ -25,7 +25,6 @@ import com.google.gerrit.server.extensions.events.GitReferenceUpdated; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.DeleteBranch.Input; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -36,6 +35,8 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class DeleteBranch implements RestModifyView{ private static final Logger log = LoggerFactory.getLogger(DeleteBranch.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteDashboard.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteDashboard.java index b525399083..adf3d11528 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteDashboard.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteDashboard.java @@ -23,12 +23,13 @@ import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.server.project.DashboardsCollection.DashboardInfo; import com.google.gerrit.server.project.DeleteDashboard.Input; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; + @Singleton class DeleteDashboard implements RestModifyView { static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/FilesCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/FilesCollection.java index f0544fef49..38dfbb5693 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/FilesCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/FilesCollection.java @@ -19,9 +19,10 @@ import com.google.gerrit.extensions.restapi.ChildCollection; import com.google.gerrit.extensions.restapi.IdString; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestView; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class FilesCollection implements ChildCollection { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/FilesInCommitCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/FilesInCommitCollection.java index f3832307a1..756db0a196 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/FilesInCommitCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/FilesInCommitCollection.java @@ -19,9 +19,10 @@ import com.google.gerrit.extensions.restapi.ChildCollection; import com.google.gerrit.extensions.restapi.IdString; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestView; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class FilesInCommitCollection implements ChildCollection { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GarbageCollect.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GarbageCollect.java index fe1086b6f1..113823a00b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GarbageCollect.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GarbageCollect.java @@ -26,7 +26,6 @@ import com.google.gerrit.server.git.GarbageCollection; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.LocalDiskRepositoryManager; import com.google.gerrit.server.project.GarbageCollect.Input; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.IOException; @@ -35,6 +34,8 @@ import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.util.Collections; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.RUN_GC) @Singleton public class GarbageCollect implements RestModifyView, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetChildProject.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetChildProject.java index 815653ff8d..289b0bcca9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetChildProject.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetChildProject.java @@ -17,10 +17,11 @@ package com.google.gerrit.server.project; import com.google.gerrit.extensions.common.ProjectInfo; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestReadView; -import com.google.inject.Inject; import org.kohsuke.args4j.Option; +import javax.inject.Inject; + public class GetChildProject implements RestReadView { @Option(name = "--recursive", usage = "to list child projects recursively") private boolean recursive; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetConfig.java index bb910970da..8f05657d97 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetConfig.java @@ -21,9 +21,10 @@ import com.google.gerrit.server.config.AllProjectsNameProvider; import com.google.gerrit.server.config.PluginConfigFactory; import com.google.gerrit.server.config.ProjectConfigEntry; import com.google.gerrit.server.git.TransferConfig; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class GetConfig implements RestReadView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetContent.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetContent.java index 00f25bc0f5..760ad04431 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetContent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetContent.java @@ -18,11 +18,12 @@ import com.google.gerrit.extensions.restapi.BinaryResult; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.change.FileContentUtil; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class GetContent implements RestReadView { private final FileContentUtil fileContentUtil; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetDashboard.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetDashboard.java index 8acc29e608..48b4c99c7a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetDashboard.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetDashboard.java @@ -25,7 +25,6 @@ import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.extensions.restapi.Url; import com.google.gerrit.server.project.DashboardsCollection.DashboardInfo; -import com.google.inject.Inject; import org.eclipse.jgit.errors.ConfigInvalidException; import org.kohsuke.args4j.Option; @@ -33,6 +32,8 @@ import org.kohsuke.args4j.Option; import java.io.IOException; import java.util.List; +import javax.inject.Inject; + class GetDashboard implements RestReadView { private final DashboardsCollection dashboards; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetHead.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetHead.java index 0530a4cdf8..94a87aafde 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetHead.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetHead.java @@ -19,7 +19,6 @@ import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestReadView; 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 com.google.inject.Singleton; @@ -34,6 +33,8 @@ import org.eclipse.jgit.revwalk.RevWalk; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class GetHead implements RestReadView { private GitRepositoryManager repoManager; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetParent.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetParent.java index 8161cfd435..06528cd533 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetParent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetParent.java @@ -17,9 +17,10 @@ package com.google.gerrit.server.project; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.config.AllProjectsName; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton class GetParent implements RestReadView { private final AllProjectsName allProjectsName; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetProject.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetProject.java index e782cb1a34..70d806f221 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetProject.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetProject.java @@ -16,9 +16,10 @@ package com.google.gerrit.server.project; import com.google.gerrit.extensions.common.ProjectInfo; import com.google.gerrit.extensions.restapi.RestReadView; -import com.google.inject.Inject; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton class GetProject implements RestReadView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java index 7e52381e0c..629b87ed60 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java @@ -23,7 +23,6 @@ import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.CommonConverters; import com.google.gerrit.server.args4j.TimestampHandler; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.inject.Inject; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.ReflogEntry; @@ -36,6 +35,8 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + public class GetReflog implements RestReadView { private final GitRepositoryManager repoManager; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetStatistics.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetStatistics.java index 2b9d11f8a7..39d4dfa62a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetStatistics.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetStatistics.java @@ -20,7 +20,6 @@ import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.api.GarbageCollectCommand; @@ -31,6 +30,8 @@ import org.eclipse.jgit.lib.Repository; import java.io.IOException; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.RUN_GC) @Singleton public class GetStatistics implements RestReadView { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java index ba3180585d..c8369ef351 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java @@ -28,7 +28,6 @@ import com.google.gerrit.reviewdb.client.RefNames; import com.google.gerrit.server.WebLinks; import com.google.gerrit.server.extensions.webui.UiActions; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import com.google.inject.util.Providers; @@ -47,6 +46,8 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; +import javax.inject.Inject; + @Singleton public class ListBranches implements RestReadView { private final GitRepositoryManager repoManager; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java index 8d1e95f546..14088d0865 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java @@ -22,7 +22,6 @@ import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.config.AllProjectsNameProvider; -import com.google.inject.Inject; import org.kohsuke.args4j.Option; @@ -30,6 +29,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import javax.inject.Inject; + public class ListChildProjects implements RestReadView { @Option(name = "--recursive", usage = "to list child projects recursively") diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java index 07fd095f74..b94427ad52 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java @@ -22,7 +22,6 @@ import com.google.gerrit.extensions.restapi.RestReadView; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.DashboardsCollection.DashboardInfo; -import com.google.inject.Inject; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.RepositoryNotFoundException; @@ -39,6 +38,8 @@ import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.List; +import javax.inject.Inject; + class ListDashboards implements RestReadView { private static final Logger log = LoggerFactory.getLogger(DashboardsCollection.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java index ad9636ea69..d8900975fa 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java @@ -42,7 +42,6 @@ import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.util.RegexListSearcher; import com.google.gerrit.server.util.TreeFormatter; import com.google.gson.reflect.TypeToken; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.errors.RepositoryNotFoundException; @@ -70,6 +69,8 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; +import javax.inject.Inject; + /** List projects visible to the calling user. */ public class ListProjects implements RestReadView { private static final Logger log = LoggerFactory.getLogger(ListProjects.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PerRequestProjectControlCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/PerRequestProjectControlCache.java index f46a88118e..eb54e3bc87 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/PerRequestProjectControlCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/PerRequestProjectControlCache.java @@ -16,12 +16,13 @@ package com.google.gerrit.server.project; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.CurrentUser; -import com.google.inject.Inject; import com.google.inject.servlet.RequestScoped; import java.util.HashMap; import java.util.Map; +import javax.inject.Inject; + /** Caches {@link ProjectControl} objects for the current user of the request. */ @RequestScoped public class PerRequestProjectControlCache { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PerformCreateProject.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/PerformCreateProject.java index 111385c55f..dfbb752283 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/PerformCreateProject.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/PerformCreateProject.java @@ -38,7 +38,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.git.RepositoryCaseMismatchException; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -61,6 +60,8 @@ import java.util.Collections; import java.util.List; import java.util.Set; +import javax.inject.Inject; + /** Common class that holds the code to create projects */ public class PerformCreateProject { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PermissionCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/PermissionCollection.java index 63d2b35fa3..d10fb23092 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/PermissionCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/PermissionCollection.java @@ -23,7 +23,6 @@ import com.google.gerrit.common.data.Permission; import com.google.gerrit.common.data.PermissionRule; import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.Project; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.ArrayList; @@ -35,6 +34,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + /** * Effective permissions applied to a reference in a project. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheClock.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheClock.java index c96ebdf1ff..a5ba87956e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheClock.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheClock.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.project; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.gerrit.server.config.ConfigUtil; import com.google.gerrit.server.config.GerritServerConfig; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Config; @@ -26,6 +25,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import javax.inject.Inject; + /** Ticks periodically to force refresh events for {@link ProjectCacheImpl}. */ @Singleton public class ProjectCacheClock { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java index 1e7a221a18..4035a49e47 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java @@ -25,7 +25,6 @@ import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.config.AllUsersName; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.ProjectConfig; -import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Singleton; import com.google.inject.TypeLiteral; @@ -46,6 +45,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import javax.inject.Inject; + /** Cache of project information, including access rights. */ @Singleton public class ProjectCacheImpl implements ProjectCache { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java index 2ae09f229f..e259ab6be9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java @@ -44,7 +44,6 @@ import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.TagCache; import com.google.gerrit.server.git.VisibleRefFilter; import com.google.gerrit.server.group.SystemGroupBackend; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -64,6 +63,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + /** Access control management for a user accessing a project's data. */ public class ProjectControl { public static final int VISIBLE = 1 << 0; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java index 4cafc0a556..bb6ea2be97 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java @@ -23,10 +23,11 @@ import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.WebLinks; import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.config.AllProjectsNameProvider; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; +import javax.inject.Inject; + @Singleton public class ProjectJson { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNode.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNode.java index e74511a4d9..d033ddcc21 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNode.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNode.java @@ -17,12 +17,13 @@ package com.google.gerrit.server.project; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.util.TreeFormatter.TreeNode; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.util.SortedSet; import java.util.TreeSet; +import javax.inject.Inject; + /** Node of a Project in a tree formatted by {@link ListProjects}. */ public class ProjectNode implements TreeNode, Comparable { public interface Factory { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java index df4899312d..41ca029f7f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java @@ -44,7 +44,6 @@ import com.google.gerrit.server.git.BranchOrderSection; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.git.ProjectLevelConfig; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import com.googlecode.prolog_cafe.compiler.CompileException; @@ -68,6 +67,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + /** Cached information on a project. */ public class ProjectState { private static final Logger log = diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectsCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectsCollection.java index 519f4f21a8..55b7094589 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectsCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectsCollection.java @@ -25,12 +25,13 @@ import com.google.gerrit.extensions.restapi.UnprocessableEntityException; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.OutputFormat; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class ProjectsCollection implements RestCollection, diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java index 7c7b966d85..f865b559b8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java @@ -42,7 +42,6 @@ import com.google.gerrit.server.git.MetaDataUpdate; import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.git.TransferConfig; import com.google.gerrit.server.project.PutConfig.Input; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -58,6 +57,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import javax.inject.Inject; + @Singleton public class PutConfig implements RestModifyView { private static final Logger log = LoggerFactory.getLogger(PutConfig.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PutDescription.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/PutDescription.java index db67ce0edd..a42633d325 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/PutDescription.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/PutDescription.java @@ -32,7 +32,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.project.PutDescription.Input; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -41,6 +40,8 @@ import org.eclipse.jgit.lib.ObjectId; import java.io.IOException; +import javax.inject.Inject; + @Singleton class PutDescription implements RestModifyView { static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SectionSortCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SectionSortCache.java index c012bd53db..53feb71451 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SectionSortCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SectionSortCache.java @@ -18,7 +18,6 @@ import com.google.common.cache.Cache; import com.google.gerrit.common.data.AccessSection; import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.util.MostSpecificComparator; -import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Singleton; import com.google.inject.name.Named; @@ -31,6 +30,8 @@ import java.util.Collections; import java.util.IdentityHashMap; import java.util.List; +import javax.inject.Inject; + /** Caches the order AccessSections should be sorted for evaluation. */ @Singleton public class SectionSortCache { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetDashboard.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetDashboard.java index cda548a54f..8aa2b5edbf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetDashboard.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetDashboard.java @@ -22,12 +22,13 @@ import com.google.gerrit.extensions.restapi.ResourceConflictException; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.server.project.SetDashboard.Input; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.io.IOException; +import javax.inject.Inject; + @Singleton class SetDashboard implements RestModifyView { static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetDefaultDashboard.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetDefaultDashboard.java index b18b8ec442..9f1b701b95 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetDefaultDashboard.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetDefaultDashboard.java @@ -29,7 +29,6 @@ import com.google.gerrit.server.git.MetaDataUpdate; import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.project.DashboardsCollection.DashboardInfo; import com.google.gerrit.server.project.SetDashboard.Input; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -38,6 +37,8 @@ import org.kohsuke.args4j.Option; import java.io.IOException; +import javax.inject.Inject; + class SetDefaultDashboard implements RestModifyView { private final ProjectCache cache; private final MetaDataUpdate.Server updateFactory; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetHead.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetHead.java index 7efc1b79fd..ae1197be97 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetHead.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetHead.java @@ -26,7 +26,6 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.auth.AuthException; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.SetHead.Input; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -39,6 +38,8 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class SetHead implements RestModifyView { private static final Logger log = LoggerFactory.getLogger(SetHead.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java index 4ff2b0fa18..53c26098ad 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java @@ -30,7 +30,6 @@ import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.git.MetaDataUpdate; import com.google.gerrit.server.git.ProjectConfig; import com.google.gerrit.server.project.SetParent.Input; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -38,6 +37,8 @@ import org.eclipse.jgit.errors.RepositoryNotFoundException; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class SetParent implements RestModifyView { public static class Input { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SuggestParentCandidates.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/SuggestParentCandidates.java index 4b8d2a4ba8..65a87f0995 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/SuggestParentCandidates.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/SuggestParentCandidates.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.project; import com.google.gerrit.reviewdb.client.Project; import com.google.gerrit.server.config.AllProjectsName; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.ArrayList; @@ -26,6 +25,8 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; +import javax.inject.Inject; + @Singleton public class SuggestParentCandidates { private final ProjectControl.Factory projectControlFactory; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/BasicChangeRewrites.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/BasicChangeRewrites.java index e85365610d..742ef548fb 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/BasicChangeRewrites.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/BasicChangeRewrites.java @@ -19,11 +19,12 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.query.IntPredicate; import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.QueryRewriter; -import com.google.inject.Inject; import com.google.inject.OutOfScopeException; import com.google.inject.Provider; import com.google.inject.name.Named; +import javax.inject.Inject; + public class BasicChangeRewrites extends QueryRewriter { private static final ChangeQueryBuilder BUILDER = new ChangeQueryBuilder( new ChangeQueryBuilder.Arguments( // diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java index 30862b6cd2..882478393c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java @@ -48,7 +48,6 @@ import com.google.gerrit.server.query.Predicate; import com.google.gerrit.server.query.QueryBuilder; import com.google.gerrit.server.query.QueryParseException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -63,6 +62,8 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; +import javax.inject.Inject; + /** * Parses a query string meant to be applied to change objects. */ diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsCacheImpl.java index 1b3473e38b..322d0d5b35 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsCacheImpl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsCacheImpl.java @@ -16,11 +16,12 @@ package com.google.gerrit.server.query.change; import com.google.common.cache.Cache; import com.google.gerrit.server.cache.CacheModule; -import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Singleton; import com.google.inject.name.Named; +import javax.inject.Inject; + @Singleton public class ConflictsCacheImpl implements ConflictsCache { public final static String NAME = "conflicts"; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java index 4808b47f3d..21e2516bcd 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java @@ -26,7 +26,6 @@ import com.google.gerrit.server.change.ChangeJson; import com.google.gerrit.server.change.ChangeJson.ChangeInfo; import com.google.gerrit.server.query.QueryParseException; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import org.kohsuke.args4j.Option; @@ -38,6 +37,8 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import javax.inject.Inject; + public class QueryChanges implements RestReadView { private final ChangeJson json; private final QueryProcessor imp; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java index d32d4b61f9..0a1dddd294 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryProcessor.java @@ -36,7 +36,6 @@ import com.google.gerrit.server.util.TimeUtil; import com.google.gson.Gson; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.util.io.DisabledOutputStream; @@ -58,6 +57,8 @@ import java.util.Comparator; import java.util.Date; import java.util.List; +import javax.inject.Inject; + public class QueryProcessor { private static final Logger log = LoggerFactory.getLogger(QueryProcessor.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java index 07de4c1b72..74bab6e3c7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllUsersCreator.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllUsersCreator.java index fda5306965..abea34ef8d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllUsersCreator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllUsersCreator.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java index 49ac45297d..18faad5cfa 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java @@ -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. */ diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/H2.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/H2.java index f43530f8aa..8d27c3f99d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/H2.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/H2.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/JDBC.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/JDBC.java index 2c2051de00..a781dd7241 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/JDBC.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/JDBC.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MaxDb.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MaxDb.java index 7ef88f0c94..ba31a4eb30 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MaxDb.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MaxDb.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java index 308cec8ec6..16f135559f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Oracle.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Oracle.java index bb4c477009..96d9b64ce9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Oracle.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Oracle.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/PostgreSQL.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/PostgreSQL.java index c58d0c22c5..215e24dbd2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/PostgreSQL.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/PostgreSQL.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/ReviewDbDatabaseProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/ReviewDbDatabaseProvider.java index 9ceaf1cecc..33560f7a74 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/ReviewDbDatabaseProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/ReviewDbDatabaseProvider.java @@ -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} database handle. */ diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java index 298c0d8e4d..9f9d069fbe 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java @@ -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 diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaUpdater.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaUpdater.java index 0cea4bc9df..d4ddda7d18 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaUpdater.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaUpdater.java @@ -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 schema; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersionCheck.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersionCheck.java index 2e12f5c62a..4c91de1685 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersionCheck.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersionCheck.java @@ -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 () { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_52.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_52.java index 76dbdf53a2..19ba3658b9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_52.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_52.java @@ -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() { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_53.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_53.java index c4f845859d..20e8157fc1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_53.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_53.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_54.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_54.java index 77c677522f..91ef7de6d7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_54.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_54.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_55.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_55.java index 006c759ecd..ec92a97fb2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_55.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_55.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_56.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_56.java index 852ca2aa7f..20dca0cfc9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_56.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_56.java @@ -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 keysOne; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_57.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_57.java index 4b4f545648..36f03b065e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_57.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_57.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_58.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_58.java index 72b0c8b448..ba9ac80186 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_58.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_58.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_59.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_59.java index d90ecc1bec..ab84b4b77b 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_59.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_59.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_60.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_60.java index 7fe0cdede1..ae81707438 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_60.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_60.java @@ -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 diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_61.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_61.java index 890c824480..9fb463e919 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_61.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_61.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_62.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_62.java index 4de8e55858..a0795027c6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_62.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_62.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_63.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_63.java index 761c36a568..6f4d3f16ee 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_63.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_63.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_64.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_64.java index e665bdca97..93a8a835f3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_64.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_64.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_65.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_65.java index 636e0c6563..175a280579 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_65.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_65.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_66.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_66.java index 9ee2c6ffd6..4a50449c49 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_66.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_66.java @@ -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 diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_67.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_67.java index b57dcb9752..cc10105c63 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_67.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_67.java @@ -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 diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_68.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_68.java index 4dc2b6e4ba..7012716658 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_68.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_68.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_69.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_69.java index 9b2bff4a0e..54211aa8db 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_69.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_69.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_70.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_70.java index 3868e667fb..51e140b312 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_70.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_70.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_71.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_71.java index 8d5b9438ca..e84b93cc70 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_71.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_71.java @@ -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 diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_72.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_72.java index 748837b985..09850541d5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_72.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_72.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_73.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_73.java index 2732a3d8bd..e3234a5242 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_73.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_73.java @@ -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 diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_74.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_74.java index e5480b4e75..9a4f7704fd 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_74.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_74.java @@ -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 diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_75.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_75.java index a847f255f4..6cf6b6dad5 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_75.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_75.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_76.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_76.java index 8b0b557832..562268dfa3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_76.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_76.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_77.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_77.java index a5166b6224..6427f468df 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_77.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_77.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_78.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_78.java index 18ae8b4ff6..24d5c021c1 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_78.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_78.java @@ -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 diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_79.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_79.java index c5087eab3e..2b20b3c2ac 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_79.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_79.java @@ -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 diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_80.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_80.java index 2cf8d2a1bf..231ecdb769 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_80.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_80.java @@ -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 diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_81.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_81.java index 1e3b2b7be5..15f91b23cd 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_81.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_81.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_82.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_82.java index 939afe07f8..2adc6277a0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_82.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_82.java @@ -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 tables = ImmutableMap.of( diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_83.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_83.java index 160d41c984..41cbce2cdf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_83.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_83.java @@ -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 diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_84.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_84.java index c96f650618..e93540ff37 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_84.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_84.java @@ -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 diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_85.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_85.java index e24e67cbc7..5468fbbc39 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_85.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_85.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_86.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_86.java index d758189a66..052196ba3e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_86.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_86.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_87.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_87.java index 451f5edc77..46bebfe6ba 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_87.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_87.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_88.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_88.java index 0a7f14c994..c4c4afab1d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_88.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_88.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_89.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_89.java index 34f6b606c9..cb6b72b031 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_89.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_89.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_90.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_90.java index c117509e6e..03e4980723 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_90.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_90.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_91.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_91.java index 173793e711..eee73a3b36 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_91.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_91.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_92.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_92.java index 5f5c141498..4aa604db2d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_92.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_92.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_93.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_93.java index 3132aa4e4f..5b6c059ee3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_93.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_93.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_94.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_94.java index 3d45274265..d338d3b165 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_94.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_94.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_95.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_95.java index 1c839f7281..3938357ded 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_95.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_95.java @@ -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; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_96.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_96.java index bf1921386e..9c714af6a9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_96.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_96.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_97.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_97.java index 06703778a5..c3613e1b10 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_97.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_97.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_98.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_98.java index aea5abc0dc..c91b70597d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_98.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_98.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_99.java b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_99.java index b7fab7f659..2e0876e2a2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_99.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_99.java @@ -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 prior) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/securestore/DefaultSecureStore.java b/gerrit-server/src/main/java/com/google/gerrit/server/securestore/DefaultSecureStore.java index 9a073546dd..0adf5fcd60 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/securestore/DefaultSecureStore.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/securestore/DefaultSecureStore.java @@ -16,7 +16,6 @@ package com.google.gerrit.server.securestore; import com.google.gerrit.common.FileUtil; import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.internal.storage.file.LockFile; @@ -28,6 +27,8 @@ import java.io.File; import java.io.IOException; import java.util.List; +import javax.inject.Inject; + @Singleton public class DefaultSecureStore implements SecureStore { private final FileBasedConfig sec; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/securestore/SecureStoreProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/securestore/SecureStoreProvider.java index c830ee6240..818c8cf837 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/securestore/SecureStoreProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/securestore/SecureStoreProvider.java @@ -17,7 +17,6 @@ package com.google.gerrit.server.securestore; import com.google.common.base.Strings; import com.google.gerrit.common.SiteLibraryLoaderUtil; import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Provider; @@ -30,6 +29,8 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; +import javax.inject.Inject; + public class SecureStoreProvider implements Provider { private static final Logger log = LoggerFactory .getLogger(SecureStoreProvider.class); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/tools/ToolsCatalog.java b/gerrit-server/src/main/java/com/google/gerrit/server/tools/ToolsCatalog.java index 3e41858116..d682118289 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/tools/ToolsCatalog.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/tools/ToolsCatalog.java @@ -15,7 +15,6 @@ package com.google.gerrit.server.tools; import com.google.gerrit.common.Version; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.eclipse.jgit.lib.Constants; @@ -35,6 +34,8 @@ import java.util.List; import java.util.SortedMap; import java.util.TreeMap; +import javax.inject.Inject; + /** * Listing of all client side tools stored on this server. *

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/FallbackRequestContext.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/FallbackRequestContext.java index 5514ef566b..dec4cc8ce8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/FallbackRequestContext.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/FallbackRequestContext.java @@ -17,11 +17,12 @@ 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; +import javax.inject.Inject; + /** * The default RequestContext to use when not in a request scope e.g. * ThreadLocalRequestContext is not set. diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/GuiceRequestScopePropagator.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/GuiceRequestScopePropagator.java index 0b2efd8780..5914b8a8d9 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/GuiceRequestScopePropagator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/GuiceRequestScopePropagator.java @@ -19,7 +19,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; import com.google.inject.servlet.ServletScopes; @@ -32,6 +31,8 @@ import java.net.SocketAddress; import java.util.Map; import java.util.concurrent.Callable; +import javax.inject.Inject; + /** Propagator for Guice's built-in servlet scope. */ public class GuiceRequestScopePropagator extends RequestScopePropagator { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/IdGenerator.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/IdGenerator.java index 78eb6572c3..320e56b127 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/IdGenerator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/IdGenerator.java @@ -14,12 +14,13 @@ package com.google.gerrit.server.util; -import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; +import javax.inject.Inject; + /** Simple class to produce 4 billion keys randomly distributed. */ @Singleton public class IdGenerator { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/ServerRequestContext.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/ServerRequestContext.java index 2b6b86e5a1..b4be30377a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/ServerRequestContext.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/ServerRequestContext.java @@ -17,10 +17,11 @@ 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; +import javax.inject.Inject; + /** RequestContext with an InternalUser making the internals visible. */ public class ServerRequestContext implements RequestContext { private final InternalUser user; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/SystemLog.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/SystemLog.java index ba31f565fe..e2e70c6afd 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/SystemLog.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/SystemLog.java @@ -18,7 +18,6 @@ import com.google.common.base.Strings; import com.google.gerrit.common.Die; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.apache.log4j.Appender; @@ -36,6 +35,8 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.io.IOException; +import javax.inject.Inject; + @Singleton public class SystemLog { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/ThreadLocalRequestContext.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/ThreadLocalRequestContext.java index d1b1da4b0e..875e61876e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/ThreadLocalRequestContext.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/ThreadLocalRequestContext.java @@ -21,13 +21,14 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.IdentifiedUser; import com.google.inject.AbstractModule; -import com.google.inject.Inject; import com.google.inject.Module; import com.google.inject.Provides; import com.google.inject.ProvisionException; import com.google.inject.name.Named; import com.google.inject.name.Names; +import javax.inject.Inject; + /** * ThreadLocalRequestContext manages the current RequestContext using a * ThreadLocal. When the context is set, the fields exposed by the context diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/change/CommentsTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/change/CommentsTest.java index 0265d9dc3b..5549d4dadc 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/change/CommentsTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/change/CommentsTest.java @@ -75,7 +75,6 @@ import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; import com.google.inject.AbstractModule; import com.google.inject.Guice; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Provides; import com.google.inject.Singleton; @@ -96,6 +95,8 @@ import java.util.List; import java.util.Map; import java.util.TimeZone; +import javax.inject.Inject; + @RunWith(ConfigSuite.class) public class CommentsTest { private static final TimeZone TZ = diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/git/LabelNormalizerTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/git/LabelNormalizerTest.java index 40088e9506..70a150cf31 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/git/LabelNormalizerTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/git/LabelNormalizerTest.java @@ -45,7 +45,6 @@ import com.google.gerrit.server.util.TimeUtil; import com.google.gerrit.testutil.InMemoryDatabase; import com.google.gerrit.testutil.InMemoryModule; import com.google.inject.Guice; -import com.google.inject.Inject; import com.google.inject.Injector; import org.eclipse.jgit.lib.Repository; @@ -55,6 +54,8 @@ import org.junit.Test; import java.util.List; +import javax.inject.Inject; + /** Unit tests for {@link LabelNormalizer}. */ public class LabelNormalizerTest { @Inject private AccountManager accountManager; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java index 635ccbd9d0..510ec04a2d 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java @@ -55,7 +55,6 @@ import com.google.gwtorm.client.KeyUtil; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.StandardKeyEncoder; import com.google.inject.Guice; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.util.Providers; @@ -72,6 +71,8 @@ import java.sql.Timestamp; import java.util.TimeZone; import java.util.concurrent.atomic.AtomicLong; +import javax.inject.Inject; + public class AbstractChangeNotesTest { private static final TimeZone TZ = TimeZone.getTimeZone("America/Los_Angeles"); diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/project/ProjectControlTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/project/ProjectControlTest.java index c3fbccd4d9..52725ecc8a 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/project/ProjectControlTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/project/ProjectControlTest.java @@ -34,7 +34,6 @@ import com.google.gerrit.testutil.InMemoryDatabase; import com.google.gerrit.testutil.InMemoryModule; import com.google.gerrit.testutil.InMemoryRepositoryManager; import com.google.inject.Guice; -import com.google.inject.Inject; import com.google.inject.Injector; import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; @@ -46,6 +45,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import javax.inject.Inject; + /** Unit tests for {@link ProjectControl}. */ public class ProjectControlTest { @Inject private AccountManager accountManager; diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java index 4181c147a9..dfebe7bc02 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java @@ -63,7 +63,6 @@ import com.google.gerrit.server.util.TimeUtil; import com.google.gerrit.testutil.ConfigSuite; import com.google.gerrit.testutil.InMemoryDatabase; import com.google.gerrit.testutil.InMemoryRepositoryManager; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Provider; import com.google.inject.util.Providers; @@ -84,6 +83,8 @@ import org.junit.runner.RunWith; import java.util.List; import java.util.concurrent.atomic.AtomicLong; +import javax.inject.Inject; + @Ignore @RunWith(ConfigSuite.class) public abstract class AbstractQueryChangesTest { diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java index 996aafa3c6..cc0972f9d8 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java @@ -32,7 +32,6 @@ import com.google.gerrit.testutil.InMemoryDatabase; import com.google.gerrit.testutil.InMemoryModule; import com.google.gwtorm.jdbc.JdbcSchema; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.eclipse.jgit.lib.Repository; import org.junit.After; @@ -46,6 +45,8 @@ import java.sql.SQLException; import java.util.Arrays; import java.util.List; +import javax.inject.Inject; + public class SchemaCreatorTest { @Inject private AllProjectsName allProjects; diff --git a/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryDatabase.java b/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryDatabase.java index 6353904681..d9e208c50c 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryDatabase.java +++ b/gerrit-server/src/test/java/com/google/gerrit/testutil/InMemoryDatabase.java @@ -26,7 +26,6 @@ import com.google.gwtorm.jdbc.SimpleDataSource; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.SchemaFactory; import com.google.inject.Guice; -import com.google.inject.Inject; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -35,6 +34,7 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.Properties; +import javax.inject.Inject; import javax.sql.DataSource; /** diff --git a/gerrit-solr/src/main/java/com/google/gerrit/solr/IndexVersionCheck.java b/gerrit-solr/src/main/java/com/google/gerrit/solr/IndexVersionCheck.java index ddb86c3c23..0b39032d6f 100644 --- a/gerrit-solr/src/main/java/com/google/gerrit/solr/IndexVersionCheck.java +++ b/gerrit-solr/src/main/java/com/google/gerrit/solr/IndexVersionCheck.java @@ -18,7 +18,6 @@ import com.google.common.collect.ImmutableMap; import com.google.gerrit.extensions.events.LifecycleListener; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.index.ChangeSchemas; -import com.google.inject.Inject; import com.google.inject.ProvisionException; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -29,6 +28,8 @@ import java.io.File; import java.io.IOException; import java.util.Map; +import javax.inject.Inject; + class IndexVersionCheck implements LifecycleListener { public static final Map SCHEMA_VERSIONS = ImmutableMap.of( SolrChangeIndex.CHANGES_OPEN, ChangeSchemas.getLatest().getVersion(), diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java index 90ffebd4f0..0c65b3d0b0 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AbstractGitCommand.java @@ -20,7 +20,6 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.sshd.SshScope.Context; -import com.google.inject.Inject; import org.apache.sshd.server.Environment; import org.eclipse.jgit.errors.RepositoryNotFoundException; @@ -29,6 +28,8 @@ import org.kohsuke.args4j.Argument; import java.io.IOException; +import javax.inject.Inject; + public abstract class AbstractGitCommand extends BaseCommand { @Argument(index = 0, metaVar = "PROJECT.git", required = true, usage = "project name") protected ProjectControl projectControl; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AliasCommandProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AliasCommandProvider.java index ee28e03aaf..860115defa 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AliasCommandProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/AliasCommandProvider.java @@ -15,11 +15,12 @@ package com.google.gerrit.sshd; import com.google.gerrit.server.CurrentUser; -import com.google.inject.Inject; import com.google.inject.Provider; import org.apache.sshd.server.Command; +import javax.inject.Inject; + /** Resolves an alias to another command. */ public class AliasCommandProvider implements Provider { private final CommandName command; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CachingPublicKeyAuthenticator.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CachingPublicKeyAuthenticator.java index f315cff3b8..b158a401f7 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CachingPublicKeyAuthenticator.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CachingPublicKeyAuthenticator.java @@ -14,7 +14,6 @@ package com.google.gerrit.sshd; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.apache.sshd.common.Session; @@ -27,6 +26,8 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import javax.inject.Inject; + @Singleton public class CachingPublicKeyAuthenticator implements PublickeyAuthenticator, SessionListener { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorProvider.java index 5c6f80acd3..c518fefe74 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorProvider.java @@ -17,9 +17,10 @@ package com.google.gerrit.sshd; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.git.QueueProvider; import com.google.gerrit.server.git.WorkQueue; -import com.google.inject.Inject; import com.google.inject.Provider; +import javax.inject.Inject; + class CommandExecutorProvider implements Provider { private final QueueProvider queues; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java index bafb9eee58..24778bd06f 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandExecutorQueueProvider.java @@ -17,12 +17,13 @@ package com.google.gerrit.sshd; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.git.QueueProvider; import com.google.gerrit.server.git.WorkQueue; -import com.google.inject.Inject; import org.eclipse.jgit.lib.Config; import java.util.concurrent.ThreadFactory; +import javax.inject.Inject; + public class CommandExecutorQueueProvider implements QueueProvider { private int poolSize; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java index f394766b43..7379d6636f 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java @@ -22,7 +22,6 @@ import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.git.WorkQueue; import com.google.gerrit.sshd.SshScope.Context; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -48,6 +47,8 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import javax.inject.Inject; + /** * Creates a CommandFactory using commands registered by {@link CommandModule}. */ diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java index cc7b637321..9a3ae8d0be 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java @@ -20,7 +20,6 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.PeerDaemonUser; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; import org.apache.commons.codec.binary.Base64; import org.apache.sshd.common.KeyPairProvider; @@ -45,6 +44,8 @@ import java.util.HashSet; import java.util.Locale; import java.util.Set; +import javax.inject.Inject; + /** * Authenticates by public key through {@link AccountSshKey} entities. */ diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java index a7748ffa99..84cad9d99b 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java @@ -21,7 +21,6 @@ import com.google.gerrit.extensions.restapi.AuthException; import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.account.CapabilityUtils; import com.google.gerrit.server.args4j.SubcommandHandler; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.assistedinject.Assisted; @@ -36,6 +35,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; +import javax.inject.Inject; + /** * Command that dispatches to a subcommand from its command table. */ diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java index ce1da95fed..ac1b5eb31d 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java @@ -17,7 +17,6 @@ package com.google.gerrit.sshd; import com.google.common.collect.Maps; import com.google.gerrit.extensions.registration.RegistrationHandle; import com.google.inject.Binding; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Provider; import com.google.inject.TypeLiteral; @@ -28,6 +27,8 @@ import java.lang.annotation.Annotation; import java.util.List; import java.util.concurrent.ConcurrentMap; +import javax.inject.Inject; + /** * Creates DispatchCommand using commands registered by {@link CommandModule}. */ diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/GerritGSSAuthenticator.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/GerritGSSAuthenticator.java index 17db6b92fa..78586da115 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/GerritGSSAuthenticator.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/GerritGSSAuthenticator.java @@ -19,12 +19,13 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.IdentifiedUser.GenericFactory; import com.google.gerrit.server.account.AccountCache; import com.google.gerrit.server.account.AccountState; -import com.google.inject.Inject; import com.google.inject.Singleton; import org.apache.sshd.server.auth.gss.GSSAuthenticator; import org.apache.sshd.server.session.ServerSession; +import javax.inject.Inject; + /** * Authenticates users with kerberos (gssapi-with-mic). */ diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java index 241f853412..960c84e793 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/HostKeyProvider.java @@ -15,7 +15,6 @@ package com.google.gerrit.sshd; import com.google.gerrit.server.config.SitePaths; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.ProvisionException; @@ -28,6 +27,8 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + class HostKeyProvider implements Provider { private final SitePaths site; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java index 78f006b1b6..906bfab1f3 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/NoShell.java @@ -21,7 +21,6 @@ import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.ssh.SshInfo; import com.google.gerrit.sshd.SshScope.Context; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.Provider; import org.apache.sshd.common.Factory; @@ -39,6 +38,8 @@ import java.io.OutputStream; import java.net.MalformedURLException; import java.net.URL; +import javax.inject.Inject; + /** * Dummy shell which prints a message and terminates. *

diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java index 73bc7c2bab..016f339434 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java @@ -30,7 +30,6 @@ import com.google.gerrit.server.ssh.SshInfo; import com.google.gerrit.server.ssh.SshListenAddresses; import com.google.gerrit.server.util.IdGenerator; import com.google.gerrit.server.util.SocketUtil; -import com.google.inject.Inject; import com.google.inject.Singleton; import com.jcraft.jsch.HostKey; @@ -123,6 +122,8 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; +import javax.inject.Inject; + /** * SSH daemon to communicate with Gerrit. *

diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheImpl.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheImpl.java index 2ec67a44d5..bf37f9a876 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheImpl.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshKeyCacheImpl.java @@ -26,7 +26,6 @@ import com.google.gerrit.server.cache.CacheModule; import com.google.gerrit.server.ssh.SshKeyCache; 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.Singleton; import com.google.inject.TypeLiteral; @@ -44,6 +43,8 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; +import javax.inject.Inject; + /** Provides the {@link SshKeyCacheEntry}. */ @Singleton public class SshKeyCacheImpl implements SshKeyCache { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java index 7df8db4c4a..e3b5d79563 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshLog.java @@ -27,7 +27,6 @@ import com.google.gerrit.server.util.IdGenerator; import com.google.gerrit.server.util.SystemLog; import com.google.gerrit.server.util.TimeUtil; import com.google.gerrit.sshd.SshScope.Context; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -37,6 +36,8 @@ import org.apache.log4j.Logger; import org.apache.log4j.spi.LoggingEvent; import org.eclipse.jgit.lib.Config; +import javax.inject.Inject; + @Singleton class SshLog implements LifecycleListener { private static final Logger log = Logger.getLogger(SshLog.class); diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java index 7dd12b0cfd..1d4c6205a9 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshModule.java @@ -32,7 +32,6 @@ import com.google.gerrit.server.plugins.StartPluginListener; import com.google.gerrit.server.ssh.SshInfo; import com.google.gerrit.server.util.RequestScopePropagator; import com.google.gerrit.sshd.commands.QueryShell; -import com.google.inject.Inject; import com.google.inject.internal.UniqueAnnotations; import com.google.inject.servlet.RequestScoped; @@ -44,6 +43,8 @@ import org.eclipse.jgit.lib.Config; import java.net.SocketAddress; import java.util.Map; +import javax.inject.Inject; + /** Configures standard dependencies for {@link SshDaemon}. */ public class SshModule extends LifecycleModule { private final Map aliases; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshRemotePeerProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshRemotePeerProvider.java index 2c7736016d..955bce9ac2 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshRemotePeerProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshRemotePeerProvider.java @@ -14,12 +14,13 @@ package com.google.gerrit.sshd; -import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; import java.net.SocketAddress; +import javax.inject.Inject; + @Singleton public class SshRemotePeerProvider implements Provider { private final Provider session; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java index f8b5ddb004..85b940fc3c 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshScope.java @@ -25,7 +25,6 @@ import com.google.gerrit.server.util.ThreadLocalRequestContext; import com.google.gerrit.server.util.ThreadLocalRequestScopePropagator; import com.google.gerrit.server.util.TimeUtil; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.Key; import com.google.inject.OutOfScopeException; import com.google.inject.Provider; @@ -34,6 +33,8 @@ import com.google.inject.util.Providers; import java.util.Map; +import javax.inject.Inject; + /** Guice scopes for state during an SSH connection. */ public class SshScope { private static final Key RC_KEY = diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java index 2c9dc4538f..4fb880c8d4 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java @@ -16,13 +16,14 @@ package com.google.gerrit.sshd; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.git.WorkQueue; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.lib.Config; import java.util.concurrent.ThreadFactory; +import javax.inject.Inject; + class StreamCommandExecutorProvider implements Provider { private final int poolSize; private final WorkQueue queues; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SuExec.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SuExec.java index 77738d07d5..773e78212d 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SuExec.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/SuExec.java @@ -21,7 +21,6 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.PeerDaemonUser; import com.google.gerrit.server.config.AuthConfig; import com.google.gerrit.sshd.SshScope.Context; -import com.google.inject.Inject; import com.google.inject.Provider; import org.apache.sshd.server.Command; @@ -35,6 +34,8 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicReference; +import javax.inject.Inject; + /** * Executes any other command as a different user identity. *

diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminQueryShell.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminQueryShell.java index 0ff3a017aa..af55e541c5 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminQueryShell.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminQueryShell.java @@ -21,10 +21,11 @@ import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.sshd.AdminHighPriorityCommand; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import org.kohsuke.args4j.Option; +import javax.inject.Inject; + /** Opens a query processor. */ @AdminHighPriorityCommand @RequiresCapability(GlobalCapability.ACCESS_DATABASE) diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java index d448bd2dce..17479eabae 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java @@ -32,7 +32,6 @@ import com.google.gerrit.server.project.ProjectResource; import com.google.gerrit.server.project.ProjectState; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.errors.ConfigInvalidException; @@ -49,6 +48,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @CommandMetaData(name = "set-project-parent", description = "Change the project permissions are inherited from") final class AdminSetParent extends SshCommand { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AproposCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AproposCommand.java index 0aa12c407d..2f1dc21d2c 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AproposCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AproposCommand.java @@ -22,12 +22,13 @@ import com.google.gerrit.server.documentation.QueryDocumentationExecutor.DocQuer import com.google.gerrit.server.documentation.QueryDocumentationExecutor.DocResult; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import org.kohsuke.args4j.Argument; import java.util.List; +import javax.inject.Inject; + @CommandMetaData(name = "apropos", description = "Search in Gerrit documentation", runsAt = MASTER_OR_SLAVE) final class AproposCommand extends SshCommand { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java index 647d28d650..046cdd8e5a 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java @@ -26,7 +26,6 @@ import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.server.project.ProjectResource; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import org.apache.commons.collections.CollectionUtils; import org.eclipse.jgit.lib.ObjectId; @@ -37,6 +36,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + @CommandMetaData(name = "ban-commit", description = "Ban a commit from a project's repository", runsAt = MASTER_OR_SLAVE) public class BanCommitCommand extends SshCommand { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BaseTestPrologCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BaseTestPrologCommand.java index 0e13fd6bc0..673c905eaf 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BaseTestPrologCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BaseTestPrologCommand.java @@ -24,7 +24,6 @@ import com.google.gerrit.server.change.Revisions; import com.google.gerrit.server.change.TestSubmitRule.Filters; import com.google.gerrit.server.change.TestSubmitRule.Input; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import org.eclipse.jgit.util.IO; import org.eclipse.jgit.util.RawParseUtils; @@ -33,6 +32,8 @@ import org.kohsuke.args4j.Option; import java.nio.ByteBuffer; +import javax.inject.Inject; + abstract class BaseTestPrologCommand extends SshCommand { private Input input = new Input(); diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateAccountCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateAccountCommand.java index aeb69d0c76..ea7ec12b6e 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateAccountCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateAccountCommand.java @@ -25,7 +25,6 @@ import com.google.gerrit.server.account.CreateAccount; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; @@ -37,6 +36,8 @@ import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + /** Create a new user account. **/ @RequiresCapability(GlobalCapability.CREATE_ACCOUNT) @CommandMetaData(name = "create-account", description = "Create a new batch/role account") diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateBranchCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateBranchCommand.java index 55f6158a93..c069fc4807 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateBranchCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateBranchCommand.java @@ -20,10 +20,11 @@ import com.google.gerrit.extensions.restapi.RestApiException; import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import org.kohsuke.args4j.Argument; +import javax.inject.Inject; + /** Create a new branch. **/ @CommandMetaData(name = "create-branch", description = "Create a new branch") final public class CreateBranchCommand extends SshCommand { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java index 75194dcb57..69aba44163 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java @@ -28,7 +28,6 @@ import com.google.gerrit.server.validators.ValidationException; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; @@ -36,6 +35,8 @@ import org.kohsuke.args4j.Option; import java.util.HashSet; import java.util.Set; +import javax.inject.Inject; + /** * Creates a new group. *

diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java index 624d4e5cef..011d32edd7 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java @@ -34,7 +34,6 @@ import com.google.gerrit.server.project.SuggestParentCandidates; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; @@ -43,6 +42,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.inject.Inject; + /** Create a new project. **/ @RequiresCapability(GlobalCapability.CREATE_PROJECT) @CommandMetaData(name = "create-project", description = "Create a new project and associated Git repository") diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/FlushCaches.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/FlushCaches.java index 6dfcb51d16..983bc37d4b 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/FlushCaches.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/FlushCaches.java @@ -27,7 +27,6 @@ import com.google.gerrit.server.config.ListCaches.OutputFormat; import com.google.gerrit.server.config.PostCaches; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import com.google.inject.Provider; import org.kohsuke.args4j.Option; @@ -35,6 +34,8 @@ import org.kohsuke.args4j.Option; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + /** Causes the caches to purge all entries and reload. */ @RequiresCapability(GlobalCapability.FLUSH_CACHES) @CommandMetaData(name = "flush-caches", description = "Flush some/all server caches from memory", diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/GarbageCollectionCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/GarbageCollectionCommand.java index c533f4f4ed..e7c6a0c55a 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/GarbageCollectionCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/GarbageCollectionCommand.java @@ -26,7 +26,6 @@ import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; @@ -34,6 +33,8 @@ import org.kohsuke.args4j.Option; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + /** Runs the Git garbage collection. */ @RequiresCapability(GlobalCapability.RUN_GC) @CommandMetaData(name = "gc", description = "Run Git garbage collection", diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/KillCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/KillCommand.java index 95beaf3692..7d73592be9 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/KillCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/KillCommand.java @@ -25,13 +25,14 @@ import com.google.gerrit.server.config.TaskResource; import com.google.gerrit.server.config.TasksCollection; import com.google.gerrit.sshd.AdminHighPriorityCommand; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import org.kohsuke.args4j.Argument; import java.util.ArrayList; import java.util.List; +import javax.inject.Inject; + /** Kill a task in the work queue. */ @AdminHighPriorityCommand @RequiresCapability(GlobalCapability.KILL_TASK) diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java index 82ad16ff6f..d3e4ed2bfa 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java @@ -31,13 +31,14 @@ import com.google.gerrit.server.ioutil.ColumnFormatter; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import com.google.inject.Provider; import org.kohsuke.args4j.Option; import java.io.PrintWriter; +import javax.inject.Inject; + @CommandMetaData(name = "ls-groups", description = "List groups visible to the caller", runsAt = MASTER_OR_SLAVE) public class ListGroupsCommand extends SshCommand { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListProjectsCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListProjectsCommand.java index 134a719e87..fc18a6d282 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListProjectsCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListProjectsCommand.java @@ -19,10 +19,11 @@ import static com.google.gerrit.sshd.CommandMetaData.Mode.MASTER_OR_SLAVE; import com.google.gerrit.server.project.ListProjects; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import java.util.List; +import javax.inject.Inject; + @CommandMetaData(name = "ls-projects", description = "List projects visible to the caller", runsAt = MASTER_OR_SLAVE) final class ListProjectsCommand extends SshCommand { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java index c41fcdc1ff..9624ddf2d6 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java @@ -32,7 +32,6 @@ import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.Ref; @@ -42,6 +41,8 @@ import org.kohsuke.args4j.Option; import java.io.IOException; import java.util.Map; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @CommandMetaData(name = "ls-user-refs", description = "List refs visible to a specific user", runsAt = MASTER_OR_SLAVE) diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginEnableCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginEnableCommand.java index 1d3ee9fbd4..348af26744 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginEnableCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginEnableCommand.java @@ -23,12 +23,13 @@ import com.google.gerrit.server.plugins.PluginInstallException; import com.google.gerrit.server.plugins.PluginLoader; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import org.kohsuke.args4j.Argument; import java.util.List; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @CommandMetaData(name = "enable", description = "Enable plugins", runsAt = MASTER_OR_SLAVE) diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginInstallCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginInstallCommand.java index 49120f7f4b..b36f332253 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginInstallCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginInstallCommand.java @@ -23,7 +23,6 @@ import com.google.gerrit.server.plugins.PluginInstallException; import com.google.gerrit.server.plugins.PluginLoader; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; @@ -36,6 +35,8 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @CommandMetaData(name = "install", description = "Install/Add a plugin", runsAt = MASTER_OR_SLAVE) diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginLsCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginLsCommand.java index dc8abf2de4..f0b0b1055f 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginLsCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginLsCommand.java @@ -21,7 +21,8 @@ import com.google.gerrit.extensions.annotations.RequiresCapability; import com.google.gerrit.server.plugins.ListPlugins; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; + +import javax.inject.Inject; @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @CommandMetaData(name = "ls", description = "List the installed plugins", diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginReloadCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginReloadCommand.java index 4157515ffe..9ef7394ce7 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginReloadCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginReloadCommand.java @@ -23,12 +23,13 @@ import com.google.gerrit.server.plugins.PluginInstallException; import com.google.gerrit.server.plugins.PluginLoader; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import org.kohsuke.args4j.Argument; import java.util.List; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @CommandMetaData(name = "reload", description = "Reload/Restart plugins", runsAt = MASTER_OR_SLAVE) diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginRemoveCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginRemoveCommand.java index 8e87b0f4de..a0838ef693 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginRemoveCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginRemoveCommand.java @@ -22,12 +22,13 @@ import com.google.gerrit.extensions.annotations.RequiresCapability; import com.google.gerrit.server.plugins.PluginLoader; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import org.kohsuke.args4j.Argument; import java.util.List; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @CommandMetaData(name = "remove", description = "Disable plugins", runsAt = MASTER_OR_SLAVE) diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Query.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Query.java index 63b7ab6596..107a8bd0ad 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Query.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Query.java @@ -17,13 +17,14 @@ package com.google.gerrit.sshd.commands; import com.google.gerrit.server.query.change.QueryProcessor; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; import java.util.List; +import javax.inject.Inject; + @CommandMetaData(name = "query", description = "Query the change database") class Query extends SshCommand { @Inject diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java index 39ec81f57a..f9b4fb2866 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/QueryShell.java @@ -22,7 +22,6 @@ import com.google.gson.JsonObject; import com.google.gwtorm.jdbc.JdbcSchema; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import java.io.BufferedReader; @@ -44,6 +43,8 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; +import javax.inject.Inject; + /** Simple interactive SQL query tool. */ public class QueryShell { public interface Factory { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java index abb788dee4..2dd09e5a53 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java @@ -26,7 +26,6 @@ import com.google.gerrit.server.git.TransferConfig; import com.google.gerrit.server.git.VisibleRefFilter; import com.google.gerrit.sshd.AbstractGitCommand; import com.google.gerrit.sshd.CommandMetaData; -import com.google.inject.Inject; import org.eclipse.jgit.errors.TooLargeObjectInPackException; import org.eclipse.jgit.errors.UnpackException; @@ -47,6 +46,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + /** Receives change upload over SSH using the Git receive-pack protocol. */ @CommandMetaData(name = "receive-pack", description = "Standard Git server side command for client side git push") final class Receive extends AbstractGitCommand { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/RenameGroupCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/RenameGroupCommand.java index 38535a4719..85f555610b 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/RenameGroupCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/RenameGroupCommand.java @@ -21,10 +21,11 @@ import com.google.gerrit.server.account.PerformRenameGroup; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.kohsuke.args4j.Argument; +import javax.inject.Inject; + @CommandMetaData(name = "rename-group", description = "Rename an account group") public class RenameGroupCommand extends SshCommand { @Argument(index = 0, required = true, metaVar = "GROUP", usage = "name of the group to be renamed") diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java index 7753961348..4dcd51269e 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java @@ -43,7 +43,6 @@ import com.google.gerrit.util.cli.CmdLineParser; import com.google.gson.JsonSyntaxException; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; -import com.google.inject.Inject; import com.google.inject.Provider; import org.kohsuke.args4j.Argument; @@ -60,6 +59,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.inject.Inject; + @CommandMetaData(name = "review", description = "Apply reviews to one or more patch sets") public class ReviewCommand extends SshCommand { private static final Logger log = diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java index 65f876fe70..9d4219da09 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ScpCommand.java @@ -25,7 +25,6 @@ package com.google.gerrit.sshd.commands; import com.google.gerrit.server.tools.ToolsCatalog; import com.google.gerrit.server.tools.ToolsCatalog.Entry; import com.google.gerrit.sshd.BaseCommand; -import com.google.inject.Inject; import org.apache.sshd.server.Environment; import org.slf4j.Logger; @@ -36,6 +35,8 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.UnsupportedEncodingException; +import javax.inject.Inject; + final class ScpCommand extends BaseCommand { private static final String TYPE_DIR = "D"; private static final String TYPE_FILE = "C"; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java index 76a5f24919..232bfe98e6 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java @@ -41,7 +41,6 @@ import com.google.gerrit.server.account.PutPreferred; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.gwtorm.server.OrmException; -import com.google.inject.Inject; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; @@ -56,6 +55,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.inject.Inject; + /** Set a user's account settings. **/ @CommandMetaData(name = "set-account", description = "Change an account's settings") @RequiresCapability(GlobalCapability.MODIFY_ACCOUNT) diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetMembersCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetMembersCommand.java index 923865a2a1..ab8a18a1fe 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetMembersCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetMembersCommand.java @@ -33,7 +33,6 @@ import com.google.gerrit.server.group.GroupResource; import com.google.gerrit.server.group.GroupsCollection; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import com.google.inject.Provider; import org.kohsuke.args4j.Argument; @@ -43,6 +42,8 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.List; +import javax.inject.Inject; + @CommandMetaData(name = "set-members", description = "Modify members of specific group or number of groups") public class SetMembersCommand extends SshCommand { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetProjectCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetProjectCommand.java index cc72e968a9..0a06d1e805 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetProjectCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetProjectCommand.java @@ -26,7 +26,6 @@ import com.google.gerrit.server.project.ProjectCache; import com.google.gerrit.server.project.ProjectControl; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.RepositoryNotFoundException; @@ -37,6 +36,8 @@ import org.slf4j.LoggerFactory; import java.io.IOException; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @CommandMetaData(name = "set-project", description = "Change a project's settings") final class SetProjectCommand extends SshCommand { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java index 8ce935c0bd..93e6b17464 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java @@ -33,7 +33,6 @@ import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.ResultSet; -import com.google.inject.Inject; import com.google.inject.Provider; import org.kohsuke.args4j.Argument; @@ -47,6 +46,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import javax.inject.Inject; + @CommandMetaData(name = "set-reviewers", description = "Add or remove reviewers on a change") public class SetReviewersCommand extends SshCommand { private static final Logger log = diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowCaches.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowCaches.java index 1f3a49a9b5..0cad6d7270 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowCaches.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowCaches.java @@ -36,7 +36,6 @@ import com.google.gerrit.server.util.TimeUtil; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.SshDaemon; -import com.google.inject.Inject; import com.google.inject.Provider; import org.apache.sshd.common.io.IoAcceptor; @@ -52,6 +51,8 @@ import java.util.Date; import java.util.Map; import java.util.Map.Entry; +import javax.inject.Inject; + /** Show the current cache states. */ @RequiresCapability(GlobalCapability.VIEW_CACHES) @CommandMetaData(name = "show-caches", description = "Display current cache statistics", diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java index 3d1ed3f074..a6be362223 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java @@ -26,7 +26,6 @@ import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.SshDaemon; import com.google.gerrit.sshd.SshSession; -import com.google.inject.Inject; import org.apache.sshd.common.io.IoAcceptor; import org.apache.sshd.common.io.IoSession; @@ -48,6 +47,8 @@ import java.util.Comparator; import java.util.Date; import java.util.List; +import javax.inject.Inject; + /** Show the current SSH connections. */ @RequiresCapability(GlobalCapability.VIEW_CONNECTIONS) @CommandMetaData(name = "show-connections", description = "Display active client SSH connections", diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java index 3b72c7f0c8..6cf9d557a6 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java @@ -27,7 +27,6 @@ import com.google.gerrit.server.util.TimeUtil; import com.google.gerrit.sshd.AdminHighPriorityCommand; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.SshCommand; -import com.google.inject.Inject; import org.apache.sshd.server.Environment; import org.kohsuke.args4j.Option; @@ -37,6 +36,8 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; +import javax.inject.Inject; + /** Display the current work queue. */ @AdminHighPriorityCommand @CommandMetaData(name = "show-queue", description = "Display the background work queues", diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java index 6da858a867..dfedb3b6c3 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java @@ -28,7 +28,6 @@ import com.google.gerrit.sshd.BaseCommand; import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.StreamCommandExecutor; import com.google.gson.Gson; -import com.google.inject.Inject; import org.apache.sshd.server.Environment; @@ -37,6 +36,8 @@ import java.io.PrintWriter; import java.util.concurrent.Future; import java.util.concurrent.LinkedBlockingQueue; +import javax.inject.Inject; + @RequiresCapability(GlobalCapability.STREAM_EVENTS) @CommandMetaData(name = "stream-events", description = "Monitor events occurring in real time", runsAt = MASTER_OR_SLAVE) diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/TestSubmitRuleCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/TestSubmitRuleCommand.java index b957a7a650..ccf7c9316f 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/TestSubmitRuleCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/TestSubmitRuleCommand.java @@ -19,9 +19,10 @@ import com.google.gerrit.server.change.RevisionResource; import com.google.gerrit.server.change.TestSubmitRule; import com.google.gerrit.server.change.TestSubmitRule.Input; import com.google.gerrit.sshd.CommandMetaData; -import com.google.inject.Inject; import com.google.inject.Provider; +import javax.inject.Inject; + /** Command that allows testing of prolog submit-rules in a live instance. */ @CommandMetaData(name = "rule", description = "Test prolog submit rules") final class TestSubmitRuleCommand extends BaseTestPrologCommand { diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/TestSubmitTypeCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/TestSubmitTypeCommand.java index 2e7f0dfa0f..b069bac26b 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/TestSubmitTypeCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/TestSubmitTypeCommand.java @@ -20,9 +20,10 @@ import com.google.gerrit.server.change.RevisionResource; import com.google.gerrit.server.change.TestSubmitRule.Input; import com.google.gerrit.server.change.TestSubmitType; import com.google.gerrit.sshd.CommandMetaData; -import com.google.inject.Inject; import com.google.inject.Provider; +import javax.inject.Inject; + @CommandMetaData(name = "type", description = "Test prolog submit type") final class TestSubmitTypeCommand extends BaseTestPrologCommand { @Inject diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java index 34f7107059..a82b12bacb 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Upload.java @@ -25,7 +25,6 @@ import com.google.gerrit.server.git.validators.UploadValidationException; import com.google.gerrit.server.git.validators.UploadValidators; import com.google.gerrit.sshd.AbstractGitCommand; import com.google.gerrit.sshd.SshSession; -import com.google.inject.Inject; import com.google.inject.Provider; import org.eclipse.jgit.transport.PreUploadHook; @@ -35,6 +34,8 @@ import org.eclipse.jgit.transport.UploadPack; import java.io.IOException; import java.util.List; +import javax.inject.Inject; + /** Publishes Git repositories over SSH using the Git upload-pack protocol. */ final class Upload extends AbstractGitCommand { @Inject diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java index 7771d7f10c..d13d5876fe 100644 --- a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java +++ b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/CmdLineParser.java @@ -39,7 +39,6 @@ import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; import org.kohsuke.args4j.Argument; @@ -63,6 +62,8 @@ import java.util.List; import java.util.Map; import java.util.ResourceBundle; +import javax.inject.Inject; + /** * Extended command line parser which handles --foo=value arguments. *

diff --git a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlers.java b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlers.java index 50cad12ebf..a89a878e8c 100644 --- a/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlers.java +++ b/gerrit-util-cli/src/main/java/com/google/gerrit/util/cli/OptionHandlers.java @@ -17,7 +17,6 @@ package com.google.gerrit.util.cli; import com.google.common.collect.ImmutableMap; import com.google.gerrit.common.Nullable; import com.google.inject.Binding; -import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Key; import com.google.inject.Provider; @@ -27,6 +26,8 @@ import com.google.inject.TypeLiteral; import java.lang.reflect.ParameterizedType; import java.util.Map.Entry; +import javax.inject.Inject; + @Singleton public class OptionHandlers { public static OptionHandlers empty() { diff --git a/gerrit-war/src/main/java/com/google/gerrit/httpd/SitePathFromSystemConfigProvider.java b/gerrit-war/src/main/java/com/google/gerrit/httpd/SitePathFromSystemConfigProvider.java index b97df3f0b8..fe6623373b 100644 --- a/gerrit-war/src/main/java/com/google/gerrit/httpd/SitePathFromSystemConfigProvider.java +++ b/gerrit-war/src/main/java/com/google/gerrit/httpd/SitePathFromSystemConfigProvider.java @@ -19,12 +19,13 @@ import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.config.SitePath; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; import com.google.inject.Provider; import java.io.File; import java.util.List; +import javax.inject.Inject; + /** Provides {@link java.io.File} annotated with {@link SitePath}. */ class SitePathFromSystemConfigProvider implements Provider { private final File path; diff --git a/plugins/commit-message-length-validator b/plugins/commit-message-length-validator index c882e58322..0ad83eb20e 160000 --- a/plugins/commit-message-length-validator +++ b/plugins/commit-message-length-validator @@ -1 +1 @@ -Subproject commit c882e583226d712053ad02fdee4afcfd1e4df915 +Subproject commit 0ad83eb20e011cb44f702321209d23b1f172d27d diff --git a/plugins/cookbook-plugin b/plugins/cookbook-plugin index 6477bd3de8..bc3c2fce85 160000 --- a/plugins/cookbook-plugin +++ b/plugins/cookbook-plugin @@ -1 +1 @@ -Subproject commit 6477bd3de8e5a5c15e7ad9c864f997caf7f3c809 +Subproject commit bc3c2fce8506418071966ee1285cf5c03a2316ce diff --git a/plugins/download-commands b/plugins/download-commands index 4e978f916d..7695f354f9 160000 --- a/plugins/download-commands +++ b/plugins/download-commands @@ -1 +1 @@ -Subproject commit 4e978f916d429ab22b0ea28d25ac87755513cc56 +Subproject commit 7695f354f9d0fb061fea2bf0d71d2a9a27ea8f7b diff --git a/plugins/replication b/plugins/replication index 319c5905d6..e0ce5041d6 160000 --- a/plugins/replication +++ b/plugins/replication @@ -1 +1 @@ -Subproject commit 319c5905d60bb13f3a62196f05a959ea016ac9b8 +Subproject commit e0ce5041d6678ed38132a9d08939d26955ffe12f diff --git a/plugins/reviewnotes b/plugins/reviewnotes index de5eccc9c5..ecb113bf38 160000 --- a/plugins/reviewnotes +++ b/plugins/reviewnotes @@ -1 +1 @@ -Subproject commit de5eccc9c5477a3c504c523f39dfede35426ec8c +Subproject commit ecb113bf38a3903810c6aa47076018ff1b34e92c diff --git a/plugins/singleusergroup b/plugins/singleusergroup index 3c59757631..4ad466d36a 160000 --- a/plugins/singleusergroup +++ b/plugins/singleusergroup @@ -1 +1 @@ -Subproject commit 3c5975763148a6ea2bfa867a96ba5498ae5767f2 +Subproject commit 4ad466d36aa7473c2ad56b966c38a9b097c2fea8