Use lambdas when possible

Replace anonymous inner classes with lambda declarations (when possible
using method references).

See gh-9781

spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java

@@ -18,7 +18,6 @@ package org.springframework.boot.cli.infrastructure;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -71,14 +70,8 @@ public final class CommandLineInvoker {
 	private File findLaunchScript() throws IOException {
 		File unpacked = new File("target/unpacked-cli");
 		if (!unpacked.isDirectory()) {
-			File zip = new File("target").listFiles(new FileFilter() {
-
-				@Override
-				public boolean accept(File pathname) {
-					return pathname.getName().endsWith("-bin.zip");
-				}
-
-			})[0];
+			File zip = new File("target")
+					.listFiles((pathname) -> pathname.getName().endsWith("-bin.zip"))[0];
 			try (ZipInputStream input = new ZipInputStream(new FileInputStream(zip))) {
 				ZipEntry entry;
 				while ((entry = input.getNextEntry()) != null) {

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java

@@ -57,9 +57,7 @@ import org.springframework.boot.cli.compiler.RepositoryConfigurationFactory;
 import org.springframework.boot.cli.compiler.grape.RepositoryConfiguration;
 import org.springframework.boot.loader.tools.JarWriter;
 import org.springframework.boot.loader.tools.Layout;
-import org.springframework.boot.loader.tools.Libraries;
 import org.springframework.boot.loader.tools.Library;
-import org.springframework.boot.loader.tools.LibraryCallback;
 import org.springframework.boot.loader.tools.LibraryScope;
 import org.springframework.boot.loader.tools.Repackager;
 import org.springframework.core.io.Resource;
@@ -198,13 +196,9 @@ abstract class ArchiveCommand extends OptionParsingCommand {
 			libraries.addAll(createLibraries(dependencies));
 			Repackager repackager = new Repackager(file);
 			repackager.setMainClass(PackagedSpringApplicationLauncher.class.getName());
-			repackager.repackage(new Libraries() {
-
-				@Override
-				public void doWithLibraries(LibraryCallback callback) throws IOException {
-					for (Library library : libraries) {
-						callback.library(library);
-					}
+			repackager.repackage((callback) -> {
+				for (Library library : libraries) {
+					callback.library(library);
 				}
 			});
 		}

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java

@@ -94,11 +94,7 @@ class ServiceCapabilitiesReportGenerator {
 
 	private List<Dependency> getSortedDependencies(InitializrServiceMetadata metadata) {
 		ArrayList<Dependency> dependencies = new ArrayList<>(metadata.getDependencies());
-		dependencies.sort(new Comparator<Dependency>() {
-			@Override public int compare(Dependency o1, Dependency o2) {
-				return o1.getId().compareTo(o2.getId());
-			}
-		});
+		dependencies.sort(Comparator.comparing(Dependency::getId));
 		return dependencies;
 	}
 
@@ -107,15 +103,7 @@ class ServiceCapabilitiesReportGenerator {
 		report.append("Available project types:" + NEW_LINE);
 		report.append("------------------------" + NEW_LINE);
 		SortedSet<Entry<String, ProjectType>> entries = new TreeSet<>(
-				new Comparator<Entry<String, ProjectType>>() {
-
-					@Override
-					public int compare(Entry<String, ProjectType> o1,
-							Entry<String, ProjectType> o2) {
-						return o1.getKey().compareTo(o2.getKey());
-					}
-
-				});
+				Comparator.comparing(Entry::getKey));
 		entries.addAll(metadata.getProjectTypes().entrySet());
 		for (Entry<String, ProjectType> entry : entries) {
 			ProjectType type = entry.getValue();

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java

@@ -130,17 +130,10 @@ public class OptionHandler {
 
 		@Override
 		public String format(Map<String, ? extends OptionDescriptor> options) {
-			Comparator<OptionDescriptor> comparator = new Comparator<OptionDescriptor>() {
-				@Override
-				public int compare(OptionDescriptor first, OptionDescriptor second) {
-					return first.options().iterator().next()
-							.compareTo(second.options().iterator().next());
-				}
-			};
-
+			Comparator<OptionDescriptor> comparator = (first, second) -> first.options()
+					.iterator().next().compareTo(second.options().iterator().next());
 			Set<OptionDescriptor> sorted = new TreeSet<>(comparator);
 			sorted.addAll(options.values());
-
 			for (OptionDescriptor descriptor : sorted) {
 				if (!descriptor.representsNonOptions()) {
 					this.help.add(new OptionHelpAdapter(descriptor));

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java

@@ -119,12 +119,7 @@ public class Shell {
 	}
 
 	private void attachSignalHandler() {
-		SignalUtils.attachSignalHandler(new Runnable() {
-			@Override
-			public void run() {
-				handleSigInt();
-			}
-		});
+		SignalUtils.attachSignalHandler(this::handleSigInt);
 	}
 
 	/**

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java

@@ -122,23 +122,23 @@ public class ExtendedGroovyClassLoader extends GroovyClassLoader {
 
 	@Override
 	public ClassCollector createCollector(CompilationUnit unit, SourceUnit su) {
-		InnerLoader loader = AccessController
-				.doPrivileged(new PrivilegedAction<InnerLoader>() {
-					@Override
-					public InnerLoader run() {
-						return new InnerLoader(ExtendedGroovyClassLoader.this) {
-							// Don't return URLs from the inner loader so that Tomcat only
-							// searches the parent. Fixes 'TLD skipped' issues
-							@Override
-							public URL[] getURLs() {
-								return NO_URLS;
-							}
-						};
-					}
-				});
+		InnerLoader loader = AccessController.doPrivileged(getInnerLoader());
 		return new ExtendedClassCollector(loader, unit, su);
 	}
 
+	private PrivilegedAction<InnerLoader> getInnerLoader() {
+		return () -> new InnerLoader(ExtendedGroovyClassLoader.this) {
+
+			// Don't return URLs from the inner loader so that Tomcat only
+			// searches the parent. Fixes 'TLD skipped' issues
+			@Override
+			public URL[] getURLs() {
+				return NO_URLS;
+			}
+
+		};
+	}
+
 	public CompilerConfiguration getConfiguration() {
 		return this.configuration;
 	}

spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java

@@ -100,19 +100,11 @@ public class AetherGrapeEngine implements GrapeEngine {
 				|| Boolean.getBoolean("groovy.grape.report.downloads")) {
 			return new DetailedProgressReporter(session, System.out);
 		}
-		else if ("none".equals(progressReporter)) {
-			return new ProgressReporter() {
-
-				@Override
-				public void finished() {
-
-				}
-
+		if ("none".equals(progressReporter)) {
+			return () -> {
 			};
 		}
-		else {
-			return new SummaryProgressReporter(session, System.out);
-		}
+		return new SummaryProgressReporter(session, System.out);
 	}
 
 	@Override

spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java

@@ -26,7 +26,6 @@ import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -105,25 +104,22 @@ public class CliTester implements TestRule {
 			String... args) {
 		clearUrlHandler();
 		final String[] sources = getSources(args);
-		return Executors.newSingleThreadExecutor().submit(new Callable<T>() {
-			@Override
-			public T call() throws Exception {
-				ClassLoader loader = Thread.currentThread().getContextClassLoader();
-				System.setProperty("server.port", "0");
-				System.setProperty("spring.application.class.name",
-						"org.springframework.boot.cli.CliTesterSpringApplication");
-				System.setProperty("portfile",
-						new File("target/server.port").getAbsolutePath());
-				try {
-					command.run(sources);
-					return command;
-				}
-				finally {
-					System.clearProperty("server.port");
-					System.clearProperty("spring.application.class.name");
-					System.clearProperty("portfile");
-					Thread.currentThread().setContextClassLoader(loader);
-				}
+		return Executors.newSingleThreadExecutor().submit(() -> {
+			ClassLoader loader = Thread.currentThread().getContextClassLoader();
+			System.setProperty("server.port", "0");
+			System.setProperty("spring.application.class.name",
+					"org.springframework.boot.cli.CliTesterSpringApplication");
+			System.setProperty("portfile",
+					new File("target/server.port").getAbsolutePath());
+			try {
+				command.run(sources);
+				return command;
+			}
+			finally {
+				System.clearProperty("server.port");
+				System.clearProperty("spring.application.class.name");
+				System.clearProperty("portfile");
+				Thread.currentThread().setContextClassLoader(loader);
 			}
 		});
 	}

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactoryTests.java

@@ -36,69 +36,53 @@ public class RepositoryConfigurationFactoryTests {
 
 	@Test
 	public void defaultRepositories() {
-		SystemProperties.doWithSystemProperties(new Runnable() {
-			@Override
-			public void run() {
-				List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
-						.createDefaultRepositoryConfiguration();
-				assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
-						"spring-snapshot", "spring-milestone");
-			}
+		SystemProperties.doWithSystemProperties(() -> {
+			List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
+					.createDefaultRepositoryConfiguration();
+			assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
+					"spring-snapshot", "spring-milestone");
 		}, "user.home:src/test/resources/maven-settings/basic");
 	}
 
 	@Test
 	public void snapshotRepositoriesDisabled() {
-		SystemProperties.doWithSystemProperties(new Runnable() {
-			@Override
-			public void run() {
-				List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
-						.createDefaultRepositoryConfiguration();
-				assertRepositoryConfiguration(repositoryConfiguration, "central",
-						"local");
-			}
+		SystemProperties.doWithSystemProperties(() -> {
+			List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
+					.createDefaultRepositoryConfiguration();
+			assertRepositoryConfiguration(repositoryConfiguration, "central", "local");
 		}, "user.home:src/test/resources/maven-settings/basic",
 				"disableSpringSnapshotRepos:true");
 	}
 
 	@Test
 	public void activeByDefaultProfileRepositories() {
-		SystemProperties.doWithSystemProperties(new Runnable() {
-			@Override
-			public void run() {
-				List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
-						.createDefaultRepositoryConfiguration();
-				assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
-						"spring-snapshot", "spring-milestone", "active-by-default");
-			}
+		SystemProperties.doWithSystemProperties(() -> {
+			List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
+					.createDefaultRepositoryConfiguration();
+			assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
+					"spring-snapshot", "spring-milestone", "active-by-default");
 		}, "user.home:src/test/resources/maven-settings/active-profile-repositories");
 	}
 
 	@Test
 	public void activeByPropertyProfileRepositories() {
-		SystemProperties.doWithSystemProperties(new Runnable() {
-			@Override
-			public void run() {
-				List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
-						.createDefaultRepositoryConfiguration();
-				assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
-						"spring-snapshot", "spring-milestone", "active-by-property");
-			}
+		SystemProperties.doWithSystemProperties(() -> {
+			List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
+					.createDefaultRepositoryConfiguration();
+			assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
+					"spring-snapshot", "spring-milestone", "active-by-property");
 		}, "user.home:src/test/resources/maven-settings/active-profile-repositories",
 				"foo:bar");
 	}
 
 	@Test
 	public void interpolationProfileRepositories() {
-		SystemProperties.doWithSystemProperties(new Runnable() {
-			@Override
-			public void run() {
-				List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
-						.createDefaultRepositoryConfiguration();
-				assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
-						"spring-snapshot", "spring-milestone", "interpolate-releases",
-						"interpolate-snapshots");
-			}
+		SystemProperties.doWithSystemProperties(() -> {
+			List<RepositoryConfiguration> repositoryConfiguration = RepositoryConfigurationFactory
+					.createDefaultRepositoryConfiguration();
+			assertRepositoryConfiguration(repositoryConfiguration, "central", "local",
+					"spring-snapshot", "spring-milestone", "interpolate-releases",
+					"interpolate-snapshots");
 		}, "user.home:src/test/resources/maven-settings/active-profile-repositories",
 				"interpolate:true");
 	}

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java

@@ -72,54 +72,32 @@ public class AetherGrapeEngineTests {
 
 	@Test
 	public void proxySelector() {
-		doWithCustomUserHome(new Runnable() {
-
-			@Override
-			public void run() {
-				AetherGrapeEngine grapeEngine = createGrapeEngine();
-
-				DefaultRepositorySystemSession session = (DefaultRepositorySystemSession) ReflectionTestUtils
-						.getField(grapeEngine, "session");
-
-				assertThat(session.getProxySelector() instanceof CompositeProxySelector)
-						.isTrue();
-			}
+		doWithCustomUserHome(() -> {
+			AetherGrapeEngine grapeEngine = createGrapeEngine();
+			DefaultRepositorySystemSession session = (DefaultRepositorySystemSession) ReflectionTestUtils
+					.getField(grapeEngine, "session");
 
+			assertThat(session.getProxySelector() instanceof CompositeProxySelector)
+					.isTrue();
 		});
 	}
 
 	@Test
 	public void repositoryMirrors() {
-		doWithCustomUserHome(new Runnable() {
-
-			@SuppressWarnings("unchecked")
-			@Override
-			public void run() {
-				AetherGrapeEngine grapeEngine = createGrapeEngine();
-
-				List<RemoteRepository> repositories = (List<RemoteRepository>) ReflectionTestUtils
-						.getField(grapeEngine, "repositories");
-				assertThat(repositories).hasSize(1);
-				assertThat(repositories.get(0).getId()).isEqualTo("central-mirror");
-			}
+		doWithCustomUserHome(() -> {
+			List<RemoteRepository> repositories = getRepositories();
+			assertThat(repositories).hasSize(1);
+			assertThat(repositories.get(0).getId()).isEqualTo("central-mirror");
 		});
 	}
 
 	@Test
 	public void repositoryAuthentication() {
-		doWithCustomUserHome(new Runnable() {
-
-			@SuppressWarnings("unchecked")
-			@Override
-			public void run() {
-				AetherGrapeEngine grapeEngine = createGrapeEngine();
-
-				List<RemoteRepository> repositories = (List<RemoteRepository>) ReflectionTestUtils
-						.getField(grapeEngine, "repositories");
-				assertThat(repositories).hasSize(1);
-				Authentication authentication = repositories.get(0).getAuthentication();
-				assertThat(authentication).isNotNull();
-			}
+		doWithCustomUserHome(() -> {
+			List<RemoteRepository> repositories = getRepositories();
+			assertThat(repositories).hasSize(1);
+			Authentication authentication = repositories.get(0).getAuthentication();
+			assertThat(authentication).isNotNull();
 		});
 	}
 
@@ -216,6 +194,13 @@ public class AetherGrapeEngineTests {
 		assertThat(urls[0].toExternalForm().endsWith("-sources.jar")).isTrue();
 	}
 
+	@SuppressWarnings("unchecked")
+	private List<RemoteRepository> getRepositories() {
+		AetherGrapeEngine grapeEngine = createGrapeEngine();
+		return (List<RemoteRepository>) ReflectionTestUtils.getField(grapeEngine,
+				"repositories");
+	}
+
 	private Map<String, Object> createDependency(String group, String module,
 			String version) {
 		Map<String, Object> dependency = new HashMap<>();

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/GrapeRootRepositorySystemSessionAutoConfigurationTests.java

@@ -59,21 +59,12 @@ public class GrapeRootRepositorySystemSessionAutoConfigurationTests {
 	@Test
 	public void noLocalRepositoryWhenNoGrapeRoot() {
 		given(this.repositorySystem.newLocalRepositoryManager(eq(this.session),
-				any(LocalRepository.class)))
-						.willAnswer(new Answer<LocalRepositoryManager>() {
-
-							@Override
-							public LocalRepositoryManager answer(
-									InvocationOnMock invocation) throws Throwable {
-								LocalRepository localRepository = invocation
-										.getArgument(1);
-								return new SimpleLocalRepositoryManagerFactory()
-										.newInstance(
-												GrapeRootRepositorySystemSessionAutoConfigurationTests.this.session,
-												localRepository);
-							}
-
-						});
+				any(LocalRepository.class))).willAnswer((invocation) -> {
+					LocalRepository localRepository = invocation.getArgument(1);
+					return new SimpleLocalRepositoryManagerFactory().newInstance(
+							GrapeRootRepositorySystemSessionAutoConfigurationTests.this.session,
+							localRepository);
+				});
 		new GrapeRootRepositorySystemSessionAutoConfiguration().apply(this.session,
 				this.repositorySystem);
 		verify(this.repositorySystem, times(0))

spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/SettingsXmlRepositorySystemSessionAutoConfigurationTests.java

@@ -26,7 +26,6 @@ import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
 import org.eclipse.aether.repository.Authentication;
 import org.eclipse.aether.repository.AuthenticationContext;
 import org.eclipse.aether.repository.LocalRepository;
-import org.eclipse.aether.repository.LocalRepositoryManager;
 import org.eclipse.aether.repository.Proxy;
 import org.eclipse.aether.repository.RemoteRepository;
 import org.junit.Before;
@@ -35,8 +34,6 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
 
 import org.springframework.boot.cli.testutil.SystemProperties;
 
@@ -78,28 +75,17 @@ public class SettingsXmlRepositorySystemSessionAutoConfigurationTests {
 		final DefaultRepositorySystemSession session = MavenRepositorySystemUtils
 				.newSession();
 		given(this.repositorySystem.newLocalRepositoryManager(eq(session),
-				any(LocalRepository.class)))
-						.willAnswer(new Answer<LocalRepositoryManager>() {
-
-							@Override
-							public LocalRepositoryManager answer(
-									InvocationOnMock invocation) throws Throwable {
-								LocalRepository localRepository = invocation
-										.getArgument(1);
-								return new SimpleLocalRepositoryManagerFactory()
-										.newInstance(session, localRepository);
-							}
-						});
-
-		SystemProperties.doWithSystemProperties(new Runnable() {
-			@Override
-			public void run() {
-				new SettingsXmlRepositorySystemSessionAutoConfiguration().apply(session,
-						SettingsXmlRepositorySystemSessionAutoConfigurationTests.this.repositorySystem);
-			}
-		}, "user.home:src/test/resources/maven-settings/property-interpolation",
+				any(LocalRepository.class))).willAnswer((invocation) -> {
+					LocalRepository localRepository = invocation.getArgument(1);
+					return new SimpleLocalRepositoryManagerFactory().newInstance(session,
+							localRepository);
+				});
+		SystemProperties.doWithSystemProperties(
+				() -> new SettingsXmlRepositorySystemSessionAutoConfiguration().apply(
+						session,
+						SettingsXmlRepositorySystemSessionAutoConfigurationTests.this.repositorySystem),
+				"user.home:src/test/resources/maven-settings/property-interpolation",
 				"foo:bar");
-
 		assertThat(session.getLocalRepository().getBasedir().getAbsolutePath())
 				.endsWith(File.separatorChar + "bar" + File.separatorChar + "repository");
 	}
@@ -107,14 +93,11 @@ public class SettingsXmlRepositorySystemSessionAutoConfigurationTests {
 	private void assertSessionCustomization(String userHome) {
 		final DefaultRepositorySystemSession session = MavenRepositorySystemUtils
 				.newSession();
-		SystemProperties.doWithSystemProperties(new Runnable() {
-			@Override
-			public void run() {
-				new SettingsXmlRepositorySystemSessionAutoConfiguration().apply(session,
-						SettingsXmlRepositorySystemSessionAutoConfigurationTests.this.repositorySystem);
-			}
-		}, "user.home:" + userHome);
-
+		SystemProperties.doWithSystemProperties(
+				() -> new SettingsXmlRepositorySystemSessionAutoConfiguration().apply(
+						session,
+						SettingsXmlRepositorySystemSessionAutoConfigurationTests.this.repositorySystem),
+				"user.home:" + userHome);
 		RemoteRepository repository = new RemoteRepository.Builder("my-server", "default",
 				"http://maven.example.com").build();
 		assertMirrorSelectorConfiguration(session, repository);