diff --git a/core/src/main/java/hudson/model/AsyncAperiodicWork.java b/core/src/main/java/hudson/model/AsyncAperiodicWork.java index 294b471f99..ba07352bde 100644 --- a/core/src/main/java/hudson/model/AsyncAperiodicWork.java +++ b/core/src/main/java/hudson/model/AsyncAperiodicWork.java @@ -114,7 +114,7 @@ public abstract class AsyncAperiodicWork extends AperiodicWork { long startTime = System.currentTimeMillis(); long stopTime; - AsyncPeriodicWork.LazyTaskListener l = new AsyncPeriodicWork.LazyTaskListener(() -> createListener(), String.format("Started at %tc", new Date(startTime))); + AsyncPeriodicWork.LazyTaskListener l = new AsyncPeriodicWork.LazyTaskListener(this::createListener, String.format("Started at %tc", new Date(startTime))); try (ACLContext ctx = ACL.as2(ACL.SYSTEM2)) { execute(l); } catch (IOException e) { diff --git a/core/src/main/java/hudson/model/AsyncPeriodicWork.java b/core/src/main/java/hudson/model/AsyncPeriodicWork.java index 3b75984454..42b0628449 100644 --- a/core/src/main/java/hudson/model/AsyncPeriodicWork.java +++ b/core/src/main/java/hudson/model/AsyncPeriodicWork.java @@ -96,7 +96,7 @@ public abstract class AsyncPeriodicWork extends PeriodicWork { long startTime = System.currentTimeMillis(); long stopTime; - LazyTaskListener l = new LazyTaskListener(() -> createListener(), String.format("Started at %tc", new Date(startTime))); + LazyTaskListener l = new LazyTaskListener(this::createListener, String.format("Started at %tc", new Date(startTime))); try { try (ACLContext ctx = ACL.as2(ACL.SYSTEM2)) { execute(l); diff --git a/core/src/main/java/jenkins/util/TreeString.java b/core/src/main/java/jenkins/util/TreeString.java index 3ff7185c84..455e48ff58 100644 --- a/core/src/main/java/jenkins/util/TreeString.java +++ b/core/src/main/java/jenkins/util/TreeString.java @@ -207,12 +207,7 @@ public final class TreeString implements Serializable { // dedup at the end final TreeStringBuilder _builder = builder; - context.addCompletionCallback(new Runnable() { - @Override - public void run() { - _builder.dedup(); - } - }, 0); + context.addCompletionCallback(_builder::dedup, 0); } return builder.intern(reader.getValue()); } diff --git a/core/src/main/java/jenkins/views/Header.java b/core/src/main/java/jenkins/views/Header.java index 683d6fb491..8418ccb871 100644 --- a/core/src/main/java/jenkins/views/Header.java +++ b/core/src/main/java/jenkins/views/Header.java @@ -51,7 +51,7 @@ public abstract class Header implements ExtensionPoint { @Restricted(NoExternalUse.class) public static Header get() { Optional
header = ExtensionList.lookup(Header.class).stream().filter(Header::isAvailable).findFirst(); - return header.orElseGet(() -> new JenkinsHeader()); + return header.orElseGet(JenkinsHeader::new); } } diff --git a/core/src/test/java/hudson/model/RunTest.java b/core/src/test/java/hudson/model/RunTest.java index 1c17dcffc8..a45fb9d05e 100644 --- a/core/src/test/java/hudson/model/RunTest.java +++ b/core/src/test/java/hudson/model/RunTest.java @@ -78,11 +78,7 @@ public class RunTest { }).get(); TimeZone.setDefault(TimeZone.getTimeZone("America/Los_Angeles")); id = r.getId(); - assertEquals(id, svc.submit(new Callable() { - @Override public String call() { - return r.getId(); - } - }).get()); + assertEquals(id, svc.submit(r::getId).get()); } finally { svc.shutdown(); } @@ -90,12 +86,7 @@ public class RunTest { svc = Executors.newSingleThreadExecutor(); try { assertEquals(id, r.getId()); - assertEquals(id, svc.submit(new Callable() { - @Override - public String call() { - return r.getId(); - } - }).get()); + assertEquals(id, svc.submit(r::getId).get()); } finally { svc.shutdown(); } diff --git a/test/src/test/java/hudson/model/ItemGroupMixInTest.java b/test/src/test/java/hudson/model/ItemGroupMixInTest.java index 5363d69dcb..6b5cb4f819 100644 --- a/test/src/test/java/hudson/model/ItemGroupMixInTest.java +++ b/test/src/test/java/hudson/model/ItemGroupMixInTest.java @@ -227,7 +227,7 @@ public class ItemGroupMixInTest { Project goodProject = r.jenkins.createProject(FreeStyleProject.class, goodName); - Failure exception = assertThrows(Failure.class, () -> { r.jenkins.copy(goodProject, badName); }); + Failure exception = assertThrows(Failure.class, () -> r.jenkins.copy(goodProject, badName)); assertEquals(exception.getMessage(), Messages.Hudson_UnsafeChar("@")); } @@ -236,7 +236,7 @@ public class ItemGroupMixInTest { public void createProject_checkGoodName() { final String badName = "calvin@jenkins"; - Failure exception = assertThrows(Failure.class, () -> { r.jenkins.createProject(MockFolder.class, badName); }); + Failure exception = assertThrows(Failure.class, () -> r.jenkins.createProject(MockFolder.class, badName)); assertEquals(exception.getMessage(), Messages.Hudson_UnsafeChar("@")); } @@ -262,9 +262,7 @@ public class ItemGroupMixInTest { " \n" + ""; - Failure exception = assertThrows(Failure.class, () -> { - r.jenkins.createProjectFromXML(badName, new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8))); - }); + Failure exception = assertThrows(Failure.class, () -> r.jenkins.createProjectFromXML(badName, new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8)))); assertEquals(exception.getMessage(), Messages.Hudson_UnsafeChar("@")); } diff --git a/test/src/test/java/hudson/model/QueueTest.java b/test/src/test/java/hudson/model/QueueTest.java index e38f9d92dc..018e5ea27d 100644 --- a/test/src/test/java/hudson/model/QueueTest.java +++ b/test/src/test/java/hudson/model/QueueTest.java @@ -971,7 +971,7 @@ public class QueueTest { } }, 2, TimeUnit.SECONDS); - assertThrows(CancellationException.class, () -> f.waitForStart()); + assertThrows(CancellationException.class, f::waitForStart); } @Ignore("TODO flakes in CI") diff --git a/test/src/test/java/hudson/model/labels/LabelAtomSecurity1986Test.java b/test/src/test/java/hudson/model/labels/LabelAtomSecurity1986Test.java index 3f24c4b563..1b84a7d9aa 100644 --- a/test/src/test/java/hudson/model/labels/LabelAtomSecurity1986Test.java +++ b/test/src/test/java/hudson/model/labels/LabelAtomSecurity1986Test.java @@ -153,7 +153,7 @@ public class LabelAtomSecurity1986Test { @Issue("SECURITY-1986") public void programmaticCreationInvalidName() { LabelAtom label = new LabelAtom("foo/../goo"); - assertThrows(IOException.class, () -> label.save()); + assertThrows(IOException.class, label::save); } @Test diff --git a/test/src/test/java/hudson/util/XStream2AnnotationTest.java b/test/src/test/java/hudson/util/XStream2AnnotationTest.java index 8a01255440..2fd70c0340 100644 --- a/test/src/test/java/hudson/util/XStream2AnnotationTest.java +++ b/test/src/test/java/hudson/util/XStream2AnnotationTest.java @@ -66,9 +66,7 @@ public class XStream2AnnotationTest { // Typical content saved by Jenkins session when annotation autodetection was still enabled: AnnotatedUnprocessed.get().writeXml("4"); }); - rr.then(r -> { - assertThat("CannotResolveClassException/IOException caught in Descriptor.load", AnnotatedUnprocessed.get().x, is(0)); - }); + rr.then(r -> assertThat("CannotResolveClassException/IOException caught in Descriptor.load", AnnotatedUnprocessed.get().x, is(0))); } @XStreamAlias("myconf-annotated-processed") diff --git a/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java b/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java index 38bb125331..4d1ffe2491 100644 --- a/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java +++ b/test/src/test/java/jenkins/model/JenkinsBuildsAndWorkspacesDirectoriesTest.java @@ -82,10 +82,7 @@ public class JenkinsBuildsAndWorkspacesDirectoriesTest { setWorkspacesDirProperty("testdir2"); }); - story.then(step -> { - assertTrue(logWasFoundAtLevel(LOG_WHEN_CHANGING_WORKSPACES_DIR, - Level.WARNING)); - }); + story.then(step -> assertTrue(logWasFoundAtLevel(LOG_WHEN_CHANGING_WORKSPACES_DIR, Level.WARNING))); } @Issue("JENKINS-50164") @@ -170,10 +167,7 @@ public class JenkinsBuildsAndWorkspacesDirectoriesTest { .record(Jenkins.class, Level.INFO) .capture(100); - story.then(step -> { - assertFalse(logWasFound("Using non default builds directories")); - } - ); + story.then(step -> assertFalse(logWasFound("Using non default builds directories"))); story.then(steps -> { assertTrue(story.j.getInstance().isDefaultBuildDir()); diff --git a/test/src/test/java/lib/layout/SvgIconTest.java b/test/src/test/java/lib/layout/SvgIconTest.java index a2f32aa0f4..c4f4219a45 100644 --- a/test/src/test/java/lib/layout/SvgIconTest.java +++ b/test/src/test/java/lib/layout/SvgIconTest.java @@ -93,9 +93,7 @@ public class SvgIconTest { JenkinsRule.WebClient wc = j.createWebClient(); AtomicBoolean alertTriggered = new AtomicBoolean(false); - wc.setAlertHandler((p, s) -> { - alertTriggered.set(true); - }); + wc.setAlertHandler((p, s) -> alertTriggered.set(true)); HtmlPage page = wc.goTo(testRootAction.getUrlName());