Replace anonymous classes with lambdas

Change-Id: Ia50a1a6a8f7de93941702878b9b9966a565deec8

java/com/google/gerrit/acceptance/GcAssert.java

@@ -20,7 +20,6 @@ import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.inject.Inject;
 import java.io.File;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import org.eclipse.jgit.errors.RepositoryNotFoundException;
 import org.eclipse.jgit.lib.Repository;
@@ -53,13 +52,7 @@ public class GcAssert {
   private String[] getPackFiles(Project.NameKey p) throws RepositoryNotFoundException, IOException {
     try (Repository repo = repoManager.openRepository(p)) {
       File packDir = new File(repo.getDirectory(), "objects/pack");
-      return packDir.list(
+      return packDir.list((dir, name) -> name.endsWith(".pack"));
-          new FilenameFilter() {
-            @Override
-            public boolean accept(File dir, String name) {
-              return name.endsWith(".pack");
-            }
-          });
     }
   }
 }

java/com/google/gerrit/acceptance/StandaloneSiteTest.java

@@ -100,10 +100,8 @@ public abstract class StandaloneSiteTest {
   private final TemporaryFolder tempSiteDir = new TemporaryFolder();
 
   private final TestRule testRunner =
-      new TestRule() {
+      (base, description) ->
-        @Override
+          new Statement() {
-        public Statement apply(Statement base, Description description) {
-          return new Statement() {
             @Override
             public void evaluate() throws Throwable {
               try {
@@ -114,8 +112,6 @@ public abstract class StandaloneSiteTest {
               }
             }
           };
-        }
-      };
 
   @Rule public RuleChain ruleChain = RuleChain.outerRule(tempSiteDir).around(testRunner);
 

java/com/google/gerrit/asciidoctor/AsciiDoctor.java

@@ -19,7 +19,6 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import com.google.common.io.ByteStreams;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -168,14 +167,7 @@ public class AsciiDoctor {
       try (ZipOutputStream zip = new ZipOutputStream(Files.newOutputStream(Paths.get(zipFile)))) {
         renderFiles(inputFiles, zip);
 
-        File[] cssFiles =
+        File[] cssFiles = tmpdir.listFiles((dir, name) -> name.endsWith(".css"));
-            tmpdir.listFiles(
-                new FilenameFilter() {
-                  @Override
-                  public boolean accept(File dir, String name) {
-                    return name.endsWith(".css");
-                  }
-                });
         for (File css : cssFiles) {
           zipFile(css, css.getName(), zip);
         }

java/com/google/gerrit/common/SiteLibraryLoaderUtil.java

@@ -50,12 +50,9 @@ public final class SiteLibraryLoaderUtil {
 
   public static List<Path> listJars(Path dir) throws IOException {
     DirectoryStream.Filter<Path> filter =
-        new DirectoryStream.Filter<Path>() {
+        entry -> {
-          @Override
-          public boolean accept(Path entry) throws IOException {
           String name = entry.getFileName().toString();
           return (name.endsWith(".jar") || name.endsWith(".zip")) && Files.isRegularFile(entry);
-          }
         };
     try (DirectoryStream<Path> jars = Files.newDirectoryStream(dir, filter)) {
       return new Ordering<Path>() {

java/com/google/gerrit/extensions/registration/DynamicItem.java

@@ -184,12 +184,7 @@ public class DynamicItem<T> {
     }
 
     final Extension<T> defaultItem = old;
-    return new RegistrationHandle() {
+    return () -> ref.compareAndSet(item, defaultItem);
-      @Override
-      public void remove() {
-        ref.compareAndSet(item, defaultItem);
-      }
-    };
   }
 
   /**

java/com/google/gerrit/extensions/registration/DynamicSet.java

@@ -167,10 +167,8 @@ public class DynamicSet<T> implements Iterable<T> {
 
   public Iterable<Extension<T>> entries() {
     final Iterator<AtomicReference<Extension<T>>> itr = items.iterator();
-    return new Iterable<Extension<T>>() {
+    return () ->
-      @Override
+        new Iterator<Extension<T>>() {
-      public Iterator<Extension<T>> iterator() {
-        return new Iterator<Extension<T>>() {
           private Extension<T> next;
 
           @Override
@@ -200,8 +198,6 @@ public class DynamicSet<T> implements Iterable<T> {
           }
         };
   }
-    };
-  }
 
   /**
    * Returns {@code true} if this set contains the given item.
@@ -266,13 +262,10 @@ public class DynamicSet<T> implements Iterable<T> {
     final AtomicReference<Extension<T>> ref =
         new AtomicReference<>(new Extension<>(pluginName, item));
     items.add(ref);
-    return new RegistrationHandle() {
+    return () -> {
-      @Override
-      public void remove() {
       if (ref.compareAndSet(ref.get(), null)) {
         items.remove(ref);
       }
-      }
     };
   }
 

java/com/google/gerrit/extensions/registration/PrivateInternals_DynamicMapImpl.java

@@ -36,12 +36,7 @@ public class PrivateInternals_DynamicMapImpl<T> extends DynamicMap<T> {
     requireNonNull(item);
     final NamePair key = new NamePair(pluginName, exportName);
     items.put(key, item);
-    return new RegistrationHandle() {
+    return () -> items.remove(key, item);
-      @Override
-      public void remove() {
-        items.remove(key, item);
-      }
-    };
   }
 
   /**

java/com/google/gerrit/httpd/UrlModule.java

@@ -32,7 +32,6 @@ import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.server.config.AuthConfig;
 import com.google.inject.Key;
-import com.google.inject.Provider;
 import com.google.inject.internal.UniqueAnnotations;
 import com.google.inject.servlet.ServletModule;
 import java.io.IOException;
@@ -171,15 +170,7 @@ class UrlModule extends ServletModule {
 
   private Key<HttpServlet> key(HttpServlet servlet) {
     final Key<HttpServlet> srv = Key.get(HttpServlet.class, UniqueAnnotations.create());
-    bind(srv)
+    bind(srv).toProvider(() -> servlet).in(SINGLETON);
-        .toProvider(
-            new Provider<HttpServlet>() {
-              @Override
-              public HttpServlet get() {
-                return servlet;
-              }
-            })
-        .in(SINGLETON);
     return srv;
   }
 

java/com/google/gerrit/httpd/plugins/HttpPluginServlet.java

@@ -35,7 +35,6 @@ import com.google.common.collect.Maps;
 import com.google.common.flogger.FluentLogger;
 import com.google.common.io.ByteStreams;
 import com.google.common.net.HttpHeaders;
-import com.google.gerrit.extensions.registration.RegistrationHandle;
 import com.google.gerrit.httpd.resources.Resource;
 import com.google.gerrit.httpd.resources.ResourceKey;
 import com.google.gerrit.httpd.resources.SmallResource;
@@ -84,8 +83,6 @@ import javax.servlet.FilterChain;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -174,13 +171,7 @@ class HttpPluginServlet extends HttpServlet implements StartPluginListener, Relo
     GuiceFilter filter = load(plugin);
     final String name = plugin.getName();
     final PluginHolder holder = new PluginHolder(plugin, filter);
-    plugin.add(
+    plugin.add(() -> plugins.remove(name, holder));
-        new RegistrationHandle() {
-          @Override
-          public void remove() {
-            plugins.remove(name, holder);
-          }
-        });
     plugins.put(name, holder);
   }
 
@@ -234,12 +225,7 @@ class HttpPluginServlet extends HttpServlet implements StartPluginListener, Relo
 
     HttpServletRequest wr = wrapper.create(req, name);
     FilterChain chain =
-        new FilterChain() {
+        (sreq, sres) -> onDefault(holder, (HttpServletRequest) sreq, (HttpServletResponse) sres);
-          @Override
-          public void doFilter(ServletRequest req, ServletResponse res) throws IOException {
-            onDefault(holder, (HttpServletRequest) req, (HttpServletResponse) res);
-          }
-        };
     if (holder.filter != null) {
       holder.filter.doFilter(wr, res, chain);
     } else {

java/com/google/gerrit/httpd/plugins/LfsPluginServlet.java

@@ -19,7 +19,6 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 import static javax.servlet.http.HttpServletResponse.SC_NOT_IMPLEMENTED;
 
 import com.google.common.flogger.FluentLogger;
-import com.google.gerrit.extensions.registration.RegistrationHandle;
 import com.google.gerrit.httpd.resources.Resource;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gerrit.server.plugins.Plugin;
@@ -40,8 +39,6 @@ import javax.servlet.FilterChain;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -66,12 +63,7 @@ public class LfsPluginServlet extends HttpServlet
   LfsPluginServlet(@GerritServerConfig Config cfg) {
     this.pluginName = cfg.getString("lfs", null, "plugin");
     this.chain =
-        new FilterChain() {
+        (req, res) -> Resource.NOT_FOUND.send((HttpServletRequest) req, (HttpServletResponse) res);
-          @Override
-          public void doFilter(ServletRequest req, ServletResponse res) throws IOException {
-            Resource.NOT_FOUND.send((HttpServletRequest) req, (HttpServletResponse) res);
-          }
-        };
     this.filter = new AtomicReference<>();
   }
 
@@ -123,13 +115,7 @@ public class LfsPluginServlet extends HttpServlet
       return;
     }
     final GuiceFilter guiceFilter = load(plugin);
-    plugin.add(
+    plugin.add(() -> filter.compareAndSet(guiceFilter, null));
-        new RegistrationHandle() {
-          @Override
-          public void remove() {
-            filter.compareAndSet(guiceFilter, null);
-          }
-        });
     filter.set(guiceFilter);
   }
 

java/com/google/gerrit/index/Schema.java

@@ -16,7 +16,6 @@ package com.google.gerrit.index;
 
 import static com.google.common.base.Preconditions.checkState;
 
-import com.google.common.base.Function;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Predicates;
 import com.google.common.collect.FluentIterable;
@@ -176,9 +175,7 @@ public class Schema<T> {
   public final Iterable<Values<T>> buildFields(T obj) {
     return FluentIterable.from(fields.values())
         .transform(
-            new Function<FieldDef<T, ?>, Values<T>>() {
+            f -> {
-              @Override
-              public Values<T> apply(FieldDef<T, ?> f) {
               Object v;
               try {
                 v = f.get(obj);
@@ -194,7 +191,6 @@ public class Schema<T> {
               } else {
                 return new Values<>(f, Collections.singleton(v));
               }
-              }
             })
         .filter(Predicates.notNull());
   }

java/com/google/gerrit/metrics/DisabledMetricMaker.java

@@ -187,9 +187,6 @@ public class DisabledMetricMaker extends MetricMaker {
 
   @Override
   public RegistrationHandle newTrigger(Set<CallbackMetric<?>> metrics, Runnable trigger) {
-    return new RegistrationHandle() {
+    return () -> {};
-      @Override
-      public void remove() {}
-    };
   }
 }

java/com/google/gerrit/metrics/dropwizard/CallbackMetricImpl0.java

@@ -14,6 +14,7 @@
 
 package com.google.gerrit.metrics.dropwizard;
 
+import com.codahale.metrics.Gauge;
 import com.codahale.metrics.MetricRegistry;
 import com.google.gerrit.metrics.CallbackMetric0;
 
@@ -71,12 +72,10 @@ class CallbackMetricImpl0<V> extends CallbackMetric0<V> implements CallbackMetri
   public void register(Runnable trigger) {
     registry.register(
         name,
-        new com.codahale.metrics.Gauge<V>() {
+        (Gauge<V>)
-          @Override
+            () -> {
-          public V getValue() {
               trigger.run();
               return value;
-          }
             });
   }
 }

java/com/google/gerrit/metrics/dropwizard/DropWizardMetricMaker.java

@@ -305,14 +305,7 @@ public class DropWizardMetricMaker extends MetricMaker {
     }
     trigger.run();
 
-    return new RegistrationHandle() {
+    return () -> all.forEach(CallbackMetricGlue::remove);
-      @Override
-      public void remove() {
-        for (CallbackMetricGlue m : all) {
-          m.remove();
-        }
-      }
-    };
   }
 
   synchronized void remove(String name) {

java/com/google/gerrit/metrics/proc/ProcMetricModule.java

@@ -15,7 +15,6 @@
 package com.google.gerrit.metrics.proc;
 
 import com.google.common.base.Strings;
-import com.google.common.base.Supplier;
 import com.google.common.collect.ImmutableSet;
 import com.google.gerrit.common.Version;
 import com.google.gerrit.metrics.CallbackMetric0;
@@ -74,12 +73,7 @@ public class ProcMetricModule extends MetricModule {
           "proc/cpu/usage",
           Double.class,
           new Description("CPU time used by the process").setCumulative().setUnit(Units.SECONDS),
-          new Supplier<Double>() {
+          () -> provider.getProcessCpuTime() / 1e9);
-            @Override
-            public Double get() {
-              return provider.getProcessCpuTime() / 1e9;
-            }
-          });
     }
 
     if (provider.getOpenFileDescriptorCount() != -1) {

java/com/google/gerrit/pgm/Daemon.java

@@ -114,7 +114,6 @@ import com.google.inject.Module;
 import com.google.inject.Provider;
 import com.google.inject.Stage;
 import java.io.IOException;
-import java.lang.Thread.UncaughtExceptionHandler;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -229,12 +228,7 @@ public class Daemon extends SiteProgram {
     }
     mustHaveValidSite();
     Thread.setDefaultUncaughtExceptionHandler(
-        new UncaughtExceptionHandler() {
+        (t, e) -> logger.atSevere().withCause(e).log("Thread %s threw exception", t.getName()));
-          @Override
-          public void uncaughtException(Thread t, Throwable e) {
-            logger.atSevere().withCause(e).log("Thread %s threw exception", t.getName());
-          }
-        });
 
     if (runId != null) {
       runFile = getSitePath().resolve("logs").resolve("gerrit.run");

java/com/google/gerrit/pgm/http/jetty/JettyServer.java

@@ -49,7 +49,6 @@ import org.eclipse.jetty.server.ForwardedRequestCustomizer;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
-import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.SecureRequestCustomizer;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
@@ -241,13 +240,9 @@ public class JettyServer {
         defaultPort = 8080;
         config.addCustomizer(new ForwardedRequestCustomizer());
         config.addCustomizer(
-            new HttpConfiguration.Customizer() {
+            (connector, channelConfig, request) -> {
-              @Override
-              public void customize(
-                  Connector connector, HttpConfiguration channelConfig, Request request) {
               request.setScheme(HttpScheme.HTTPS.asString());
               request.setSecure(true);
-              }
             });
         c = newServerConnector(server, acceptors, config);
 

java/com/google/gerrit/pgm/init/StaleLibraryRemover.java

@@ -39,12 +39,7 @@ public class StaleLibraryRemover {
   public void remove(String pattern) {
     if (!Strings.isNullOrEmpty(pattern)) {
       DirectoryStream.Filter<Path> filter =
-          new DirectoryStream.Filter<Path>() {
+          entry -> entry.getFileName().toString().matches("^" + pattern + "$");
-            @Override
-            public boolean accept(Path entry) {
-              return entry.getFileName().toString().matches("^" + pattern + "$");
-            }
-          };
       try (DirectoryStream<Path> paths = Files.newDirectoryStream(lib_dir, filter)) {
         for (Path p : paths) {
           String old = p.getFileName().toString();

java/com/google/gerrit/prettify/common/EditList.java

@@ -36,10 +36,8 @@ public class EditList {
   }
 
   public Iterable<Hunk> getHunks() {
-    return new Iterable<Hunk>() {
+    return () ->
-      @Override
+        new Iterator<Hunk>() {
-      public Iterator<Hunk> iterator() {
-        return new Iterator<Hunk>() {
           private int curIdx;
 
           @Override
@@ -61,8 +59,6 @@ public class EditList {
           }
         };
   }
-    };
-  }
 
   private int findCombinedEnd(int i) {
     int end = i + 1;

java/com/google/gerrit/server/IdentifiedUser.java

@@ -512,11 +512,8 @@ public class IdentifiedUser extends CurrentUser {
       remotePeer = Providers.of(remotePeerProvider.get());
     } catch (OutOfScopeException | ProvisionException e) {
       remotePeer =
-          new Provider<SocketAddress>() {
+          () -> {
-            @Override
-            public SocketAddress get() {
             throw e;
-            }
           };
     }
     return new IdentifiedUser(

java/com/google/gerrit/server/account/AccountsUpdate.java

@@ -30,7 +30,6 @@ import com.google.gerrit.git.RefUpdateUtil;
 import com.google.gerrit.reviewdb.client.Account;
 import com.google.gerrit.server.GerritPersonIdent;
 import com.google.gerrit.server.IdentifiedUser;
-import com.google.gerrit.server.account.InternalAccountUpdate.Builder;
 import com.google.gerrit.server.account.externalids.ExternalIdNotes;
 import com.google.gerrit.server.account.externalids.ExternalIdNotes.ExternalIdNotesLoader;
 import com.google.gerrit.server.account.externalids.ExternalIds;
@@ -154,13 +153,10 @@ public class AccountsUpdate {
     void update(AccountState accountState, InternalAccountUpdate.Builder update) throws IOException;
 
     static AccountUpdater join(List<AccountUpdater> updaters) {
-      return new AccountUpdater() {
+      return (accountState, update) -> {
-        @Override
-        public void update(AccountState accountState, Builder update) throws IOException {
         for (AccountUpdater updater : updaters) {
           updater.update(accountState, update);
         }
-        }
       };
     }
 

java/com/google/gerrit/server/auth/ldap/Helper.java

@@ -186,13 +186,7 @@ class Helper {
     Subject subject = ctx.getSubject();
     try {
       return Subject.doAs(
-          subject,
+          subject, (PrivilegedExceptionAction<DirContext>) () -> createContext(env));
-          new PrivilegedExceptionAction<DirContext>() {
-            @Override
-            public DirContext run() throws IOException, NamingException {
-              return createContext(env);
-            }
-          });
     } catch (PrivilegedActionException e) {
       Throwables.throwIfInstanceOf(e.getException(), IOException.class);
       Throwables.throwIfInstanceOf(e.getException(), NamingException.class);

java/com/google/gerrit/server/cache/h2/H2CacheDefProxy.java

@@ -42,7 +42,6 @@ class H2CacheDefProxy<K, V> implements PersistentCacheDef<K, V> {
     return source.expireFromMemoryAfterAccess();
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public Weigher<K, V> weigher() {
     Weigher<K, V> weigher = source.weigher();
@@ -52,13 +51,10 @@ class H2CacheDefProxy<K, V> implements PersistentCacheDef<K, V> {
 
     // introduce weigher that performs calculations
     // on value that is being stored not on ValueHolder
-    return (Weigher<K, V>)
+    Weigher<K, ValueHolder<V>> holderWeigher = (k, v) -> weigher.weigh(k, v.value);
-        new Weigher<K, ValueHolder<V>>() {
+    @SuppressWarnings("unchecked")
-          @Override
+    Weigher<K, V> ret = (Weigher<K, V>) holderWeigher;
-          public int weigh(K key, ValueHolder<V> value) {
+    return ret;
-            return weigher.weigh(key, value.value);
-          }
-        };
   }
 
   @Override

java/com/google/gerrit/server/cache/mem/DefaultMemoryCacheFactory.java

@@ -112,11 +112,6 @@ class DefaultMemoryCacheFactory implements MemoryCacheFactory {
   }
 
   private static <K, V> Weigher<K, V> unitWeight() {
-    return new Weigher<K, V>() {
+    return (key, value) -> 1;
-      @Override
-      public int weigh(K key, V value) {
-        return 1;
-      }
-    };
   }
 }

java/com/google/gerrit/server/config/CacheResource.java

@@ -33,15 +33,7 @@ public class CacheResource extends ConfigResource {
   }
 
   public CacheResource(String pluginName, String cacheName, Cache<?, ?> cache) {
-    this(
+    this(pluginName, cacheName, () -> cache);
-        pluginName,
-        cacheName,
-        new Provider<Cache<?, ?>>() {
-          @Override
-          public Cache<?, ?> get() {
-            return cache;
-          }
-        });
   }
 
   public String getName() {

java/com/google/gerrit/server/documentation/MarkdownFormatterHeader.java

@@ -18,7 +18,6 @@ import com.vladsch.flexmark.ast.Heading;
 import com.vladsch.flexmark.ast.Node;
 import com.vladsch.flexmark.ext.anchorlink.AnchorLink;
 import com.vladsch.flexmark.ext.anchorlink.internal.AnchorLinkNodeRenderer;
-import com.vladsch.flexmark.html.CustomNodeRenderer;
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.html.HtmlRenderer.HtmlRendererExtension;
 import com.vladsch.flexmark.html.HtmlWriter;
@@ -61,21 +60,8 @@ public class MarkdownFormatterHeader {
           Arrays.asList(
               new NodeRenderingHandler<>(
                   AnchorLink.class,
-                  new CustomNodeRenderer<AnchorLink>() {
+                  (node, context, html) -> HeadingNodeRenderer.this.render(node, context)),
-                    @Override
+              new NodeRenderingHandler<>(Heading.class, HeadingNodeRenderer.this::render)));
-                    public void render(
-                        AnchorLink node, NodeRendererContext context, HtmlWriter html) {
-                      HeadingNodeRenderer.this.render(node, context);
-                    }
-                  }),
-              new NodeRenderingHandler<>(
-                  Heading.class,
-                  new CustomNodeRenderer<Heading>() {
-                    @Override
-                    public void render(Heading node, NodeRendererContext context, HtmlWriter html) {
-                      HeadingNodeRenderer.this.render(node, context, html);
-                    }
-                  })));
     }
 
     void render(final AnchorLink node, final NodeRendererContext context) {
@@ -116,25 +102,15 @@ public class MarkdownFormatterHeader {
               .withAttr()
               .tagLine(
                   "h" + node.getLevel(),
-                  new Runnable() {
+                  () -> {
-                    @Override
-                    public void run() {
                     html.srcPos(node.getText()).withAttr().tag("span");
                     context.renderChildren(node);
                     html.tag("/span");
-                    }
                   });
         } else {
           html.srcPos(node.getText())
               .withAttr()
-              .tagLine(
+              .tagLine("h" + node.getLevel(), () -> context.renderChildren(node));
-                  "h" + node.getLevel(),
-                  new Runnable() {
-                    @Override
-                    public void run() {
-                      context.renderChildren(node);
-                    }
-                  });
         }
       } else {
         context.delegateRender();

java/com/google/gerrit/server/events/StreamEventsApiListener.java

@@ -50,7 +50,6 @@ import com.google.gerrit.server.data.AccountAttribute;
 import com.google.gerrit.server.data.ApprovalAttribute;
 import com.google.gerrit.server.data.ChangeAttribute;
 import com.google.gerrit.server.data.PatchSetAttribute;
-import com.google.gerrit.server.data.RefUpdateAttribute;
 import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.gerrit.server.notedb.ChangeNotes;
 import com.google.gerrit.server.plugincontext.PluginItemContext;
@@ -151,43 +150,33 @@ public class StreamEventsApiListener
 
   private Supplier<ChangeAttribute> changeAttributeSupplier(Change change, ChangeNotes notes) {
     return Suppliers.memoize(
-        new Supplier<ChangeAttribute>() {
+        () -> {
-          @Override
-          public ChangeAttribute get() {
           try {
             return eventFactory.asChangeAttribute(change, notes);
           } catch (OrmException e) {
             throw new RuntimeException(e);
           }
-          }
         });
   }
 
   private Supplier<AccountAttribute> accountAttributeSupplier(AccountInfo account) {
     return Suppliers.memoize(
-        new Supplier<AccountAttribute>() {
+        () ->
-          @Override
+            account != null
-          public AccountAttribute get() {
-            return account != null
                 ? eventFactory.asAccountAttribute(new Account.Id(account._accountId))
-                : null;
+                : null);
-          }
-        });
   }
 
   private Supplier<PatchSetAttribute> patchSetAttributeSupplier(
       final Change change, PatchSet patchSet) {
     return Suppliers.memoize(
-        new Supplier<PatchSetAttribute>() {
+        () -> {
-          @Override
-          public PatchSetAttribute get() {
           try (Repository repo = repoManager.openRepository(change.getProject());
               RevWalk revWalk = new RevWalk(repo)) {
             return eventFactory.asPatchSetAttribute(revWalk, change, patchSet);
           } catch (IOException e) {
             throw new RuntimeException(e);
           }
-          }
         });
   }
 
@@ -226,21 +215,18 @@ public class StreamEventsApiListener
       final Map<String, ApprovalInfo> oldApprovals) {
     final Map<String, Short> approvals = convertApprovalsMap(newApprovals);
     return Suppliers.memoize(
-        new Supplier<ApprovalAttribute[]>() {
+        () -> {
-          @Override
-          public ApprovalAttribute[] get() {
           LabelTypes labelTypes = projectCache.get(change.getProject()).getLabelTypes();
           if (approvals.size() > 0) {
             ApprovalAttribute[] r = new ApprovalAttribute[approvals.size()];
             int i = 0;
-              for (Map.Entry<String, Short> approval : approvals.entrySet()) {
+            for (Entry<String, Short> approval : approvals.entrySet()) {
               r[i++] =
                   getApprovalAttribute(labelTypes, approval, convertApprovalsMap(oldApprovals));
             }
             return r;
           }
           return null;
-          }
         });
   }
 
@@ -378,15 +364,11 @@ public class StreamEventsApiListener
     final Branch.NameKey refName = new Branch.NameKey(ev.getProjectName(), ev.getRefName());
     event.refUpdate =
         Suppliers.memoize(
-            new Supplier<RefUpdateAttribute>() {
+            () ->
-              @Override
+                eventFactory.asRefUpdateAttribute(
-              public RefUpdateAttribute get() {
-                return eventFactory.asRefUpdateAttribute(
                     ObjectId.fromString(ev.getOldObjectId()),
                     ObjectId.fromString(ev.getNewObjectId()),
-                    refName);
+                    refName));
-              }
-            });
     dispatcher.run(d -> d.postEvent(refName, event));
   }
 

java/com/google/gerrit/server/git/GroupCollector.java

@@ -106,14 +106,11 @@ public class GroupCollector {
       Project.NameKey project) {
     return new GroupCollector(
         transformRefs(changeRefsById),
-        new Lookup() {
+        psId -> {
-          @Override
-          public List<String> lookup(PatchSet.Id psId) throws OrmException {
           // TODO(dborowitz): Reuse open repository from caller.
           ChangeNotes notes = notesFactory.createChecked(project, psId.getParentKey());
           PatchSet ps = psUtil.get(notes, psId);
           return ps != null ? ps.getGroups() : null;
-          }
         });
   }
 
@@ -135,12 +132,9 @@ public class GroupCollector {
       ListMultimap<PatchSet.Id, String> groupLookup) {
     this(
         patchSetsBySha,
-        new Lookup() {
+        psId -> {
-          @Override
-          public List<String> lookup(PatchSet.Id psId) {
           List<String> groups = groupLookup.get(psId);
           return !groups.isEmpty() ? groups : null;
-          }
         });
   }
 

java/com/google/gerrit/server/git/WorkQueue.java

@@ -17,7 +17,6 @@ package com.google.gerrit.server.git;
 import static java.util.stream.Collectors.toList;
 
 import com.google.common.base.CaseFormat;
-import com.google.common.base.Supplier;
 import com.google.common.flogger.FluentLogger;
 import com.google.gerrit.extensions.events.LifecycleListener;
 import com.google.gerrit.lifecycle.LifecycleModule;
@@ -86,12 +85,8 @@ public class WorkQueue {
   }
 
   private static final UncaughtExceptionHandler LOG_UNCAUGHT_EXCEPTION =
-      new UncaughtExceptionHandler() {
+      (t, e) ->
-        @Override
-        public void uncaughtException(Thread t, Throwable e) {
           logger.atSevere().withCause(e).log("WorkQueue thread %s threw exception", t.getName());
-        }
-      };
 
   private final ScheduledExecutorService defaultQueue;
   private final IdGenerator idGenerator;
@@ -360,68 +355,38 @@ public class WorkQueue {
           new Description("Maximum allowed number of threads in the pool")
               .setGauge()
               .setUnit("threads"),
-          new Supplier<Long>() {
+          () -> (long) getMaximumPoolSize());
-            @Override
-            public Long get() {
-              return (long) getMaximumPoolSize();
-            }
-          });
       metrics.newCallbackMetric(
           getMetricName(queueName, "pool_size"),
           Long.class,
           new Description("Current number of threads in the pool").setGauge().setUnit("threads"),
-          new Supplier<Long>() {
+          () -> (long) getPoolSize());
-            @Override
-            public Long get() {
-              return (long) getPoolSize();
-            }
-          });
       metrics.newCallbackMetric(
           getMetricName(queueName, "active_threads"),
           Long.class,
           new Description("Number number of threads that are actively executing tasks")
               .setGauge()
               .setUnit("threads"),
-          new Supplier<Long>() {
+          () -> (long) getActiveCount());
-            @Override
-            public Long get() {
-              return (long) getActiveCount();
-            }
-          });
       metrics.newCallbackMetric(
           getMetricName(queueName, "scheduled_tasks"),
           Integer.class,
           new Description("Number of scheduled tasks in the queue").setGauge().setUnit("tasks"),
-          new Supplier<Integer>() {
+          () -> getQueue().size());
-            @Override
-            public Integer get() {
-              return getQueue().size();
-            }
-          });
       metrics.newCallbackMetric(
           getMetricName(queueName, "total_scheduled_tasks_count"),
           Long.class,
           new Description("Total number of tasks that have been scheduled for execution")
               .setCumulative()
               .setUnit("tasks"),
-          new Supplier<Long>() {
+          this::getTaskCount);
-            @Override
-            public Long get() {
-              return getTaskCount();
-            }
-          });
       metrics.newCallbackMetric(
           getMetricName(queueName, "total_completed_tasks_count"),
           Long.class,
           new Description("Total number of tasks that have completed execution")
               .setCumulative()
               .setUnit("tasks"),
-          new Supplier<Long>() {
+          this::getCompletedTaskCount);
-            @Override
-            public Long get() {
-              return getCompletedTaskCount();
-            }
-          });
     }
 
     private String getMetricName(String queueName, String metricName) {

java/com/google/gerrit/server/index/IndexUtils.java

@@ -39,9 +39,7 @@ public final class IndexUtils {
       ImmutableMap.of("_", " ", ".", " ");
 
   public static final Function<Exception, IOException> MAPPER =
-      new Function<Exception, IOException>() {
+      in -> {
-        @Override
-        public IOException apply(Exception in) {
         if (in instanceof IOException) {
           return (IOException) in;
         } else if (in instanceof ExecutionException && in.getCause() instanceof IOException) {
@@ -49,7 +47,6 @@ public final class IndexUtils {
         } else {
           return new IOException(in);
         }
-        }
       };
 
   public static void setReady(SitePaths sitePaths, String name, int version, boolean ready)

java/com/google/gerrit/server/index/change/ChangeIndexer.java

@@ -25,7 +25,6 @@ import com.google.gerrit.extensions.events.ChangeIndexedListener;
 import com.google.gerrit.index.Index;
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.config.GerritServerConfig;
 import com.google.gerrit.server.index.IndexExecutor;
 import com.google.gerrit.server.index.IndexUtils;
@@ -309,11 +308,8 @@ public class ChangeIndexer {
     public final T call() throws Exception {
       try {
         RequestContext newCtx =
-            new RequestContext() {
+            () -> {
-              @Override
-              public CurrentUser getUser() {
               throw new OutOfScopeException("No user during ChangeIndexer");
-              }
             };
         RequestContext oldCtx = context.setContext(newCtx);
         try {

java/com/google/gerrit/server/ioutil/HostPlatform.java

@@ -33,12 +33,7 @@ public final class HostPlatform {
   private static boolean compute(String platform) {
     final String osDotName =
         AccessController.doPrivileged(
-            new PrivilegedAction<String>() {
+            (PrivilegedAction<String>) () -> System.getProperty("os.name"));
-              @Override
-              public String run() {
-                return System.getProperty("os.name");
-              }
-            });
     return osDotName != null && osDotName.toLowerCase().contains(platform);
   }
 

java/com/google/gerrit/server/plugins/JarScanner.java

@@ -331,13 +331,6 @@ public class JarScanner implements PluginContentScanner, AutoCloseable {
     if (attributes == null) {
       return Collections.emptyMap();
     }
-    return Maps.transformEntries(
+    return Maps.transformEntries(attributes, (key, value) -> (String) value);
-        attributes,
-        new Maps.EntryTransformer<Object, Object, String>() {
-          @Override
-          public String transformEntry(Object key, Object value) {
-            return (String) value;
-          }
-        });
   }
 }

java/com/google/gerrit/server/plugins/PluginLoader.java

@@ -290,12 +290,7 @@ public class PluginLoader implements LifecycleListener {
 
   private void removeStalePluginFiles() {
     DirectoryStream.Filter<Path> filter =
-        new DirectoryStream.Filter<Path>() {
+        entry -> entry.getFileName().toString().startsWith("plugin_");
-          @Override
-          public boolean accept(Path entry) throws IOException {
-            return entry.getFileName().toString().startsWith("plugin_");
-          }
-        };
     try (DirectoryStream<Path> files = Files.newDirectoryStream(tempDir, filter)) {
       for (Path file : files) {
         logger.atInfo().log("Removing stale plugin file: %s", file.toFile().getName());

java/com/google/gerrit/server/plugins/PluginMetricMaker.java

@@ -160,12 +160,9 @@ public class PluginMetricMaker extends MetricMaker implements LifecycleListener
   public RegistrationHandle newTrigger(Set<CallbackMetric<?>> metrics, Runnable trigger) {
     final RegistrationHandle handle = root.newTrigger(metrics, trigger);
     cleanup.add(handle);
-    return new RegistrationHandle() {
+    return () -> {
-      @Override
-      public void remove() {
       handle.remove();
       cleanup.remove(handle);
-      }
     };
   }
 

java/com/google/gerrit/server/plugins/PluginUtil.java

@@ -34,9 +34,7 @@ public class PluginUtil {
       return ImmutableList.of();
     }
     DirectoryStream.Filter<Path> filter =
-        new DirectoryStream.Filter<Path>() {
+        entry -> {
-          @Override
-          public boolean accept(Path entry) throws IOException {
           String n = entry.getFileName().toString();
           boolean accept =
               !n.startsWith(".last_") && !n.startsWith(".next_") && Files.isRegularFile(entry);
@@ -44,7 +42,6 @@ public class PluginUtil {
             accept &= n.endsWith(suffix);
           }
           return accept;
-          }
         };
     try (DirectoryStream<Path> files = Files.newDirectoryStream(pluginsDir, filter)) {
       return Ordering.natural().sortedCopy(files);

java/com/google/gerrit/server/project/ProjectState.java

@@ -64,7 +64,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -422,12 +421,7 @@ public class ProjectState {
    *     Starts from this project and progresses up the hierarchy to All-Projects.
    */
   public Iterable<ProjectState> tree() {
-    return new Iterable<ProjectState>() {
+    return () -> new ProjectHierarchyIterator(projectCache, allProjectsName, ProjectState.this);
-      @Override
-      public Iterator<ProjectState> iterator() {
-        return new ProjectHierarchyIterator(projectCache, allProjectsName, ProjectState.this);
-      }
-    };
   }
 
   /**

java/com/google/gerrit/server/restapi/account/StarredChanges.java

@@ -86,14 +86,11 @@ public class StarredChanges
 
   @Override
   public RestView<AccountResource> list() throws ResourceNotFoundException {
-    return new RestReadView<AccountResource>() {
+    return (RestReadView<AccountResource>)
-      @Override
+        self -> {
-      public Object apply(AccountResource self)
-          throws BadRequestException, AuthException, OrmException, PermissionBackendException {
           QueryChanges query = changes.list();
           query.addQuery("starredby:" + self.getUser().getAccountId().get());
           return query.apply(TopLevelResource.INSTANCE);
-      }
         };
   }
 

java/com/google/gerrit/server/restapi/change/SuggestChangeReviewers.java

@@ -19,7 +19,6 @@ import com.google.gerrit.extensions.common.SuggestedReviewerInfo;
 import com.google.gerrit.extensions.restapi.AuthException;
 import com.google.gerrit.extensions.restapi.BadRequestException;
 import com.google.gerrit.extensions.restapi.RestReadView;
-import com.google.gerrit.reviewdb.client.Account;
 import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.change.ChangeResource;
 import com.google.gerrit.server.config.GerritServerConfig;
@@ -81,16 +80,13 @@ public class SuggestChangeReviewers extends SuggestReviewers
 
   private VisibilityControl getVisibility(ChangeResource rsrc) {
 
-    return new VisibilityControl() {
+    return account -> {
-      @Override
-      public boolean isVisibleTo(Account.Id account) {
       // Use the destination reference, not the change, as private changes deny anyone who is not
       // already a reviewer.
       return permissionBackend
           .absentUser(account)
           .ref(rsrc.getChange().getDest())
           .testOrFalse(RefPermission.READ);
-      }
     };
   }
 }

java/com/google/gerrit/server/util/RequestScopePropagator.java

@@ -18,11 +18,9 @@ import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.Throwables;
 import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.RequestCleanup;
 import com.google.gerrit.server.git.ProjectRunnable;
 import com.google.inject.Key;
-import com.google.inject.Provider;
 import com.google.inject.Scope;
 import com.google.inject.servlet.ServletScopes;
 import java.util.concurrent.Callable;
@@ -167,14 +165,7 @@ public abstract class RequestScopePropagator {
 
   protected <T> Callable<T> context(RequestContext context, Callable<T> callable) {
     return () -> {
-      RequestContext old =
+      RequestContext old = local.setContext(context::getUser);
-          local.setContext(
-              new RequestContext() {
-                @Override
-                public CurrentUser getUser() {
-                  return context.getUser();
-                }
-              });
       try {
         return callable.call();
       } finally {
@@ -186,16 +177,7 @@ public abstract class RequestScopePropagator {
   protected <T> Callable<T> cleanup(Callable<T> callable) {
     return () -> {
       RequestCleanup cleanup =
-          scope
+          scope.scope(Key.get(RequestCleanup.class), RequestCleanup::new).get();
-              .scope(
-                  Key.get(RequestCleanup.class),
-                  new Provider<RequestCleanup>() {
-                    @Override
-                    public RequestCleanup get() {
-                      return new RequestCleanup();
-                    }
-                  })
-              .get();
       try {
         return callable.call();
       } finally {

java/com/google/gerrit/sshd/CommandFactoryProvider.java

@@ -91,16 +91,13 @@ class CommandFactoryProvider implements Provider<CommandFactory>, LifecycleListe
 
   @Override
   public CommandFactory get() {
-    return new CommandFactory() {
+    return requestCommand -> {
-      @Override
-      public Command createCommand(String requestCommand) {
       String c = requestCommand;
       SshCreateCommandInterceptor interceptor = createCommandInterceptor.get();
       if (interceptor != null) {
         c = interceptor.intercept(c);
       }
       return new Trampoline(c);
-      }
     };
   }
 

java/com/google/gerrit/sshd/DispatchCommandProvider.java

@@ -50,24 +50,14 @@ public class DispatchCommandProvider implements Provider<DispatchCommand> {
     if (m.putIfAbsent(name.value(), commandProvider) != null) {
       throw new IllegalArgumentException(name.value() + " exists");
     }
-    return new RegistrationHandle() {
+    return () -> m.remove(name.value(), commandProvider);
-      @Override
-      public void remove() {
-        m.remove(name.value(), commandProvider);
-      }
-    };
   }
 
   public RegistrationHandle replace(CommandName name, Provider<Command> cmd) {
     final ConcurrentMap<String, CommandProvider> m = getMap();
     final CommandProvider commandProvider = new CommandProvider(cmd, null);
     m.put(name.value(), commandProvider);
-    return new RegistrationHandle() {
+    return () -> m.remove(name.value(), commandProvider);
-      @Override
-      public void remove() {
-        m.remove(name.value(), commandProvider);
-      }
-    };
   }
 
   ConcurrentMap<String, CommandProvider> getMap() {

java/com/google/gerrit/sshd/SshCommand.java

@@ -34,9 +34,7 @@ public abstract class SshCommand extends BaseCommand {
   @Override
   public void start(Environment env) throws IOException {
     startThread(
-        new CommandRunnable() {
+        () -> {
-          @Override
-          public void run() throws Exception {
           parseCommandLine();
           stdout = toPrintWriter(out);
           stderr = toPrintWriter(err);
@@ -46,7 +44,6 @@ public abstract class SshCommand extends BaseCommand {
             stdout.flush();
             stderr.flush();
           }
-          }
         },
         AccessPath.SSH_COMMAND);
   }

java/com/google/gerrit/sshd/SshDaemon.java

@@ -69,10 +69,7 @@ import org.apache.sshd.common.NamedFactory;
 import org.apache.sshd.common.cipher.Cipher;
 import org.apache.sshd.common.compression.BuiltinCompressions;
 import org.apache.sshd.common.compression.Compression;
-import org.apache.sshd.common.file.FileSystemFactory;
 import org.apache.sshd.common.forward.DefaultForwarderFactory;
-import org.apache.sshd.common.future.CloseFuture;
-import org.apache.sshd.common.future.SshFutureListener;
 import org.apache.sshd.common.io.AbstractIoServiceFactory;
 import org.apache.sshd.common.io.IoAcceptor;
 import org.apache.sshd.common.io.IoServiceFactory;
@@ -271,15 +268,12 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
             // Log a session close without authentication as a failure.
             //
             s.addCloseFutureListener(
-                new SshFutureListener<CloseFuture>() {
+                future -> {
-                  @Override
-                  public void operationComplete(CloseFuture future) {
                   connected.decrementAndGet();
                   if (sd.isAuthenticationError()) {
                     authFailures.increment();
                     sshLog.onAuthFail(sd);
                   }
-                  }
                 });
             return s;
           }
@@ -718,10 +712,8 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
 
   private void initFileSystemFactory() {
     setFileSystemFactory(
-        new FileSystemFactory() {
+        session ->
-          @Override
+            new FileSystem() {
-          public FileSystem createFileSystem(Session session) throws IOException {
-            return new FileSystem() {
               @Override
               public void close() throws IOException {}
 
@@ -779,8 +771,6 @@ public class SshDaemon extends SshServer implements SshInfo, LifecycleListener {
               public Set<String> supportedFileAttributeViews() {
                 return null;
               }
-            };
-          }
             });
   }
 }

java/com/google/gerrit/sshd/SshUtil.java

@@ -30,8 +30,6 @@ import java.security.interfaces.RSAPublicKey;
 import java.security.spec.InvalidKeySpecException;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.sshd.common.SshException;
-import org.apache.sshd.common.future.CloseFuture;
-import org.apache.sshd.common.future.SshFutureListener;
 import org.apache.sshd.common.keyprovider.KeyPairProvider;
 import org.apache.sshd.common.util.buffer.ByteArrayBuffer;
 import org.apache.sshd.server.session.ServerSession;
@@ -136,16 +134,13 @@ public class SshUtil {
       }
 
       session.addCloseFutureListener(
-          new SshFutureListener<CloseFuture>() {
+          future -> {
-            @Override
+            final Context ctx1 = sshScope.newContext(sd, null);
-            public void operationComplete(CloseFuture future) {
+            final Context old1 = sshScope.set(ctx1);
-              final Context ctx = sshScope.newContext(sd, null);
-              final Context old = sshScope.set(ctx);
             try {
               sshLog.onLogout();
             } finally {
-                sshScope.set(old);
+              sshScope.set(old1);
-              }
             }
           });
     }

java/com/google/gerrit/testing/GerritServerTests.java

@@ -17,7 +17,6 @@ package com.google.gerrit.testing;
 import org.eclipse.jgit.lib.Config;
 import org.junit.Rule;
 import org.junit.rules.TestRule;
-import org.junit.runner.Description;
 import org.junit.runner.RunWith;
 import org.junit.runners.model.Statement;
 
@@ -29,15 +28,11 @@ public class GerritServerTests extends GerritBaseTests {
 
   @Rule
   public TestRule testRunner =
-      new TestRule() {
+      (base, description) ->
-        @Override
+          new Statement() {
-        public Statement apply(Statement base, Description description) {
-          return new Statement() {
             @Override
             public void evaluate() throws Throwable {
               base.evaluate();
             }
           };
 }
-      };
-}

java/com/google/gerrit/testing/InMemoryTestEnvironment.java

@@ -16,12 +16,10 @@ package com.google.gerrit.testing;
 
 import com.google.gerrit.lifecycle.LifecycleManager;
 import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.account.AccountManager;
 import com.google.gerrit.server.account.AuthRequest;
 import com.google.gerrit.server.schema.SchemaCreator;
-import com.google.gerrit.server.util.RequestContext;
 import com.google.gerrit.server.util.ThreadLocalRequestContext;
 import com.google.inject.Guice;
 import com.google.inject.Inject;
@@ -85,13 +83,7 @@ public final class InMemoryTestEnvironment implements MethodRule {
 
   public void setApiUser(Account.Id id) {
     IdentifiedUser user = userFactory.create(id);
-    requestContext.setContext(
+    requestContext.setContext(() -> user);
-        new RequestContext() {
-          @Override
-          public CurrentUser getUser() {
-            return user;
-          }
-        });
   }
 
   private void setUp(Object target) throws Exception {

javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java

@@ -2698,16 +2698,9 @@ public class ChangeIT extends AbstractDaemonTest {
     RegistrationHandle handle =
         changeMessageModifiers.add(
             "gerrit",
-            new ChangeMessageModifier() {
+            (newCommitMessage, original, mergeTip, destination) -> {
-              @Override
-              public String onSubmit(
-                  String newCommitMessage,
-                  RevCommit original,
-                  RevCommit mergeTip,
-                  Branch.NameKey destination) {
               assertThat(original.getName()).isNotEqualTo(mergeTip.getName());
               return newCommitMessage + "Custom: " + destination.get();
-              }
             });
     ChangeInfo actual;
     try {

javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java

@@ -1173,14 +1173,7 @@ public class RevisionIT extends AbstractDaemonTest {
   public void commit() throws Exception {
     WebLinkInfo expectedWebLinkInfo = new WebLinkInfo("foo", "imageUrl", "url");
     RegistrationHandle handle =
-        patchSetLinks.add(
+        patchSetLinks.add("gerrit", (projectName, commit) -> expectedWebLinkInfo);
-            "gerrit",
-            new PatchSetWebLink() {
-              @Override
-              public WebLinkInfo getPatchSetWebLink(String projectName, String commit) {
-                return expectedWebLinkInfo;
-              }
-            });
 
     try {
       PushOneCommit.Result r = createChange();

javatests/com/google/gerrit/acceptance/rest/account/ExternalIdIT.java

@@ -980,12 +980,7 @@ public class ExternalIdIT extends AbstractDaemonTest {
 
   private AutoCloseable createFailOnLoadContext() {
     externalIdReader.setFailOnLoad(true);
-    return new AutoCloseable() {
+    return () -> externalIdReader.setFailOnLoad(false);
-      @Override
-      public void close() {
-        externalIdReader.setFailOnLoad(false);
-      }
-    };
   }
 
   @FunctionalInterface

javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java

@@ -737,9 +737,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
   public void submitWithValidation() throws Exception {
     AtomicBoolean called = new AtomicBoolean(false);
     this.addOnSubmitValidationListener(
-        new OnSubmitValidationListener() {
+        args -> {
-          @Override
-          public void preBranchUpdate(Arguments args) throws ValidationException {
           called.set(true);
           HashSet<String> refs = Sets.newHashSet(args.getCommands().keySet());
           assertThat(refs).contains("refs/heads/master");
@@ -749,7 +747,6 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
             assertThat(refs).hasSize(1);
             assertThat(refs.iterator().next()).startsWith(RefNames.REFS_CHANGES);
           }
-          }
         });
 
     PushOneCommit.Result change = createChange();
@@ -791,9 +788,7 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
     // succeed.
     List<String> projectsCalled = new ArrayList<>(4);
     this.addOnSubmitValidationListener(
-        new OnSubmitValidationListener() {
+        args -> {
-          @Override
-          public void preBranchUpdate(Arguments args) throws ValidationException {
           String master = "refs/heads/master";
           assertThat(args.getCommands()).containsKey(master);
           ReceiveCommand cmd = args.getCommands().get(master);
@@ -809,7 +804,6 @@ public abstract class AbstractSubmit extends AbstractDaemonTest {
           if (projectsCalled.size() == 2) {
             throw new ValidationException("time to fail");
           }
-          }
         });
     submitWithConflict(change4.getChangeId(), "time to fail");
     assertThat(projectsCalled).containsExactly(keyA.get(), keyB.get());

javatests/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java

@@ -30,7 +30,6 @@ import com.google.gerrit.extensions.client.SubmitType;
 import com.google.gerrit.extensions.common.ChangeInfo;
 import com.google.gerrit.extensions.registration.DynamicSet;
 import com.google.gerrit.extensions.registration.RegistrationHandle;
-import com.google.gerrit.reviewdb.client.Branch;
 import com.google.gerrit.server.git.ChangeMessageModifier;
 import com.google.gerrit.server.submit.CommitMergeStatus;
 import com.google.inject.Inject;
@@ -91,16 +90,8 @@ public class SubmitByCherryPickIT extends AbstractSubmit {
     RegistrationHandle handle =
         changeMessageModifiers.add(
             "gerrit",
-            new ChangeMessageModifier() {
+            (newCommitMessage, original, mergeTip, destination) ->
-              @Override
+                newCommitMessage + "Custom: " + destination.get());
-              public String onSubmit(
-                  String newCommitMessage,
-                  RevCommit original,
-                  RevCommit mergeTip,
-                  Branch.NameKey destination) {
-                return newCommitMessage + "Custom: " + destination.get();
-              }
-            });
     try {
       submit(change.getChangeId());
     } finally {

javatests/com/google/gerrit/acceptance/rest/change/SubmitByRebaseAlwaysIT.java

@@ -25,7 +25,6 @@ import com.google.gerrit.extensions.client.SubmitType;
 import com.google.gerrit.extensions.common.ChangeInfo;
 import com.google.gerrit.extensions.registration.DynamicSet;
 import com.google.gerrit.extensions.registration.RegistrationHandle;
-import com.google.gerrit.reviewdb.client.Branch;
 import com.google.gerrit.server.git.ChangeMessageModifier;
 import com.google.inject.Inject;
 import java.util.List;
@@ -88,19 +87,12 @@ public class SubmitByRebaseAlwaysIT extends AbstractSubmitByRebase {
     RegistrationHandle handle =
         changeMessageModifiers.add(
             "gerrit",
-            new ChangeMessageModifier() {
+            (newCommitMessage, original, mergeTip, destination) -> {
-              @Override
-              public String onSubmit(
-                  String newCommitMessage,
-                  RevCommit original,
-                  RevCommit mergeTip,
-                  Branch.NameKey destination) {
               List<String> custom = mergeTip.getFooterLines("Custom");
               if (!custom.isEmpty()) {
                 newCommitMessage += "Custom-Parent: " + custom.get(0) + "\n";
               }
               return newCommitMessage + "Custom: " + destination.get();
-              }
             });
     try {
       // change1 is a fast-forward, but should be rebased in cherry pick style

javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java

@@ -90,14 +90,8 @@ public class AccessIT extends AbstractDaemonTest {
     RegistrationHandle handle =
         fileHistoryWebLinkDynamicSet.add(
             "gerrit",
-            new FileHistoryWebLink() {
+            (projectName, revision, fileName) ->
-              @Override
+                new WebLinkInfo("name", "imageURL", "http://view/" + projectName + "/" + fileName));
-              public WebLinkInfo getFileHistoryWebLink(
-                  String projectName, String revision, String fileName) {
-                return new WebLinkInfo(
-                    "name", "imageURL", "http://view/" + projectName + "/" + fileName);
-              }
-            });
     try {
       ProjectAccessInfo info = pApi().access();
       assertThat(info.configWebLinks).hasSize(1);
@@ -113,14 +107,8 @@ public class AccessIT extends AbstractDaemonTest {
     RegistrationHandle handle =
         fileHistoryWebLinkDynamicSet.add(
             "gerrit",
-            new FileHistoryWebLink() {
+            (projectName, revision, fileName) ->
-              @Override
+                new WebLinkInfo("name", "imageURL", "http://view/" + projectName + "/" + fileName));
-              public WebLinkInfo getFileHistoryWebLink(
-                  String projectName, String revision, String fileName) {
-                return new WebLinkInfo(
-                    "name", "imageURL", "http://view/" + projectName + "/" + fileName);
-              }
-            });
     try (Repository repo = repoManager.openRepository(newProjectName)) {
       RefUpdate u = repo.updateRef(RefNames.REFS_CONFIG);
       u.setForceUpdate(true);

javatests/com/google/gerrit/acceptance/server/event/CommentAddedEventIT.java

@@ -74,15 +74,7 @@ public class CommentAddedEventIT extends AbstractDaemonTest {
       u.save();
     }
 
-    eventListenerRegistration =
+    eventListenerRegistration = source.add("gerrit", event -> lastCommentAddedEvent = event);
-        source.add(
-            "gerrit",
-            new CommentAddedListener() {
-              @Override
-              public void onCommentAdded(Event event) {
-                lastCommentAddedEvent = event;
-              }
-            });
   }
 
   @After

javatests/com/google/gerrit/acceptance/server/project/CustomLabelIT.java

@@ -80,15 +80,7 @@ public class CustomLabelIT extends AbstractDaemonTest {
       u.save();
     }
 
-    eventListenerRegistration =
+    eventListenerRegistration = source.add("gerrit", event -> lastCommentAddedEvent = event);
-        source.add(
-            "gerrit",
-            new CommentAddedListener() {
-              @Override
-              public void onCommentAdded(Event event) {
-                lastCommentAddedEvent = event;
-              }
-            });
   }
 
   @After

javatests/com/google/gerrit/gpg/GerritPublicKeyCheckerTest.java

@@ -33,7 +33,6 @@ import com.google.gerrit.extensions.common.GpgKeyInfo.Status;
 import com.google.gerrit.gpg.testing.TestKey;
 import com.google.gerrit.lifecycle.LifecycleManager;
 import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.ServerInitiated;
 import com.google.gerrit.server.account.AccountManager;
@@ -41,7 +40,6 @@ import com.google.gerrit.server.account.AccountsUpdate;
 import com.google.gerrit.server.account.AuthRequest;
 import com.google.gerrit.server.account.externalids.ExternalId;
 import com.google.gerrit.server.schema.SchemaCreator;
-import com.google.gerrit.server.util.RequestContext;
 import com.google.gerrit.server.util.ThreadLocalRequestContext;
 import com.google.gerrit.testing.GerritBaseTests;
 import com.google.gerrit.testing.InMemoryModule;
@@ -111,13 +109,7 @@ public class GerritPublicKeyCheckerTest extends GerritBaseTests {
         .update("Set Preferred Email", userId, u -> u.setPreferredEmail("user@example.com"));
     user = reloadUser();
 
-    requestContext.setContext(
+    requestContext.setContext(() -> user);
-        new RequestContext() {
-          @Override
-          public CurrentUser getUser() {
-            return user;
-          }
-        });
 
     storeRepo = new InMemoryRepository(new DfsRepositoryDescription("repo"));
     store = new PublicKeyStore(storeRepo);

javatests/com/google/gerrit/pgm/init/LibrariesTest.java

@@ -22,7 +22,6 @@ import static org.junit.Assert.assertNotNull;
 import com.google.gerrit.pgm.init.api.ConsoleUI;
 import com.google.gerrit.server.config.SitePaths;
 import com.google.gerrit.testing.GerritBaseTests;
-import com.google.inject.Provider;
 import java.nio.file.Paths;
 import java.util.Collections;
 import org.junit.Test;
@@ -38,14 +37,7 @@ public class LibrariesTest extends GerritBaseTests {
 
     Libraries lib =
         new Libraries(
-            new Provider<LibraryDownloader>() {
+            () -> new LibraryDownloader(ui, site, remover), Collections.emptyList(), false);
-              @Override
-              public LibraryDownloader get() {
-                return new LibraryDownloader(ui, site, remover);
-              }
-            },
-            Collections.emptyList(),
-            false);
 
     assertNotNull(lib.mysqlDriver);
 

javatests/com/google/gerrit/server/account/UniversalGroupBackendTest.java

@@ -39,7 +39,6 @@ import com.google.gerrit.server.plugincontext.PluginContext.PluginMetrics;
 import com.google.gerrit.server.plugincontext.PluginSetContext;
 import com.google.gerrit.testing.GerritBaseTests;
 import java.util.Set;
-import org.easymock.IAnswer;
 import org.eclipse.jgit.lib.Config;
 import org.junit.Before;
 import org.junit.Test;
@@ -113,16 +112,13 @@ public class UniversalGroupBackendTest extends GerritBaseTests {
     expect(backend.handles(not(eq(handled)))).andStubReturn(false);
     expect(backend.membershipsOf(anyObject(IdentifiedUser.class)))
         .andStubAnswer(
-            new IAnswer<GroupMembership>() {
+            () -> {
-              @Override
-              public GroupMembership answer() throws Throwable {
               Object[] args = getCurrentArguments();
               GroupMembership membership = createMock(GroupMembership.class);
               expect(membership.contains(eq(handled))).andStubReturn(args[0] == member);
               expect(membership.contains(not(eq(notHandled)))).andStubReturn(false);
               replay(membership);
               return membership;
-              }
             });
     replay(member, notMember, backend);
 

javatests/com/google/gerrit/server/change/LabelNormalizerTest.java

@@ -32,7 +32,6 @@ import com.google.gerrit.reviewdb.client.Account;
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.LabelId;
 import com.google.gerrit.reviewdb.client.PatchSetApproval;
-import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.account.AccountManager;
 import com.google.gerrit.server.account.AuthRequest;
@@ -44,7 +43,6 @@ import com.google.gerrit.server.notedb.ChangeNotes;
 import com.google.gerrit.server.project.ProjectCache;
 import com.google.gerrit.server.project.ProjectConfig;
 import com.google.gerrit.server.schema.SchemaCreator;
-import com.google.gerrit.server.util.RequestContext;
 import com.google.gerrit.server.util.ThreadLocalRequestContext;
 import com.google.gerrit.server.util.time.TimeUtil;
 import com.google.gerrit.testing.GerritBaseTests;
@@ -91,13 +89,7 @@ public class LabelNormalizerTest extends GerritBaseTests {
     userId = accountManager.authenticate(AuthRequest.forUser("user")).getAccountId();
     user = userFactory.create(userId);
 
-    requestContext.setContext(
+    requestContext.setContext(() -> user);
-        new RequestContext() {
-          @Override
-          public CurrentUser getUser() {
-            return user;
-          }
-        });
 
     configureProject();
     setUpChange();

javatests/com/google/gerrit/server/events/EventDeserializerTest.java

@@ -59,12 +59,6 @@ public class EventDeserializerTest extends GerritBaseTests {
   }
 
   private <T> Supplier<T> createSupplier(T value) {
-    return Suppliers.memoize(
+    return Suppliers.memoize(() -> value);
-        new Supplier<T>() {
-          @Override
-          public T get() {
-            return value;
-          }
-        });
   }
 }

javatests/com/google/gerrit/server/permissions/RefControlTest.java

@@ -63,7 +63,6 @@ import com.google.gerrit.server.project.ProjectState;
 import com.google.gerrit.server.project.RefPattern;
 import com.google.gerrit.server.project.testing.Util;
 import com.google.gerrit.server.schema.SchemaCreator;
-import com.google.gerrit.server.util.RequestContext;
 import com.google.gerrit.server.util.ThreadLocalRequestContext;
 import com.google.gerrit.testing.GerritBaseTests;
 import com.google.gerrit.testing.InMemoryModule;
@@ -300,13 +299,7 @@ public class RefControlTest extends GerritBaseTests {
     add(local);
     local.getProject().setParentName(parentKey);
 
-    requestContext.setContext(
+    requestContext.setContext(() -> null);
-        new RequestContext() {
-          @Override
-          public CurrentUser getUser() {
-            return null;
-          }
-        });
 
     changeControlFactory = injector.getInstance(ChangeControl.Factory.class);
   }

javatests/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java

@@ -169,22 +169,11 @@ public abstract class AbstractQueryAccountsTest extends GerritServerTests {
 
   protected RequestContext newRequestContext(Account.Id requestUserId) {
     final CurrentUser requestUser = userFactory.create(requestUserId);
-    return new RequestContext() {
+    return () -> requestUser;
-      @Override
-      public CurrentUser getUser() {
-        return requestUser;
-      }
-    };
   }
 
   protected void setAnonymous() {
-    requestContext.setContext(
+    requestContext.setContext(anonymousUser::get);
-        new RequestContext() {
-          @Override
-          public CurrentUser getUser() {
-            return anonymousUser.get();
-          }
-        });
   }
 
   @After

javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java

@@ -229,12 +229,7 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests {
 
   protected RequestContext newRequestContext(Account.Id requestUserId) {
     final CurrentUser requestUser = userFactory.create(requestUserId);
-    return new RequestContext() {
+    return () -> requestUser;
-      @Override
-      public CurrentUser getUser() {
-        return requestUser;
-      }
-    };
   }
 
   protected void resetUser() {

javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java

@@ -139,22 +139,11 @@ public abstract class AbstractQueryGroupsTest extends GerritServerTests {
 
   protected RequestContext newRequestContext(Account.Id requestUserId) {
     final CurrentUser requestUser = userFactory.create(requestUserId);
-    return new RequestContext() {
+    return () -> requestUser;
-      @Override
-      public CurrentUser getUser() {
-        return requestUser;
-      }
-    };
   }
 
   protected void setAnonymous() {
-    requestContext.setContext(
+    requestContext.setContext(anonymousUser::get);
-        new RequestContext() {
-          @Override
-          public CurrentUser getUser() {
-            return anonymousUser.get();
-          }
-        });
   }
 
   @After

javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java

@@ -129,22 +129,11 @@ public abstract class AbstractQueryProjectsTest extends GerritServerTests {
 
   protected RequestContext newRequestContext(Account.Id requestUserId) {
     final CurrentUser requestUser = userFactory.create(requestUserId);
-    return new RequestContext() {
+    return () -> requestUser;
-      @Override
-      public CurrentUser getUser() {
-        return requestUser;
-      }
-    };
   }
 
   protected void setAnonymous() {
-    requestContext.setContext(
+    requestContext.setContext(anonymousUser::get);
-        new RequestContext() {
-          @Override
-          public CurrentUser getUser() {
-            return anonymousUser.get();
-          }
-        });
   }
 
   @After