Merge "Remove more finals from method signatures"

gerrit-openid/src/main/java/com/google/gerrit/httpd/auth/openid/OpenIdServiceImpl.java

@@ -99,12 +99,12 @@ class OpenIdServiceImpl {
 
   @Inject
   OpenIdServiceImpl(
-      final DynamicItem<WebSession> cf,
+      DynamicItem<WebSession> cf,
-      final Provider<IdentifiedUser> iu,
+      Provider<IdentifiedUser> iu,
       CanonicalWebUrl up,
-      @GerritServerConfig final Config config,
+      @GerritServerConfig Config config,
-      final AuthConfig ac,
+      AuthConfig ac,
-      final AccountManager am,
+      AccountManager am,
       ProxyProperties proxyProperties) {
 
     if (proxyProperties.getProxyUrl() != null) {
@@ -139,9 +139,9 @@ class OpenIdServiceImpl {
   DiscoveryResult discover(
       HttpServletRequest req,
       String openidIdentifier,
-      final SignInMode mode,
+      SignInMode mode,
-      final boolean remember,
+      boolean remember,
-      final String returnToken) {
+      String returnToken) {
     final State state;
     state = init(req, openidIdentifier, mode, remember, returnToken);
     if (state == null) {

gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/JettyServer.java

@@ -79,7 +79,7 @@ public class JettyServer {
     private final Config cfg;
 
     @Inject
-    Lifecycle(JettyServer server, @GerritServerConfig final Config cfg) {
+    Lifecycle(JettyServer server, @GerritServerConfig Config cfg) {
       this.server = server;
       this.cfg = cfg;
     }

gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/ProjectQoSFilter.java

@@ -85,10 +85,10 @@ public class ProjectQoSFilter implements Filter {
 
   @Inject
   ProjectQoSFilter(
-      final Provider<CurrentUser> user,
+      Provider<CurrentUser> user,
       QueueProvider queue,
-      final ServletContext context,
+      ServletContext context,
-      @GerritServerConfig final Config cfg) {
+      @GerritServerConfig Config cfg) {
     this.user = user;
     this.queue = queue;
     this.context = context;
@@ -155,7 +155,7 @@ public class ProjectQoSFilter implements Filter {
     private boolean done;
     private Thread worker;
 
-    TaskThunk(final WorkQueue.Executor executor, Continuation cont, HttpServletRequest req) {
+    TaskThunk(WorkQueue.Executor executor, Continuation cont, HttpServletRequest req) {
       this.executor = executor;
       this.cont = cont;
       this.name = generateName(req);

gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java

@@ -29,7 +29,7 @@ public class Browser {
   private final Config cfg;
 
   @Inject
-  Browser(@GerritServerConfig final Config cfg) {
+  Browser(@GerritServerConfig Config cfg) {
     this.cfg = cfg;
   }
 

gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java

@@ -29,7 +29,7 @@ public class GerritPersonIdentProvider implements Provider<PersonIdent> {
   private final String email;
 
   @Inject
-  public GerritPersonIdentProvider(@GerritServerConfig final Config cfg) {
+  public GerritPersonIdentProvider(@GerritServerConfig Config cfg) {
     String name = cfg.getString("user", null, "name");
     if (name == null) {
       name = "Gerrit Code Review";

gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java

@@ -73,7 +73,7 @@ class Helper {
 
   @Inject
   Helper(
-      @GerritServerConfig final Config config,
+      @GerritServerConfig Config config,
       @Named(LdapModule.PARENT_GROUPS_CACHE) Cache<String, ImmutableSet<String>> parentGroups) {
     this.config = config;
     this.server = LdapRealm.optional(config, "server");

gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java

@@ -81,11 +81,9 @@ class LdapRealm extends AbstractRealm {
       AuthConfig authConfig,
       EmailExpander emailExpander,
       LdapGroupBackend groupBackend,
-      @Named(LdapModule.GROUP_CACHE)
+      @Named(LdapModule.GROUP_CACHE) LoadingCache<String, Set<AccountGroup.UUID>> membershipCache,
-          final LoadingCache<String, Set<AccountGroup.UUID>> membershipCache,
+      @Named(LdapModule.USERNAME_CACHE) LoadingCache<String, Optional<Account.Id>> usernameCache,
-      @Named(LdapModule.USERNAME_CACHE)
+      @GerritServerConfig Config config) {
-          final LoadingCache<String, Optional<Account.Id>> usernameCache,
-      @GerritServerConfig final Config config) {
     this.helper = helper;
     this.authConfig = authConfig;
     this.emailExpander = emailExpander;

gerrit-server/src/main/java/com/google/gerrit/server/config/AnonymousCowardNameProvider.java

@@ -24,7 +24,7 @@ public class AnonymousCowardNameProvider implements Provider<String> {
   private final String anonymousCoward;
 
   @Inject
-  public AnonymousCowardNameProvider(@GerritServerConfig final Config cfg) {
+  public AnonymousCowardNameProvider(@GerritServerConfig Config cfg) {
     String anonymousCoward = cfg.getString("user", null, "anonymousCoward");
     if (anonymousCoward == null) {
       anonymousCoward = DEFAULT;

gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java

@@ -67,7 +67,7 @@ public class AuthConfig {
   private GitBasicAuthPolicy gitBasicAuthPolicy;
 
   @Inject
-  AuthConfig(@GerritServerConfig final Config cfg) throws XsrfException {
+  AuthConfig(@GerritServerConfig Config cfg) throws XsrfException {
     authType = toType(cfg);
     httpHeader = cfg.getString("auth", null, "httpheader");
     httpDisplaynameHeader = cfg.getString("auth", null, "httpdisplaynameheader");

gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java

@@ -23,7 +23,7 @@ public class CanonicalWebUrlProvider implements Provider<String> {
   private final String canonicalUrl;
 
   @Inject
-  public CanonicalWebUrlProvider(@GerritServerConfig final Config config) {
+  public CanonicalWebUrlProvider(@GerritServerConfig Config config) {
     String u = config.getString("gerrit", null, "canonicalweburl");
     if (u != null && !u.endsWith("/")) {
       u += "/";

gerrit-server/src/main/java/com/google/gerrit/server/config/DownloadConfig.java

@@ -40,7 +40,7 @@ public class DownloadConfig {
   private final ImmutableSet<ArchiveFormat> archiveFormats;
 
   @Inject
-  DownloadConfig(@GerritServerConfig final Config cfg) {
+  DownloadConfig(@GerritServerConfig Config cfg) {
     String[] allSchemes = cfg.getStringList("download", null, "scheme");
     if (allSchemes.length == 0) {
       downloadSchemes =

gerrit-server/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java

@@ -23,7 +23,7 @@ class EmailExpanderProvider implements Provider<EmailExpander> {
   private final EmailExpander expander;
 
   @Inject
-  EmailExpanderProvider(@GerritServerConfig final Config cfg) {
+  EmailExpanderProvider(@GerritServerConfig Config cfg) {
     final String s = cfg.getString("auth", null, "emailformat");
     if (EmailExpander.Simple.canHandle(s)) {
       expander = new EmailExpander.Simple(s);

gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFootersProvider.java

@@ -40,7 +40,7 @@ public class TrackingFootersProvider implements Provider<TrackingFooters> {
   private static final Logger log = LoggerFactory.getLogger(TrackingFootersProvider.class);
 
   @Inject
-  TrackingFootersProvider(@GerritServerConfig final Config cfg) {
+  TrackingFootersProvider(@GerritServerConfig Config cfg) {
     for (String name : cfg.getSubsections(TRACKING_ID_TAG)) {
       boolean configValid = true;
 

gerrit-server/src/main/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProvider.java

@@ -41,11 +41,10 @@ public class FromAddressGeneratorProvider implements Provider<FromAddressGenerat
 
   @Inject
   FromAddressGeneratorProvider(
-      @GerritServerConfig final Config cfg,
+      @GerritServerConfig Config cfg,
-      @AnonymousCowardName final String anonymousCowardName,
+      @AnonymousCowardName String anonymousCowardName,
-      @GerritPersonIdent final PersonIdent myIdent,
+      @GerritPersonIdent PersonIdent myIdent,
-      final AccountCache accountCache) {
+      AccountCache accountCache) {
-
     final String from = cfg.getString("sendemail", null, "from");
     final Address srvAddr = toAddress(myIdent);
 

gerrit-server/src/main/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java

@@ -74,7 +74,7 @@ public class SmtpEmailSender implements EmailSender {
   private int expiryDays;
 
   @Inject
-  SmtpEmailSender(@GerritServerConfig final Config cfg) {
+  SmtpEmailSender(@GerritServerConfig Config cfg) {
     enabled = cfg.getBoolean("sendemail", null, "enable", true);
     connectTimeout =
         Ints.checkedCast(

gerrit-server/src/main/java/com/google/gerrit/server/schema/DB2.java

@@ -26,7 +26,7 @@ public class DB2 extends BaseDataSourceType {
   private Config cfg;
 
   @Inject
-  public DB2(@GerritServerConfig final Config cfg) {
+  public DB2(@GerritServerConfig Config cfg) {
     super("com.ibm.db2.jcc.DB2Driver");
     this.cfg = cfg;
   }

gerrit-server/src/main/java/com/google/gerrit/server/schema/H2.java

@@ -26,7 +26,7 @@ class H2 extends BaseDataSourceType {
   private final SitePaths site;
 
   @Inject
-  H2(SitePaths site, @GerritServerConfig final Config cfg) {
+  H2(SitePaths site, @GerritServerConfig Config cfg) {
     super("org.h2.Driver");
     this.cfg = cfg;
     this.site = site;

gerrit-server/src/main/java/com/google/gerrit/server/schema/HANA.java

@@ -28,7 +28,7 @@ class HANA extends BaseDataSourceType {
   private Config cfg;
 
   @Inject
-  HANA(@GerritServerConfig final Config cfg) {
+  HANA(@GerritServerConfig Config cfg) {
     super("com.sap.db.jdbc.Driver");
     this.cfg = cfg;
   }

gerrit-server/src/main/java/com/google/gerrit/server/schema/JDBC.java

@@ -24,7 +24,7 @@ class JDBC extends BaseDataSourceType {
   protected final Config cfg;
 
   @Inject
-  JDBC(@GerritServerConfig final Config cfg) {
+  JDBC(@GerritServerConfig Config cfg) {
     super(ConfigUtil.getRequired(cfg, "database", "driver"));
     this.cfg = cfg;
   }

gerrit-server/src/main/java/com/google/gerrit/server/schema/MaxDb.java

@@ -27,7 +27,7 @@ class MaxDb extends BaseDataSourceType {
   private Config cfg;
 
   @Inject
-  MaxDb(@GerritServerConfig final Config cfg) {
+  MaxDb(@GerritServerConfig Config cfg) {
     super("com.sap.dbtech.jdbc.DriverSapDB");
     this.cfg = cfg;
   }

gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java

@@ -27,7 +27,7 @@ class MySql extends BaseDataSourceType {
   private Config cfg;
 
   @Inject
-  MySql(@GerritServerConfig final Config cfg) {
+  MySql(@GerritServerConfig Config cfg) {
     super("com.mysql.jdbc.Driver");
     this.cfg = cfg;
   }

gerrit-server/src/main/java/com/google/gerrit/server/schema/Oracle.java

@@ -26,7 +26,7 @@ public class Oracle extends BaseDataSourceType {
   private Config cfg;
 
   @Inject
-  public Oracle(@GerritServerConfig final Config cfg) {
+  public Oracle(@GerritServerConfig Config cfg) {
     super("oracle.jdbc.driver.OracleDriver");
     this.cfg = cfg;
   }

gerrit-server/src/main/java/com/google/gerrit/server/schema/PostgreSQL.java

@@ -28,7 +28,7 @@ class PostgreSQL extends BaseDataSourceType {
   private Config cfg;
 
   @Inject
-  PostgreSQL(@GerritServerConfig final Config cfg) {
+  PostgreSQL(@GerritServerConfig Config cfg) {
     super("org.postgresql.Driver");
     this.cfg = cfg;
   }

gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandFactoryProvider.java

@@ -60,11 +60,11 @@ class CommandFactoryProvider implements Provider<CommandFactory>, LifecycleListe
 
   @Inject
   CommandFactoryProvider(
-      @CommandName(Commands.ROOT) final DispatchCommandProvider d,
+      @CommandName(Commands.ROOT) DispatchCommandProvider d,
-      @GerritServerConfig final Config cfg,
+      @GerritServerConfig Config cfg,
-      final WorkQueue workQueue,
+      WorkQueue workQueue,
-      final SshLog l,
+      SshLog l,
-      final SshScope s,
+      SshScope s,
       SchemaFactory<ReviewDb> sf) {
     dispatcher = d;
     log = l;

gerrit-sshd/src/main/java/com/google/gerrit/sshd/DatabasePubKeyAuth.java

@@ -62,14 +62,14 @@ class DatabasePubKeyAuth implements PublickeyAuthenticator {
 
   @Inject
   DatabasePubKeyAuth(
-      final SshKeyCacheImpl skc,
+      SshKeyCacheImpl skc,
-      final SshLog l,
+      SshLog l,
-      final IdentifiedUser.GenericFactory uf,
+      IdentifiedUser.GenericFactory uf,
-      final PeerDaemonUser.Factory pf,
+      PeerDaemonUser.Factory pf,
-      final SitePaths site,
+      SitePaths site,
-      final KeyPairProvider hostKeyProvider,
+      KeyPairProvider hostKeyProvider,
-      @GerritServerConfig final Config cfg,
+      @GerritServerConfig Config cfg,
-      final SshScope s) {
+      SshScope s) {
     sshKeyCache = skc;
     sshLog = l;
     userFactory = uf;
@@ -162,7 +162,7 @@ class DatabasePubKeyAuth implements PublickeyAuthenticator {
     return p.keys;
   }
 
-  private SshKeyCacheEntry find(final Iterable<SshKeyCacheEntry> keyList, PublicKey suppliedKey) {
+  private SshKeyCacheEntry find(Iterable<SshKeyCacheEntry> keyList, PublicKey suppliedKey) {
     for (SshKeyCacheEntry k : keyList) {
       if (k.match(suppliedKey)) {
         return k;

gerrit-sshd/src/main/java/com/google/gerrit/sshd/SshDaemon.java

@@ -149,16 +149,16 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
 
   @Inject
   SshDaemon(
-      final CommandFactory commandFactory,
+      CommandFactory commandFactory,
-      final NoShell noShell,
+      NoShell noShell,
-      final PublickeyAuthenticator userAuth,
+      PublickeyAuthenticator userAuth,
-      final GerritGSSAuthenticator kerberosAuth,
+      GerritGSSAuthenticator kerberosAuth,
-      final KeyPairProvider hostKeyProvider,
+      KeyPairProvider hostKeyProvider,
-      final IdGenerator idGenerator,
+      IdGenerator idGenerator,
-      @GerritServerConfig final Config cfg,
+      @GerritServerConfig Config cfg,
-      final SshLog sshLog,
+      SshLog sshLog,
-      @SshListenAddresses final List<SocketAddress> listen,
+      @SshListenAddresses List<SocketAddress> listen,
-      @SshAdvertisedAddresses final List<String> advertised,
+      @SshAdvertisedAddresses List<String> advertised,
       MetricMaker metricMaker) {
     setPort(IANA_SSH_PORT /* never used */);
 

gerrit-sshd/src/main/java/com/google/gerrit/sshd/StreamCommandExecutorProvider.java

@@ -26,7 +26,7 @@ class StreamCommandExecutorProvider implements Provider<WorkQueue.Executor> {
   private final WorkQueue queues;
 
   @Inject
-  StreamCommandExecutorProvider(@GerritServerConfig final Config config, WorkQueue wq) {
+  StreamCommandExecutorProvider(@GerritServerConfig Config config, WorkQueue wq) {
     final int cores = Runtime.getRuntime().availableProcessors();
     poolSize = config.getInt("sshd", "streamThreads", cores + 1);
     queues = wq;