Make inner classes static where appropriate

There are several classes that have inner classes not declared with the
'static' modifier.  For these classes Findbugs reports:

  This class is an inner class, but does not use its embedded reference
  to the object which created it.  This reference makes the instances of
  the class larger, and may keep the reference to the creator object alive
  longer than necessary.  If possible, the class should be made static.

Add a 'static' modifier on these classes.

Change-Id: I0244bb1cd5662398f79c61d442df815e3811bf12

gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/AcceptanceTestRequestScope.java

@@ -41,7 +41,7 @@ public class AcceptanceTestRequestScope {
   private static final Key<RequestScopedReviewDbProvider> DB_KEY =
       Key.get(RequestScopedReviewDbProvider.class);
 
-  public class Context implements RequestContext {
+  public static class Context implements RequestContext {
     private final RequestCleanup cleanup = new RequestCleanup();
     private final Map<Key<?>, Object> map = Maps.newHashMap();
     private final SchemaFactory<ReviewDb> schemaFactory;

gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyAgreementsScreen.java

@@ -47,7 +47,7 @@ public class MyAgreementsScreen extends SettingsScreen {
     });
   }
 
-  private class AgreementTable extends FancyFlexTable<ContributorAgreement> {
+  private static class AgreementTable extends FancyFlexTable<ContributorAgreement> {
     AgreementTable() {
       table.setWidth("");
       table.setText(0, 1, Util.C.agreementStatus());

gerrit-gwtui/src/main/java/com/google/gerrit/client/account/UsernameField.java

@@ -142,7 +142,7 @@ class UsernameField extends Composite {
     setUserName.setEnabled(on);
   }
 
-  private final class UserNameValidator implements KeyPressHandler {
+  private static final class UserNameValidator implements KeyPressHandler {
     @Override
     public void onKeyPress(final KeyPressEvent event) {
       final char code = event.getCharCode();

gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/PluginListScreen.java

@@ -60,7 +60,7 @@ public class PluginListScreen extends PluginScreen {
     add(pluginPanel);
   }
 
-  private class PluginTable extends FancyFlexTable<PluginInfo> {
+  private static class PluginTable extends FancyFlexTable<PluginInfo> {
     PluginTable() {
       table.setText(0, 1, Util.C.columnPluginName());
       table.setText(0, 2, Util.C.columnPluginSettings());

gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ProjectInfoScreen.java

@@ -698,7 +698,7 @@ public class ProjectInfoScreen extends ProjectScreen {
         && Gerrit.getUserAccount().getUserName().length() > 0;
   }
 
-  private class LabeledWidgetsGrid extends FlexTable {
+  private static class LabeledWidgetsGrid extends FlexTable {
     private String labelSuffix;
 
     public LabeledWidgetsGrid() {

gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CherryPickDialog.java

@@ -82,7 +82,7 @@ public abstract class CherryPickDialog extends TextAreaActionDialog {
     return newBranch.getText();
   }
 
-  class BranchSuggestion implements Suggestion {
+  static class BranchSuggestion implements Suggestion {
     private BranchInfo branch;
 
     public BranchSuggestion(BranchInfo branch) {

gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/CreateChangeDialog.java

@@ -82,7 +82,7 @@ public abstract class CreateChangeDialog extends TextAreaActionDialog {
     return newChange.getText();
   }
 
-  class BranchSuggestion implements Suggestion {
+  static class BranchSuggestion implements Suggestion {
     private BranchInfo branch;
 
     public BranchSuggestion(BranchInfo branch) {

gerrit-httpd/src/main/java/com/google/gerrit/httpd/ProjectBasicAuthFilter.java

@@ -186,7 +186,7 @@ class ProjectBasicAuthFilter implements Filter {
     return MoreObjects.firstNonNull(req.getCharacterEncoding(), "UTF-8");
   }
 
-  class Response extends HttpServletResponseWrapper {
+  static class Response extends HttpServletResponseWrapper {
     private static final String WWW_AUTHENTICATE = "WWW-Authenticate";
 
     Response(HttpServletResponse rsp) {

gerrit-httpd/src/main/java/com/google/gerrit/httpd/plugins/ContextMapper.java

@@ -45,7 +45,7 @@ class ContextMapper {
     return base + name;
   }
 
-  private class WrappedRequest extends HttpServletRequestWrapper {
+  private static class WrappedRequest extends HttpServletRequestWrapper {
     private final String contextPath;
     private final String pathInfo;
 

gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneIndexModule.java

@@ -54,7 +54,7 @@ public class LuceneIndexModule extends LifecycleModule {
     }
   }
 
-  private class MultiVersionModule extends LifecycleModule {
+  private static class MultiVersionModule extends LifecycleModule {
     @Override
     public void configure() {
       factory(OnlineReindexer.Factory.class);

gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNotedb.java

@@ -244,7 +244,7 @@ public class RebuildNotedb extends SiteProgram {
     }
   }
 
-  private class RebuildListener implements Runnable {
+  private static class RebuildListener implements Runnable {
     private Change.Id changeId;
     private ListenableFuture<?> future;
     private AtomicBoolean ok;

gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java

@@ -278,7 +278,7 @@ public class ListAccess implements RestReadView<TopLevelResource> {
     }
   }
 
-  public class PermissionRuleInfo {
+  public static class PermissionRuleInfo {
     public PermissionRule.Action action;
     public Boolean force;
     public Integer min;

gerrit-server/src/test/java/com/google/gerrit/server/ioutil/ColumnFormatterTest.java

@@ -25,7 +25,7 @@ public class ColumnFormatterTest {
    * Holds an in-memory {@link java.io.PrintWriter} object and allows
    * comparisons of its contents to a supplied string via an assert statement.
    */
-  class PrintWriterComparator {
+  static class PrintWriterComparator {
     private PrintWriter printWriter;
     private StringWriter stringWriter;
 

plugins/cookbook-plugin

@@ -1 +1 @@
-Subproject commit de0c0d019be1ce81b681ec4365bec169602c4b3c
+Subproject commit 967de784b310c365decd3f262a8e025bce547fff

plugins/replication

@@ -1 +1 @@
-Subproject commit e9b987413e9bf59ced29f796e8c005161df47c1f
+Subproject commit 896240c09de4fe434f778f10aaf2811a81a52ea4