From eca086a537ff15f0420044b89b0d4f0b85c08f58 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sun, 2 Apr 2017 08:16:35 +0200 Subject: [PATCH] Remove unnecessary final modifiers Change-Id: I32794046d557db051234b33d8b50d5d939bbbf1f --- .../gerrit/client/diff/ChunkManager.java | 7 +----- .../gerrit/client/diff/CommentManager.java | 2 +- .../google/gerrit/client/diff/DiffScreen.java | 2 +- .../gerrit/client/diff/PreferencesBox.java | 4 +-- .../google/gerrit/client/diff/SideBySide.java | 14 +++++------ .../client/diff/SideBySideChunkManager.java | 2 +- .../google/gerrit/client/diff/Unified.java | 8 +++--- .../client/diff/UnifiedChunkManager.java | 2 +- .../gerrit/client/editor/EditScreen.java | 4 +-- .../gerrit/lucene/AbstractLuceneIndex.java | 8 +++--- .../com/google/gerrit/pgm/RebuildNoteDb.java | 2 +- .../gerrit/metrics/proc/ProcMetricModule.java | 25 ++++++++----------- .../gerrit/server/cache/CacheMetrics.java | 18 ++++++------- .../config/RequestScopedReviewDbProvider.java | 2 +- .../index/account/AllAccountsIndexer.java | 2 +- .../server/index/group/AllGroupsIndexer.java | 2 +- .../notedb/rebuild/ChangeRebuilder.java | 2 +- .../gerrit/server/patch/PatchListLoader.java | 3 +-- .../server/project/ProjectCacheWarmer.java | 2 +- .../server/util/RequestScopePropagator.java | 4 +-- .../ThreadLocalRequestScopePropagator.java | 2 +- .../metrics/proc/ProcMetricModuleTest.java | 4 +-- 22 files changed, 54 insertions(+), 67 deletions(-) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ChunkManager.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ChunkManager.java index 12f5a0298a..0091f53853 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ChunkManager.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/ChunkManager.java @@ -68,12 +68,7 @@ abstract class ChunkManager { colorLines(cm, LineClassWhere.WRAP, color, line, line + cnt); } - void colorLines( - final CodeMirror cm, - final LineClassWhere where, - final String className, - final int start, - final int end) { + void colorLines(CodeMirror cm, LineClassWhere where, String className, int start, int end) { if (start < end) { for (int line = start; line < end; line++) { cm.addLineClass(line, where, className); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentManager.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentManager.java index 6bb69a31a6..95b88ac7e4 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentManager.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentManager.java @@ -261,7 +261,7 @@ abstract class CommentManager { abstract SortedMap getMapForNav(DisplaySide side); - Runnable commentNav(final CodeMirror src, final Direction dir) { + Runnable commentNav(CodeMirror src, Direction dir) { return () -> { // Every comment appears in both side maps as a linked pair. // It is only necessary to search one side to find a comment diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffScreen.java index 4ff7254e3e..e395a4751e 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffScreen.java @@ -637,7 +637,7 @@ abstract class DiffScreen extends Screen { abstract void setSyntaxHighlighting(boolean b); - void setContext(final int context) { + void setContext(int context) { operation( () -> { skipManager.removeAll(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.java index 84a7352541..f5619b2561 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/PreferencesBox.java @@ -442,7 +442,7 @@ public class PreferencesBox extends Composite { @UiHandler("mode") void onMode(@SuppressWarnings("unused") ChangeEvent e) { - final String mode = getSelectedMode(); + String mode = getSelectedMode(); prefs.syntaxHighlighting(true); syntaxHighlighting.setValue(true, false); new ModeInjector() @@ -525,7 +525,7 @@ public class PreferencesBox extends Composite { @UiHandler("theme") void onTheme(@SuppressWarnings("unused") ChangeEvent e) { - final Theme newTheme = getSelectedTheme(); + Theme newTheme = getSelectedTheme(); prefs.theme(newTheme); if (view != null) { ThemeLoader.loadTheme( diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java index 547b0c6c15..bb33b03317 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide.java @@ -180,8 +180,8 @@ public class SideBySide extends DiffScreen { }; } - private void display(final CommentsCollections comments) { - final DiffInfo diff = getDiff(); + private void display(CommentsCollections comments) { + DiffInfo diff = getDiff(); setThemeStyles(prefs.theme().isDark()); setShowIntraline(prefs.intralineDifference()); if (prefs.showLineNumbers()) { @@ -313,8 +313,8 @@ public class SideBySide extends DiffScreen { } @Override - Runnable updateActiveLine(final CodeMirror cm) { - final CodeMirror other = otherCm(cm); + Runnable updateActiveLine(CodeMirror cm) { + CodeMirror other = otherCm(cm); return () -> { // The rendering of active lines has to be deferred. Reflow // caused by adding and removing styles chokes Firefox when arrow @@ -345,13 +345,13 @@ public class SideBySide extends DiffScreen { }; } - private Runnable moveCursorToSide(final CodeMirror cmSrc, DisplaySide sideDst) { - final CodeMirror cmDst = getCmFromSide(sideDst); + private Runnable moveCursorToSide(CodeMirror cmSrc, DisplaySide sideDst) { + CodeMirror cmDst = getCmFromSide(sideDst); if (cmDst == cmSrc) { return () -> {}; } - final DisplaySide sideSrc = cmSrc.side(); + DisplaySide sideSrc = cmSrc.side(); return () -> { if (cmSrc.extras().hasActiveLine()) { cmDst.setCursor( diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java index 507bb5bf5d..cfd42267b3 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java @@ -245,7 +245,7 @@ class SideBySideChunkManager extends ChunkManager { } @Override - Runnable diffChunkNav(final CodeMirror cm, final Direction dir) { + Runnable diffChunkNav(CodeMirror cm, Direction dir) { return () -> { int line = cm.extras().hasActiveLine() ? cm.getLineNumber(cm.extras().activeLine()) : 0; int res = diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Unified.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Unified.java index 93874b060c..8647d68ae0 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Unified.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Unified.java @@ -133,7 +133,7 @@ public class Unified extends DiffScreen { } @Override - void registerCmEvents(final CodeMirror cm) { + void registerCmEvents(CodeMirror cm) { super.registerCmEvents(cm); cm.on( @@ -164,8 +164,8 @@ public class Unified extends DiffScreen { }; } - private void display(final CommentsCollections comments) { - final DiffInfo diff = getDiff(); + private void display(CommentsCollections comments) { + DiffInfo diff = getDiff(); setThemeStyles(prefs.theme().isDark()); setShowIntraline(prefs.intralineDifference()); if (prefs.showLineNumbers()) { @@ -307,7 +307,7 @@ public class Unified extends DiffScreen { } @Override - Runnable updateActiveLine(final CodeMirror cm) { + Runnable updateActiveLine(CodeMirror cm) { return () -> { // The rendering of active lines has to be deferred. Reflow // caused by adding and removing styles chokes Firefox when arrow diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedChunkManager.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedChunkManager.java index 7e1a75bd81..1a662e2127 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedChunkManager.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedChunkManager.java @@ -213,7 +213,7 @@ class UnifiedChunkManager extends ChunkManager { } @Override - Runnable diffChunkNav(final CodeMirror cm, final Direction dir) { + Runnable diffChunkNav(CodeMirror cm, Direction dir) { return () -> { int line = cm.extras().hasActiveLine() ? cm.getLineNumber(cm.extras().activeLine()) : 0; int res = diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditScreen.java index ac4fb631db..06c8c555d0 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditScreen.java @@ -468,7 +468,7 @@ public class EditScreen extends Screen { cmEdit.setOption(option, value); } - void setTheme(final Theme newTheme) { + void setTheme(Theme newTheme) { cmBase.operation( () -> { cmBase.setOption("theme", newTheme.name().toLowerCase()); @@ -494,7 +494,7 @@ public class EditScreen extends Screen { cmEdit.setOption("lineNumbers", show); } - void setShowWhitespaceErrors(final boolean show) { + void setShowWhitespaceErrors(boolean show) { cmBase.operation( () -> { cmBase.setOption("showTrailingSpace", show); diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java index 4ca7dc8ff1..9e375e7184 100644 --- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java +++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java @@ -97,7 +97,7 @@ public abstract class AbstractLuceneIndex implements Index { this.sitePaths = sitePaths; this.dir = dir; this.name = name; - final String index = Joiner.on('_').skipNulls().join(name, subIndex); + String index = Joiner.on('_').skipNulls().join(name, subIndex); IndexWriter delegateWriter; long commitPeriod = writerConfig.getCommitWithinMs(); @@ -243,15 +243,15 @@ public abstract class AbstractLuceneIndex implements Index { } } - ListenableFuture insert(final Document doc) { + ListenableFuture insert(Document doc) { return submit(() -> writer.addDocument(doc)); } - ListenableFuture replace(final Term term, final Document doc) { + ListenableFuture replace(Term term, Document doc) { return submit(() -> writer.updateDocument(term, doc)); } - ListenableFuture delete(final Term term) { + ListenableFuture delete(Term term) { return submit(() -> writer.deleteDocuments(term)); } diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNoteDb.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNoteDb.java index b4d0ef581e..0c8e4a56ff 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNoteDb.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNoteDb.java @@ -151,7 +151,7 @@ public class RebuildNoteDb extends SiteProgram { List> futures = new ArrayList<>(); List projectNames = Ordering.usingToString().sortedCopy(changesByProject.keySet()); - for (final Project.NameKey project : projectNames) { + for (Project.NameKey project : projectNames) { ListenableFuture future = executor.submit( () -> { diff --git a/gerrit-server/src/main/java/com/google/gerrit/metrics/proc/ProcMetricModule.java b/gerrit-server/src/main/java/com/google/gerrit/metrics/proc/ProcMetricModule.java index e0371fef5a..8978e99d69 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/metrics/proc/ProcMetricModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/metrics/proc/ProcMetricModule.java @@ -103,7 +103,7 @@ public class ProcMetricModule extends MetricModule { } private void procJvmMemory(MetricMaker metrics) { - final CallbackMetric0 heapCommitted = + CallbackMetric0 heapCommitted = metrics.newCallbackMetric( "proc/jvm/memory/heap_committed", Long.class, @@ -111,7 +111,7 @@ public class ProcMetricModule extends MetricModule { .setGauge() .setUnit(Units.BYTES)); - final CallbackMetric0 heapUsed = + CallbackMetric0 heapUsed = metrics.newCallbackMetric( "proc/jvm/memory/heap_used", Long.class, @@ -119,7 +119,7 @@ public class ProcMetricModule extends MetricModule { .setGauge() .setUnit(Units.BYTES)); - final CallbackMetric0 nonHeapCommitted = + CallbackMetric0 nonHeapCommitted = metrics.newCallbackMetric( "proc/jvm/memory/non_heap_committed", Long.class, @@ -127,7 +127,7 @@ public class ProcMetricModule extends MetricModule { .setGauge() .setUnit(Units.BYTES)); - final CallbackMetric0 nonHeapUsed = + CallbackMetric0 nonHeapUsed = metrics.newCallbackMetric( "proc/jvm/memory/non_heap_used", Long.class, @@ -135,7 +135,7 @@ public class ProcMetricModule extends MetricModule { .setGauge() .setUnit(Units.BYTES)); - final CallbackMetric0 objectPendingFinalizationCount = + CallbackMetric0 objectPendingFinalizationCount = metrics.newCallbackMetric( "proc/jvm/memory/object_pending_finalization_count", Integer.class, @@ -143,7 +143,7 @@ public class ProcMetricModule extends MetricModule { .setGauge() .setUnit("objects")); - final MemoryMXBean memory = ManagementFactory.getMemoryMXBean(); + MemoryMXBean memory = ManagementFactory.getMemoryMXBean(); metrics.newTrigger( ImmutableSet.>of( heapCommitted, heapUsed, nonHeapCommitted, nonHeapUsed, objectPendingFinalizationCount), @@ -165,14 +165,14 @@ public class ProcMetricModule extends MetricModule { } private void procJvmGc(MetricMaker metrics) { - final CallbackMetric1 gcCount = + CallbackMetric1 gcCount = metrics.newCallbackMetric( "proc/jvm/gc/count", Long.class, new Description("Number of GCs").setCumulative(), Field.ofString("gc_name", "The name of the garbage collector")); - final CallbackMetric1 gcTime = + CallbackMetric1 gcTime = metrics.newCallbackMetric( "proc/jvm/gc/time", Long.class, @@ -199,16 +199,11 @@ public class ProcMetricModule extends MetricModule { } private void procJvmThread(MetricMaker metrics) { - final ThreadMXBean thread = ManagementFactory.getThreadMXBean(); + ThreadMXBean thread = ManagementFactory.getThreadMXBean(); metrics.newCallbackMetric( "proc/jvm/thread/num_live", Integer.class, new Description("Current live thread count").setGauge().setUnit("threads"), - new Supplier() { - @Override - public Integer get() { - return thread.getThreadCount(); - } - }); + () -> thread.getThreadCount()); } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheMetrics.java b/gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheMetrics.java index 8770ac116f..11f20346c2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheMetrics.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheMetrics.java @@ -30,41 +30,41 @@ import java.util.Set; @Singleton public class CacheMetrics { @Inject - public CacheMetrics(MetricMaker metrics, final DynamicMap> cacheMap) { + public CacheMetrics(MetricMaker metrics, DynamicMap> cacheMap) { Field F_NAME = Field.ofString("cache_name"); - final CallbackMetric1 memEnt = + CallbackMetric1 memEnt = metrics.newCallbackMetric( "caches/memory_cached", Long.class, new Description("Memory entries").setGauge().setUnit("entries"), F_NAME); - final CallbackMetric1 memHit = + CallbackMetric1 memHit = metrics.newCallbackMetric( "caches/memory_hit_ratio", Double.class, new Description("Memory hit ratio").setGauge().setUnit("percent"), F_NAME); - final CallbackMetric1 memEvict = + CallbackMetric1 memEvict = metrics.newCallbackMetric( "caches/memory_eviction_count", Long.class, new Description("Memory eviction count").setGauge().setUnit("evicted entries"), F_NAME); - final CallbackMetric1 perDiskEnt = + CallbackMetric1 perDiskEnt = metrics.newCallbackMetric( "caches/disk_cached", Long.class, new Description("Disk entries used by persistent cache").setGauge().setUnit("entries"), F_NAME); - final CallbackMetric1 perDiskHit = + CallbackMetric1 perDiskHit = metrics.newCallbackMetric( "caches/disk_hit_ratio", Double.class, new Description("Disk hit ratio for persistent cache").setGauge().setUnit("percent"), F_NAME); - final Set> cacheMetrics = + Set> cacheMetrics = ImmutableSet.>of(memEnt, memHit, memEvict, perDiskEnt, perDiskHit); metrics.newTrigger( @@ -83,9 +83,7 @@ public class CacheMetrics { perDiskHit.set(name, hitRatio(d)); } } - for (CallbackMetric cbm : cacheMetrics) { - cbm.prune(); - } + cacheMetrics.forEach(CallbackMetric::prune); }); } 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 c6384aea39..4358186e33 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 @@ -41,7 +41,7 @@ public class RequestScopedReviewDbProvider implements Provider { @Override public ReviewDb get() { if (db == null) { - final ReviewDb c; + ReviewDb c; try { c = schema.open(); } catch (OrmException e) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java index a388b44ef5..36a409ab9f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java @@ -82,7 +82,7 @@ public class AllAccountsIndexer extends SiteIndexer future = executor.submit( diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/AllGroupsIndexer.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/AllGroupsIndexer.java index ae79ccb893..4014102996 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/AllGroupsIndexer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/group/AllGroupsIndexer.java @@ -81,7 +81,7 @@ public class AllGroupsIndexer extends SiteIndexer future = executor.submit( diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilder.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilder.java index e5b1c0e76d..8ce9987568 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilder.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilder.java @@ -42,7 +42,7 @@ public abstract class ChangeRebuilder { } public final ListenableFuture rebuildAsync( - final Change.Id id, ListeningExecutorService executor) { + Change.Id id, ListeningExecutorService executor) { return executor.submit( () -> { try (ReviewDb db = schemaFactory.open()) { 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 0211dfd148..b766a02680 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 @@ -250,8 +250,7 @@ public class PatchListLoader implements Callable { } private FileHeader toFileHeader( - PatchListKey key, final DiffFormatter diffFormatter, final DiffEntry diffEntry) - throws IOException { + PatchListKey key, DiffFormatter diffFormatter, DiffEntry diffEntry) throws IOException { Future result = diffExecutor.submit( diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheWarmer.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheWarmer.java index 84fdf13f44..16a3b6b29f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheWarmer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheWarmer.java @@ -46,7 +46,7 @@ public class ProjectCacheWarmer implements LifecycleListener { public void start() { int cpus = Runtime.getRuntime().availableProcessors(); if (config.getBoolean("cache", "projects", "loadOnStartup", false)) { - final ThreadPoolExecutor pool = + ThreadPoolExecutor pool = new ScheduledThreadPoolExecutor( config.getInt("cache", "projects", "loadThreads", cpus), new ThreadFactoryBuilder().setNameFormat("ProjectCacheLoader-%d").build()); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java index 5288db7043..a1333c686e 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java @@ -172,7 +172,7 @@ public abstract class RequestScopePropagator { /** @see #wrap(Callable) */ protected abstract Callable wrapImpl(Callable callable); - protected Callable context(final RequestContext context, final Callable callable) { + protected Callable context(RequestContext context, Callable callable) { return () -> { RequestContext old = local.setContext( @@ -195,7 +195,7 @@ public abstract class RequestScopePropagator { }; } - protected Callable cleanup(final Callable callable) { + protected Callable cleanup(Callable callable) { return () -> { RequestCleanup cleanup = scope diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/ThreadLocalRequestScopePropagator.java b/gerrit-server/src/main/java/com/google/gerrit/server/util/ThreadLocalRequestScopePropagator.java index 4cca0b3c12..90fb9948b0 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/util/ThreadLocalRequestScopePropagator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/util/ThreadLocalRequestScopePropagator.java @@ -41,7 +41,7 @@ public abstract class ThreadLocalRequestScopePropagator extends RequestScopeP /** @see RequestScopePropagator#wrap(Callable) */ @Override - protected final Callable wrapImpl(final Callable callable) { + protected final Callable wrapImpl(Callable callable) { C ctx = continuingContext(requireContext()); return () -> { C old = threadLocal.get(); diff --git a/gerrit-server/src/test/java/com/google/gerrit/metrics/proc/ProcMetricModuleTest.java b/gerrit-server/src/test/java/com/google/gerrit/metrics/proc/ProcMetricModuleTest.java index 181b5c7c1b..91b01f6ab1 100644 --- a/gerrit-server/src/test/java/com/google/gerrit/metrics/proc/ProcMetricModuleTest.java +++ b/gerrit-server/src/test/java/com/google/gerrit/metrics/proc/ProcMetricModuleTest.java @@ -126,11 +126,11 @@ public class ProcMetricModuleTest { @Test public void callbackMetric0() { - final CallbackMetric0 cntr = + CallbackMetric0 cntr = metrics.newCallbackMetric( "test/count", Long.class, new Description("simple test").setCumulative()); - final AtomicInteger invocations = new AtomicInteger(0); + AtomicInteger invocations = new AtomicInteger(0); metrics.newTrigger( cntr, () -> {